diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1a950838ab0c..48d8973e9224 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2675,6 +2675,12 @@
email = "christoph.senjak@googlemail.com";
name = "Christoph-Simon Senjak";
};
+ datafoo = {
+ email = "34766150+datafoo@users.noreply.github.com";
+ github = "datafoo";
+ githubId = 34766150;
+ name = "datafoo";
+ };
davhau = {
email = "d.hauer.it@gmail.com";
name = "David Hauer";
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
index f87298201791..4c399586eb52 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
@@ -4,19 +4,19 @@ The test itself can be run interactively. This is particularly useful
when developing or debugging a test:
```ShellSession
-$ nix-build nixos/tests/login.nix -A driverInteractive
+$ nix-build . -A nixosTests.login.driverInteractive
$ ./result/bin/nixos-test-driver --interactive
-starting VDE switch for network 1
->
+[...]
+>>>
```
You can then take any Python statement, e.g.
```py
-> start_all()
-> test_script()
-> machine.succeed("touch /tmp/foo")
-> print(machine.succeed("pwd")) # Show stdout of command
+>>> start_all()
+>>> test_script()
+>>> machine.succeed("touch /tmp/foo")
+>>> print(machine.succeed("pwd")) # Show stdout of command
```
The function `test_script` executes the entire test script and drops you
diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
index 17003cbcbfdc..8348ab56deb3 100644
--- a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
+++ b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml
@@ -5,19 +5,19 @@
useful when developing or debugging a test:
-$ nix-build nixos/tests/login.nix -A driverInteractive
+$ nix-build . -A nixosTests.login.driverInteractive
$ ./result/bin/nixos-test-driver --interactive
-starting VDE switch for network 1
->
+[...]
+>>>
You can then take any Python statement, e.g.
-> start_all()
-> test_script()
-> machine.succeed("touch /tmp/foo")
-> print(machine.succeed("pwd")) # Show stdout of command
+>>> start_all()
+>>> test_script()
+>>> machine.succeed("touch /tmp/foo")
+>>> print(machine.succeed("pwd")) # Show stdout of command
The function test_script executes the entire test
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 365e22714573..a67040468136 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -17,7 +17,7 @@ rec {
inherit pkgs;
# Run an automated test suite in the given virtual network.
- runTests = { driver, pos }:
+ runTests = { driver, driverInteractive, pos }:
stdenv.mkDerivation {
name = "vm-test-run-${driver.testName}";
@@ -34,7 +34,7 @@ rec {
'';
passthru = driver.passthru // {
- inherit driver;
+ inherit driver driverInteractive;
};
inherit pos; # for better debugging
@@ -224,7 +224,7 @@ rec {
passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
meta = (drv.meta or { }) // t.meta;
};
- in passMeta (runTests { inherit driver pos; });
+ in passMeta (runTests { inherit driver pos driverInteractive; });
in
test // {
diff --git a/nixos/modules/installer/sd-card/sd-image-riscv64-qemu.nix b/nixos/modules/installer/sd-card/sd-image-riscv64-qemu.nix
new file mode 100644
index 000000000000..a3e30768da45
--- /dev/null
+++ b/nixos/modules/installer/sd-card/sd-image-riscv64-qemu.nix
@@ -0,0 +1,32 @@
+# To build, use:
+# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-riscv64-qemu.nix -A config.system.build.sdImage
+{ config, lib, pkgs, ... }:
+
+{
+ imports = [
+ ../../profiles/base.nix
+ ./sd-image.nix
+ ];
+
+ boot.loader = {
+ grub.enable = false;
+ generic-extlinux-compatible = {
+ enable = true;
+
+ # Don't even specify FDTDIR - We do not have the correct DT
+ # The DTB is generated by QEMU at runtime
+ useGenerationDeviceTree = false;
+ };
+ };
+
+ boot.consoleLogLevel = lib.mkDefault 7;
+ boot.kernelParams = [ "console=tty0" "console=ttyS0,115200n8" ];
+
+ sdImage = {
+ populateFirmwareCommands = "";
+ populateRootCommands = ''
+ mkdir -p ./files/boot
+ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
+ '';
+ };
+}
diff --git a/nixos/modules/installer/sd-card/sd-image-x86_64.nix b/nixos/modules/installer/sd-card/sd-image-x86_64.nix
new file mode 100644
index 000000000000..b44c0a4eeca5
--- /dev/null
+++ b/nixos/modules/installer/sd-card/sd-image-x86_64.nix
@@ -0,0 +1,27 @@
+# To build, use:
+# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-x86_64.nix -A config.system.build.sdImage
+
+# This image is primarily used in NixOS tests (boot.nix) to test `boot.loader.generic-extlinux-compatible`.
+{ config, lib, pkgs, ... }:
+
+{
+ imports = [
+ ../../profiles/base.nix
+ ./sd-image.nix
+ ];
+
+ boot.loader = {
+ grub.enable = false;
+ generic-extlinux-compatible.enable = true;
+ };
+
+ boot.consoleLogLevel = lib.mkDefault 7;
+
+ sdImage = {
+ populateFirmwareCommands = "";
+ populateRootCommands = ''
+ mkdir -p ./files/boot
+ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
+ '';
+ };
+}
diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix
index a964cf2d6f85..7560c682517a 100644
--- a/nixos/modules/installer/sd-card/sd-image.nix
+++ b/nixos/modules/installer/sd-card/sd-image.nix
@@ -176,7 +176,7 @@ in
nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ];
- inherit (config.sdImage) compressImage;
+ inherit (config.sdImage) imageName compressImage;
buildCommand = ''
mkdir -p $out/nix-support $out/sd-image
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 797fcddb8c90..25f68123a1da 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -44,12 +44,12 @@ in
"ohci1394" "sbp2"
# Virtio (QEMU, KVM etc.) support.
- "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
+ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
# VMware support.
"mptspi" "vmxnet3" "vsock"
] ++ lib.optional platform.isx86 "vmw_balloon"
- ++ lib.optionals (!platform.isAarch64 && !platform.isAarch32) [ # not sure where else they're missing
+ ++ lib.optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
"vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
# Hyper-V support.
diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix
index d51effa31c97..a4ada662cfbd 100644
--- a/nixos/modules/services/web-servers/caddy/default.nix
+++ b/nixos/modules/services/web-servers/caddy/default.nix
@@ -28,11 +28,7 @@ let
let
Caddyfile = pkgs.writeText "Caddyfile" ''
{
- ${optionalString (cfg.email != null) "email ${cfg.email}"}
- ${optionalString (cfg.acmeCA != null) "acme_ca ${cfg.acmeCA}"}
- log {
- ${cfg.logFormat}
- }
+ ${cfg.globalConfig}
}
${cfg.extraConfig}
'';
@@ -183,6 +179,26 @@ in
'';
};
+ globalConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ debug
+ servers {
+ protocol {
+ experimental_http3
+ }
+ }
+ '';
+ description = ''
+ Additional lines of configuration appended to the global config section
+ of the Caddyfile.
+
+ Refer to
+ for details on supported values.
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -253,6 +269,13 @@ in
];
services.caddy.extraConfig = concatMapStringsSep "\n" mkVHostConf virtualHosts;
+ services.caddy.globalConfig = ''
+ ${optionalString (cfg.email != null) "email ${cfg.email}"}
+ ${optionalString (cfg.acmeCA != null) "acme_ca ${cfg.acmeCA}"}
+ log {
+ ${cfg.logFormat}
+ }
+ '';
systemd.packages = [ cfg.package ];
systemd.services.caddy = {
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
index bd508bbe8eaa..545b594674f3 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
@@ -30,6 +30,21 @@ in
'';
};
+ useGenerationDeviceTree = mkOption {
+ default = true;
+ type = types.bool;
+ description = ''
+ Whether to generate Device Tree-related directives in the
+ extlinux configuration.
+
+ When enabled, the bootloader will attempt to load the device
+ tree binaries from the generation's kernel.
+
+ Note that this affects all generations, regardless of the
+ setting value used in their configurations.
+ '';
+ };
+
configurationLimit = mkOption {
default = 20;
example = 10;
@@ -54,7 +69,9 @@ in
};
config = let
- builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}" + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}";
+ builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}"
+ + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}"
+ + lib.optionalString (!cfg.useGenerationDeviceTree) " -r";
in
mkIf cfg.enable {
system.build.installBootLoader = "${builder} ${builderArgs} -c";
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
index 5ffffb95edb1..1a0da0050291 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
@@ -6,7 +6,7 @@ export PATH=/empty
for i in @path@; do PATH=$PATH:$i/bin; done
usage() {
- echo "usage: $0 -t -c [-d ] [-g ] [-n ]" >&2
+ echo "usage: $0 -t -c [-d ] [-g ] [-n ] [-r]" >&2
exit 1
}
@@ -15,7 +15,7 @@ default= # Default configuration
target=/boot # Target directory
numGenerations=0 # Number of other generations to include in the menu
-while getopts "t:c:d:g:n:" opt; do
+while getopts "t:c:d:g:n:r" opt; do
case "$opt" in
t) # U-Boot interprets '0' as infinite and negative as instant boot
if [ "$OPTARG" -lt 0 ]; then
@@ -30,6 +30,7 @@ while getopts "t:c:d:g:n:" opt; do
d) target="$OPTARG" ;;
g) numGenerations="$OPTARG" ;;
n) dtbName="$OPTARG" ;;
+ r) noDeviceTree=1 ;;
\?) usage ;;
esac
done
@@ -96,6 +97,12 @@ addEntry() {
fi
echo " LINUX ../nixos/$(basename $kernel)"
echo " INITRD ../nixos/$(basename $initrd)"
+ echo " APPEND init=$path/init $extraParams"
+
+ if [ -n "$noDeviceTree" ]; then
+ return
+ fi
+
if [ -d "$dtbDir" ]; then
# if a dtbName was specified explicitly, use that, else use FDTDIR
if [ -n "$dtbName" ]; then
@@ -109,7 +116,6 @@ addEntry() {
exit 1
fi
fi
- echo " APPEND init=$path/init $extraParams"
}
tmpFile="$target/extlinux/extlinux.conf.tmp.$$"
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix
index 9945a1dcd62f..cf5565667131 100644
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -12,12 +12,22 @@ let
iso =
(import ../lib/eval-config.nix {
inherit system;
- modules =
- [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
- ../modules/testing/test-instrumentation.nix
- ];
+ modules = [
+ ../modules/installer/cd-dvd/installation-cd-minimal.nix
+ ../modules/testing/test-instrumentation.nix
+ ];
}).config.system.build.isoImage;
+ sd =
+ (import ../lib/eval-config.nix {
+ inherit system;
+ modules = [
+ ../modules/installer/sd-card/sd-image-x86_64.nix
+ ../modules/testing/test-instrumentation.nix
+ { sdImage.compressImage = false; }
+ ];
+ }).config.system.build.sdImage;
+
pythonDict = params: "\n {\n ${concatStringsSep ",\n " (mapAttrsToList (name: param: "\"${name}\": \"${param}\"") params)},\n }\n";
makeBootTest = name: extraConfig:
@@ -110,4 +120,30 @@ in {
};
biosNetboot = makeNetbootTest "bios" {};
+
+ ubootExtlinux = let
+ sdImage = "${sd}/sd-image/${sd.imageName}";
+ mutableImage = "/tmp/linked-image.qcow2";
+
+ machineConfig = pythonDict {
+ bios = "${pkgs.ubootQemuX86}/u-boot.rom";
+ qemuFlags = "-m 768 -machine type=pc,accel=tcg -drive file=${mutableImage},if=ide,format=qcow2";
+ };
+ in makeTest {
+ name = "boot-uboot-extlinux";
+ nodes = { };
+ testScript = ''
+ import os
+
+ # Create a mutable linked image backed by the read-only SD image
+ if os.system("qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0:
+ raise RuntimeError("Could not create mutable linked image")
+
+ machine = create_machine(${machineConfig})
+ machine.start()
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed("nix store verify -r --no-trust --option experimental-features nix-command /run/current-system")
+ machine.shutdown()
+ '';
+ };
}
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 15ebb85136b0..a595f285c68a 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -1,15 +1,11 @@
{ lib, stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }:
-let
- version = "1.7.5";
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "caudec";
- inherit version;
+ version = "1.7.5";
src = fetchurl {
- url = "http://caudec.net/downloads/caudec-${version}.tar.gz";
+ url = "http://caudec.cocatre.net/downloads/caudec-${version}.tar.gz";
sha256 = "5d1f5ab3286bb748bd29cbf45df2ad2faf5ed86070f90deccf71c60be832f3d5";
};
@@ -31,7 +27,7 @@ stdenv.mkDerivation {
'';
meta = with lib; {
- homepage = "http://caudec.net/";
+ homepage = "https://caudec.cocatre.net/";
description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)";
license = licenses.gpl3;
platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index e5a97aee86cd..cebf20ae78b8 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "pt2-clone";
- version = "1.37";
+ version = "1.38";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${version}";
- sha256 = "sha256-r9H+qF542j2qjmOEjJLAtnMU7SkJBJB8nH39zhkZu9M=";
+ sha256 = "sha256-fnPYlZvCZYiKkQmp5bNtrqgZAkVtKLmLMcfkbbysMyU=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index e1a0dd207a0a..35ab9791ec73 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
parties. Users hold the crypto keys to their own money and transact directly
with each other, with the help of a P2P network to check for double-spending.
'';
- homepage = "https://bitcoin.org/";
+ homepage = "https://bitcoin.org/en/";
downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/";
changelog = "https://bitcoincore.org/en/releases/${version}/";
maintainers = with maintainers; [ prusnak roconnor ];
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index c279ccf3df64..899495db9317 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -7,11 +7,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "feh";
- version = "3.7.2";
+ version = "3.8";
src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
- sha256 = "sha256-hHGP0nIM9UDSRXaElP4OtOWY9Es54jJrrow2ioKcglg=";
+ sha256 = "1a9bsq5j9sl2drzkab0hdhnamalpaszw9mz2prz6scrr5dak8g3z";
};
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix
index a74043730bf5..b99902954572 100644
--- a/pkgs/applications/graphics/odafileconverter/default.nix
+++ b/pkgs/applications/graphics/odafileconverter/default.nix
@@ -14,7 +14,7 @@ in mkDerivation {
src = fetchurl {
# NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time)
- url = "http://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb";
+ url = "https://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb";
sha256 = "10027a3ab18efd04ca75aa699ff550eca3bdfe6f7084460d3c00001bffb50070";
};
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index a4ad25109c84..ff112d7ce67c 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -11,7 +11,7 @@
buildDotnetModule rec {
pname = "Pinta";
- version = "2.0";
+ version = "2.0.1";
nativeBuildInputs = [
installShellFiles
@@ -36,7 +36,7 @@ buildDotnetModule rec {
owner = "PintaProject";
repo = "Pinta";
rev = version;
- sha256 = "sha256-wqqNPyy5h/hTDm2u5MDZx1ds5qWAxy1/BY/fX4PeA88=";
+ sha256 = "sha256-iOKJPB2bI/GjeDxzG7r6ew7SGIzgrJTcRXhEYzOpC9k=";
};
# FIXME: this should be propagated by wrapGAppsHook already, however for some
diff --git a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch
new file mode 100644
index 000000000000..f8f725f7f680
--- /dev/null
+++ b/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch
@@ -0,0 +1,63 @@
+From 8befa137776786829508f23dd33ab37e2b95a895 Mon Sep 17 00:00:00 2001
+From: Poncho
+Date: Mon, 7 Sep 2020 09:39:49 +0200
+Subject: [PATCH] Fix building with bison 3.7
+
+Bison 3.7 changes how header files are included [1][2], in that instead of
+copying and inserting the contents of a file, the file itself is included
+(by default as '"basename.h"').
+
+[1] https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00006.html
+[2] https://www.gnu.org/software/bison/manual/html_node/_0025define-Summary.html
+
+Close: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586
+---
+ src/Core/DataFilter.y | 3 +++
+ src/Core/RideDB.y | 2 ++
+ src/FileIO/JsonRideFile.y | 3 +++
+ 3 files changed, 8 insertions(+)
+
+diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y
+index 7c5e481b0..142e80a5c 100644
+--- a/src/Core/DataFilter.y
++++ b/src/Core/DataFilter.y
+@@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement
+
+ %}
+
++// generated by the scanner
++%define api.header.include {"DataFilter_yacc.h"}
++
+ // Symbol can be meta or metric name
+ %token SYMBOL PYTHON
+
+diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y
+index d6da086bd..f2001e23c 100644
+--- a/src/Core/RideDB.y
++++ b/src/Core/RideDB.y
+@@ -40,6 +40,8 @@ void RideDBerror(void*jc, const char *error) // used by parser aka yyerror()
+ #define scanner jc->scanner
+
+ %}
++// generated by the scanner
++%define api.header.include {"RideDB_yacc.h"}
+
+ %pure-parser
+ %lex-param { void *scanner }
+diff --git a/src/FileIO/JsonRideFile.y b/src/FileIO/JsonRideFile.y
+index 2cbbef9fc..d5c77a779 100644
+--- a/src/FileIO/JsonRideFile.y
++++ b/src/FileIO/JsonRideFile.y
+@@ -106,6 +106,9 @@ static QString protect(const QString string)
+
+ %}
+
++// generated by the scanner
++%define api.header.include {"JsonRideFile_yacc.h"}
++
+ %pure-parser
+ %lex-param { void *scanner }
+ %parse-param { struct JsonContext *jc }
+--
+2.34.1
+
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 4f411f105ce9..b2a858d8d3e9 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -26,18 +26,26 @@ in mkDerivation rec {
};
buildInputs = [
- qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
- qtconnectivity qtcharts libusb-compat-0_1 gsl blas
+ qtbase
+ qtsvg
+ qtserialport
+ qtwebengine
+ qtmultimedia
+ qttools
+ zlib
+ qtconnectivity
+ qtcharts
+ libusb-compat-0_1
+ gsl
+ blas
];
nativeBuildInputs = [ flex makeWrapper qmake bison ];
patches = [
# allow building with bison 3.7
- # PR at https://github.com/GoldenCheetah/GoldenCheetah/pull/3590
- (fetchpatch {
- url = "https://github.com/GoldenCheetah/GoldenCheetah/commit/e1f42f8b3340eb4695ad73be764332e75b7bce90.patch";
- sha256 = "1h0y9vfji5jngqcpzxna5nnawxs77i1lrj44w8a72j0ah0sznivb";
- })
+ # Included in https://github.com/GoldenCheetah/GoldenCheetah/pull/3590,
+ # which is periodically rebased but pre 3.6 release, as it'll break other CI systems
+ ./0001-Fix-building-with-bison-3.7.patch
];
NIX_LDFLAGS = "-lz -lgsl -lblas";
diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix
index 0e269bf9ab3f..d2f1740a573d 100644
--- a/pkgs/applications/networking/bee/bee.nix
+++ b/pkgs/applications/networking/bee/bee.nix
@@ -62,7 +62,7 @@ buildGoModule {
'';
meta = with lib; {
- homepage = "https://swarm.ethereum.org/";
+ homepage = "https://github.com/ethersphere/bee";
description = "Ethereum Swarm Bee";
longDescription = ''
A decentralised storage and communication system for a sovereign digital society.
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 0d7b0f826c27..7c490e860d41 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -45,19 +45,19 @@
}
},
"ungoogled-chromium": {
- "version": "96.0.4664.110",
- "sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n",
- "sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb",
+ "version": "97.0.4692.71",
+ "sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca",
+ "sha256bin64": "1z1d50i5pvqaw6hjdxwasbznzgqwrnd1z8jmy2x05b6i49vd7r9j",
"deps": {
"gn": {
- "version": "2021-09-24",
+ "version": "2021-11-03",
"url": "https://gn.googlesource.com/gn",
- "rev": "0153d369bbccc908f4da4993b1ba82728055926a",
- "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
+ "rev": "90294ccdcf9334ed25a76ac9b67689468e506342",
+ "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa"
},
"ungoogled-patches": {
- "rev": "96.0.4664.110-1",
- "sha256": "098mfcd1lr2hhlic0i1l5gxsq71axvqnn4gayr4r9j6nbj9byf4h"
+ "rev": "97.0.4692.71-1",
+ "sha256": "0a1172kj93lg3ip4im1s5s7bdm2q41w4m6ylyxc92w29rbhbxjxp"
}
}
}
diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix
index 4daab414268a..c80ce2d71ca3 100644
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
- version = "1.9.3";
+ version = "1.9.5";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
- sha256 = "sha256-0+NY21oIbRMCYnneWxw48yQ3UOXW0Ves2A4JTXyLnCE=";
+ sha256 = "sha256-jvknhGTvb2Qw2587TmCJxES2DSv+9+BfMk2IOyqqLt8=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a15305cba848..7bcc6476115a 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -198,8 +198,8 @@ rec {
};
terraform_1 = mkTerraform {
- version = "1.1.2";
- sha256 = "sha256-8M/hs4AiApe9C19VnVhWYYOkKqXbv3aREUTNfExTDww=";
+ version = "1.1.3";
+ sha256 = "sha256-dvAuzVmwnM2PQcILzw3xNacBwuRY7cZEU3nv4/DzOKE=";
vendorSha256 = "sha256-inPNvNUcil9X0VQ/pVgZdnnmn9UCfEz7qXiuKDj8RYM=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index 805278b4e456..ead46366cbf4 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -59,7 +59,7 @@ mkDerivationWith python2Packages.buildPythonApplication rec {
'';
meta = with lib; {
- homepage = "http://icanblink.com/";
+ homepage = "https://icanblink.com/";
description = "A state of the art, easy to use SIP client for Voice, Video and IM";
platforms = platforms.linux;
license = licenses.gpl3;
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 9451dcd2d236..752fa7ba191f 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -28,11 +28,11 @@
}:
let
- version = "5.8.6.739";
+ version = "5.9.1.1380";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
- sha256 = "12gzdfxf6xy558smsfazvjj4g1rnaiw7l2lznzlh2qazyaq6f3mq";
+ sha256 = "0r1w13y3ks377hdyil9s68vn09vh22zl6ni4693fm7cf6q49ayyw";
};
};
diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix
deleted file mode 100644
index e7a19fa7825f..000000000000
--- a/pkgs/applications/networking/openbazaar/client.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib, stdenv
-, fetchurl
-, gcc-unwrapped
-, dpkg
-, bash
-, nodePackages
-, makeWrapper
-, electron_6
-}:
-
-let
- electron = electron_6;
-in
-stdenv.mkDerivation rec {
- pname = "openbazaar-client";
- version = "2.4.10";
-
- src = fetchurl {
- url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb";
- sha256 = "sha256-X0iTTLOJsZeyVZwNU3y39cFMHnxlnYXmqQERE26CLTY=";
- };
-
- dontBuild = true;
- dontConfigure = true;
-
- nativeBuildInputs = [ makeWrapper ];
-
- unpackPhase = ''
- ${dpkg}/bin/dpkg-deb -x $src .
- '';
-
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/bin $out/share/{${pname},applications,pixmaps}
-
- cp -a usr/lib/openbazaar2client/{locales,resources} $out/share/${pname}
- cp -a usr/share/applications/openbazaar2client.desktop $out/share/applications/${pname}.desktop
- cp -a usr/share/pixmaps/openbazaar2client.png $out/share/pixmaps/${pname}.png
-
- substituteInPlace $out/share/applications/${pname}.desktop \
- --replace 'openbazaar2client' 'openbazaar-client'
-
- runHook postInstall
- '';
-
- postFixup = ''
- makeWrapper ${electron}/bin/electron $out/bin/${pname} \
- --add-flags $out/share/${pname}/resources/app \
- --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
- '';
-
- meta = with lib; {
- description = "Decentralized Peer to Peer Marketplace for Bitcoin - client";
- homepage = "https://www.openbazaar.org/";
- license = licenses.mit;
- maintainers = with maintainers; [ prusnak ];
- platforms = [ "x86_64-linux" ];
- };
-}
diff --git a/pkgs/applications/networking/openbazaar/default.nix b/pkgs/applications/networking/openbazaar/default.nix
deleted file mode 100644
index aa5d14724ac4..000000000000
--- a/pkgs/applications/networking/openbazaar/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, stdenv
-, fetchurl
-}:
-
-stdenv.mkDerivation rec {
- pname = "openbazaar";
- version = "0.14.6";
-
- suffix = {
- i686-linux = "linux-386";
- x86_64-darwin = "darwin-10.6-amd64";
- x86_64-linux = "linux-amd64";
- }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
- src = fetchurl {
- url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}";
- sha256 = {
- i686-linux = "1cmv3gyfd6q7y6yn6kigksy2abkq5b8mfgk51d04ky1ckgbriaqq";
- x86_64-darwin = "0n32a0pyj1k2had3imimdyhdhyb285y1dj04f7g3jajmy5zndaxx";
- x86_64-linux = "105i5yl2yvhcvyh1wf35kqq1qyxgbl9j2kxs6yshsk14b2p02j5i";
- }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
- };
-
- dontUnpack = true;
- dontConfigure = true;
- dontBuild = true;
- dontStrip = true;
- dontPatchELF = true;
- preferLocalBuild = true;
-
- installPhase = ''
- install -D $src $out/bin/openbazaard
- '';
-
- postFixup = lib.optionalString (!stdenv.isDarwin) ''
- patchelf \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- $out/bin/openbazaard
- '';
-
- meta = with lib; {
- description = "Decentralized Peer to Peer Marketplace for Bitcoin - daemon";
- homepage = "https://www.openbazaar.org/";
- license = licenses.mit;
- maintainers = with maintainers; [ prusnak ];
- platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ];
- };
-}
diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix
index 3711d5a3c1ed..369244604a88 100644
--- a/pkgs/applications/networking/p2p/gnunet/gtk.nix
+++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gnunet-gtk";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
- sha256 = "18rc7mb45y17d5nrlpf2p4ixp7ir67gcgjf4hlj4r95ic5zi54wa";
+ sha256 = "sha256-FLLlqpQ7Bf+oNRUvx7IniVxFusy/tPYxEP2T6VGF7h8=";
};
nativeBuildInputs= [
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 0554713feb89..c064ea94d04e 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -5,29 +5,15 @@
stdenv.mkDerivation rec {
pname = "abiword";
- version = "3.0.4";
+ version = "3.0.5";
src = fetchurl {
url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
- sha256 = "1mx5l716n0z5788i19qmad30cck4v9ggr071cafw2nrf375rcc79";
+ hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ=";
};
enableParallelBuilding = true;
- patches = [
- # Switch to using enchant2; note by the next update enchant2 should be
- # default and this patch can be removed.
- # https://github.com/NixOS/nixpkgs/issues/38506
- (fetchurl {
- url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d3ff951d3c7249927e7113b3de1653031db24596/abiword/trunk/enchant-2.1.patch";
- sha256 = "444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2";
- })
- ];
-
- postPatch = ''
- substituteInPlace configure --replace 'enchant >=' 'enchant-2 >='
- '';
-
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [
diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix
index c71c1eafa66c..e6c5192b0f94 100644
--- a/pkgs/applications/office/banking/default.nix
+++ b/pkgs/applications/office/banking/default.nix
@@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Banking application for small screens";
- homepage = "https://tabos.gitlab.io/project/banking/";
+ homepage = "https://tabos.gitlab.io/projects/banking/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index bb1463ad9648..78c2a56dc16f 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "lean";
- version = "3.36.0";
+ version = "3.37.0";
src = fetchFromGitHub {
owner = "leanprover-community";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
# from. this is then used to check whether an olean file should be
# rebuilt. don't use a tag as rev because this will get replaced into
# src/githash.h.in in preConfigure.
- rev = "e948149d3d1bbdb8eac9cd103d58626a59fae3b9";
- sha256 = "1lcjif29lfj3myc6j63ifk8fdvylyv8g82g2dv0d85nz7mpbq47b";
+ rev = "e69ab934262eb6f141344fdaec98ede68a9102b6";
+ sha256 = "19sigzbrdl90jqk7lvl3q8j6n4nnidzwp9zzmzgq3zxxgywa2ghp";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 4a1e7f46ea38..4a47fdeaf2b2 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
{
- "version": "14.6.0",
- "repo_hash": "0b77nh7xq5qalzhvfmsymmkrb78lmaffk464b074wi5c8gy3f5dn",
+ "version": "14.6.1",
+ "repo_hash": "0zgznf0f7jxyznil6q3fac2rvhaa2lhlpxcnbmkg9djyx1vcm7k1",
"yarn_hash": "1kcjbf8xn3bwac2s9i2i7dpgbkwcjh09wvgbgysm5yffpdswg6nl",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v14.6.0-ee",
+ "rev": "v14.6.1-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "14.6.0",
+ "GITALY_SERVER_VERSION": "14.6.1",
"GITLAB_PAGES_VERSION": "1.49.0",
"GITLAB_SHELL_VERSION": "13.22.1",
- "GITLAB_WORKHORSE_VERSION": "14.6.0"
+ "GITLAB_WORKHORSE_VERSION": "14.6.1"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 7cfcdf7dd746..04cfd0e47146 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -33,7 +33,7 @@ let
};
};
- version = "14.6.0";
+ version = "14.6.1";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
@@ -45,7 +45,7 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-YiDZtWRb1PnCAv+UCPRQFoCA12vf3xoHoJ1i/hW+vMg=";
+ sha256 = "sha256-nbE71s+KoDC6EK26cmq+YIw9MFSQv1y6qwZAJXVXGj4=";
};
vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index fd8bdd2aef17..0ac84d8aa012 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
- version = "14.6.0";
+ version = "14.6.1";
src = fetchFromGitLab {
owner = data.owner;
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 8320491758ea..c3c04da3a69a 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -11,6 +11,7 @@
, which
, sqlite
, git
+, cacert
, gnupg
}:
@@ -70,6 +71,7 @@ let
git
gnupg
];
+ SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; # needed for git
checkPhase = ''
cat << EOF > tests/blacklists/nix
# tests enforcing "/usr/bin/env" shebangs, which are patched for nix
@@ -78,7 +80,7 @@ let
EOF
# extended timeout necessary for tests to pass on the busy CI workers
- export HGTESTFLAGS="--blacklist blacklists/nix --timeout 600"
+ export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800"
make check
'';
diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix
index 602d99499810..4d3e471cca24 100644
--- a/pkgs/applications/version-management/p4/default.nix
+++ b/pkgs/applications/version-management/p4/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
# actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases
- url = "http://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
+ url = "https://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
sha256 = "sha256-cmIMVek4lwVYJQbW8ziABftPZ0iIoAoSpR7cKuN4I7M=";
};
diff --git a/pkgs/applications/video/kodi/addons/future/default.nix b/pkgs/applications/video/kodi/addons/future/default.nix
index fcc525ef1797..0f2815fe5f99 100644
--- a/pkgs/applications/video/kodi/addons/future/default.nix
+++ b/pkgs/applications/video/kodi/addons/future/default.nix
@@ -18,7 +18,7 @@ buildKodiAddon rec {
};
meta = with lib; {
- homepage = "http://python-future.org";
+ homepage = "https://python-future.org";
description = "The missing compatibility layer between Python 2 and Python 3";
license = licenses.mit;
maintainers = teams.kodi.members;
diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index 6235c93a2816..68e1467c5a8c 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "dwm";
- version = "6.2";
+ version = "6.3";
src = fetchurl {
url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz";
- sha256 = "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p";
+ sha256 = "utqgKFKbH7of1/moTztk8xGQRmyFgBG1Pi97cMajB40=";
};
buildInputs = [ libX11 libXinerama libXft ];
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index 45d56194bede..30328cd7719a 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tiling tabbed window manager designed with keyboard users in mind";
- homepage = "http://modeemi.fi/~tuomov/ion";
+ homepage = "https://modeemi.fi/~tuomov/ion";
platforms = with platforms; linux;
license = licenses.lgpl21;
maintainers = with maintainers; [ ];
diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix
index 1f5ce7f642fa..b5a7e8878876 100644
--- a/pkgs/data/fonts/comic-relief/default.nix
+++ b/pkgs/data/fonts/comic-relief/default.nix
@@ -19,7 +19,7 @@ in fetchzip rec {
sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff";
meta = with lib; {
- homepage = "http://loudifier.com/comic-relief/";
+ homepage = "https://fontlibrary.org/en/font/comic-relief";
description = "A font metric-compatible with Microsoft Comic Sans";
longDescription = ''
Comic Relief is a typeface designed to be metrically equivalent
diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix
index ef914d144843..cafd3c16fd4d 100644
--- a/pkgs/data/fonts/ipaexfont/default.nix
+++ b/pkgs/data/fonts/ipaexfont/default.nix
@@ -3,7 +3,7 @@
fetchzip {
name = "ipaexfont-003.01";
- url = "http://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
+ url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
postFetch = ''
mkdir -p $out/share/fonts
diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix
index 7333c5abe358..85cf06df11fb 100644
--- a/pkgs/data/fonts/iwona/default.nix
+++ b/pkgs/data/fonts/iwona/default.nix
@@ -14,7 +14,7 @@ in fetchzip {
meta = with lib; {
description = "A two-element sans-serif typeface, created by Małgorzata Budyta";
- homepage = "http://jmn.pl/en/kurier-i-iwona/";
+ homepage = "https://jmn.pl/en/kurier-i-iwona/";
# "[...] GUST Font License (GFL), which is a free license, legally
# equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
# later." - GUST website
diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix
index ed0411ceb9f6..0d62a866e0f0 100644
--- a/pkgs/data/fonts/quattrocento-sans/default.nix
+++ b/pkgs/data/fonts/quattrocento-sans/default.nix
@@ -5,7 +5,7 @@ let
in fetchzip rec {
name = "quattrocento-sans-${version}";
- url = "http://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
+ url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
postFetch = ''
mkdir -p $out/share/{fonts,doc}
diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix
index 3d11321cd4b2..aa23175a04d4 100644
--- a/pkgs/data/fonts/quattrocento/default.nix
+++ b/pkgs/data/fonts/quattrocento/default.nix
@@ -5,7 +5,7 @@ let
in fetchzip rec {
name = "quattrocento-${version}";
- url = "http://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
+ url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
postFetch = ''
mkdir -p $out/share/{fonts,doc}
diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/pkgs/data/fonts/vista-fonts-chs/default.nix
index 7c5d9dbba6ea..66274c667a04 100644
--- a/pkgs/data/fonts/vista-fonts-chs/default.nix
+++ b/pkgs/data/fonts/vista-fonts-chs/default.nix
@@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation {
version = "1";
src = fetchurl {
- url = "http://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
+ url = "https://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
# Alternative mirror:
# http://www.eeo.cn/download/font/VistaFont_CHS.EXE
sha256 = "1qwm30b8aq9piyqv07hv8b5bac9ms40rsdf8pwix5dyk8020i8xi";
diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix
index 3ba5e1b61de1..4fe6a5c20fde 100644
--- a/pkgs/data/misc/freepats/default.nix
+++ b/pkgs/data/misc/freepats/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
Freepats is a project to create a free and open set of instrument
patches, in any format, that can be used with softsynths.
'';
- homepage = "http://freepats.zenvoid.org/";
+ homepage = "https://freepats.zenvoid.org/";
license = licenses.gpl2;
platforms = platforms.all;
maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/data/themes/graphite/default.nix b/pkgs/data/themes/graphite/default.nix
new file mode 100644
index 000000000000..42d4c5c7534f
--- /dev/null
+++ b/pkgs/data/themes/graphite/default.nix
@@ -0,0 +1,87 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+, gnome-themes-extra
+, gtk-engine-murrine
+, jdupes
+, sassc
+, themeVariants ? [] # default: blue
+, colorVariants ? [] # default: all
+, sizeVariants ? [] # default: standard
+, tweaks ? []
+, wallpapers ? false
+}:
+
+let
+ pname = "graphite-gtk-theme";
+
+ throwIfNotSubList = name: given: valid:
+ let
+ unexpected = lib.subtractLists valid given;
+ in
+ lib.throwIfNot (unexpected == [])
+ "${name}: ${builtins.concatStringsSep ", " (builtins.map builtins.toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (builtins.map builtins.toString valid)}";
+
+in
+throwIfNotSubList "${pname}: theme variants" themeVariants [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ]
+throwIfNotSubList "${pname}: color variants" colorVariants [ "standard" "light" "dark" ]
+throwIfNotSubList "${pname}: size variants" sizeVariants [ "standard" "compact" ]
+throwIfNotSubList "${pname}: tweaks" tweaks [ "nord" "black" "midblack" "rimless" "normal" ]
+
+stdenvNoCC.mkDerivation {
+ inherit pname;
+ version = "unstable-2022-01-04";
+
+ src = fetchFromGitHub {
+ owner = "vinceliuice";
+ repo = pname;
+ rev = "947cac4966377d8f5b5a4e2966ec2b9a6041d205";
+ sha256 = "11pl8hzk4fwniqdib0ffvjilpspr1n5pg1gw39kal13wxh4sdg28";
+ };
+
+ nativeBuildInputs = [
+ jdupes
+ sassc
+ ];
+
+ buildInputs = [
+ gnome-themes-extra
+ ];
+
+ propagatedUserEnvPkgs = [
+ gtk-engine-murrine
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ patchShebangs install.sh
+
+ name= ./install.sh \
+ ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \
+ ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \
+ ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \
+ ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
+ --dest $out/share/themes
+
+ ${lib.optionalString wallpapers ''
+ mkdir -p $out/share/backgrounds
+ cp -a wallpaper/Graphite-normal/*.png $out/share/backgrounds/
+ ${lib.optionalString (builtins.elem "nord" tweaks) ''
+ cp -a wallpaper/Graphite-nord/*.png $out/share/backgrounds/
+ ''}
+ ''}
+
+ jdupes -L -r $out/share
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Flat Gtk+ theme based on Elegant Design";
+ homepage = "https://github.com/vinceliuice/Graphite-gtk-theme";
+ license = licenses.gpl3Only;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
index 19936f6be61d..5f7dc7b06a36 100644
--- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-taskwhisperer";
- version = "16";
+ version = "20";
src = fetchFromGitHub {
owner = "cinatic";
repo = "taskwhisperer";
rev = "v${version}";
- sha256 = "05w2dfpr5vrydb7ij4nd2gb7c31nxix3j48rb798r4jzl1rakyah";
+ sha256 = "sha256-UVBLFXsbOPRXC4P5laZ82Rs08yXnNnzJ+pp5fbx6Zqc=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch
index 2ea54f4b0897..0e3ea668a8a1 100644
--- a/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch
+++ b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch
@@ -1,99 +1,99 @@
-diff --git a/taskwhisperer-extension@infinicode.de/extra/create.sh b/taskwhisperer-extension@infinicode.de/extra/create.sh
-index a69e369..35d5ea1 100755
---- a/taskwhisperer-extension@infinicode.de/extra/create.sh
-+++ b/taskwhisperer-extension@infinicode.de/extra/create.sh
-@@ -1 +1 @@
--bash -c "task add $1"
-+bash -c "@task@ add $1"
-diff --git a/taskwhisperer-extension@infinicode.de/extra/modify.sh b/taskwhisperer-extension@infinicode.de/extra/modify.sh
-index 7964a26..8edd21b 100755
---- a/taskwhisperer-extension@infinicode.de/extra/modify.sh
-+++ b/taskwhisperer-extension@infinicode.de/extra/modify.sh
-@@ -1 +1 @@
--bash -c "task $1 modify $2"
-+bash -c "@task@ $1 modify $2"
-diff --git a/taskwhisperer-extension@infinicode.de/taskService.js b/taskwhisperer-extension@infinicode.de/taskService.js
-index ead7a12..aa36db4 100644
---- a/taskwhisperer-extension@infinicode.de/taskService.js
-+++ b/taskwhisperer-extension@infinicode.de/taskService.js
-@@ -182,7 +182,7 @@ const TaskService = class TaskService {
+diff --git a/taskwhisperer-extension@infinicode.de/metadata.json b/taskwhisperer-extension@infinicode.de/metadata.json
+index 2f1471c..a84bdf4 100644
+--- a/taskwhisperer-extension@infinicode.de/metadata.json
++++ b/taskwhisperer-extension@infinicode.de/metadata.json
+@@ -6,7 +6,8 @@
+ "3.32",
+ "3.36",
+ "3.38",
+- "40"
++ "40",
++ "41"
+ ],
+ "url": "https://github.com/cinatic/taskwhisperer",
+ "uuid": "taskwhisperer-extension@infinicode.de",
+diff --git a/taskwhisperer-extension@infinicode.de/services/taskService.js b/taskwhisperer-extension@infinicode.de/services/taskService.js
+index df09cdf..df68c60 100644
+--- a/taskwhisperer-extension@infinicode.de/services/taskService.js
++++ b/taskwhisperer-extension@infinicode.de/services/taskService.js
+@@ -63,7 +63,7 @@ var loadTaskData = async ({ taskStatus, project, taskOrder }) => {
- let project = projectName ? "project:" + projectName : "";
+ await syncTasks()
-- let command = ['task', 'rc.json.array=on', status, project, 'export'];
-+ let command = ['@task@', 'rc.json.array=on', status, project, 'export'];
- let reader = new SpawnReader.SpawnReader();
+- const command = ['task', 'rc.json.array=on', statusFilter, projectFilter, 'export'].join(' ')
++ const command = ['@task@', 'rc.json.array=on', statusFilter, projectFilter, 'export'].join(' ')
- let buffer = "";
-@@ -220,7 +220,7 @@ const TaskService = class TaskService {
- break;
- }
+ let { output, error } = await run({ command })
-- let shellProc = Gio.Subprocess.new(['task', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE);
-+ let shellProc = Gio.Subprocess.new(['@task@', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE);
+@@ -110,7 +110,7 @@ var loadProjectsData = async taskStatus => {
- shellProc.wait_async(null, function (obj, result) {
- let shellProcExited = true;
-@@ -261,7 +261,7 @@ const TaskService = class TaskService {
- return;
- }
+ await syncTasks()
-- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE);
-+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE);
+- const command = ['task', 'rc.json.array=on', statusFilter, 'export'].join(' ')
++ const command = ['@task@', 'rc.json.array=on', statusFilter, 'export'].join(' ')
+ const { output: allTheTasks } = await run({ command })
- shellProc.wait_async(null, function (obj, result) {
- let shellProcExited = true;
-@@ -290,7 +290,7 @@ const TaskService = class TaskService {
- return;
- }
+ let sortedUniqueProjects = []
+@@ -129,7 +129,7 @@ var setTaskDone = async taskID => {
+ return
+ }
-- let shellProc = Gio.Subprocess.new(['task', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE);
-+ let shellProc = Gio.Subprocess.new(['@task@', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE);
+- const command = ['task', taskID.toString(), 'done'].join(' ')
++ const command = ['@task@', taskID.toString(), 'done'].join(' ')
+ const result = await run({ command, asJson: false })
- shellProc.wait_async(null, function (obj, result) {
- let shellProcExited = true;
-@@ -318,7 +318,7 @@ const TaskService = class TaskService {
- if (!taskID) {
- return;
- }
-- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE);
-+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE);
- shellProc.wait_async(null, function (obj, result) {
- let shellProcExited = true;
- shellProc.wait_finish(result);
-@@ -344,7 +344,7 @@ const TaskService = class TaskService {
- if (!taskID) {
- return;
- }
-- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE);
-+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE);
- shellProc.wait_async(null, function (obj, result) {
- let shellProcExited = true;
- shellProc.wait_finish(result);
-@@ -374,7 +374,7 @@ const TaskService = class TaskService {
- // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the
- // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de)
- // bypassing problem with own shell script
-- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
-+ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
+ if (!result.error) {
+@@ -146,7 +146,7 @@ var setTaskUndone = async taskUUID => {
+ return
+ }
- shellProc.wait_async(null, function (obj, result) {
- let shellProcExited = true;
-@@ -403,7 +403,7 @@ const TaskService = class TaskService {
- // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the
- // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de)
- // bypassing problem with own shell script
-- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
-+ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
+- const command = ['task', `uuid:${taskUUID}`, 'modify', 'status:pending'].join(' ')
++ const command = ['@task@', `uuid:${taskUUID}`, 'modify', 'status:pending'].join(' ')
+ const result = await run({ command, asJson: false })
- shellProc.wait_async(null, function (obj, result) {
- let shellProcExited = true;
-@@ -432,7 +432,7 @@ const TaskService = class TaskService {
- let shellProc;
+ if (!result.error) {
+@@ -163,7 +163,7 @@ var startTask = async taskID => {
+ return
+ }
- try {
-- shellProc = Gio.Subprocess.new(['task', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE);
-+ shellProc = Gio.Subprocess.new(['@task@', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE);
- } catch (err) {
- onError(err);
- return;
+- const command = ['task', taskID.toString(), 'start'].join(' ')
++ const command = ['@task@', taskID.toString(), 'start'].join(' ')
+ const result = await run({ command, asJson: false })
+
+ if (!result.error) {
+@@ -180,7 +180,7 @@ var stopTask = async taskID => {
+ return
+ }
+
+- const command = ['task', taskID.toString(), 'stop'].join(' ')
++ const command = ['@task@', taskID.toString(), 'stop'].join(' ')
+ const result = await run({ command, asJson: false })
+
+ if (!result.error) {
+@@ -195,7 +195,7 @@ var stopTask = async taskID => {
+ var createTask = async task => {
+ const params = _convertTaskToParams(task)
+
+- const command = ['task', 'add', ...params].join(' ')
++ const command = ['@task@', 'add', ...params].join(' ')
+ const result = await run({ command, asJson: false })
+
+ if (!result.error) {
+@@ -212,7 +212,7 @@ var modifyTask = async (taskUUID, task) => {
+
+ const params = _convertTaskToParams(task)
+
+- const command = ['task', `uuid:${taskUUID}`, 'modify', ...params].join(' ')
++ const command = ['@task@', `uuid:${taskUUID}`, 'modify', ...params].join(' ')
+ const result = await run({ command, asJson: false })
+
+ if (!result.error) {
+@@ -227,7 +227,7 @@ var syncTasks = async () => {
+ return
+ }
+
+- const command = ['task', 'sync'].join(' ')
++ const command = ['@task@', 'sync'].join(' ')
+ const result = await run({ command, asJson: false })
+
+ _showProcessErrorNotificationIfError(result, 'Sync Tasks')
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix
deleted file mode 100644
index a4e822eec6da..000000000000
--- a/pkgs/development/compilers/asn1c/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchurl, perl }:
-
-stdenv.mkDerivation rec {
- pname = "asn1c";
- version = "0.9.28";
-
- src = fetchurl {
- url = "https://lionet.info/soft/asn1c-${version}.tar.gz";
- sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0";
- };
-
- outputs = [ "out" "doc" "man" ];
-
- buildInputs = [ perl ];
-
- preConfigure = ''
- patchShebangs examples/crfc2asn1.pl
- '';
-
- postInstall = ''
- cp -r skeletons/standard-modules $out/share/asn1c
- '';
-
- doCheck = true;
-
- meta = with lib; {
- homepage = "http://lionet.info/asn1c/compiler.html";
- description = "Open Source ASN.1 Compiler";
- license = licenses.bsd2;
- platforms = platforms.all;
- maintainers = [ maintainers.montag451 ];
- };
-}
diff --git a/pkgs/development/compilers/ghcjs/8.10/stage0.nix b/pkgs/development/compilers/ghcjs/8.10/stage0.nix
index 1cb476ab0cb6..d173d5a2e557 100644
--- a/pkgs/development/compilers/ghcjs/8.10/stage0.nix
+++ b/pkgs/development/compilers/ghcjs/8.10/stage0.nix
@@ -60,7 +60,7 @@
libraryHaskellDepends = [
base binary bytestring containers ghc-prim ghci template-haskell
];
- homepage = "http://github.com/ghcjs";
+ homepage = "https://github.com/ghcjs";
license = lib.licenses.mit;
}) {};
@@ -71,7 +71,7 @@
version = "0.1.1.0";
src = ./.;
libraryHaskellDepends = [ base ghc-prim ];
- homepage = "http://github.com/ghcjs";
+ homepage = "https://github.com/ghcjs";
license = lib.licenses.mit;
}) {};
}
diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix
index 46738343431a..24a7f125599d 100644
--- a/pkgs/development/coq-modules/CoLoR/default.nix
+++ b/pkgs/development/coq-modules/CoLoR/default.nix
@@ -23,7 +23,7 @@ with lib; mkCoqDerivation {
enableParallelBuilding = false;
meta = {
- homepage = "http://color.inria.fr/";
+ homepage = "https://github.com/fblanqui/color";
description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant.";
maintainers = with maintainers; [ jpas jwiegley ];
};
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index 1e11661b0098..2db69f8028c4 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "An interface to banking tasks, file formats and country information";
- homepage = "https://www.aquamaniac.de/";
+ homepage = "https://www.aquamaniac.de/rdm/";
hydraPlatforms = [];
license = licenses.gpl2Plus;
maintainers = with maintainers; [ goibhniu ];
diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix
index f22f81c87709..9752b9600397 100644
--- a/pkgs/development/libraries/argtable/default.nix
+++ b/pkgs/development/libraries/argtable/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- homepage = "https://argtable.org";
+ homepage = "https://github.com/argtable/argtable3";
description = "A single-file, ANSI C command-line parsing library";
longDescription = ''
Argtable is an open source ANSI C library that parses GNU-style
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 23675c9f9f89..a889e5358a50 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -25,9 +25,9 @@ stdenv.mkDerivation {
};
# replace database with a more recent snapshot
- postUnpack = ''
- rm -R source/data/db
- cp -R ${lensfunDatabase}/data/db source/data
+ prePatch = ''
+ rm -R ./data/db
+ cp -R ${lensfunDatabase}/data/db ./data
'';
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 40d814814caa..f79f82e9a782 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "libmysqlconnectorcpp";
- version = "8.0.23";
+ version = "8.0.27";
src = fetchurl {
url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
- sha256 = "sha256-mvBklaaggP7WLacJePHLDGbwWO3V6p7ak0WmS/jsaI8=";
+ sha256 = "sha256-WIZpj8aCpeh0CCLtm0YbxRtgz5y6304cf+vllYSyv7c=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 0d01eeb81f1a..7a2718c01539 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -91,7 +91,7 @@ in {
sha256 = "112bjfrwwqlk0lak7fmfhcls18ydf62cp7gxghf4gklpfl1zyckw";
};
libressl_3_4 = generic {
- version = "3.4.1";
- sha256 = "0766yxb599lx7qmlmsddiw9wgminz9mc311mav5q23l0rbkflz0h";
+ version = "3.4.2";
+ sha256 = "sha256-y4LKfVRzNpFzUvvSPbL8SDxsRNNRV7MngCFOx0GXs84=";
};
}
diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix
index 85a66f940658..21b9fdf419c8 100644
--- a/pkgs/development/libraries/nghttp3/default.nix
+++ b/pkgs/development/libraries/nghttp3/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "nghttp3";
- version = "unstable-2021-11-10";
+ version = "unstable-2021-12-22";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
- rev = "270e75447ed9e2a05b78ba89d0699d076230ea60";
- sha256 = "01cla03cv8nd2rf5p77h0xzvn9f8sfwn8pp3r2jshvqp9ipa8065";
+ rev = "8d8184acf850b06b53157bba39022bc7b7b5f1cd";
+ sha256 = "sha256-pV1xdQa5RBz17jDINC2uN1Q+jpa2edDwqTqf8D5VU3E=";
};
nativeBuildInputs = [ autoreconfHook pkg-config cunit file ];
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 0d4002ca10d7..dfe07c39e326 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
- version = "unstable-2021-11-10";
+ version = "unstable-2021-12-19";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = pname;
- rev = "7039808c044152c14b44046468bd16249b4d7048";
- sha256 = "1cjsky24f6fazw9b1r6w9cgp09vi8wp99sv76gg2b1r8ic3hgq23";
+ rev = "20c710a8789ec910455ae4e588c72e9e39f8cec9";
+ sha256 = "sha256-uBmD26EYT8zxmHD5FuHCbEuTdWxer/3uhRp8PhUT87M=";
};
nativeBuildInputs = [ autoreconfHook pkg-config cunit file ];
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 10459d959b29..0c6f9fb90c0c 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -275,7 +275,12 @@ stdenv.mkDerivation {
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ];
- nativeBuildInputs = [ cmake pkg-config unzip ];
+ nativeBuildInputs = [ cmake pkg-config unzip ]
+ ++ lib.optionals enablePython [
+ pythonPackages.pip
+ pythonPackages.wheel
+ pythonPackages.setuptools
+ ];
NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
@@ -333,6 +338,21 @@ stdenv.mkDerivation {
postInstall = ''
sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
"$out/lib/pkgconfig/opencv4.pc"
+ ''
+ # install python distribution information, so other packages can `import opencv`
+ + lib.optionalString enablePython ''
+ pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package
+ python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
+
+ pushd dist
+ python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache
+
+ # the cv2/__init__.py just tries to check provide "nice user feedback" if the installation is bad
+ # however, this also causes infinite recursion when used by other packages
+ rm -r $out/${pythonPackages.python.sitePackages}/cv2
+
+ popd
+ popd
'';
passthru = lib.optionalAttrs enablePython { pythonPath = [ ]; };
diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix
index a91015e1b8a7..3d5741ccba55 100644
--- a/pkgs/development/libraries/quictls/default.nix
+++ b/pkgs/development/libraries/quictls/default.nix
@@ -16,13 +16,13 @@ assert (
stdenv.mkDerivation rec {
pname = "quictls";
- version = "3.0.0+quick_unstable-2021-11.02";
+ version = "3.0.1+quick_unstable-2021-12.14";
src = fetchFromGitHub {
owner = "quictls";
repo = "openssl";
- rev = "62d4de00abfa82fc01efa2eba1982a86c4864f39";
- sha256 = "11mi4bkkyy4qd2wml6p7xcsbps0mabk3bp537rp7n43qnhwyg1g3";
+ rev = "ab8b87bdb436b11bf2a10a2a57a897722224f828";
+ sha256 = "sha256-835oZgoM1CTS+JLxPO3oGSTnhLmJXGT1cFaJhCJK++8=";
};
patches = [
diff --git a/pkgs/development/misc/haskell/hasura/pool.nix b/pkgs/development/misc/haskell/hasura/pool.nix
index 48954114a4a1..c03b1fb88121 100644
--- a/pkgs/development/misc/haskell/hasura/pool.nix
+++ b/pkgs/development/misc/haskell/hasura/pool.nix
@@ -17,7 +17,7 @@ mkDerivation {
vector
];
testHaskellDepends = [ base hspec ];
- homepage = "http://github.com/bos/pool";
+ homepage = "https://github.com/bos/pool";
description = "A high-performance striped resource pooling implementation";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ lassulus ];
diff --git a/pkgs/development/nim-packages/build-nim-package/default.nix b/pkgs/development/nim-packages/build-nim-package/default.nix
index acf67b9f8977..f8301ebb4880 100644
--- a/pkgs/development/nim-packages/build-nim-package/default.nix
+++ b/pkgs/development/nim-packages/build-nim-package/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (attrs // {
configurePhase = if isNull configurePhase then ''
runHook preConfigure
- find $NIX_BUILD_TOP -name .attrs.json
+ export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
nim_builder --phase:configure
runHook postConfigure
'' else
diff --git a/pkgs/development/nim-packages/bumpy/default.nix b/pkgs/development/nim-packages/bumpy/default.nix
index 9579d87d9d5d..909894352319 100644
--- a/pkgs/development/nim-packages/bumpy/default.nix
+++ b/pkgs/development/nim-packages/bumpy/default.nix
@@ -1,7 +1,24 @@
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub, vmath }:
-fetchNimble {
+buildNimPackage rec {
pname = "bumpy";
version = "1.0.3";
- hash = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0=";
+
+ src = fetchFromGitHub {
+ owner = "treeform";
+ repo = pname;
+ rev = version;
+ hash = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0=";
+ };
+
+ propagatedBuildInputs = [ vmath ];
+
+ doCheck = true;
+
+ meta = with lib;
+ src.meta // {
+ description = "2d collision library";
+ license = [ licenses.mit ];
+ maintainers = [ maintainers.ehmry ];
+ };
}
diff --git a/pkgs/development/nim-packages/flatty/default.nix b/pkgs/development/nim-packages/flatty/default.nix
index 88f3426e512a..5e542d22e4a5 100644
--- a/pkgs/development/nim-packages/flatty/default.nix
+++ b/pkgs/development/nim-packages/flatty/default.nix
@@ -1,7 +1,22 @@
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub }:
-fetchNimble {
+buildNimPackage rec {
pname = "flatty";
version = "0.2.3";
- hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA=";
+
+ src = fetchFromGitHub {
+ owner = "treeform";
+ repo = pname;
+ rev = version;
+ hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA=";
+ };
+
+ doCheck = true;
+
+ meta = with lib;
+ src.meta // {
+ description = "Tools and serializer for plain flat binary files";
+ license = [ licenses.mit ];
+ maintainers = [ maintainers.ehmry ];
+ };
}
diff --git a/pkgs/development/nim-packages/nim_builder/nim_builder.nim b/pkgs/development/nim-packages/nim_builder/nim_builder.nim
index 90dcb46588b7..0cb68e63f137 100644
--- a/pkgs/development/nim-packages/nim_builder/nim_builder.nim
+++ b/pkgs/development/nim-packages/nim_builder/nim_builder.nim
@@ -97,7 +97,7 @@ proc configurePhase*() =
for def in getEnv("nimDefines").split:
if def != "":
switch("define", def)
- for input in getEnv("buildInputs").split:
+ for input in getEnv("NIX_NIM_BUILD_INPUTS").split:
if input != "":
for nimbleFile in walkFiles(input / "*.nimble"):
let inputSrc = normalizedPath(
diff --git a/pkgs/development/nim-packages/pixie/default.nix b/pkgs/development/nim-packages/pixie/default.nix
index 2262ccf23721..1366e55a1e36 100644
--- a/pkgs/development/nim-packages/pixie/default.nix
+++ b/pkgs/development/nim-packages/pixie/default.nix
@@ -1,7 +1,25 @@
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub, bumpy, chroma, flatty, nimsimd, vmath
+, zippy }:
-fetchNimble {
+buildNimPackage rec {
pname = "pixie";
- version = "1.1.3";
- hash = "sha256-xKIejVxOd19mblL1ZwpJH91dgKQS5g8U08EL8lGGelA=";
+ version = "3.1.2";
+
+ src = fetchFromGitHub {
+ owner = "treeform";
+ repo = pname;
+ rev = version;
+ hash = "sha256-rF72ybfsipBHgQmH0e6DBn1e7WWY6dGn9yp1qvLIS3A=";
+ };
+
+ propagatedBuildInputs = [ bumpy chroma flatty nimsimd vmath zippy ];
+
+ doCheck = true;
+
+ meta = with lib;
+ src.meta // {
+ description = "Full-featured 2d graphics library for Nim";
+ license = [ licenses.mit ];
+ maintainers = [ maintainers.ehmry ];
+ };
}
diff --git a/pkgs/development/nim-packages/typography/default.nix b/pkgs/development/nim-packages/typography/default.nix
deleted file mode 100644
index 59037cbd9dd3..000000000000
--- a/pkgs/development/nim-packages/typography/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ fetchNimble }:
-
-fetchNimble {
- pname = "typography";
- version = "0.7.9";
- hash = "sha256-IYjw3PCp5XzVed2fGGCt9Hb60cxFeF0BUZ7L5PedTLU=";
-}
diff --git a/pkgs/development/nim-packages/vmath/default.nix b/pkgs/development/nim-packages/vmath/default.nix
index 9ca48c43d7f4..bb6e1c266ea5 100644
--- a/pkgs/development/nim-packages/vmath/default.nix
+++ b/pkgs/development/nim-packages/vmath/default.nix
@@ -1,7 +1,22 @@
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub }:
-fetchNimble {
+buildNimPackage rec {
pname = "vmath";
- version = "1.0.3";
- hash = "sha256-zzSKXjuTZ46HTFUs0N47mxEKTKIdS3dwr+60sQYSdn0=";
+ version = "1.1.1";
+
+ src = fetchFromGitHub {
+ owner = "treeform";
+ repo = pname;
+ rev = version;
+ hash = "sha256-/v0lQIOMogTxFRtbssziW4W6VhMDepM6Si8igLgcx30=";
+ };
+
+ doCheck = true;
+
+ meta = with lib;
+ src.meta // {
+ description = "Math vector library for graphical things";
+ license = [ licenses.mit ];
+ maintainers = [ maintainers.ehmry ];
+ };
}
diff --git a/pkgs/development/nim-packages/zippy/default.nix b/pkgs/development/nim-packages/zippy/default.nix
index 84008325bec8..ba27b0858f59 100644
--- a/pkgs/development/nim-packages/zippy/default.nix
+++ b/pkgs/development/nim-packages/zippy/default.nix
@@ -1,7 +1,24 @@
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub, unzip }:
-fetchNimble {
+buildNimPackage rec {
pname = "zippy";
version = "0.7.3";
- hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8=";
+
+ nativeBuildInputs = [ unzip ];
+
+ src = fetchFromGitHub {
+ owner = "guzba";
+ repo = pname;
+ rev = version;
+ hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8=";
+ };
+
+ doCheck = true;
+
+ meta = with lib;
+ src.meta // {
+ description = "Pure Nim implementation of deflate, zlib, gzip and zip";
+ license = [ licenses.mit ];
+ maintainers = [ maintainers.ehmry ];
+ };
}
diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
index 2835852d6708..987c325ee00e 100644
--- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
+++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
@@ -14,13 +14,13 @@
buildDunePackage rec {
pname = "ca-certs-nss";
- version = "3.71.0.1";
+ version = "3.74";
minimumOCamlVersion = "4.08";
src = fetchurl {
- url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-v${version}.tbz";
- sha256 = "b83749d983781631745079dccb7345d9ee1b52c1844ce865e97a25349289a124";
+ url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz";
+ sha256 = "c95f5b2e36a0564e6f65421e0e197d7cfe600d19eb492f8f27c4841cbe68b231";
};
useDune2 = true;
diff --git a/pkgs/development/python-modules/algebraic-data-types/default.nix b/pkgs/development/python-modules/algebraic-data-types/default.nix
index 8a46d405799b..7c4f9a4f6082 100644
--- a/pkgs/development/python-modules/algebraic-data-types/default.nix
+++ b/pkgs/development/python-modules/algebraic-data-types/default.nix
@@ -1,28 +1,45 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, hypothesis, mypy }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, hypothesis
+, mypy
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "algebraic-data-types";
- version = "0.1.1";
+ version = "0.2.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jspahrsummers";
repo = "adt";
rev = "v" + version;
- sha256 = "1py94jsgh6wch59n9dxnwvk74psbpa1679zfmripa1qfc2218kqi";
+ hash = "sha256-RHLI5rmFxklzG9dyYgYfSS/srCjcxNpzNcK/RPNJBPE=";
};
- disabled = pythonOlder "3.6";
-
checkInputs = [
+ pytestCheckHook
hypothesis
mypy
];
+ disabledTestPaths = [
+ # AttributeError: module 'mypy.types' has no attribute 'TypeVarDef'
+ "tests/test_mypy_plugin.py"
+ ];
+
+ pythonImportsCheck = [
+ "adt"
+ ];
+
meta = with lib; {
description = "Algebraic data types for Python";
homepage = "https://github.com/jspahrsummers/adt";
license = licenses.mit;
maintainers = with maintainers; [ uri-canva ];
- platforms = platforms.unix;
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
index aa942d3a732b..ce17bc60de50 100644
--- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-consumption";
- version = "8.0.0";
+ version = "9.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "b4cc167648634f864394066d5621afc137c1be795ee76f7539125f9538a2bf37";
+ sha256 = "76f9566390721226add96c9d3020ab986d3e5fd81e3143c098f57262c6ce4a51";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
index bf9d9bab576b..7b7704401c17 100644
--- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-notificationhubs";
- version = "7.0.0";
+ version = "8.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "92ffed71a2999ff5db41afd66c6ba5cfef9d467f732c7bb45b7c41db371c6e4a";
+ sha256 = "4dd924f4704993e3ebf1d42e2be1cbe0b0d908e695857fa08c4369ae11d0eb36";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/base58check/default.nix b/pkgs/development/python-modules/base58check/default.nix
new file mode 100644
index 000000000000..e81eca6e137d
--- /dev/null
+++ b/pkgs/development/python-modules/base58check/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "base58check";
+ version = "1.0.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "joeblackwaslike";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs=";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "base58check"
+ ];
+
+ meta = with lib; {
+ description = "Implementation of the Base58Check encoding scheme";
+ homepage = "https://github.com/joeblackwaslike/base58check";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 31f8a24d8b76..665fd6806bfa 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
];
meta = with lib; {
- homepage = "http://furius.ca/beancount/";
+ homepage = "https://github.com/beancount/beancount";
description = "Double-entry bookkeeping computer language";
longDescription = ''
A double-entry bookkeeping computer language that lets you define
diff --git a/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix
new file mode 100644
index 000000000000..820fa883676a
--- /dev/null
+++ b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, base58
+, buildPythonPackage
+, ecdsa
+, fetchPypi
+, sympy
+}:
+
+buildPythonPackage rec {
+ pname = "bitcoin-utils-fork-minimal";
+ version = "0.4.11.4";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-n3tEQkl6KBAno4LY67lZme3TIvsm35VA2yyfWYuIE1c=";
+ };
+
+ propagatedBuildInputs = [
+ base58
+ ecdsa
+ sympy
+ ];
+
+ preConfigure = ''
+ substituteInPlace setup.py \
+ --replace "sympy==1.3" "sympy>=1.3" \
+ --replace "base58==2.1.0" "base58>=2.1.0" \
+ --replace "ecdsa==0.13.3" "ecdsa>=0.13.3"
+ '';
+
+ # Project doesn't ship tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "bitcoinutils"
+ ];
+
+ meta = with lib; {
+ description = "Bitcoin utility functions";
+ homepage = "https://github.com/doersf/python-bitcoin-utils";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/bitcoinrpc/default.nix b/pkgs/development/python-modules/bitcoinrpc/default.nix
new file mode 100644
index 000000000000..200f3edf038a
--- /dev/null
+++ b/pkgs/development/python-modules/bitcoinrpc/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, orjson
+, httpx
+, typing-extensions
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "bitcoinrpc";
+ version = "0.5.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "bibajz";
+ repo = "bitcoin-python-async-rpc";
+ rev = "v${version}";
+ hash = "sha256-uxkSz99X9ior7l825PaXGIC5XJzO/Opv0vTyY1ixvxU=";
+ };
+
+ propagatedBuildInputs = [
+ orjson
+ httpx
+ typing-extensions
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "bitcoinrpc"
+ ];
+
+ meta = with lib; {
+ description = "Bitcoin JSON-RPC client";
+ homepage = "https://github.com/bibajz/bitcoin-python-async-rpc";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix
index f634bf17ecc0..64ffc5ff4b3e 100644
--- a/pkgs/development/python-modules/block-io/default.nix
+++ b/pkgs/development/python-modules/block-io/default.nix
@@ -1,8 +1,20 @@
-{ lib, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }:
+{ lib
+, fetchPypi
+, bitcoin-utils-fork-minimal
+, buildPythonPackage
+, base58
+, pycryptodome
+, requests
+, setuptools
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "block-io";
version = "2.0.5";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
@@ -11,24 +23,24 @@ buildPythonPackage rec {
propagatedBuildInputs = [
base58
- ecdsa
+ bitcoin-utils-fork-minimal
pycryptodome
requests
- six
setuptools
];
preConfigure = ''
substituteInPlace setup.py \
- --replace "ecdsa==0.15" "ecdsa>=0.15" \
- --replace "base58==1.0.3" "base58>=1.0.3"
+ --replace "base58==2.1.0" "base58>=2.1.0"
'';
# Tests needs a BlockIO API key to run properly
# https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18
doCheck = false;
- pythonImportsCheck = [ "block_io" ];
+ pythonImportsCheck = [
+ "block_io"
+ ];
meta = with lib; {
description = "Integrate Bitcoin, Dogecoin and Litecoin in your Python applications using block.io";
diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix
index 6c943d5ae57c..4c5b96bce538 100644
--- a/pkgs/development/python-modules/blocksat-cli/default.nix
+++ b/pkgs/development/python-modules/blocksat-cli/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "blocksat-cli";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "96ec5e548dcdb71ada75727d76b34006fe5f6818bd89cf982e15616d41889603";
+ sha256 = "sha256-hz5BGE+gqOrPiXvmeOTOecm2RUrTvM/xxvV3cnO2QSc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 143e76cf0d87..a68cfd6d9cdf 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "django-allauth";
- version = "0.40.0";
+ version = "0.47.0";
# no tests on PyPI
src = fetchFromGitHub {
owner = "pennersr";
repo = pname;
rev = version;
- sha256 = "10id4k01p1hg5agb8cmllg8mv4kc7ryl75br10idwxabqqp4vla1";
+ sha256 = "sha256-wKrsute6TCl331UrxNEBf/zTtGnyGHsOZQwdiicbg2o=";
};
propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];
diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index e7cb4814cb48..6212c754f893 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -1,22 +1,58 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, django, requests, oauthlib
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+
+# propagates
+, django
+, jwcrypto
+, requests
+, oauthlib
+
+# tests
+, djangorestframework
+, pytest-django
+, pytest-xdist
+, pytest-mock
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "django-oauth-toolkit";
- version = "1.2.0";
+ version = "1.6.1";
+ format = "setuptools";
src = fetchFromGitHub {
owner = "jazzband";
repo = pname;
rev = version;
- sha256 = "1zbksxrcxlqnapmlvx4rgvpqc4plgnq0xnf45cjwzwi1626zs8g6";
+ sha256 = "sha256-TOrFxQULwiuwpVFqRwRkfTW+GRudLNy6F/gIjUYjZhI=";
};
- propagatedBuildInputs = [ django requests oauthlib ];
+ postPatch = ''
+ sed -i '/cov/d' tox.ini
+ '';
- # django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
- doCheck = false;
+ propagatedBuildInputs = [
+ django
+ jwcrypto
+ oauthlib
+ requests
+ ];
+
+ DJANGO_SETTINGS_MODULE = "tests.settings";
+
+ checkInputs = [
+ djangorestframework
+ pytest-django
+ pytest-xdist
+ pytest-mock
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Failed to get a valid response from authentication server. Status code: 404, Reason: Not Found.
+ "test_response_when_auth_server_response_return_404"
+ ];
meta = with lib; {
description = "OAuth2 goodies for the Djangonauts";
diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix
index 9685e55bb1c3..c7bda13dd9ab 100644
--- a/pkgs/development/python-modules/django_guardian/default.nix
+++ b/pkgs/development/python-modules/django_guardian/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
-, django_environ, mock, django
+, django-environ, mock, django
, pytest, pytest-runner, pytest-django
}:
buildPythonPackage rec {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0";
};
- checkInputs = [ pytest pytest-runner pytest-django django_environ mock ];
+ checkInputs = [ pytest pytest-runner pytest-django django-environ mock ];
propagatedBuildInputs = [ django ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
new file mode 100644
index 000000000000..b8479c0f73ca
--- /dev/null
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -0,0 +1,60 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, keras
+, lib
+, matplotlib
+, msgpack
+, numpy
+, optax
+, pytestCheckHook
+, tensorflow
+}:
+
+buildPythonPackage rec {
+ pname = "flax";
+ version = "0.3.6";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0zvq0vl88hiwmss49bnm7gdmndr1dfza2bcs1fj88a9r7w9dmlsr";
+ };
+
+ propagatedBuildInputs = [
+ matplotlib
+ msgpack
+ numpy
+ optax
+ ];
+
+ pythonImportsCheck = [
+ "flax"
+ ];
+
+ checkInputs = [
+ keras
+ pytestCheckHook
+ tensorflow
+ ];
+
+ disabledTestPaths = [
+ # Docs test, needs extra deps + we're not interested in it.
+ "docs/_ext/codediff_test.py"
+
+ # The tests in `examples` are not designed to be executed from a single test
+ # session and thus either have the modules that conflict with each other or
+ # wrong import paths, depending on how they're invoked. Many tests also have
+ # dependencies that are not packaged in `nixpkgs` (`clu`, `jgraph`,
+ # `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them
+ # would be limited anyway.
+ "examples/*"
+ ];
+
+ meta = with lib; {
+ description = "Neural network library for JAX";
+ homepage = "https://github.com/google/flax";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ndl ];
+ };
+}
diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix
index 9cf6c08b24cc..a1f26845d346 100644
--- a/pkgs/development/python-modules/goodwe/default.nix
+++ b/pkgs/development/python-modules/goodwe/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "goodwe";
- version = "0.2.10";
+ version = "0.2.11";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "marcelblijleven";
repo = pname;
rev = "v${version}";
- sha256 = "1c4wks67vm2dwzmm3xqkidyss04vkx4mpkkr8l1c7c5myfk1n157";
+ sha256 = "14m2r3x1dgh3npnbspkp2214976669nnpqhbc26ib88qmn75kzad";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index b08f8fb31ff9..62bba685417d 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
- version = "3.12.0";
+ version = "3.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "8f1390c3776fcfce71e1ef024d9ccde52c16d1cd728bc587c24065d6e4d21933";
+ sha256 = "98e53298a7c79f0af351c80e6fc0b57bc735afdec764424e459179ef04f5a40f";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix
new file mode 100644
index 000000000000..65e4bbde319b
--- /dev/null
+++ b/pkgs/development/python-modules/gql/default.nix
@@ -0,0 +1,77 @@
+{ lib
+, aiofiles
+, aiohttp
+, botocore
+, buildPythonPackage
+, fetchFromGitHub
+, graphql-core
+, mock
+, parse
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests-toolbelt
+, urllib3
+, vcrpy
+, websockets
+, yarl
+}:
+
+buildPythonPackage rec {
+ pname = "gql";
+ version = "3.0.0rc0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "graphql-python";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-yr1DyMj/0C9XPTyGdbQbn7nMRKr4JwItFDsqvl/goqU=";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ botocore
+ graphql-core
+ requests
+ requests-toolbelt
+ urllib3
+ websockets
+ yarl
+ ];
+
+ checkInputs = [
+ aiofiles
+ mock
+ parse
+ pytest-asyncio
+ pytestCheckHook
+ vcrpy
+ ];
+
+ disabledTests = [
+ # Tests requires network access
+ "test_execute_result_error"
+ "test_http_transport"
+ ];
+
+ disabledTestPaths = [
+ # Exclude linter tests
+ "gql-checker/tests/test_flake8_linter.py"
+ "gql-checker/tests/test_pylama_linter.py"
+ ];
+
+ pythonImportsCheck = [
+ "gql"
+ ];
+
+ meta = with lib; {
+ description = "GraphQL client in Python";
+ homepage = "https://github.com/graphql-python/gql";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix
index b7424c44f6de..e81d815e8c20 100644
--- a/pkgs/development/python-modules/gradient-utils/default.nix
+++ b/pkgs/development/python-modules/gradient-utils/default.nix
@@ -7,6 +7,7 @@
, poetry-core
, prometheus-client
, pytestCheckHook
+, pythonOlder
, requests
}:
@@ -15,6 +16,8 @@ buildPythonPackage rec {
version = "0.5.0";
format = "pyproject";
+ disabled = pythonOlder "3.6";
+
src = fetchFromGitHub {
owner = "Paperspace";
repo = pname;
@@ -22,15 +25,9 @@ buildPythonPackage rec {
sha256 = "19plkgwwfs6298vjplgsvhirixi3jbngq5y07x9c0fjxk39fa2dk";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
- --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
- --replace 'wheel = "^0.35.1"' 'wheel = "*"' \
- --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"'
- '';
-
- nativeBuildInputs = [ poetry-core ];
+ nativeBuildInputs = [
+ poetry-core
+ ];
propagatedBuildInputs = [
hyperopt
@@ -44,15 +41,24 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace 'wheel = "^0.35.1"' 'wheel = "*"' \
+ --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"'
+ '';
+
preCheck = ''
export HOSTNAME=myhost-experimentId
'';
- disabledTests = [
- "test_add_metrics_pushes_metrics" # requires a working prometheus push gateway
+ disabledTestPaths = [
+ # Requires a working Prometheus push gateway
+ "tests/integration/test_metrics.py"
];
- pythonImportsCheck = [ "gradient_utils" ];
+ pythonImportsCheck = [
+ "gradient_utils"
+ ];
meta = with lib; {
description = "Python utils and helpers library for Gradient";
diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix
index 735dc03b6df7..026c61fc6157 100644
--- a/pkgs/development/python-modules/gradient/default.nix
+++ b/pkgs/development/python-modules/gradient/default.nix
@@ -9,6 +9,7 @@
, fetchPypi
, gradient_statsd
, gradient-utils
+, gql
, halo
, marshmallow
, progressbar2
@@ -22,17 +23,19 @@
buildPythonPackage rec {
pname = "gradient";
- version = "1.8.13";
+ version = "1.9.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "0fa4a0553c28839e364d3aac27ec7292d26c1df27b8c54701d57eb7eda0b14f2";
+ hash = "sha256-zimOh4bc9EQGpqMky/etwnAF04onJ2m/KAl29IaAeAY=";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'attrs<=' 'attrs>=' \
--replace 'colorama==' 'colorama>=' \
+ --replace 'gql[requests]==3.0.0a6' 'gql' \
--replace 'PyYAML==' 'PyYAML>=' \
--replace 'marshmallow<' 'marshmallow>=' \
--replace 'websocket-client==' 'websocket-client>='
@@ -45,6 +48,7 @@ buildPythonPackage rec {
click-didyoumean
click-help-colors
colorama
+ gql
gradient_statsd
gradient-utils
halo
@@ -58,17 +62,20 @@ buildPythonPackage rec {
websocket-client
];
- # tries to use /homeless-shelter to mimic container usage, etc
+ # Tries to use /homeless-shelter to mimic container usage, etc
doCheck = false;
+ # marshmallow.exceptions.StringNotCollectionError: "only" should be a collection of strings.
+ # Support for marshmallow > 3
+ # pythonImportsCheck = [
+ # "gradient"
+ # ];
+
meta = with lib; {
description = "The command line interface for Gradient";
homepage = "https://github.com/Paperspace/gradient-cli";
license = licenses.isc;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ];
- # There is no support for click > 8
- # https://github.com/Paperspace/gradient-cli/issues/368
- broken = true;
};
}
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index bf8bed9dd262..d5c5a41abc04 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "0.13.3";
+ version = "0.14.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = version;
- sha256 = "sha256-9dR0qYoHVovD4fwJz6v+/RItMuqr2vA9YHn0nMGHUX0=";
+ sha256 = "sha256-Olwol/DhsVJznxpiMB57zkPuco0RBxMy8cfzSQMZZrU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix
index 5fb15be0a3f9..645df973fa6a 100644
--- a/pkgs/development/python-modules/hydra/default.nix
+++ b/pkgs/development/python-modules/hydra/default.nix
@@ -1,9 +1,18 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook
-, importlib-resources, omegaconf, jre_headless, antlr4-python3-runtime }:
+{ lib
+, antlr4-python3-runtime
+, buildPythonPackage
+, fetchFromGitHub
+, importlib-resources
+, jre_headless
+, omegaconf
+, pytestCheckHook
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "hydra";
version = "1.1.1";
+ format = "setuptools";
disabled = pythonOlder "3.6";
@@ -14,17 +23,35 @@ buildPythonPackage rec {
sha256 = "sha256:1svzysrjg47gb6lxx66fzd8wbhpbbsppprpbqssf5aqvhxgay3qk";
};
- nativeBuildInputs = [ jre_headless ];
- checkInputs = [ pytestCheckHook ];
- propagatedBuildInputs = [ omegaconf antlr4-python3-runtime ]
- ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
+ nativeBuildInputs = [
+ jre_headless
+ ];
- # test environment setup broken under Nix for a few tests:
+ propagatedBuildInputs = [
+ antlr4-python3-runtime
+ omegaconf
+ ] ++ lib.optionals (pythonOlder "3.9") [
+ importlib-resources
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ # Test environment setup broken under Nix for a few tests:
disabledTests = [
"test_bash_completion_with_dot_in_path"
"test_install_uninstall"
+ "test_config_search_path"
+ ];
+
+ disabledTestPaths = [
+ "tests/test_hydra.py"
+ ];
+
+ pythonImportsCheck = [
+ "hydra"
];
- disabledTestPaths = [ "tests/test_hydra.py" ];
meta = with lib; {
description = "A framework for configuring complex applications";
diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 194dce3f88df..4497683932ce 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
- version = "2.4.1";
+ version = "2.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-+kfIpmJ6Gnb33MZ7NZrE8oVSBbZLuRfIvfCbstxJFX0=";
+ sha256 = "sha256-6YduKmXqgqXAqlK2cd1CkdI7nzK0Dg65E+nl6vhMAow=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix
index aeb13abd0dfe..dbf4b8ffe46b 100644
--- a/pkgs/development/python-modules/makefun/default.nix
+++ b/pkgs/development/python-modules/makefun/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "makefun";
- version = "1.12.1";
+ version = "1.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4d0e90ca3fdbdeb6a4a0891e2da7d4b8e80386e19e6db91ce29b8aa5c876ecfe";
+ sha256 = "2c673d2b4f0ef809347513cb45e3b23a04228588af7c9ac859e99247abac516a";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix
index 5c2bbe9222b7..a0aacb63a1cf 100644
--- a/pkgs/development/python-modules/meross-iot/default.nix
+++ b/pkgs/development/python-modules/meross-iot/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "meross-iot";
- version = "0.4.3.0";
+ version = "0.4.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "albertogeniola";
repo = "MerossIot";
rev = version;
- sha256 = "sha256-PZ1+Bjw7k6EFZEuPhbkGrdQzdLGiM4U0ecAAN8SxWU4=";
+ sha256 = "sha256-NkLMQ1sgoZit2BQechgGq8XhBuzw2P7jKHsAjGq3l08=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix
index 5c4cbc78adb7..01e6ca29b5d9 100644
--- a/pkgs/development/python-modules/oauthlib/default.nix
+++ b/pkgs/development/python-modules/oauthlib/default.nix
@@ -1,31 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, mock
-, pytest
-, cryptography
+
+# propagates
, blinker
+, cryptography
, pyjwt
+
+# test
+, mock
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "oauthlib";
- version = "unstable-2020-05-08";
+ version = "3.1.1";
+ format = "setuptools";
# master supports pyjwt==1.7.1
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "46647402896db5f0d979eba9594623e889739060";
- sha256 = "1wrdjdvlfcd74lckcgascnasrffg8sip0z673si4ag5kv4afiz3l";
+ rev = "v${version}";
+ hash = "sha256:1bgxpzh11i0x7h9py3a29cz5z714b3p498b62znnn5ciy0cr80sv";
};
- checkInputs = [ mock pytest ];
- propagatedBuildInputs = [ cryptography blinker pyjwt ];
+ propagatedBuildInputs = [
+ blinker
+ cryptography
+ pyjwt
+ ];
- checkPhase = ''
- py.test tests/
- '';
+ checkInputs = [
+ mock
+ pytestCheckHook
+ ];
meta = with lib; {
homepage = "https://github.com/idan/oauthlib";
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 9d54eef4d706..62bab6694d79 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pip-tools";
- version = "6.4.0";
+ version = "6.3.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b";
+ sha256 = "992d968df6f1a19d4d37c53b68b3d4b601b894fb3ee0926d1fa762ebc7c7e9e9";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix
index 31a62c109646..bd80fb725c31 100644
--- a/pkgs/development/python-modules/plaid-python/default.nix
+++ b/pkgs/development/python-modules/plaid-python/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "plaid-python";
- version = "8.8.0";
+ version = "8.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8689b5c4d69e93026aea252314fb3133359fa70df5819ad6995c4e44a2f84858";
+ sha256 = "ba2021812835bfeb19ad6d32a1afeb41cb01e45f4fd2b8145ae162800e4bc87f";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index 6b67814a2220..3adf54281b77 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -1,8 +1,18 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+
+# tests
+, ffmpeg-full
+, python
+}:
buildPythonPackage rec {
pname = "pydub";
version = "0.25.1";
+ format = "setuptools";
+
# pypi version doesn't include required data files for tests
src = fetchFromGitHub {
owner = "jiaaro";
@@ -11,23 +21,24 @@ buildPythonPackage rec {
sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m";
};
+ pythonImportsCheck = [
+ "pydub"
+ "pydub.audio_segment"
+ "pydub.playback"
+ ];
- # disable a test that fails on aarch64 due to rounding errors
- postPatch = lib.optionalString stdenv.isAarch64 ''
- substituteInPlace test/test.py \
- --replace "test_overlay_with_gain_change" "notest_overlay_with_gain_change"
- '';
-
- checkInputs = [ scipy ffmpeg-full ];
+ checkInputs = [
+ ffmpeg-full
+ ];
checkPhase = ''
- python test/test.py
+ ${python.interpreter} test/test.py
'';
meta = with lib; {
- description = "Manipulate audio with a simple and easy high level interface.";
- homepage = "http://pydub.com/";
- license = licenses.mit;
- platforms = platforms.all;
+ description = "Manipulate audio with a simple and easy high level interface";
+ homepage = "http://pydub.com";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
};
}
diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix
index 3005c26f77b5..609ed9cc343e 100644
--- a/pkgs/development/python-modules/pytest-console-scripts/default.nix
+++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pytest-console-scripts";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "c7f258025110f1337c23499c2f6674b873d4adba2438be55895edf01451c5ce3";
+ sha256 = "caeaaaf57f3a99e4482127e8a18467a1cfd49c92f4b37e5578d0bc40bf1b3394";
};
postPatch = ''
# setuptools-scm is pinned to <6 because it dropped Python 3.5
diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix
index c286cb3dc65b..8fd24d957ca7 100644
--- a/pkgs/development/python-modules/qcs-api-client/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "qcs-api-client";
- version = "0.20.7";
+ version = "0.20.9";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "64f3ee91cb9424ac1f27a2e13a4d03090a57d2e0e5edf6981a0b4e5295844c81";
+ sha256 = "7b4e890ca9d9996060690629eee88db49c5fa4bde520910d48dd20323d1c5574";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix
index 9637602cce1f..8b378e844e43 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/pkgs/development/python-modules/shodan/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "shodan";
- version = "1.25.0";
+ version = "1.26.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-fivdvBtgv2IAQtABD0t2KoC0MRHb6pwEHXLUMl4mDCM=";
+ sha256 = "4f2ee19bdcad41a5f4618c8e7e1759f62c337cc2214416b53ad3d0c04a1146bc";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix
index f2639debbdd0..0e884a09b440 100644
--- a/pkgs/development/python-modules/striprtf/default.nix
+++ b/pkgs/development/python-modules/striprtf/default.nix
@@ -5,13 +5,18 @@
buildPythonPackage rec {
pname = "striprtf";
- version = "0.0.18";
+ version = "0.0.19";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "6bb2dc8a59f3128662f958d647c5e6755f9ad8053f216c88e68514df204926d2";
+ sha256 = "b7f15e11306e466dbe91665409233a06d9fdb4ee156489a3d879579891b04c25";
};
+ pythonImportsCheck = [
+ "striprtf"
+ ];
+
meta = with lib; {
homepage = "https://github.com/joshy/striprtf";
description = "A simple library to convert rtf to text";
diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index 2bb07b37301e..e2838ad526e8 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -31,12 +31,12 @@
buildPythonPackage rec {
pname = "sunpy";
- version = "3.1.2";
+ version = "3.1.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "5eeb479c3f2424bf46355165249a1caa849872f8bee525349c4dca4d15b271fd";
+ sha256 = "4acb05a05c7e6a2090cd0bb426b34c7e1620be0de2bf90a95a3f48ba15a5fce2";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/tensorflow-metadata/build.patch b/pkgs/development/python-modules/tensorflow-metadata/build.patch
new file mode 100644
index 000000000000..ff81c5d1e86c
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow-metadata/build.patch
@@ -0,0 +1,24 @@
+diff --git a/setup.py b/setup.py
+index 7a09b2f..94c5aa6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -125,7 +125,7 @@ setup(
+ ],
+ namespace_packages=[],
+ install_requires=[
+- 'absl-py>=0.9,<0.13',
++ 'absl-py>=0.9',
+ 'googleapis-common-protos>=1.52.0,<2',
+ 'protobuf>=3.13,<4',
+ ],
+@@ -137,8 +137,5 @@ setup(
+ long_description_content_type='text/markdown',
+ keywords='tensorflow metadata tfx',
+ download_url='https://github.com/tensorflow/metadata/tags',
+- requires=[],
+- cmdclass={
+- 'build': _BuildCommand,
+- 'bazel_build': _BazelBuildCommand,
+- })
++ requires=[]
++ )
diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix
new file mode 100644
index 000000000000..2a80155c4cd9
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix
@@ -0,0 +1,46 @@
+{ absl-py
+, buildPythonPackage
+, fetchFromGitHub
+, googleapis-common-protos
+, lib
+}:
+
+buildPythonPackage rec {
+ pname = "tensorflow-metadata";
+ version = "1.5.0";
+
+ src = fetchFromGitHub {
+ owner = "tensorflow";
+ repo = "metadata";
+ rev = "v${version}";
+ sha256 = "17p74k6rwswpmj7m16cw9hdam6b4m7v5bahirmc2l1kwfvrn4w33";
+ };
+
+ patches = [
+ ./build.patch
+ ];
+
+ # Default build pulls in Bazel + extra deps, given the actual build
+ # is literally three lines (see below) - replace it with custom build.
+ preBuild = ''
+ for proto in tensorflow_metadata/proto/v0/*.proto; do
+ protoc --python_out=. $proto
+ done
+ '';
+
+ propagatedBuildInputs = [
+ absl-py
+ googleapis-common-protos
+ ];
+
+ pythonImportsCheck = [
+ "tensorflow_metadata"
+ ];
+
+ meta = with lib; {
+ description = "Standard representations for metadata that are useful when training machine learning models with TensorFlow";
+ homepage = "https://github.com/tensorflow/metadata";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ndl ];
+ };
+}
diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 9c8818dd11bc..a9b4092752e2 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
- version = "3.9.40";
+ version = "3.9.41";
src = fetchPypi {
inherit pname version;
- sha256 = "321005b498361548ce2e048f8499a347d8f38c75ff9f74cee7b118c84b0c41d4";
+ sha256 = "7cacd454f4cfde741698aa8bca4fdbc775dc42f66a3135dd0c8308fe7ba733be";
};
propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index 3006c2c5e99e..6dec072bb509 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-requests";
- version = "2.26.3";
+ version = "2.27.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-1j+mF4Rtzv/1qi1Z5Hq0/9gG5LsFZxFfetu15DgwL+Q=";
+ sha256 = "sha256-vFztDc8GdOPx+d7XNM7p+kXFfPZEsInmLI+xLKKOshU=";
};
# Module doesn't have tests
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index ee3009a633c9..92a6f9acfc67 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -46,13 +46,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
- version = "2.0.707";
+ version = "2.0.708";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
- sha256 = "sha256-AsKsv3fKubFZZMZHBRuVmgeGJB1zTe00J2kmqikBiD8=";
+ sha256 = "sha256-qnRYxbw42vN0w+x1ARRz60e8q9LCPWglprOBm7rkxsE=";
};
nativeBuildInputs = with py.pkgs; [
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
index d7943ef25844..6a8792910b11 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
@@ -536,6 +536,7 @@ stdenv.mkDerivation rec {
unzip
which
zip
+ python3.pkgs.absl-py # Needed to build fish completion
] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
# Bazel makes extensive use of symlinks in the WORKSPACE.
@@ -549,8 +550,6 @@ stdenv.mkDerivation rec {
shopt -s dotglob extglob
mv !(bazel_src) bazel_src
'';
- # Needed to build fish completion
- propagatedBuildInputs = [ python3.pkgs.absl-py ];
buildPhase = ''
runHook preBuild
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix
index 66e972826cb9..4ce8c1edffd4 100644
--- a/pkgs/development/tools/misc/astyle/default.nix
+++ b/pkgs/development/tools/misc/astyle/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
- homepage = "https://astyle.sourceforge.net/";
+ homepage = "http://astyle.sourceforge.net/";
license = licenses.lgpl3;
platforms = platforms.unix;
};
diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix
deleted file mode 100644
index a732d6e732c5..000000000000
--- a/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl, libelf, txt2man }:
-
-stdenv.mkDerivation {
- pname = "bin_replace_string";
- version = "0.2";
-
- src = fetchurl {
- sha256 = "1gnpddxwpsfrg4l76x5yplsvbcdbviybciqpn22yq3g3qgnr5c2a";
- url = "ftp://ohnopub.net/mirror/bin_replace_string-0.2.tar.bz2";
- };
-
- buildInputs = [ libelf ];
- nativeBuildInputs = [ txt2man ];
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- description = "Edit precompiled binaries";
- longDescription = ''
- bin_replace_string edits C-style strings in precompiled binaries. This is
- intended to be useful to replace arbitrary strings in binaries whose
- source code is not available. However, because of the nature of compiled
- binaries, bin_replace_string may only replace a given C-string with a
- shorter C-string.
- '';
- homepage = "http://ohnopub.net/~ohnobinki/bin_replace_string/";
- downloadPage = "ftp://ohnopub.net/mirror/";
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix
index 21a5b470a2e9..808cda01fe54 100644
--- a/pkgs/development/tools/rust/cargo-tally/default.nix
+++ b/pkgs/development/tools/rust/cargo-tally/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tally";
- version = "1.0.0";
+ version = "1.0.2";
src = fetchCrate {
inherit pname version;
- sha256 = "16r60ddrqsss5nagfb5g49md8wwm4zbp9sffbm23bhlqhxh35y0i";
+ sha256 = "sha256-m5NLI0C7ett5Fmvs9t1vl2W6h7mjCtEFBc1AzYg9JfY=";
};
- cargoSha256 = "0ffq67vy0pa7va8j93g03bralz7lck6ds1hidbpzzkp13pdcgf97";
+ cargoSha256 = "sha256-AxjQUyxX5lLFPdEdETvZLHbgMYg/xOo7bcqn1TiDKsE=";
buildInputs = lib.optionals stdenv.isDarwin [
DiskArbitration
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 31a8ef404d9a..32507f0d5a38 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.17.1";
+ version = "1.17.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-XzpOJTLTiF4GrECC7ObFzoPusFM8mvhUGH9F52o88MY=";
+ sha256 = "sha256-i8BfLnZnkHBPyNy4vUUA9J1f757KCjJ/DsWLPMVxsEg=";
};
- cargoSha256 = "sha256-7uTxDkAyViNidSDH6bdUrtP96vQgyz+p2OlK+/FUJvc=";
+ cargoSha256 = "sha256-bYRBIdB9/F9OgFxC2LZ24HJWQRLeji978Z2cpH18lY8=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix
index 613947c677a5..befb29f6ffc9 100644
--- a/pkgs/games/banner/default.nix
+++ b/pkgs/games/banner/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
- homepage = "https://software.cedar-solutions.com/utilities.html";
+ homepage = "https://github.com/pronovic/banner";
description = "Print large banners to ASCII terminals";
license = licenses.gpl2Only;
diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix
deleted file mode 100644
index b5b53aa3c413..000000000000
--- a/pkgs/games/crafty/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ lib, stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
- pname = "crafty";
- version = "25.0.1";
-
- src = fetchurl {
- url = "http://www.craftychess.com/downloads/source/crafty-${version}.zip";
- sha256 = "0aqgj2q7kdlgbha01qs869cwyja13bc7q2lh4nfhlba2pklknsm8";
- };
-
- bookBin = fetchurl {
- url = "http://www.craftychess.com/downloads/book/book.bin";
- sha256 = "10rrgkr3hxm7pxdbc2jq8b5g74gfhzk4smahks3k8am1cmyq4p7r";
- };
-
- startPgn = fetchurl {
- url = "http://craftychess.com/downloads/book/start.pgn.gz";
- sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f";
- };
-
- nativeBuildInputs = [ unzip ];
-
- unpackPhase = ''
- mkdir "craftysrc"
- unzip $src -d craftysrc
- gunzip -c $startPgn > "craftysrc/start.pgn"
- '';
-
- buildPhase = ''
- cd craftysrc
- make unix-gcc
- '';
-
- installPhase = ''
- BUILDDIR="$PWD"
- mkdir -p $out/bin
- cp -p ./crafty $out/bin
-
- mkdir -p $out/share/crafty
- cd $out/share/crafty
-
- $out/bin/crafty "books create $BUILDDIR/start.pgn 60"
- rm -f *.001
-
- cp -p ${bookBin} $out/share/crafty/book.bin
-
- mv $out/bin/crafty $out/bin/.crafty-wrapped
-
- cat - > $out/bin/crafty <