diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 0230993d3f08..fe394b662bb6 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -27,16 +27,16 @@ Rust applications are packaged by using the `buildRustPackage` helper from `rust
```
rustPlatform.buildRustPackage rec {
pname = "ripgrep";
- version = "11.0.2";
+ version = "12.1.1";
src = fetchFromGitHub {
owner = "BurntSushi";
repo = pname;
rev = version;
- sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3";
+ sha256 = "1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps";
};
- cargoSha256 = "17ldqr3asrdcsh4l29m3b5r37r5d0b3npq1lrgjmxb6vlx6a36qh";
+ cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp";
meta = with stdenv.lib; {
description = "A fast line-oriented regex search tool, similar to ag and ack";
@@ -47,10 +47,31 @@ rustPlatform.buildRustPackage rec {
}
```
-`buildRustPackage` requires a `cargoSha256` attribute which is computed over
-all crate sources of this package. Currently it is obtained by inserting a
-fake checksum into the expression and building the package once. The correct
-checksum can then be taken from the failed build.
+`buildRustPackage` requires either the `cargoSha256` or the
+`cargoHash` attribute which is computed over all crate sources of this
+package. `cargoHash256` is used for traditional Nix SHA-256 hashes,
+such as the one in the example above. `cargoHash` should instead be
+used for [SRI](https://www.w3.org/TR/SRI/) hashes. For example:
+
+```
+ cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8=";
+```
+
+Both types of hashes are permitted when contributing to nixpkgs. The
+Cargo hash is obtained by inserting a fake checksum into the
+expression and building the package once. The correct checksum can
+then be taken from the failed build. A fake hash can be used for
+`cargoSha256` as follows:
+
+```
+ cargoSha256 = stdenv.lib.fakeSha256;
+```
+
+For `cargoHash` you can use:
+
+```
+ cargoHash = stdenv.lib.fakeHash;
+```
Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
best practices guide, Rust applications should always commit the `Cargo.lock`
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5ce46ff64365..ef99c09d3c48 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3693,6 +3693,12 @@
githubId = 2789926;
name = "Imran Hossain";
};
+ iammrinal0 = {
+ email = "nixpkgs@mrinalpurohit.in";
+ github = "iammrinal0";
+ githubId = 890062;
+ name = "Mrinal";
+ };
iand675 = {
email = "ian@iankduncan.com";
github = "iand675";
@@ -6699,6 +6705,12 @@
githubId = 111265;
name = "Ozan Sener";
};
+ otavio = {
+ email = "otavio.salvador@ossystems.com.br";
+ github = "otavio";
+ githubId = 25278;
+ name = "Otavio Salvador";
+ };
otwieracz = {
email = "slawek@otwiera.cz";
github = "otwieracz";
diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index 758237152932..44040217b027 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -227,6 +227,15 @@ foreach my $u (@{$spec->{users}}) {
$u->{hashedPassword} = hashPassword($u->{password});
}
+ if (!defined $u->{shell}) {
+ if (defined $existing) {
+ $u->{shell} = $existing->{shell};
+ } else {
+ warn "warning: no declarative or previous shell for ‘$name’, setting shell to nologin\n";
+ $u->{shell} = "/run/current-system/sw/bin/nologin";
+ }
+ }
+
$u->{fakePassword} = $existing->{fakePassword} // "x";
$usersOut{$name} = $u;
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index a95763380986..e90a7d567d42 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -153,7 +153,7 @@ let
};
shell = mkOption {
- type = types.either types.shellPackage types.path;
+ type = types.nullOr (types.either types.shellPackage types.path);
default = pkgs.shadow;
defaultText = "pkgs.shadow";
example = literalExample "pkgs.bashInteractive";
diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh
index c72ef6e9c28b..450d77618148 100644
--- a/nixos/modules/installer/tools/nixos-enter.sh
+++ b/nixos/modules/installer/tools/nixos-enter.sh
@@ -69,6 +69,9 @@ mount --rbind /sys "$mountPoint/sys"
# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" chroot "$mountPoint" "$system/activate" 1>&2 || true
+
+ # Create /tmp
+ chroot "$mountPoint" systemd-tmpfiles --create --remove --exclude-prefix=/dev 1>&2 || true
)
exec chroot "$mountPoint" "${command[@]}"
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 90f40db7834b..4341c8c238a8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -745,6 +745,7 @@
./services/networking/skydns.nix
./services/networking/shadowsocks.nix
./services/networking/shairport-sync.nix
+ ./services/networking/shellhub-agent.nix
./services/networking/shorewall.nix
./services/networking/shorewall6.nix
./services/networking/shout.nix
diff --git a/nixos/modules/services/networking/shellhub-agent.nix b/nixos/modules/services/networking/shellhub-agent.nix
new file mode 100644
index 000000000000..4ce4b8250bc3
--- /dev/null
+++ b/nixos/modules/services/networking/shellhub-agent.nix
@@ -0,0 +1,91 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.services.shellhub-agent;
+in {
+
+ ###### interface
+
+ options = {
+
+ services.shellhub-agent = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable the ShellHub Agent daemon, which allows
+ secure remote logins.
+ '';
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.shellhub-agent;
+ defaultText = "pkgs.shellhub-agent";
+ description = ''
+ Which ShellHub Agent package to use.
+ '';
+ };
+
+ tenantId = mkOption {
+ type = types.str;
+ example = "ba0a880c-2ada-11eb-a35e-17266ef329d6";
+ description = ''
+ The tenant ID to use when connecting to the ShellHub
+ Gateway.
+ '';
+ };
+
+ server = mkOption {
+ type = types.str;
+ default = "https://cloud.shellhub.io";
+ description = ''
+ Server address of ShellHub Gateway to connect.
+ '';
+ };
+
+ privateKey = mkOption {
+ type = types.path;
+ default = "/var/lib/shellhub-agent/private.key";
+ description = ''
+ Location where to store the ShellHub Agent private
+ key.
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ systemd.services.shellhub-agent = {
+ description = "ShellHub Agent";
+
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "local-fs.target" ];
+ wants = [ "network-online.target" ];
+ after = [
+ "local-fs.target"
+ "network.target"
+ "network-online.target"
+ "time-sync.target"
+ ];
+
+ environment.SERVER_ADDRESS = cfg.server;
+ environment.PRIVATE_KEY = cfg.privateKey;
+ environment.TENANT_ID = cfg.tenantId;
+
+ serviceConfig = {
+ # The service starts sessions for different users.
+ User = "root";
+ Restart = "on-failure";
+ ExecStart = "${cfg.package}/bin/agent";
+ };
+ };
+
+ environment.systemPackages = [ cfg.package ];
+ };
+}
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 8c12e0e49bf5..c5470b7af09b 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -7,7 +7,7 @@ let
echo "attempting to fetch configuration from EC2 user data..."
export HOME=/root
- export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
+ export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused pkgs.xz config.system.build.nixos-rebuild]}:$PATH
export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
userData=/etc/ec2-metadata/user-data
diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index a46dd65eb491..ee9fe62187d3 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -176,10 +176,10 @@ let
description = ''
Define which other containers this one depends on. They will be added to both After and Requires for the unit.
- Use the same name as the attribute under virtualisation.oci-containers.
+ Use the same name as the attribute under virtualisation.oci-containers.containers.
'';
example = literalExample ''
- virtualisation.oci-containers = {
+ virtualisation.oci-containers.containers = {
node1 = {};
node2 = {
dependsOn = [ "node1" ];
diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix
index 88e8ba6d0bc6..0322459685f2 100644
--- a/pkgs/applications/audio/netease-music-tui/default.nix
+++ b/pkgs/applications/audio/netease-music-tui/default.nix
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "betta-cyber";
repo = "netease-music-tui";
- rev = "${version}";
+ rev = version;
sha256 = "0m5b3q493d32kxznm4apn56216l07b1c49km236i03mpfvdw7m1f";
};
diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix
index b4b9adfa619e..e29a19713bdd 100644
--- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix
@@ -4,8 +4,8 @@ let
src = pkgs.fetchgit {
url = "https://github.com/ttuegel/emacs2nix.git";
fetchSubmodules = true;
- rev = "798542b34dc8d7f5c110119350bd9bafef9f8439";
- sha256 = "1lna9z90sxjnanggjh2si018cfzp60xsrissnv9bbkc8wish1537";
+ rev = "b815a9323c1f58f6c163a1f968939c57a8b6cfa0";
+ sha256 = "183xlmhjmj4z2zssc0pw990h7bf3bam8zqswnf1zcsyp8z7yrl5g";
};
in pkgs.mkShell {
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 4e928ff34f06..a41ee209a0be 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
- version = "7.3.0";
+ version = "7.3.1";
desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,10 +30,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "sha256-JhEF2/97vo2FgzpCFkuc31aLl9qjKHV8RYXO5oBU1no=";
+ sha256 = "sha256-4UVC5lBoGsW99L6AgM+1Rs07LCrvp2qVevBrooTbee4=";
};
installPhase = ''
+ # remove bundled jre
+ rm -rf jre
+
mkdir -p $out/
cp -r . $out/dbeaver
diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json
index 2fd29444dade..9b0ffe67f0cd 100644
--- a/pkgs/applications/misc/hubstaff/revision.json
+++ b/pkgs/applications/misc/hubstaff/revision.json
@@ -1,5 +1,5 @@
{
- "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.2-bead991b/Hubstaff-1.5.2-bead991b.sh",
- "version": "1.5.2-bead991b",
- "sha256": "068b0q94ydldyjmzbka1j94vr1xdxvkxq79pp7ria81hvpp68yxf"
+ "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.15-28673d1c/Hubstaff-1.5.15-28673d1c.sh",
+ "version": "1.5.15-28673d1c",
+ "sha256": "0ging41l3a3sdj6bggh913h71gqmb8l3rplp4civpgclnfzv7fg2"
}
diff --git a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch b/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch
deleted file mode 100644
index 34e4e6f0e7fb..000000000000
--- a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From ddc1f9e63e7a769c71131b56f6a2a011c649635c Mon Sep 17 00:00:00 2001
-From: Arnout Engelen
-Date: Tue, 24 Nov 2020 15:34:40 +0100
-Subject: [PATCH] Avoid name clash between inkscape plugin and inkcut itself
-
-Ohterwise, with an unfortunate PYTONPATH, inkcut would no longer
-start since it'd try to invoke the inkcut.py from the extension
-instead of the main application
----
- plugins/inkscape/{inkcut.py => inkcut4inkscape.py} | 2 +-
- plugins/inkscape/inkcut_cut.inx | 2 +-
- plugins/inkscape/inkcut_cut.py | 2 +-
- plugins/inkscape/inkcut_open.inx | 2 +-
- plugins/inkscape/inkcut_open.py | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
- rename plugins/inkscape/{inkcut.py => inkcut4inkscape.py} (98%)
-
-diff --git a/plugins/inkscape/inkcut.py b/plugins/inkscape/inkcut4inkscape.py
-similarity index 98%
-rename from plugins/inkscape/inkcut.py
-rename to plugins/inkscape/inkcut4inkscape.py
-index 5b90475..7dc8d86 100644
---- a/plugins/inkscape/inkcut.py
-+++ b/plugins/inkscape/inkcut4inkscape.py
-@@ -2,7 +2,7 @@
- # -*- coding: utf-8 -*-
- """
- Inkcut, Plot HPGL directly from Inkscape.
-- inkcut.py
-+ inkcut4inkscape.py
-
- Copyright 2018 The Inkcut Team
-
-diff --git a/plugins/inkscape/inkcut_cut.inx b/plugins/inkscape/inkcut_cut.inx
-index 4b44ae5..3db8721 100644
---- a/plugins/inkscape/inkcut_cut.inx
-+++ b/plugins/inkscape/inkcut_cut.inx
-@@ -2,7 +2,7 @@
- <_name>Cut selection...
- org.ekips.filter.inkcut.cut
- inkcut_cut.py
-- inkcut.py
-+ inkcut4inkscape.py
- inkex.py
-
- all
-diff --git a/plugins/inkscape/inkcut_cut.py b/plugins/inkscape/inkcut_cut.py
-index acaf812..777629a 100644
---- a/plugins/inkscape/inkcut_cut.py
-+++ b/plugins/inkscape/inkcut_cut.py
-@@ -37,7 +37,7 @@
- else:
- inkex.localize()
- import subprocess
--from inkcut import contains_text, convert_objects_to_paths
-+from inkcut4inkscape import contains_text, convert_objects_to_paths
-
-
-
-diff --git a/plugins/inkscape/inkcut_open.inx b/plugins/inkscape/inkcut_open.inx
-index 45ee585..2dcd38e 100644
---- a/plugins/inkscape/inkcut_open.inx
-+++ b/plugins/inkscape/inkcut_open.inx
-@@ -2,7 +2,7 @@
- <_name>Open current document...
- org.ekips.filter.inkcut.open
- inkcut_open.py
-- inkcut.py
-+ inkcut4inkscape.py
- inkex.py
-
- all
-diff --git a/plugins/inkscape/inkcut_open.py b/plugins/inkscape/inkcut_open.py
-index b4652eb..e4c2d62 100644
---- a/plugins/inkscape/inkcut_open.py
-+++ b/plugins/inkscape/inkcut_open.py
-@@ -38,7 +38,7 @@
- inkex.localize()
- import subprocess
-
--from inkcut import convert_objects_to_paths
-+from inkcut4inkscape import convert_objects_to_paths
-
- DEBUG = False
- try:
diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix
index 481069feac07..4ca373ee2751 100644
--- a/pkgs/applications/misc/inkcut/default.nix
+++ b/pkgs/applications/misc/inkcut/default.nix
@@ -8,21 +8,15 @@ with python3Packages;
buildPythonApplication rec {
pname = "inkcut";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx";
+ sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32";
};
- patches = [
- # https://github.com/inkcut/inkcut/pull/292 but downloaded
- # because of https://github.com/NixOS/nixpkgs/issues/32084
- ./avoid-name-clash-between-inkcut-and-extension.patch
- ];
-
nativeBuildInputs = [ wrapQtAppsHook ];
propagatedBuildInputs = [
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index b33c091a581a..3379e2e9b9d2 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -30,12 +30,12 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
- version = "0.9.22";
+ version = "0.10.1";
src = fetchurl {
url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
- sha256 = "kIqNptt5fl3YORQ7iDqQ5d6Exu+P/nAvVCVgXMRQvpQ=";
+ sha256 = "wnCgW4EAcg0Oc1fqOZBYKN2g8N27riL+yonoIy0AfxA=";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 0596cd350dfb..f7b1b990acb8 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mutt";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
- sha256 = "1vf1ab3mnx7p4s4n4pssajj211s3zr4730bwgsjx9gxcnyppqclw";
+ sha256 = "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225";
};
patches = optional smimeSupport (fetchpatch {
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index c2e51ee743b5..47693cc97f1c 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8";
};
- buildInputs = stdenv.lib.optional (stdenv.hostPlatform.isx86) libsmbios;
+ buildInputs = stdenv.lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios;
nativeBuildInputs = [ autoreconfHook ];
autoreconfPhase = ''
autoreconf -i -I src/missing/m4
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
homepage = "http://www.netperf.org/netperf/";
license = "Hewlett-Packard BSD-like license";
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.mmlb ];
};
}
diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix
new file mode 100644
index 000000000000..b8ee60e57138
--- /dev/null
+++ b/pkgs/applications/networking/shellhub-agent/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "shellhub-agent";
+ version = "0.4.2";
+
+ src = fetchFromGitHub {
+ owner = "shellhub-io";
+ repo = "shellhub";
+ rev = "v${version}";
+ sha256 = "0cd41ing1pcf1bdaaq00w5h7lih5j2kcaa0m41g3ikm3vd1w5qna";
+ };
+
+ modRoot = "./agent";
+
+ vendorSha256 = "19gsfhh6idqysdxhpq45sq35gw19adz9lp83krjlhzj1vqm59qma";
+
+ buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ];
+
+ meta = with stdenv.lib; {
+ description =
+ "Enables easy access any Linux device behind firewall and NAT";
+ longDescription = ''
+ ShellHub is a modern SSH server for remotely accessing Linux devices via
+ command line (using any SSH client) or web-based user interface, designed
+ as an alternative to _sshd_. Think ShellHub as centralized SSH for the the
+ edge and cloud computing.
+ '';
+ homepage = "https://shellhub.io/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ otavio ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
index 3197a7d0cc4a..96f6df2744be 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -32,13 +32,13 @@ uhd
mkDerivation rec {
pname = "sdrangel";
- version = "4.21.1";
+ version = "6.4.0";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
- sha256 = "y6BVwnSJXiapgm9pAuby1DLLeU5MSyB4uqEa3oS35/U=";
+ sha256 = "4iJoKs0BHmBR6JRFuTIqs0GW3SjhPRMPRlqdyTI38T4=";
fetchSubmodules = false;
};
diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index 5411571113d5..3a51f77d7bd6 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -5,13 +5,13 @@
python3Packages.buildPythonApplication rec {
pname = "urh";
- version = "2.9.0";
+ version = "2.9.1";
src = fetchFromGitHub {
owner = "jopohl";
repo = pname;
rev = "v${version}";
- sha256 = "1pcyj1vzv51j8rgi0hh9chw3vfkfi03bg1rg7gs4nk95ffmwx4pd";
+ sha256 = "0s8zlq2bx6hp8c522rkxj9kbkf3a0qj6iyg7q9dcxmcl3q2sanq9";
};
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix
index 3d95f7c5772d..2b79c5362de1 100644
--- a/pkgs/applications/terminal-emulators/foot/default.nix
+++ b/pkgs/applications/terminal-emulators/foot/default.nix
@@ -1,35 +1,142 @@
-{ stdenv, fetchgit
-, fcft, freetype, pixman, libxkbcommon, fontconfig, wayland
-, meson, ninja, ncurses, scdoc, tllist, wayland-protocols, pkg-config
+{ stdenv
+, lib
+, fetchzip
+, fetchurl
+, runCommandNoCC
+, fcft
+, freetype
+, pixman
+, libxkbcommon
+, fontconfig
+, wayland
+, meson
+, ninja
+, ncurses
+, scdoc
+, tllist
+, wayland-protocols
+, pkg-config
+, allowPgo ? true
+, python3 # for PGO
}:
+let
+ version = "1.6.2";
+
+ # build stimuli file for PGO build and the script to generate it
+ # independently of the foot's build, so we can cache the result
+ # and avoid unnecessary rebuilds as it can take relatively long
+ # to generate
+ stimulusGenerator = stdenv.mkDerivation {
+ pname = "foot-generate-alt-random-writes";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py";
+ sha256 = "0pnc5nvqrbgx5618ylrkrs9fyxjh4jcsbryfk6vlnk8x4wyyaibz";
+ };
+
+ dontUnpack = true;
+
+ buildInputs = [ python3 ];
+
+ installPhase = ''
+ install -Dm755 $src $out
+ '';
+ };
+
+ stimuliFile = runCommandNoCC "pgo-stimulus-file" { } ''
+ ${stimulusGenerator} \
+ --rows=67 --cols=135 \
+ --scroll --scroll-region \
+ --colors-regular --colors-bright --colors-256 --colors-rgb \
+ --attr-bold --attr-italic --attr-underline \
+ --sixel \
+ --seed=2305843009213693951 \
+ $out
+ '';
+
+ compilerName =
+ if stdenv.cc.isClang
+ then "clang"
+ else if stdenv.cc.isGNU
+ then "gcc"
+ else "unknown";
+
+ # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#performance-optimized-pgo
+ pgoCflags = {
+ "clang" = "-O3 -Wno-ignored-optimization-argument -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled";
+ "gcc" = "-O3 -Wno-missing-profile";
+ }."${compilerName}";
+
+ # ar with lto support
+ ar = {
+ "clang" = "llvm-ar";
+ "gcc" = "gcc-ar";
+ "unknown" = "ar";
+ }."${compilerName}";
+
+ # PGO only makes sense if we are not cross compiling and
+ # using a compiler which foot's PGO build supports (clang or gcc)
+ doPgo = allowPgo && (stdenv.hostPlatform == stdenv.buildPlatform)
+ && compilerName != "unknown";
+in
stdenv.mkDerivation rec {
pname = "foot";
- version = "1.5.1";
+ inherit version;
- src = fetchgit {
- url = "https://codeberg.org/dnkl/foot.git";
- rev = version;
- sha256 = "sha256-GAk2qkrgCNILJOeRcn1NT4t3w+R6WFTZ1goOhBEwKwc=";
+ src = fetchzip {
+ url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz";
+ sha256 = "08i3jmjky5s2nnc0c95c009cym91rs4sj4876sr4xnlkb7ab4812";
};
nativeBuildInputs = [
- meson ninja ncurses scdoc tllist wayland-protocols pkg-config
- ];
+ meson
+ ninja
+ ncurses
+ scdoc
+ tllist
+ wayland-protocols
+ pkg-config
+ ] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm;
+
buildInputs = [
- fontconfig freetype pixman wayland libxkbcommon fcft
+ fontconfig
+ freetype
+ pixman
+ wayland
+ libxkbcommon
+ fcft
];
- # recommended build flags for foot as per INSTALL.md
- # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#user-content-release-build
+ # recommended build flags for performance optimized foot builds
+ # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#release-build
+ CFLAGS =
+ if !doPgo
+ then "-O3 -fno-plt"
+ else pgoCflags;
+
+ # ar with gcc plugins for lto objects
preConfigure = ''
- export CFLAGS+="-O3 -fno-plt"
+ export AR="${ar}"
'';
mesonFlags = [ "--buildtype=release" "-Db_lto=true" ];
- meta = with stdenv.lib; {
+ # build and run binary generating PGO profiles,
+ # then reconfigure to build the normal foot binary utilizing PGO
+ preBuild = lib.optionalString doPgo ''
+ meson configure -Db_pgo=generate
+ ninja
+ ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile}
+ meson configure -Db_pgo=use
+ '' + lib.optionalString (doPgo && stdenv.cc.cc.pname == "clang") ''
+ llvm-profdata merge default_*profraw --output=default.profdata
+ '';
+
+ meta = with lib; {
homepage = "https://codeberg.org/dnkl/foot/";
+ changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}";
description = "A fast, lightweight and minimalistic Wayland terminal emulator";
license = licenses.mit;
maintainers = [ maintainers.sternenseemann ];
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 0fa30651170a..f44987037aab 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
- version = "0.4.5";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
- sha256 = "0rh902h76pn7ja5zizlfklmwcyyki4b0v4irw1j40cjjnah75ljp";
+ sha256 = "134dhkk6ckhk6pb2hmfy1q2hkb8d1fkhbshw9qzbnp0qwbv3wgqj";
};
- cargoSha256 = "1rniihx1rb18n2bp4b2yhn4ayih5cbcyqmiv6jckas7jwrgk6wra";
+ cargoSha256 = "0633g8jyhmhs33cdspa46gvmnzl2jfwxylmjfhsvbxznzygb4dw3";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix
index bc3d54f3b5b8..16aa2a3e6a5f 100644
--- a/pkgs/applications/video/vdr/default.nix
+++ b/pkgs/applications/video/vdr/default.nix
@@ -5,12 +5,12 @@
}: stdenv.mkDerivation rec {
pname = "vdr";
- version = "2.4.4";
+ version = "2.4.6";
src = fetchgit {
url = "git://git.tvdr.de/vdr.git";
- rev = "V20404";
- sha256 = "1fzghnp5mpcwn3a3fyk3w8h15z4f2cnc75247kvxj1c9069mgnwa";
+ rev = "V20406";
+ sha256 = "sha256-te9lMmnWpesv+np2gJUDL17pI0WyVxhUnoBsFSRtOco=";
};
enableParallelBuilding = true;
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 8e47a2b0bf25..9e8e32035d0d 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -15,7 +15,13 @@
}:
{ name ? "${args.pname}-${args.version}"
-, cargoSha256 ? "unset"
+
+ # SRI hash
+, cargoHash ? ""
+
+ # Legacy hash
+, cargoSha256 ? ""
+
, src ? null
, srcs ? null
, unpackPhase ? null
@@ -46,7 +52,7 @@
, buildAndTestSubdir ? null
, ... } @ args:
-assert cargoVendorDir == null -> cargoSha256 != "unset";
+assert cargoVendorDir == null -> !(cargoSha256 == "" && cargoHash == "");
assert buildType == "release" || buildType == "debug";
let
@@ -54,6 +60,7 @@ let
cargoDeps = if cargoVendorDir == null
then fetchCargoTarball ({
inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;
+ hash = cargoHash;
patches = cargoPatches;
sha256 = cargoSha256;
} // depsExtraArgs)
@@ -61,7 +68,7 @@ let
# If we have a cargoSha256 fixed-output derivation, validate it at build time
# against the src fixed-output derivation to check consistency.
- validateCargoDeps = cargoSha256 != "unset";
+ validateCargoDeps = !(cargoHash == "" && cargoSha256 == "");
# Some cargo builds include build hooks that modify their own vendor
# dependencies. This copies the vendor directory into the build tree and makes
diff --git a/pkgs/build-support/rust/fetchCargoTarball.nix b/pkgs/build-support/rust/fetchCargoTarball.nix
index dff5d99da9eb..0726e5cfa5a1 100644
--- a/pkgs/build-support/rust/fetchCargoTarball.nix
+++ b/pkgs/build-support/rust/fetchCargoTarball.nix
@@ -22,11 +22,17 @@ in
, srcs ? []
, patches ? []
, sourceRoot
-, sha256
+, hash ? ""
+, sha256 ? ""
, cargoUpdateHook ? ""
, ...
} @ args:
-stdenv.mkDerivation ({
+
+let hash_ =
+ if hash != "" then { outputHashAlgo = null; outputHash = hash; }
+ else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; }
+ else throw "fetchCargoTarball requires a hash for ${name}";
+in stdenv.mkDerivation ({
name = "${name}-vendor.tar.gz";
nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
@@ -40,7 +46,7 @@ stdenv.mkDerivation ({
echo
echo "ERROR: The Cargo.lock file doesn't exist"
echo
- echo "Cargo.lock is needed to make sure that cargoSha256 doesn't change"
+ echo "Cargo.lock is needed to make sure that cargoHash/cargoSha256 doesn't change"
echo "when the registry is updated."
echo
@@ -72,8 +78,7 @@ stdenv.mkDerivation ({
-czf $out $name
'';
- outputHashAlgo = "sha256";
- outputHash = sha256;
+ inherit (hash_) outputHashAlgo outputHash;
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
} // (builtins.removeAttrs args [
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
index fcd40462f6d6..5575bf585fce 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_46
+{ stdenv, pkgconfig, fetchFromGitHub, python3, vala_0_46
, gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8";
};
- nativeBuildInputs = [ pkgconfig vala_0_46 wafHook ];
+ nativeBuildInputs = [ pkgconfig vala_0_46 wafHook python3 ];
buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ];
postPatch = ''
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index cd4af47a21e3..b3b7b305fba6 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -146,5 +146,12 @@ in rec {
gcc = gcc9;
};
- cudatoolkit_11 = cudatoolkit_11_0;
+ cudatoolkit_11_1 = common {
+ version = "11.1.1";
+ url = "https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run";
+ sha256 = "13yxv2fgvdnqqbwh1zb80x4xhyfkbajfkwyfpdg9493010kngbiy";
+ gcc = gcc9;
+ };
+
+ cudatoolkit_11 = cudatoolkit_11_1;
}
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix
index 0f6179c2d310..fb928b67ad54 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/pkgs/development/compilers/llvm/8/llvm.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetch
+, fetchpatch
, cmake
, python3
, libffi
@@ -55,6 +56,14 @@ in stdenv.mkDerivation ({
propagatedBuildInputs = [ ncurses zlib ];
+ patches = [
+ # Fix missing includes for GCC 10
+ (fetchpatch {
+ url = "https://bugs.gentoo.org/attachment.cgi?id=612792";
+ sha256 = "0rwx6jpqq4xnf4mvfm8v2d4r34y1yi05am0mx5k2d5bha9j64lqg";
+ })
+ ];
+
postPatch = optionalString stdenv.isDarwin ''
substituteInPlace cmake/modules/AddLLVM.cmake \
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix
index 060b95cf8774..0aee1ca1f394 100644
--- a/pkgs/development/compilers/tinygo/default.nix
+++ b/pkgs/development/compilers/tinygo/default.nix
@@ -6,13 +6,14 @@ let main = ./main.go;
in
buildGoModule rec {
pname = "tinygo";
- version = "0.13.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "tinygo-org";
repo = "tinygo";
rev = "v${version}";
- sha256 = "0das5z5y2x1970yi9c4yssxvwrrjhdmsj495q0r5mb02amvc954v";
+ sha256 = "063aszbsnr0myq56kms1slmrfs7m4nmg0zgh2p66lxdsifrfly7j";
+ fetchSubmodules = true;
};
overrideModAttrs = (_: {
@@ -21,15 +22,23 @@ buildGoModule rec {
rm -rf *
cp ${main} main.go
cp ${gomod} go.mod
+ chmod +w go.mod
'';
});
preBuild = "cp ${gomod} go.mod";
- vendorSha256 = "19194dlzpl6zzw2gqybma5pwip71rw8z937f104k6c158qzzgy62";
+ postBuild = "make gen-device";
+
+ vendorSha256 = "12k2gin0v7aqz5543m12yhifc0xsz26qyqra5l4c68xizvzcvkxb";
doCheck = false;
+ prePatch = ''
+ sed -i s/', "-nostdlibinc"'// builder/builtins.go
+ sed -i s/'"-nostdlibinc", '// compileopts/config.go builder/picolibc.go
+ '';
+
subPackages = [ "." ];
buildInputs = [ llvm clang-unwrapped makeWrapper ];
propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ];
@@ -37,7 +46,11 @@ buildGoModule rec {
postInstall = ''
mkdir -p $out/share/tinygo
cp -a lib src targets $out/share/tinygo
- wrapProgram $out/bin/tinygo --prefix "TINYGOROOT" : "$out/share/tinygo"
+ wrapProgram $out/bin/tinygo --prefix "TINYGOROOT" : "$out/share/tinygo" \
+ --prefix "PATH" : "$out/libexec/tinygo"
+ mkdir -p $out/libexec/tinygo
+ ln -s ${clang-unwrapped}/bin/clang $out/libexec/tinygo/clang-10
+ ln -s ${lld}/bin/lld $out/libexec/tinygo/ld.lld-10
ln -sf $out/bin $out/share/tinygo
'';
diff --git a/pkgs/development/compilers/tinygo/go.mod b/pkgs/development/compilers/tinygo/go.mod
index f01b38d3e512..bab259ae48d2 100644
--- a/pkgs/development/compilers/tinygo/go.mod
+++ b/pkgs/development/compilers/tinygo/go.mod
@@ -1,13 +1,14 @@
module github.com/tinygo-org/tinygo
-go 1.14
+go 1.11
require (
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
+ github.com/chromedp/cdproto v0.0.0-20200709115526-d1f6fc58448b
+ github.com/chromedp/chromedp v0.5.4-0.20200303084119-2bb39134ab9e
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
- github.com/marcinbor85/gohex v0.0.0-20180128172054-7a43cd876e46
+ github.com/marcinbor85/gohex v0.0.0-20200531091804-343a4b548892
go.bug.st/serial v1.0.0
- golang.org/x/tools v0.0.0-20200512001501-aaeff5de670a
- google.golang.org/appengine v1.4.0
- tinygo.org/x/go-llvm v0.0.0-20200401165421-8d120882fc7a
+ golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2
+ tinygo.org/x/go-llvm v0.0.0-20201104183921-570e7a6841d9
)
diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index c42a35282233..80f7aa150c43 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -1,5 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1
-, darwin }:
+, darwin
+, gnum4
+}:
stdenv.mkDerivation rec {
pname = "hidapi";
@@ -12,7 +14,13 @@ stdenv.mkDerivation rec {
sha256 = "1nr4z4b10vpbh3ss525r7spz4i43zim2ba5qzfl15dgdxshxxivb";
};
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkgconfig
+ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ # Could be added always, but added conditionally here to avoid large rebuild
+ gnum4
+ ];
buildInputs = [ ]
++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 0e18164e6f2f..c96d1edfadfe 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -65,6 +65,13 @@ stdenv.mkDerivation {
url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch";
sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q";
})
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ # Fix for pre macOS SDK 10.13
+ # TODO(r-burns) can be applied unconditionally, at the cost of a mass linux rebuild
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/f4403f70fe5bf2ec41af5546122f0d78caffa984.patch";
+ sha256 = "03j2aj255m7ms848nkb41vj3s3yb72zb5rz3w3fzp5l9wzzargw5";
+ })
];
postPatch = ''
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 04cb0ea9a119..124a0459f139 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -8,7 +8,7 @@ top-level attribute to `top-level/all-packages.nix`.
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
- `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
+ `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.
@@ -75,19 +75,6 @@ let
# Ensure -I${includedir} is added to Cflags in pkg-config files.
# See https://github.com/NixOS/nixpkgs/issues/52457
./qtbase.patch.d/0014-qtbase-pkg-config.patch
-
- # https://bugreports.qt.io/browse/QTBUG-81715
- # remove after updating to qt > 5.12.7
- (fetchpatch {
- name = "fix-qt5_make_output_file-cmake-macro.patch";
- url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915";
- sha256 = "1gpcbdpyazdxnmldvhsf3pfwr2gjvi08x3j6rxf543rq01bp6cpx";
- })
- (fetchpatch {
- name = "QTBUG-78937.patch";
- url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=67a9c600ad14ee44501a6df3509daa8234b97606";
- sha256 = "1jiky1w9j8rka78r4q0yabb8w2l5j6csdjysynz7gs1ry4xjfdxd";
- })
];
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh
index 8f41bc582bcb..e93c9acd3f05 100644
--- a/pkgs/development/libraries/qt-5/5.12/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh
@@ -1,2 +1,2 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/ \
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.9/submodules/ \
-A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix
index 293d017c2dc7..f2ed6d13714f 100644
--- a/pkgs/development/libraries/qt-5/5.12/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix
@@ -1,325 +1,326 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
+# DO NOT EDIT! This file is generated automatically.
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.12
{ fetchurl, mirror }:
{
qt3d = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qt3d-everywhere-src-5.12.7.tar.xz";
- sha256 = "2030de3dc93fd4062f677f61938229af9cd7aa4c3d2932cdda2ccb663d681126";
- name = "qt3d-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qt3d-everywhere-src-5.12.9.tar.xz";
+ sha256 = "6fcde8c99bc5d09a5d2de99cab10c6f662d7db48139e6d5a3904fa0c580070ad";
+ name = "qt3d-everywhere-src-5.12.9.tar.xz";
};
};
qtactiveqt = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtactiveqt-everywhere-src-5.12.7.tar.xz";
- sha256 = "302ce1e74dae8ead602ac663e208e6c9b98bdf9a2b7795de4198a28eba2d895d";
- name = "qtactiveqt-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtactiveqt-everywhere-src-5.12.9.tar.xz";
+ sha256 = "e9df2dacfa4f93b42753066d14d3c504a30b259c177b366e32e6119f714f6527";
+ name = "qtactiveqt-everywhere-src-5.12.9.tar.xz";
};
};
qtandroidextras = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtandroidextras-everywhere-src-5.12.7.tar.xz";
- sha256 = "a5acc927bd46ed87627e2ae0f0bfc199189d383a3e17c2f34b8c34ea57b2aea1";
- name = "qtandroidextras-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtandroidextras-everywhere-src-5.12.9.tar.xz";
+ sha256 = "d6ab58d382feb1d79b7f28033eaa15ecab0c1f97c760fad50f20608189ab1a95";
+ name = "qtandroidextras-everywhere-src-5.12.9.tar.xz";
};
};
qtbase = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtbase-everywhere-src-5.12.7.tar.xz";
- sha256 = "b18939cb25d90aef8721fb12ec34c3632d3490ced958e41f6c7a52064643665d";
- name = "qtbase-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtbase-everywhere-src-5.12.9.tar.xz";
+ sha256 = "331dafdd0f3e8623b51bd0da2266e7e7c53aa8e9dc28a8eb6f0b22609c5d337e";
+ name = "qtbase-everywhere-src-5.12.9.tar.xz";
};
};
qtcanvas3d = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtcanvas3d-everywhere-src-5.12.7.tar.xz";
- sha256 = "b63a513a2ee11548b122e0fd640b1fa22d3eb83cdc51ddfdf3b97c2ecd0d0c50";
- name = "qtcanvas3d-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtcanvas3d-everywhere-src-5.12.9.tar.xz";
+ sha256 = "351b105507b97e61eef17a5ce8a96fe090a523101e41c20ea373266203dd3ca0";
+ name = "qtcanvas3d-everywhere-src-5.12.9.tar.xz";
};
};
qtcharts = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtcharts-everywhere-src-5.12.7.tar.xz";
- sha256 = "434065526d0b1d8921e96cc1827b1a3579e073b930fe536455c4c1da2f15cf5f";
- name = "qtcharts-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtcharts-everywhere-src-5.12.9.tar.xz";
+ sha256 = "9fc2a64a96b73746389c257684af557e70c5360bead53d61d059f968efdc5b04";
+ name = "qtcharts-everywhere-src-5.12.9.tar.xz";
};
};
qtconnectivity = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtconnectivity-everywhere-src-5.12.7.tar.xz";
- sha256 = "647148b9b1a0d3e54f788b66797b81bb87434faf6fb12ac481f9165eda0d071a";
- name = "qtconnectivity-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtconnectivity-everywhere-src-5.12.9.tar.xz";
+ sha256 = "e5457ebc22059954bba6a08b03fd1e6f30e4c8f3146636065bf12c2e6044f41c";
+ name = "qtconnectivity-everywhere-src-5.12.9.tar.xz";
};
};
qtdatavis3d = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtdatavis3d-everywhere-src-5.12.7.tar.xz";
- sha256 = "07ff5713cfcdf073681d905912e8d871e4451508494c789df805eb241ed98b27";
- name = "qtdatavis3d-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtdatavis3d-everywhere-src-5.12.9.tar.xz";
+ sha256 = "0cd4f7535bf26e4e59f89fac991fc8a400bd6193680578f31693235f185f4562";
+ name = "qtdatavis3d-everywhere-src-5.12.9.tar.xz";
};
};
qtdeclarative = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtdeclarative-everywhere-src-5.12.7.tar.xz";
- sha256 = "5cdc05a035f240ab73b6b37dd3831c1350cd80e5799da47929974085f6eae9bd";
- name = "qtdeclarative-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtdeclarative-everywhere-src-5.12.9.tar.xz";
+ sha256 = "c11ae68aedcdea7e721ec22a95265ac91b5e128a5c12d3b61b5b732d3a02be80";
+ name = "qtdeclarative-everywhere-src-5.12.9.tar.xz";
};
};
qtdoc = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtdoc-everywhere-src-5.12.7.tar.xz";
- sha256 = "6c07918cec8494ea05a42234d8f281a2958de7380458f3fb5a189949ce1233e9";
- name = "qtdoc-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtdoc-everywhere-src-5.12.9.tar.xz";
+ sha256 = "a9d751af85a07bdfc2a30e8f1b08aa249547a8100801f286e77280a9c9ede624";
+ name = "qtdoc-everywhere-src-5.12.9.tar.xz";
};
};
qtgamepad = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtgamepad-everywhere-src-5.12.7.tar.xz";
- sha256 = "07638c42be94be1e5e622b020c6192341b5bb87be34d7b38f2899672d83a1e94";
- name = "qtgamepad-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtgamepad-everywhere-src-5.12.9.tar.xz";
+ sha256 = "da3333af6b9dccd7dd3a25b01de65e317fe4b70b9d39eeb84e01c232063211fe";
+ name = "qtgamepad-everywhere-src-5.12.9.tar.xz";
};
};
qtgraphicaleffects = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtgraphicaleffects-everywhere-src-5.12.7.tar.xz";
- sha256 = "02f0328420c623da8f9ae949fec01e99ba84213dd2ad559cb00c204502bbcace";
- name = "qtgraphicaleffects-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtgraphicaleffects-everywhere-src-5.12.9.tar.xz";
+ sha256 = "1eb4b913d5cb6d0b46a231288b9717f4785fbd212936e98a8b2a8c9024e3a8bf";
+ name = "qtgraphicaleffects-everywhere-src-5.12.9.tar.xz";
};
};
qtimageformats = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtimageformats-everywhere-src-5.12.7.tar.xz";
- sha256 = "9bd19ee24fb85f249d01c78e637c95377dd738feb61da0deeee6b770fa62f70b";
- name = "qtimageformats-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtimageformats-everywhere-src-5.12.9.tar.xz";
+ sha256 = "cd8193698f830cce30959564c191e7bb698877aca3a263c652b4a23907c72b6a";
+ name = "qtimageformats-everywhere-src-5.12.9.tar.xz";
};
};
qtlocation = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtlocation-everywhere-src-5.12.7.tar.xz";
- sha256 = "d1e905b80befda3c9aaad92ea984e6dbf722568b5c91e8d15b027bc5bc22781f";
- name = "qtlocation-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtlocation-everywhere-src-5.12.9.tar.xz";
+ sha256 = "be31870104af2910690850c4e28bab3ccb76f1aa8deef1e870bcbc6b276aa2c1";
+ name = "qtlocation-everywhere-src-5.12.9.tar.xz";
};
};
qtmacextras = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtmacextras-everywhere-src-5.12.7.tar.xz";
- sha256 = "265b5607664927e1c92af3abc4b034244f37abd83db1f0a8f22f6952f7d6abb8";
- name = "qtmacextras-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtmacextras-everywhere-src-5.12.9.tar.xz";
+ sha256 = "5458f3e13c37eb8bff8588b29703fb33b61d5ea19989c56c99d36f221e269f35";
+ name = "qtmacextras-everywhere-src-5.12.9.tar.xz";
};
};
qtmultimedia = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtmultimedia-everywhere-src-5.12.7.tar.xz";
- sha256 = "28bdaa81371f922223775ae5171c4d589a2c07f255abbe5ccf130ecbbdb4db1d";
- name = "qtmultimedia-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtmultimedia-everywhere-src-5.12.9.tar.xz";
+ sha256 = "59a2f2418cefe030094687dff0846fb8957abbc0e060501a4fee40cb4a52838c";
+ name = "qtmultimedia-everywhere-src-5.12.9.tar.xz";
};
};
qtnetworkauth = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtnetworkauth-everywhere-src-5.12.7.tar.xz";
- sha256 = "cbfb7c71a25e74b92b927a5aeae2d099e4142968424a0fcebc1a52fa4fb4576b";
- name = "qtnetworkauth-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtnetworkauth-everywhere-src-5.12.9.tar.xz";
+ sha256 = "a0979689eda667e299fd9cf5a8859bd9c37eabc0a6d9738103a1143035baf0e4";
+ name = "qtnetworkauth-everywhere-src-5.12.9.tar.xz";
};
};
qtpurchasing = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtpurchasing-everywhere-src-5.12.7.tar.xz";
- sha256 = "6f7ecb1e6b6d290b268344ddb031bb7114cd36139c76323732d12661eeb15a76";
- name = "qtpurchasing-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtpurchasing-everywhere-src-5.12.9.tar.xz";
+ sha256 = "565587811b3cfd201907d3fcbf7120783de32a4d1d3c59a9efff3720cf0af3e5";
+ name = "qtpurchasing-everywhere-src-5.12.9.tar.xz";
};
};
qtquickcontrols = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols-everywhere-src-5.12.7.tar.xz";
- sha256 = "1038bbc76bba53f9634f40cd9c8ebf0ed8ae82e791f727b228bd81bdcf1859e5";
- name = "qtquickcontrols-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtquickcontrols-everywhere-src-5.12.9.tar.xz";
+ sha256 = "d89084ebccf155f4c966d4a2a188e6e870c37535a7751740960f5c38088373f6";
+ name = "qtquickcontrols-everywhere-src-5.12.9.tar.xz";
};
};
qtquickcontrols2 = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz";
- sha256 = "3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237";
- name = "qtquickcontrols2-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtquickcontrols2-everywhere-src-5.12.9.tar.xz";
+ sha256 = "ea1c2864630c6ba2540228f81ec5b582619d5ce9e4cb98e91109b4181a65a31d";
+ name = "qtquickcontrols2-everywhere-src-5.12.9.tar.xz";
};
};
qtremoteobjects = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtremoteobjects-everywhere-src-5.12.7.tar.xz";
- sha256 = "6d6aaec4e9c140c027b0badaabc6322ea3c16cf649495a27fec1f261e891120f";
- name = "qtremoteobjects-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtremoteobjects-everywhere-src-5.12.9.tar.xz";
+ sha256 = "f87af7e9931280f2b44a529dc174cae14247e1b50f9dc9bde8966adb0406babd";
+ name = "qtremoteobjects-everywhere-src-5.12.9.tar.xz";
};
};
qtscript = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtscript-everywhere-src-5.12.7.tar.xz";
- sha256 = "ca1dbc66d4125a678638dd0c9c030b72fdfc4ec2c229b9316a8bc80a86104019";
- name = "qtscript-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtscript-everywhere-src-5.12.9.tar.xz";
+ sha256 = "8f2e12e37ff1e7629923cf3b9d446f85e005b2248386e33879ba3b790f1416df";
+ name = "qtscript-everywhere-src-5.12.9.tar.xz";
};
};
qtscxml = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtscxml-everywhere-src-5.12.7.tar.xz";
- sha256 = "afa950bc95f881c90eea564511f3e9918d53fddf0823afb641d20dc6f794fbb6";
- name = "qtscxml-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtscxml-everywhere-src-5.12.9.tar.xz";
+ sha256 = "d68d04d83366f11b10a101766baf5253e53ad76a683e0bc15e7dd403d475e61c";
+ name = "qtscxml-everywhere-src-5.12.9.tar.xz";
};
};
qtsensors = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtsensors-everywhere-src-5.12.7.tar.xz";
- sha256 = "2b9aea9f4e2f681b4067f2b9d97c5073c135e41d26601c71f18f199bc980e740";
- name = "qtsensors-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtsensors-everywhere-src-5.12.9.tar.xz";
+ sha256 = "77054e2449bcac786cc8f07c0d65c503a22bc629af4844259ff0def27b9889e9";
+ name = "qtsensors-everywhere-src-5.12.9.tar.xz";
};
};
qtserialbus = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtserialbus-everywhere-src-5.12.7.tar.xz";
- sha256 = "82201edf971e957d849b041ab2914f7497226939c62884ec2906b37576987eae";
- name = "qtserialbus-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtserialbus-everywhere-src-5.12.9.tar.xz";
+ sha256 = "08b16363a47f9b41f87e3b7cf63eaed2435bb6b7e27775c9717ff863e56141ed";
+ name = "qtserialbus-everywhere-src-5.12.9.tar.xz";
};
};
qtserialport = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtserialport-everywhere-src-5.12.7.tar.xz";
- sha256 = "224c282ebed750f46b72dfe18260c3d26fbb74e928dec64bd8c51e7beed8721f";
- name = "qtserialport-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtserialport-everywhere-src-5.12.9.tar.xz";
+ sha256 = "24a10b65b03fc598acd30f4a52b0b71218e9c03ec4bb31a4ca50aae1b52a986d";
+ name = "qtserialport-everywhere-src-5.12.9.tar.xz";
};
};
qtspeech = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtspeech-everywhere-src-5.12.7.tar.xz";
- sha256 = "0cc4f14aa21172b84c8ebca442037cd94927dad4921f6f6bfb4d7f2468aa6060";
- name = "qtspeech-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtspeech-everywhere-src-5.12.9.tar.xz";
+ sha256 = "2efdaf5f49d2fad4a6c4cde12dfee2ff2c66ab4298f22d6c203ecd6019186847";
+ name = "qtspeech-everywhere-src-5.12.9.tar.xz";
};
};
qtsvg = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtsvg-everywhere-src-5.12.7.tar.xz";
- sha256 = "4bf60916d4e398d9609f1b3a17fc7345a0e13c7c1cc407298df20da4c7c67bb8";
- name = "qtsvg-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtsvg-everywhere-src-5.12.9.tar.xz";
+ sha256 = "32ec251e411d31734b873dd82fd68b6a3142227fdf06fe6ad879f16997fb98d2";
+ name = "qtsvg-everywhere-src-5.12.9.tar.xz";
};
};
qttools = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qttools-everywhere-src-5.12.7.tar.xz";
- sha256 = "860a97114d518f83c0a9ab3742071da16bb018e6eb387179d5764a8dcca03948";
- name = "qttools-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qttools-everywhere-src-5.12.9.tar.xz";
+ sha256 = "002dc23410a9d1af6f1cfc696ee18fd3baeddbbfeb9758ddb04bbdb17b2fffdf";
+ name = "qttools-everywhere-src-5.12.9.tar.xz";
};
};
qttranslations = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qttranslations-everywhere-src-5.12.7.tar.xz";
- sha256 = "2c8d1169f1f20ba32639181f1853b4159940cbaaac41adaa018b6f43ca31323f";
- name = "qttranslations-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qttranslations-everywhere-src-5.12.9.tar.xz";
+ sha256 = "50bd3a329e86f14af05ef0dbef94c7a6cd6c1f89ca4d008088a44ba76e6ecf40";
+ name = "qttranslations-everywhere-src-5.12.9.tar.xz";
};
};
qtvirtualkeyboard = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz";
- sha256 = "aaa52aaff923df22de8472d71843dadb80f3f6fe0312122e64ffe5436db40daa";
- name = "qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtvirtualkeyboard-everywhere-src-5.12.9.tar.xz";
+ sha256 = "7598ee3312a2f4e72edf363c16c506740a8b91c5c06544da068a3c0d73f7f807";
+ name = "qtvirtualkeyboard-everywhere-src-5.12.9.tar.xz";
};
};
qtwayland = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwayland-everywhere-src-5.12.7.tar.xz";
- sha256 = "fc1ab8e25461580e37090e4f82422411dee71a3de48a54be1f4b6569e00f66c5";
- name = "qtwayland-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwayland-everywhere-src-5.12.9.tar.xz";
+ sha256 = "6f416948a98586b9c13c46b36be5ac6bb96a1dde9f50123b5e6dcdd102e9d77e";
+ name = "qtwayland-everywhere-src-5.12.9.tar.xz";
};
};
qtwebchannel = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebchannel-everywhere-src-5.12.7.tar.xz";
- sha256 = "b0ae72e5957aa4b281a37d2e169fcf91f92382bc36bd0cf09c80b2bb961bce75";
- name = "qtwebchannel-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebchannel-everywhere-src-5.12.9.tar.xz";
+ sha256 = "d55a06a0929c86664496e1113e74425d56d175916acd8abbb95c371eb16b43eb";
+ name = "qtwebchannel-everywhere-src-5.12.9.tar.xz";
};
};
qtwebengine = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebengine-everywhere-src-5.12.7.tar.xz";
- sha256 = "83b754dca3dafeb21be6c7cb5ea99f11f5dbe9055bc1680f5bd7159224bb46fa";
- name = "qtwebengine-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebengine-everywhere-src-5.12.9.tar.xz";
+ sha256 = "27a9a19e4deb5e7a0fabc13e38fe5a8818730c92f6a343b9084aa17977468e25";
+ name = "qtwebengine-everywhere-src-5.12.9.tar.xz";
};
};
qtwebglplugin = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebglplugin-everywhere-src-5.12.7.tar.xz";
- sha256 = "e049ed855bc772a56808844a803aac653d2d64f092a1fd1fe6a73ab460b55c3b";
- name = "qtwebglplugin-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebglplugin-everywhere-src-5.12.9.tar.xz";
+ sha256 = "cb7ba4cb66900e5d4315809e2b5ad3e4e381d576a14f6224f8ea58373f997c42";
+ name = "qtwebglplugin-everywhere-src-5.12.9.tar.xz";
};
};
qtwebsockets = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebsockets-everywhere-src-5.12.7.tar.xz";
- sha256 = "6fd13c2558f532a32f20d977b44c0146107a0e93861df84978e4fd72af283b17";
- name = "qtwebsockets-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebsockets-everywhere-src-5.12.9.tar.xz";
+ sha256 = "08a92c36d52b4d93a539a950698bb2912ea36055015d421f874bf672637f21ef";
+ name = "qtwebsockets-everywhere-src-5.12.9.tar.xz";
};
};
qtwebview = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwebview-everywhere-src-5.12.7.tar.xz";
- sha256 = "d3f82d2ceab59dc4dee3b6f54f4b70869c199d63f4534b299d900cdacc9b7be7";
- name = "qtwebview-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwebview-everywhere-src-5.12.9.tar.xz";
+ sha256 = "3e0506411d101cc08232946bcacef2fb90884c27eb91eeb97a1a68ed3788a7b6";
+ name = "qtwebview-everywhere-src-5.12.9.tar.xz";
};
};
qtwinextras = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtwinextras-everywhere-src-5.12.7.tar.xz";
- sha256 = "cfeec81ee1f75b9786ed28382deecc5e38fd142c0b48476beccadb587f93118c";
- name = "qtwinextras-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtwinextras-everywhere-src-5.12.9.tar.xz";
+ sha256 = "7bab5053197148a5e1609cab12331e4a3f2e1a86bcbde137948330b288803754";
+ name = "qtwinextras-everywhere-src-5.12.9.tar.xz";
};
};
qtx11extras = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtx11extras-everywhere-src-5.12.7.tar.xz";
- sha256 = "23895f4b1e84f3783526b9e17680df38c587601d4dfa6ff1b81ace432c480b96";
- name = "qtx11extras-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtx11extras-everywhere-src-5.12.9.tar.xz";
+ sha256 = "09432392641b56205cbcda6be89d0835bfecad64ad61713a414b951b740c9cec";
+ name = "qtx11extras-everywhere-src-5.12.9.tar.xz";
};
};
qtxmlpatterns = {
- version = "5.12.7";
+ version = "5.12.9";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.7/submodules/qtxmlpatterns-everywhere-src-5.12.7.tar.xz";
- sha256 = "9002014129a1f2a44700df333a7776e23bdfd689e7a619c3540fd9f6819b417b";
- name = "qtxmlpatterns-everywhere-src-5.12.7.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.9/submodules/qtxmlpatterns-everywhere-src-5.12.9.tar.xz";
+ sha256 = "8d0e92fce6b4cbe7f1ecd1e90f6c7d71681b9b8870a577c0b18cadd93b8713b2";
+ name = "qtxmlpatterns-everywhere-src-5.12.9.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix
index b4486bf025d7..dff04b24f608 100644
--- a/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -8,7 +8,7 @@ top-level attribute to `top-level/all-packages.nix`.
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
- `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
+ `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 2712b45bdd25..08fd3a9720cf 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -8,7 +8,7 @@ top-level attribute to `top-level/all-packages.nix`.
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run
- `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
+ `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
3. Check that the new packages build correctly.
4. Commit the changes and open a pull request.
diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
new file mode 100644
index 000000000000..a24c4c9e821f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
@@ -0,0 +1,29 @@
+{ lib, fetchurl, buildDunePackage, cstruct-lwt, diet, io-page-unix, logs
+, mirage-block, ounit, rresult, uri }:
+
+buildDunePackage rec {
+ pname = "mirage-block-unix";
+ version = "2.12.1";
+
+ useDune2 = true;
+
+ src = fetchurl {
+ url =
+ "https://github.com/mirage/mirage-block-unix/releases/download/v${version}/mirage-block-unix-v${version}.tbz";
+ sha256 = "4fc0ccea3c06c654e149c0f0e1c2a6f19be4e3fe1afd293c6a0dba1b56b3b8c4";
+ };
+
+ minimumOCamlVersion = "4.06";
+
+ propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ];
+
+ doCheck = true;
+ checkInputs = [ diet io-page-unix ounit ];
+
+ meta = with lib; {
+ description = "MirageOS disk block driver for Unix";
+ homepage = "https://github.com/mirage/mirage-block-unix";
+ license = licenses.isc;
+ maintainers = with maintainers; [ ehmry ];
+ };
+}
diff --git a/pkgs/development/python-modules/HAP-python/default.nix b/pkgs/development/python-modules/HAP-python/default.nix
index 267fcccd8d4b..3cd211db7559 100644
--- a/pkgs/development/python-modules/HAP-python/default.nix
+++ b/pkgs/development/python-modules/HAP-python/default.nix
@@ -1,16 +1,16 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, curve25519-donna, ed25519
-, cryptography, ecdsa, zeroconf, pytest }:
+, cryptography, ecdsa, zeroconf, pytestCheckHook }:
buildPythonPackage rec {
pname = "HAP-python";
- version = "3.0.0";
+ version = "3.1.0";
# pypi package does not include tests
src = fetchFromGitHub {
owner = "ikalchev";
repo = pname;
rev = "v${version}";
- sha256 = "07s1kjm9cz4m4ksj506la1ks3dq2b5mk412rjj9rpj98b0mxrr84";
+ sha256 = "1qg38lfjby2xfm09chzc40a7i3b84kgyfs7g4xq8f5m8s39hg6d7";
};
disabled = !isPy3k;
@@ -23,20 +23,20 @@ buildPythonPackage rec {
zeroconf
];
- checkInputs = [ pytest ];
+ checkInputs = [ pytestCheckHook ];
- #disable tests needing network
- checkPhase = ''
- pytest -k 'not test_persist \
- and not test_setup_endpoints \
- and not test_auto_add_aid_mac \
- and not test_service_callbacks \
- and not test_send_events \
- and not test_not_standalone_aid \
- and not test_start_stop_async_acc \
- and not test_external_zeroconf \
- and not test_start_stop_sync_acc'
- '';
+ disabledTests = [
+ #disable tests needing network
+ "test_persist"
+ "test_setup_endpoints"
+ "test_auto_add_aid_mac"
+ "test_service_callbacks"
+ "test_send_events"
+ "test_not_standalone_aid"
+ "test_start_stop_async_acc"
+ "test_external_zeroconf"
+ "test_start_stop_sync_acc"
+ ];
meta = with lib; {
homepage = "https://github.com/ikalchev/HAP-python";
diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
index 41d0387da2f4..b204add2b5e9 100644
--- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cdn";
- version = "5.2.0";
+ version = "6.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "3e470ba07918a4f97dadb6f50c6f64068da423b735fad38d31d9535c56f06881";
+ sha256 = "590cd35c9f1556a2d93d93a88b5c5661f716de094f22db30f4d05dc58a131c84";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix
new file mode 100644
index 000000000000..317019844cb0
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildPythonPackage, fetchPypi
+, msrestazure
+, azure-common
+}:
+
+buildPythonPackage rec {
+ pname = "azure-mgmt-databoxedge";
+ version = "0.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA=";
+ };
+
+ propagatedBuildInputs = [
+ msrestazure
+ azure-common
+ ];
+
+ # no tests in pypi tarball
+ doCheck = false;
+
+ pythonImportsCheck = [ "azure.mgmt.databoxedge" ];
+
+ meta = with lib; {
+ description = "Microsoft Azure Databoxedge Management Client Library for Python";
+ homepage = "https://github.com/Azure/azure-sdk-for-python";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index 525a72a7009d..e6fd01f73478 100644
--- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
@@ -7,16 +7,17 @@
, msrestazure
, azure-common
, azure-mgmt-nspkg
+, azure-mgmt-core
}:
buildPythonPackage rec {
pname = "azure-mgmt-loganalytics";
- version = "2.0.0";
+ version = "7.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "947cada6e52fea6ecae7011d7532cf8edbe90250753a58749c473b863331fcc6";
+ sha256 = "e603f9fc61b8d2f93d8814bcca012a8b425cf0c0320ddf1e84462929cf34d1af";
};
propagatedBuildInputs = [
@@ -24,6 +25,7 @@ buildPythonPackage rec {
msrestazure
azure-common
azure-mgmt-nspkg
+ azure-mgmt-core
];
pythonNamespaces = [ "azure.mgmt" ];
diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index 7f4de1a463b7..a0ee8f3ce9cd 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-recoveryservices";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "3c90e6b2e358dbe6d5c6d7204955bdf52c3e977c6f8b727cbbb8811427d7fd52";
+ sha256 = "203ebbd6b698a99975092a72d6d47285646a0264b9085fecef1e7b7c98c5d52e";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index 85ec70f704c7..f33df1fdbe8d 100644
--- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "azure-synapse-artifacts";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a";
+ sha256 = "09fd9cf8c25c901d2daf7e436062065ada866f212f371f9d66f394d39ccaa23b";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix
index fb724e6dbfbc..571f3f9d08da 100644
--- a/pkgs/development/python-modules/azure-synapse-spark/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "azure-synapse-spark";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fcfe559e30a2e159f07e371af28d18dc635dc55174fb3457be7210ce8e7e7559";
+ sha256 = "7f5881fda4108363c8c6fdee0494fa067ba81e60f038883859d23fc197f5f286";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 5bccf7924525..ff87ba2e6691 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }:
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytestCheckHook, case, psutil, fetchpatch }:
buildPythonPackage rec {
pname = "billiard";
@@ -9,11 +9,15 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "0spssl3byzqsplra166d59jx8iqfxyzvcbx7vybkmwr5ck72a5yr";
};
+ patches = [(fetchpatch {
+ # Add Python 3.9 support to spawnv_passfds()
+ # Should be included in next release after 3.6.3.0
+ url = "https://github.com/celery/billiard/pull/310/commits/a508ebafadcfe2e25554b029593f3e66d01ede6c.patch";
+ sha256 = "05zsr1bvjgi01qg7r274c0qvbn65iig3clyz14c08mpfyn38h84i";
+ excludes = [ "tox.ini" ];
+ })];
- checkInputs = [ pytest case psutil ];
- checkPhase = ''
- pytest
- '';
+ checkInputs = [ pytestCheckHook case psutil ];
meta = with stdenv.lib; {
homepage = "https://github.com/celery/billiard";
diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index f259ea6a7891..b5ee857cadeb 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.16.44"; # N.B: if you change this, change botocore too
+ version = "1.16.46"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-4/EO1tnKmEFf3sFcheUKiew41iKbzj+v1eeWWxbE68U=";
+ sha256 = "0qlcmzpgmcp9cwrwni750yw9jlhzm407fs428bwkpxnhsxpix6fn";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 69666938301b..23f3b701ca96 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.19.44"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.19.46"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-dyXgjJWulsTb2VXLSuRKDAbT5B92p/6wqUHCekTGMRM=";
+ sha256 = "sha256-hcppFa1Ucef2zRsAYQt0YB0pcMv46bG/JVaXFUz2IaM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix
index 9fe60ba55da8..68ac9e45bb4b 100644
--- a/pkgs/development/python-modules/clifford/default.nix
+++ b/pkgs/development/python-modules/clifford/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, isPy27
, future
, h5py
@@ -21,6 +22,12 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c";
};
+ patches = [ (fetchpatch {
+ # Compatibility with h5py 3.
+ # Will be included in the next releasse after 1.3.1
+ url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch";
+ sha256 = "00m8ias58xycn5n78sy9wywf4wck1v0gb8gzmg40inzdiha93jyz";
+ }) ];
propagatedBuildInputs = [
future
diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index 4214304a9c93..fc349cdc277b 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -35,6 +35,10 @@ buildPythonPackage rec {
xxhash
];
+ postPatch = ''
+ substituteInPlace setup.py --replace '"tqdm>=4.27,<4.50.0"' '"tqdm>=4.27"'
+ '';
+
# Tests require pervasive internet access.
doCheck = false;
diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index 233aac688abd..c49e2e30b809 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, dask
, distributed
, bokeh
@@ -36,6 +37,12 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6";
};
+ patches = [ (fetchpatch {
+ # Unpins pyct==0.46 (Sep. 11, 2020).
+ # Will be incorporated into the next datashader release after 0.11.1
+ url = "https://github.com/holoviz/datashader/pull/960/commits/d7a462fa399106c34fd0d44505a8a73789dbf874.patch";
+ sha256 = "1wqsk9dpxnkxr49fa7y5q6ahin80cvys05lnirs2w2p1dja35y4x";
+ })];
propagatedBuildInputs = [
dask
diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 58099a98bdcb..3d047213f7f5 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -1,24 +1,28 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests, netifaces
-, pytest, testtools, requests-mock }:
+, pytestCheckHook, testtools, requests-mock }:
buildPythonPackage rec {
pname = "denonavr";
- version = "0.9.3";
+ version = "0.9.9";
+ disabled = isPy27;
src = fetchFromGitHub {
owner = "scarface-4711";
repo = "denonavr";
rev = version;
- sha256 = "0s8v918n6xn44r2mrq5hqbf0znpz64clq7a1jakkgz9py8bi6vnn";
+ sha256 = "08zh8rdadmxcgr707if6g5k5j2xz21s6jrn4kxh1c7xqpgdfggd9";
};
- propagatedBuildInputs = [ requests netifaces ];
+ propagatedBuildInputs = [
+ requests
+ netifaces
+ ];
- doCheck = !isPy27;
- checkInputs = [ pytest testtools requests-mock ];
- checkPhase = ''
- pytest tests
- '';
+ checkInputs = [
+ pytestCheckHook
+ testtools
+ requests-mock
+ ];
meta = with lib; {
homepage = "https://github.com/scarface-4711/denonavr";
diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix
index 47c7d5063090..07922ee19efa 100644
--- a/pkgs/development/python-modules/fastparquet/default.nix
+++ b/pkgs/development/python-modules/fastparquet/default.nix
@@ -3,22 +3,19 @@ thrift, pytest, python-snappy, lz4, zstd }:
buildPythonPackage rec {
pname = "fastparquet";
- version = "0.4.1";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "dask";
repo = pname;
rev = version;
- sha256 = "ViZRGEv227/RgCBYAQN8F3Z0m8WrNUT5KUdyFosjg9s=";
+ sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana";
};
postPatch = ''
# FIXME: package zstandard
# removing the test dependency for now
substituteInPlace setup.py --replace "'zstandard'," ""
-
- # workaround for https://github.com/dask/fastparquet/issues/517
- rm fastparquet/test/test_partition_filters_specialstrings.py
'';
nativeBuildInputs = [ pytestrunner ];
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 0e90bb10f956..665bb0c8df0e 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -41,9 +41,7 @@ buildPythonPackage rec {
checkPhase = ''
rm -r fiona # prevent importing local fiona
# Some tests access network, others test packaging
- pytest -k "not test_*_http \
- and not test_*_https \
- and not test_*_wheel"
+ pytest -k "not (http or https or wheel)"
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix
index 3042acbbe848..9f1549e98f9f 100644
--- a/pkgs/development/python-modules/fixtures/default.nix
+++ b/pkgs/development/python-modules/fixtures/default.nix
@@ -5,6 +5,7 @@
, testtools
, mock
, python
+, isPy39
}:
buildPythonPackage rec {
@@ -26,5 +27,6 @@ buildPythonPackage rec {
description = "Reusable state for writing clean tests and more";
homepage = "https://pypi.python.org/pypi/fixtures";
license = lib.licenses.asl20;
+ broken = isPy39; # see https://github.com/testing-cabal/fixtures/issues/44
};
}
diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix
index b31cbc7424d9..605d08d1258e 100644
--- a/pkgs/development/python-modules/flower/default.nix
+++ b/pkgs/development/python-modules/flower/default.nix
@@ -22,6 +22,7 @@ buildPythonPackage rec {
# rely on using example programs (flowers/examples/tasks.py) which
# are not part of the distribution
rm tests/load.py
+ substituteInPlace requirements/default.txt --replace "prometheus_client==0.8.0" "prometheus_client>=0.8.0"
'';
propagatedBuildInputs = [
@@ -39,5 +40,6 @@ buildPythonPackage rec {
homepage = "https://github.com/mher/flower";
license = licenses.bsdOriginal;
maintainers = [ maintainers.arnoldfarkas ];
+ broken = (celery.version == "5.0.2"); # currently broken with celery>=5.0 by https://github.com/mher/flower/pull/1021
};
}
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index 200dfffa562b..bd38d2663bc2 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
, pandas, shapely, fiona, descartes, pyproj
-, pytest, Rtree, fetchpatch }:
+, pytestCheckHook, Rtree, fetchpatch }:
buildPythonPackage rec {
pname = "geopandas";
@@ -20,13 +20,18 @@ buildPythonPackage rec {
url = "https://github.com/geopandas/geopandas/pull/1544/commits/6ce868a33a2f483b071089d51e178030fa4414d0.patch";
sha256 = "1sjgxrqgbhz5krx51hrv230ywszcdl6z8q3bj6830kfad8n8b5dq";
})
+ # Fix GeoJSON for Fiona>=1.8.16 (Sep. 7, 2020).
+ # https://github.com/geopandas/geopandas/issues/1606
+ # Will be included in next upstream release after 0.8.1
+ (fetchpatch {
+ url = "https://github.com/geopandas/geopandas/commit/72427d3d8c128039bfce1d54a76c0b652887b276.patch";
+ sha256 = "1726mrpddgmba0ngff73a5bsb6ywpsg63a2pdd2grp9339bgvi4a";
+ })
];
- checkInputs = [ pytest Rtree ];
-
- checkPhase = ''
- py.test geopandas -m "not web"
- '';
+ checkInputs = [ pytestCheckHook Rtree ];
+ disabledTests = [ "web" ];
+ pytestFlagsArray = [ "geopandas" ];
propagatedBuildInputs = [
pandas
diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
index d9991ee7845f..db59ba70bb26 100644
--- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, isPy3k
}:
@@ -9,9 +10,15 @@ buildPythonPackage rec {
version = "0.4.2";
src = fetchPypi {
- sha256 = "13b05b17a941a9f4a90b16910b1ffac159448cff051a153da8ba4b4343ffa195";
inherit pname version;
+ sha256 = "13b05b17a941a9f4a90b16910b1ffac159448cff051a153da8ba4b4343ffa195";
};
+ patches = [ (fetchpatch {
+ # Fixes compatibility with python3.9
+ # Should be included in the next release after 0.4.2
+ url = "https://github.com/imageio/imageio-ffmpeg/pull/43/commits/b90c39fe3d29418d67d953588ed9fdf4d848f811.patch";
+ sha256 = "0d9kf4w6ldwag3s2dr9zjin6wrj66fnl4fn8379ci4q4qfsqgx3f";
+ })];
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix
index 1cb3dc2a7b9e..21018518ca28 100644
--- a/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -1,7 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy27
-, nose
, pandas
-, pytest
+, pytestCheckHook
, scikitlearn
, tensorflow
}:
@@ -17,16 +16,17 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ scikitlearn ];
- checkInputs = [ nose pytest pandas ];
- checkPhase = ''
+ checkInputs = [ pytestCheckHook pandas ];
+ preCheck = ''
export HOME=$TMPDIR
- # skip some tests that fail because of minimal rounding errors
- # or very large dependencies (keras + tensorflow)
- py.test imblearn -k 'not estimator \
- and not classification \
- and not _generator \
- and not show_versions'
'';
+ disabledTests = [
+ "estimator"
+ "classification"
+ "_generator"
+ "show_versions"
+ "test_make_imbalanced_iris"
+ ];
meta = with stdenv.lib; {
description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance";
diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix
index 977ba3cdeb8b..92f8f5d90f10 100644
--- a/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "paho-mqtt";
- version = "1.5.0";
+ version = "1.5.1";
# No tests in PyPI tarball
src = fetchFromGitHub {
owner = "eclipse";
repo = "paho.mqtt.python";
rev = "v${version}";
- sha256 = "1fq5z53g2k18iiqnz5qq87vzjpppfza072nx0dwllmhimm2dskh5";
+ sha256 = "1y537i6zxkjkmi80w5rvd18npz1jm5246i2x8p3q7ycx94i8ixs0";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix
index bc910cea5808..6096f30181a1 100644
--- a/pkgs/development/python-modules/pyclipper/default.nix
+++ b/pkgs/development/python-modules/pyclipper/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "pyclipper";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0irs5sn6ldpg70630nfndghjnpxv8jldk61zyczfzp1jcz53b43s";
+ sha256 = "ca3751e93559f0438969c46f17459d07f983281dac170c3479de56492e152855";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix
index d56c10a9591e..0fca57cb2923 100644
--- a/pkgs/development/python-modules/pysvn/default.nix
+++ b/pkgs/development/python-modules/pysvn/default.nix
@@ -60,11 +60,11 @@ buildPythonPackage rec {
sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh
make -C ../Tests
+ ${python.interpreter} -c "import pysvn"
+
runHook postCheck
'';
- pythonImportCheck = [ "pysvn" ];
-
installPhase = ''
dest=$(toPythonPath $out)/pysvn
mkdir -p $dest
@@ -80,5 +80,4 @@ buildPythonPackage rec {
homepage = "http://pysvn.tigris.org/";
license = licenses.asl20;
};
-
}
diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix
index 7a6e3f7d9314..2fafdcd1aaa0 100644
--- a/pkgs/development/python-modules/pytest-datafiles/default.nix
+++ b/pkgs/development/python-modules/pytest-datafiles/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
license = licenses.mit;
- homepage = "https://pypi.python.org/pypi/pytest-catchlog/";
+ homepage = "https://github.com/omarkohl/pytest-datafiles";
description = "py.test plugin to create a 'tmpdir' containing predefined files/directories.";
};
}
diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix
new file mode 100644
index 000000000000..98c03b893093
--- /dev/null
+++ b/pkgs/development/python-modules/python-tado/default.nix
@@ -0,0 +1,26 @@
+{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, pythonOlder, requests }:
+
+buildPythonPackage rec {
+ pname = "python-tado";
+ version = "0.9.0";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "wmalgadey";
+ repo = "PyTado";
+ rev = version;
+ sha256 = "0cr5sxdvjgdrrlhl32rs8pwyay8liyi6prm37y66dn00b41cb5l3";
+ };
+
+ propagatedBuildInputs = [ requests ];
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description =
+ "Python binding for Tado web API. Pythonize your central heating!";
+ homepage = "https://github.com/wmalgadey/PyTado";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ jamiemagee ];
+ };
+}
diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix
index 849b56d2d0c2..569096cb466c 100644
--- a/pkgs/development/python-modules/typing-inspect/default.nix
+++ b/pkgs/development/python-modules/typing-inspect/default.nix
@@ -3,6 +3,7 @@
, fetchPypi
, typing-extensions
, mypy-extensions
+, isPy39
}:
buildPythonPackage rec {
@@ -25,5 +26,6 @@ buildPythonPackage rec {
homepage = "https://github.com/ilevkivskyi/typing_inspect";
license = licenses.mit;
maintainers = with maintainers; [ albakham ];
+ broken = isPy39; # see https://github.com/ilevkivskyi/typing_inspect/issues/65
};
}
diff --git a/pkgs/development/python-modules/vcver/default.nix b/pkgs/development/python-modules/vcver/default.nix
index 74b44cddc464..a328cb104bc1 100644
--- a/pkgs/development/python-modules/vcver/default.nix
+++ b/pkgs/development/python-modules/vcver/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
# circular dependency on test tool uranium https://pypi.org/project/uranium/
doCheck = false;
- pythonImportTests = [ "vcver" ];
+ pythonImportsCheck = [ "vcver" ];
meta = with lib; {
description = "Reference Implementation of vcver";
diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix
index 126fe1377f5f..39c7a42899a8 100755
--- a/pkgs/development/python-modules/zstandard/default.nix
+++ b/pkgs/development/python-modules/zstandard/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "zstandard";
- version = "0.14.1";
+ version = "0.15.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5dd700e52ec28c64d43f681ccde76b6436c8f89a332d6c9e22a6b629f28daeb5";
+ sha256 = "22395e97bcfdb222246da4fdf8739ed762ffce1e5d0b526eb051c90da20268d7";
};
propagatedBuildInputs = [ cffi ];
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 5c8e95f7fd4b..bf50a380d1fc 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -10,12 +10,12 @@
stdenv.mkDerivation rec {
pname = "openocd";
- version = "unstable-2020-11-11";
+ version = "0.11.0-rc1";
src = fetchgit {
url = "https://git.code.sf.net/p/openocd/code";
- rev = "06c7a53f1fff20bcc4be9e63f83ae98664777f34";
- sha256 = "0g0w7g94r88ylfpwswnhh8czlf5iqvd991ssn4gfcfd725lpdb01";
+ rev = "v${version}";
+ sha256 = "15g8qalyxhdp0imfrg8mxwnp0nimd836fc5laaavajw49gcm65m4";
fetchSubmodules = true;
};
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 34fcc9bb6c32..ce168084f2c6 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -4,7 +4,7 @@
buildDunePackage rec {
pname = "merlin";
- inherit (dot-merlin-reader) src version;
+ inherit (dot-merlin-reader) src version useDune2;
minimumOCamlVersion = "4.02.3";
diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
index 7af1b4513a85..009998a3f851 100644
--- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
+++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
@@ -4,13 +4,15 @@ with ocamlPackages;
buildDunePackage rec {
pname = "dot-merlin-reader";
- version = "3.4.0";
+ version = "3.4.2";
+
+ useDune2 = true;
minimumOCamlVersion = "4.02.1";
src = fetchurl {
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
- sha256 = "048rkpbvayksv8mgmkgi17vv0y9xplv7v2ww4d1hs7bkm5zzsvg2";
+ sha256 = "109ai1ggnkrwbzsl1wdalikvs1zx940m6n65jllxj68in6bvidz1";
};
buildInputs = [ yojson csexp result ];
diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix
new file mode 100644
index 000000000000..504e4811432b
--- /dev/null
+++ b/pkgs/games/clonehero/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, alsaLib
+, gtk2
+, libXrandr
+, libXScrnSaver
+, udev
+, zlib
+}:
+
+let
+ name = "clonehero";
+in
+stdenv.mkDerivation rec {
+ pname = "${name}-unwrapped";
+ version = "0.23.2.2";
+
+ src = fetchurl {
+ url = "http://dl.clonehero.net/${name}-v${lib.removePrefix "0" version}/${name}-linux.tar.gz";
+ sha256 = "0k9jcnd55yhr42gj8cmysd18yldp4k3cpk4z884p2ww03fyfq7mi";
+ };
+
+ outputs = [ "out" "doc" ];
+
+ nativeBuildInputs = [ autoPatchelfHook ];
+
+ buildInputs = [
+ # Load-time libraries (loaded from DT_NEEDED section in ELF binary)
+ gtk2
+ stdenv.cc.cc.lib
+ zlib
+
+ # Run-time libraries (loaded with dlopen)
+ alsaLib # ALSA sound
+ libXrandr # X11 resolution detection
+ libXScrnSaver # X11 screensaver prevention
+ udev # udev input drivers
+ ];
+
+ installPhase = ''
+ mkdir -p "$out/bin" "$out/share"
+ install -Dm755 ${name} "$out/bin"
+ cp -r clonehero_Data "$out/share"
+
+ mkdir -p "$doc/share/${name}"
+ cp README.txt "$doc/share/${name}"
+ '';
+
+ # Patch required run-time libraries as load-time libraries
+ #
+ # Libraries found with:
+ # > strings clonehero | grep '\.so'
+ # and
+ # > strace clonehero 2>&1 | grep '\.so'
+ postFixup = ''
+ patchelf \
+ --add-needed libasound.so.2 \
+ --add-needed libudev.so.1 \
+ --add-needed libXrandr.so.2 \
+ --add-needed libXss.so.1 \
+ "$out/bin/${name}"
+ '';
+
+ meta = with lib; {
+ description = "Clone of Guitar Hero and Rockband-style games";
+ homepage = "https://clonehero.net";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ metadark ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/games/clonehero/fhs-wrapper.nix b/pkgs/games/clonehero/fhs-wrapper.nix
new file mode 100644
index 000000000000..97758b2c1fab
--- /dev/null
+++ b/pkgs/games/clonehero/fhs-wrapper.nix
@@ -0,0 +1,39 @@
+{ clonehero-unwrapped
+, makeDesktopItem
+, buildFHSUserEnv
+, liberation_ttf
+, callPackage
+}:
+
+let
+ name = "clonehero";
+ desktopName = "Clone Hero";
+ desktopItem = makeDesktopItem {
+ inherit name desktopName;
+ comment = clonehero-unwrapped.meta.description;
+ exec = name;
+ icon = name;
+ categories = "Game;";
+ };
+in
+buildFHSUserEnv {
+ inherit name;
+ inherit (clonehero-unwrapped) meta;
+
+ # Clone Hero has /usr/share/fonts hard-coded in its binary for looking up fonts.
+ # This workaround is necessary for rendering text on the keybinding screen (and possibly elsewhere)
+ # If a better solution is found, the FHS environment can be removed.
+ extraBuildCommands = ''
+ chmod +w usr/share
+ mkdir -p usr/share/fonts/truetype
+ ln -s ${liberation_ttf}/share/fonts/truetype/* usr/share/fonts/truetype
+ '';
+
+ extraInstallCommands = ''
+ mkdir -p "$out/share/applications" "$out/share/pixmaps"
+ cp ${desktopItem}/share/applications/* "$out/share/applications"
+ ln -s ${clonehero-unwrapped}/share/clonehero_Data/Resources/UnityPlayer.png "$out/share/pixmaps/${name}.png"
+ '';
+
+ runScript = callPackage ./xdg-wrapper.nix { };
+}
diff --git a/pkgs/games/clonehero/xdg-wrapper.nix b/pkgs/games/clonehero/xdg-wrapper.nix
new file mode 100644
index 000000000000..2890e469db05
--- /dev/null
+++ b/pkgs/games/clonehero/xdg-wrapper.nix
@@ -0,0 +1,21 @@
+{ stdenv, clonehero-unwrapped, writeScript }:
+
+# Clone Hero doesn't have an installer, so it just stores configuration & data relative to the binary.
+# This wrapper works around that limitation, storing game configuration & data in XDG_CONFIG_HOME.
+let
+ name = "clonehero";
+ desktopName = "Clone Hero";
+in
+writeScript "${name}-xdg-wrapper-${clonehero-unwrapped.version}" ''
+ #!${stdenv.shell} -e
+ configDir="''${XDG_CONFIG_HOME:-$HOME/.config}/unity3d/srylain Inc_/${desktopName}"
+ mkdir -p "$configDir"
+
+ # Force link shipped clonehero_Data, unless directory already exists (to allow modding)
+ if [ ! -d "$configDir/clonehero_Data" ] || [ -L "$configDir/clonehero_Data" ]; then
+ ln -snf ${clonehero-unwrapped}/share/clonehero_Data "$configDir"
+ fi
+
+ # Fake argv[0] to emulate running in the config directory
+ exec -a "$configDir/${name}" ${clonehero-unwrapped}/bin/${name} "$@"
+''
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 0ea36ce8f440..00c0bb0d5d3c 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,18 +1,23 @@
{
"4.14": {
- "name": "linux-hardened-4.14.212.a.patch",
- "sha256": "068grrkygd6klv4zx3jghk987bl0v7g5g5911a2irllpsjv55rna",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.212.a/linux-hardened-4.14.212.a.patch"
+ "name": "linux-hardened-4.14.213.a.patch",
+ "sha256": "0lkjgg6cbsaiypxij7p00q3y094qf0h172hc2p7wgy39777b45a7",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.213.a/linux-hardened-4.14.213.a.patch"
},
"4.19": {
- "name": "linux-hardened-4.19.163.a.patch",
- "sha256": "0p8y9r1f3blsqrakxy4yp73sff0i0k43cwp5rg4ry3apnzfly1a4",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.163.a/linux-hardened-4.19.163.a.patch"
+ "name": "linux-hardened-4.19.164.a.patch",
+ "sha256": "0fzv2sjmf0dmhzp58yr4ggzi3pxbjjhbhmav46pv98rbdm2vjwvk",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.164.a/linux-hardened-4.19.164.a.patch"
+ },
+ "5.10": {
+ "name": "linux-hardened-5.10.4.a.patch",
+ "sha256": "0apnmcis41vz5k74g1ssq0apwxzhl6zg31nyjbplilm3b068a1h4",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.4.a/linux-hardened-5.10.4.a.patch"
},
"5.4": {
- "name": "linux-hardened-5.4.85.a.patch",
- "sha256": "1ml9vpakhpxry29c4q0fz346ly7s3hwd7rasr4dzkgs71lm5a1sy",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.85.a/linux-hardened-5.4.85.a.patch"
+ "name": "linux-hardened-5.4.86.a.patch",
+ "sha256": "0j1wr6d42rbxd66vhsp9l3lp3nv0p1j0cpir9pxshd8w9zlbdy88",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.86.a/linux-hardened-5.4.86.a.patch"
},
"5.9": {
"name": "linux-hardened-5.9.16.a.patch",
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index b542fab118ba..d37fa3c19144 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.163";
+ version = "4.19.164";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1z65iwwyx2b01fncygckmhpxirzs52qfqmv3agirn4laxgjw9viy";
+ sha256 = "1amafhydq934a04pizc5w4h4y4ny982zn33yrz7q0h2d6sskmyp5";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 783e7cf2d968..abe28da81269 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.10.3";
+ version = "5.10.4";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "09cml495fnf52lhlkjxjznw34q5s8arvq7shkb6wjq6fwlrk65gr";
+ sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 0d504ff334a4..a5db9e7f6d1f 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.4.85";
+ version = "5.4.86";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0220k327aa7gg48fqw171mcng8h717c4a1v14r3q36ksirnmiqqx";
+ sha256 = "12qf7gza94s4f7smi3dk6i6hqcz0fbc64ghapan57fgpdvybadpb";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index ef92ff9550ff..4614e1d64cad 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -59,11 +59,15 @@ in python.pkgs.buildPythonApplication rec {
--replace "deepdiff==4.3.1" "deepdiff" \
--replace "voluptuous==0.11.7" "voluptuous" \
--replace "astral==1.10.1" "astral" \
- --replace "python-socketio==4.4.0" "python-socketio"
+ --replace "python-socketio==4.4.0" "python-socketio" \
+ --replace "feedparser==5.2.1" "feedparser>=5.2.1" \
+ --replace "aiohttp_jinja2==1.2.0" "aiohttp_jinja2>=1.2.0" \
+ --replace "pygments==2.6.1" "pygments>=2.6.1" \
+ --replace "paho-mqtt==1.5.0" "paho-mqtt>=1.5.0"
'';
meta = with lib; {
- description = "Sandboxed python execution environment for writing automation apps for Home Assistant";
+ description = "Sandboxed Python execution environment for writing automation apps for Home Assistant";
homepage = "https://github.com/home-assistant/appdaemon";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg dotlambda ];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 9135ea549f34..93595c5729f1 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2020.12.1";
+ version = "2020.12.2";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@@ -811,7 +811,7 @@
"system_health" = ps: with ps; [ aiohttp-cors ];
"system_log" = ps: with ps; [ aiohttp-cors ];
"systemmonitor" = ps: with ps; [ psutil ];
- "tado" = ps: with ps; [ ]; # missing inputs: python-tado
+ "tado" = ps: with ps; [ python-tado ];
"tag" = ps: with ps; [ ];
"tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api
"tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 12dc7b681618..68d11e85fd2a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -62,7 +62,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2020.12.1";
+ hassVersion = "2020.12.2";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index ddf7a972c2eb..96363583b62e 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }:
let
- version = "1.10.2";
+ version = "1.12";
in
stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
pname = "meteor";
src = fetchurl {
url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
- sha256 = "17s1n92nznasaaprvxg289a1fcizq2nj51xqw7akgw5f77q19vmw";
+ sha256 = "0l3zc76djzypvc0dm5ikv5ybb6574qd6kdbbkarzc2dxx64wkyvb";
};
#dontStrip = true;
diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix
index bab39aef2441..cfd000d84c66 100644
--- a/pkgs/shells/any-nix-shell/default.nix
+++ b/pkgs/shells/any-nix-shell/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "any-nix-shell";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "haslersn";
repo = "any-nix-shell";
rev = "v${version}";
- sha256 = "02cv86csk1m8nlh2idvh7bjw43lpssmdawya2jhr4bam2606yzdv";
+ sha256 = "05xixgsdfv0qk648r74nvazw16dpw49ryz8dax9kwmhqrgkjaqv6";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 4e377218b73b..0b7485385dc9 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
- version = "2020-12-28";
+ version = "2020-12-30";
pname = "oh-my-zsh";
- rev = "4b2431e8b1c08a2dc14fe31bf07a5e5f08eaa87e";
+ rev = "a4a79eaa8cdf39f35dcd1753b973e830ff7b00b8";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
- sha256 = "09776acglph64lg9x1f1ypglbbhknrqidq47zk95vksd1in8l3is";
+ sha256 = "4L0G1ECFkwg7iytIvg2WQionf48a4LLGIKobopgMm4g=";
};
installPhase = ''
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 9c7f9936e592..2d995e6c1810 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
in with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.18.204"; # N.B: if you change this, change botocore to a matching version too
+ version = "1.18.206"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-YAyqRJbETCagcME63dt5b9WDRj6tq8Gdwk6qyAd86lE=";
+ sha256 = "sha256-+BEiIuhZ0L8WXNN0hkOMVH2eTojyAiuj3zahuiGkx7I=";
};
postPatch = ''
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 59b22f48f99e..4026effd6f67 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
let
- version = "2.16.0";
+ version = "2.17.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
- sha256 = "wuHPNpt5pizgAwxRxJpRBiX6keJpKRpHu6M5BpFUyeY=";
+ sha256 = "2QLPtZYZZ+W5xZH2hxFnjox31v3My3zocouqLWGWSYI=";
};
# put packages that needs to be overriden in the py package scope
@@ -67,6 +67,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
azure-mgmt-containerregistry
azure-mgmt-containerservice
azure-mgmt-cosmosdb
+ azure-mgmt-databoxedge
azure-mgmt-datalake-analytics
azure-mgmt-datalake-store
azure-mgmt-datamigration
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index f5f661c8e9b9..ab417af8d445 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -125,8 +125,8 @@ let
'';
};
- azure-batch = overrideAzureMgmtPackage super.azure-batch "9.0.0" "zip"
- "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7";
+ azure-batch = overrideAzureMgmtPackage super.azure-batch "10.0.0" "zip"
+ "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0";
azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip"
"0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr";
@@ -158,8 +158,8 @@ let
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip"
"059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx";
- azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "14.0.0" "zip"
- "0bvqv56plcgmnfyj0apphlbsn2vfm1a22idvy8y5npbfjz4zwja9";
+ azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "18.0.0" "zip"
+ "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e";
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
"12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
@@ -206,8 +206,8 @@ let
azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip"
"18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh";
- azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "13.0.0" "zip"
- "02ac54fs4wqdwy986j9qyx6fbl5zmpkh1sykr9r6mqk1xx9l4jq8";
+ azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.0.0" "zip"
+ "3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199";
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip"
"1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm";
@@ -230,8 +230,8 @@ let
azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "2.0.0" "zip"
"14v8ja8har2xrb00v98610pqvakcdvnzw8hkd6wbr1np3f3dxi8f";
- azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.4.1" "zip"
- "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r";
+ azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip"
+ "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3";
azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip"
"09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5";
@@ -260,8 +260,8 @@ let
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.2.0" "zip"
"10b8y1b5qlyr666x7yimnwis9386ciphrxdnmmyzk90qg6h0niry";
- azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc15" "zip"
- "1fnmdl3m7kdn6c2ws5vrm7nwadcbq9mgc6g5bg4s1a4xjb23q6vb";
+ azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc16" "zip"
+ "eT5gH0K4q2Qr1lEpuqjxQhOUrA6bEsAktj+PKsfMXTo=";
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip"
"05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6";
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 29592451734f..b2148fafe282 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
- sha256 = "0kldvy63gba5k6ymybnggw3q3rlav1gcbpxiwnv6670lk5qzqdsw";
+ sha256 = "1miqvh2b3mxrrr63q8f5i944mp3rz6685ckmnk5fml2wyc273jiv";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
- sha256 = "1ifl4skwqhkapfwhymyz7v4jpwpd01n4x3956w5ci8c3zvw8l118";
+ sha256 = "15kfsxn6j37rsw97ixj7ixkzcby0pkgc5xj7cpqdq975ym58sgv7";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
- version = "319.0.0";
+ version = "321.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
@@ -99,7 +99,7 @@ in stdenv.mkDerivation rec {
# This package contains vendored dependencies. All have free licenses.
license = licenses.free;
homepage = "https://cloud.google.com/sdk/";
- maintainers = with maintainers; [ pradyuman stephenmw zimbatm ];
+ maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
index d9ae2cb74615..b52099bdeab8 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "android-file-transfer";
- version = "4.1";
+ version = "4.2";
src = fetchFromGitHub {
owner = "whoozle";
repo = "android-file-transfer-linux";
rev = "v${version}";
- sha256 = "0xmnwxr649wdzsa1vf3spl387hxs4pq0rldyrsr9hz43da4v081k";
+ sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b";
};
nativeBuildInputs = [ cmake readline pkgconfig ];
@@ -17,7 +17,7 @@ mkDerivation rec {
meta = with stdenv.lib; {
description = "Reliable MTP client with minimalistic UI";
homepage = "https://whoozle.github.io/android-file-transfer-linux/";
- license = licenses.lgpl21;
+ license = licenses.lgpl21Plus;
maintainers = [ maintainers.xaverdh ];
platforms = platforms.linux;
};
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 4e40a4a336d4..e4561c382280 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "04nidx43w4nnccgbrw30wg9ai8p7hbklxpn1gc6gr2325yhqvwhl";
};
- cargoSha256 = "1bzq0dsdnmxniwnb6989wlhih28c4lyd11sci821whs11lhlfpz0";
+ cargoHash = "sha256-4F9HIQ1BQx4EikyH0DwlDAkYIeUJJbMsj7ZX23QD+K8=";
nativeBuildInputs = [
makeWrapper
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 177580c099b6..3843f16f6a86 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,17 +1,18 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
-, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests }:
+, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests
+, ncurses }:
stdenv.mkDerivation rec {
pname = "snapper";
- version = "0.8.14";
+ version = "0.8.15";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "snapper";
rev = "v${version}";
- sha256 = "1q687bjwy668klxnhsrc2rlhisa59j8bhmh1jw220rq7z0hm2khr";
+ sha256 = "1rqv1qfxr02qbkix1mpx91s4827irxryxkhby3ii0fdkm3ympsas";
};
nativeBuildInputs = [
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
- lvm2 pam python util-linux json_c
+ lvm2 pam python util-linux json_c ncurses
];
passthru.tests.snapper = nixosTests.snapper;
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index abb17946fbbe..c407637599d2 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2020.12.29";
+ version = "2020.12.31";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "1hcr3mf63csp6lfpqszl5ibb2jhyl180s6pvbb7771jg0kdvlbbb";
+ sha256 = "0ncqkzzaasda2hd89psgc0j34r2jinn1dcsfcapzrsd902qghkh9";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/tools/security/gospider/default.nix
index 7211c65d536b..b7c94c940239 100644
--- a/pkgs/tools/security/gospider/default.nix
+++ b/pkgs/tools/security/gospider/default.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "jaeles-project";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "03gl8y2047iwa6bhmayyds3li21wy3sw1x4hpp9zgqgi95039q86";
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd9a10067758..158be57f604c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1615,6 +1615,7 @@ in
boringtun = callPackage ../tools/networking/boringtun { };
+ # Upstream recommends qt5.12 and it doesn't build with qt5.15
boomerang = libsForQt512.callPackage ../development/tools/boomerang { };
boost-build = callPackage ../development/tools/boost-build { };
@@ -2607,6 +2608,8 @@ in
shell-hist = callPackage ../tools/misc/shell-hist { };
+ shellhub-agent = callPackage ../applications/networking/shellhub-agent { };
+
simdjson = callPackage ../development/libraries/simdjson { };
simg2img = callPackage ../tools/filesystems/simg2img { };
@@ -7416,6 +7419,7 @@ in
sleuthkit = callPackage ../tools/system/sleuthkit {};
+ # Not updated upstream since 2018, doesn't support qt newer than 5.12
sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {};
slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { };
@@ -19297,7 +19301,7 @@ in
sdparm = callPackage ../os-specific/linux/sdparm { };
- sdrangel = libsForQt512.callPackage ../applications/radio/sdrangel { };
+ sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { };
sepolgen = callPackage ../os-specific/linux/sepolgen { };
@@ -23696,6 +23700,7 @@ in
plexamp = callPackage ../applications/audio/plexamp { };
+ # Upstream says it supports only qt5.9 which is not packaged, and building with qt newer than 5.12 fails
plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { };
plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
@@ -25757,6 +25762,10 @@ in
chocolateDoom = callPackage ../games/chocolate-doom { };
+ clonehero-unwrapped = pkgs.callPackage ../games/clonehero { };
+
+ clonehero = pkgs.callPackage ../games/clonehero/fhs-wrapper.nix { };
+
crispyDoom = callPackage ../games/crispy-doom { };
cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 06ca7b01fae7..9f4603099f8e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -579,6 +579,8 @@ let
mirage-block-ramdisk = callPackage ../development/ocaml-modules/mirage-block-ramdisk { };
+ mirage-block-unix = callPackage ../development/ocaml-modules/mirage-block-unix { };
+
mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { };
mirage-channel = callPackage ../development/ocaml-modules/mirage-channel { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ba80903ccd5..cb5d8e784e9c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -597,6 +597,8 @@ in {
azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { };
+ azure-mgmt-databoxedge = callPackage ../development/python-modules/azure-mgmt-databoxedge { };
+
azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { };
azure-mgmt-datalake-analytics = callPackage ../development/python-modules/azure-mgmt-datalake-analytics { };
@@ -4683,6 +4685,8 @@ in {
python-openems = callPackage ../development/python-modules/python-openems { };
+ python-tado = callPackage ../development/python-modules/python-tado { };
+
pkutils = callPackage ../development/python-modules/pkutils { };
plac = callPackage ../development/python-modules/plac { };