diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md
index e42ba512b98..2e795015e36 100644
--- a/doc/contributing/coding-conventions.chapter.md
+++ b/doc/contributing/coding-conventions.chapter.md
@@ -537,7 +537,13 @@ Note that because the checksum is computed after applying these effects, using o
Tests are important to ensure quality and make reviews and automatic updates easy.
-Nix package tests are a lightweight alternative to [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests). They can be used to create simple integration tests for packages while the module tests are used to test services or programs with a graphical user interface on a NixOS VM. Unittests that are included in the source code of a package should be executed in the `checkPhase`.
+The following types of tests exists:
+
+* [NixOS **module tests**](https://nixos.org/manual/nixos/stable/#sec-nixos-tests), which spawn one or more NixOS VMs. They exercise both NixOS modules and the packaged programs used within them. For example, a NixOS module test can start a web server VM running the `nginx` module, and a client VM running `curl` or a graphical `firefox`, and test that they can talk to each other and display the correct content.
+* Nix **package tests** are a lightweight alternative to NixOS module tests. They should be used to create simple integration tests for packages, but cannot test NixOS services, and some programs with graphical user interfaces may also be difficult to test with them.
+* The **`checkPhase` of a package**, which should execute the unit tests that are included in the source code of a package.
+
+Here in the nixpkgs manual we describe mostly _package tests_; for _module tests_ head over to the corresponding [section in the NixOS manual](https://nixos.org/manual/nixos/stable/#sec-nixos-tests).
### Writing package tests {#ssec-package-tests-writing}
@@ -602,3 +608,23 @@ Here are examples of package tests:
- [Spacy annotation test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/spacy/annotation-test/default.nix)
- [Libtorch test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/science/math/libtorch/test/default.nix)
- [Multiple tests for nanopb](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/nanopb/default.nix)
+
+### Linking NixOS module tests to a package {#ssec-nixos-tests-linking}
+
+Like [package tests](#ssec-package-tests-writing) as shown above, [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests) can also be linked to a package, so that the tests can be easily run when changing the related package.
+
+For example, assuming we're packaging `nginx`, we can link its module test via `passthru.tests`:
+
+```nix
+{ stdenv, lib, nixosTests }:
+
+stdenv.mkDerivation {
+ ...
+
+ passthru.tests = {
+ nginx = nixosTests.nginx;
+ };
+
+ ...
+}
+```
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 5c787940cb0..0b61819f6b4 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -5,7 +5,7 @@ let
inherit (builtins) head tail length;
inherit (lib.trivial) and;
inherit (lib.strings) concatStringsSep sanitizeDerivationName;
- inherit (lib.lists) fold concatMap concatLists;
+ inherit (lib.lists) fold foldr concatMap concatLists;
in
rec {
@@ -152,8 +152,8 @@ rec {
=> { a = [ 2 3 ]; }
*/
foldAttrs = op: nul: list_of_attrs:
- fold (n: a:
- fold (name: o:
+ foldr (n: a:
+ foldr (name: o:
o // { ${name} = op n.${name} (a.${name} or nul); }
) a (attrNames n)
) {} list_of_attrs;
@@ -455,7 +455,7 @@ rec {
=> true
*/
matchAttrs = pattern: attrs: assert isAttrs pattern;
- fold and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:
+ foldr and true (attrValues (zipAttrsWithNames (attrNames pattern) (n: values:
let pat = head values; val = head (tail values); in
if length values == 1 then false
else if isAttrs pat then isAttrs val && matchAttrs pat val
diff --git a/lib/deprecated.nix b/lib/deprecated.nix
index be0ef904c66..ddce69f160c 100644
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -77,11 +77,11 @@ rec {
# Output : are reqs satisfied? It's asserted.
checkReqs = attrSet: argList: condList:
(
- fold lib.and true
+ foldr lib.and true
(map (x: let name = (head x); in
((checkFlag attrSet name) ->
- (fold lib.and true
+ (foldr lib.and true
(map (y: let val=(getValue attrSet argList y); in
(val!=null) && (val!=false))
(tail x))))) condList));
@@ -177,7 +177,7 @@ rec {
# merge attributes with custom function handling the case that the attribute
# exists in both sets
mergeAttrsWithFunc = f: set1: set2:
- fold (n: set: if set ? ${n}
+ foldr (n: set: if set ? ${n}
then setAttr set n (f set.${n} set2.${n})
else set )
(set2 // set1) (attrNames set2);
@@ -196,7 +196,7 @@ rec {
mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"],
overrideSnd ? [ "buildPhase" ]
}: attrs1: attrs2:
- fold (n: set:
+ foldr (n: set:
setAttr set n ( if set ? ${n}
then # merge
if elem n mergeLists # attribute contains list, merge them by concatenating
@@ -224,7 +224,7 @@ rec {
mergeAttrBy2 = { mergeAttrBy = lib.mergeAttrs; }
// (maybeAttr "mergeAttrBy" {} x)
// (maybeAttr "mergeAttrBy" {} y); in
- fold lib.mergeAttrs {} [
+ foldr lib.mergeAttrs {} [
x y
(mapAttrs ( a: v: # merge special names using given functions
if x ? ${a}
diff --git a/lib/trivial.nix b/lib/trivial.nix
index e1581f1e91d..c8ef5599ccd 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -308,7 +308,7 @@ rec {
info = msg: builtins.trace "INFO: ${msg}";
- showWarnings = warnings: res: lib.fold (w: x: warn w x) res warnings;
+ showWarnings = warnings: res: lib.foldr (w: x: warn w x) res warnings;
## Function annotations
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fd607cfdbe0..8708bf79f54 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4939,6 +4939,12 @@
fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0";
}];
};
+ jgart = {
+ email = "jgart@dismail.de";
+ github = "jgarte";
+ githubId = 47760695;
+ name = "Jorge Gomez";
+ };
jgeerds = {
email = "jascha@geerds.org";
github = "jgeerds";
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index af7a2e08220..151743d9fb5 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -12,7 +12,7 @@ let
# E.g. if some `options` came from modules in ${pkgs.customModules}/nix,
# you'd need to include `extraSources = [ pkgs.customModules ]`
prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources);
- stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip;
+ stripAnyPrefixes = lib.flip (lib.foldr lib.removePrefix) prefixesToStrip;
optionsDoc = buildPackages.nixosOptionsDoc {
inherit options revision;
diff --git a/nixos/doc/manual/development/linking-nixos-tests-to-packages.section.md b/nixos/doc/manual/development/linking-nixos-tests-to-packages.section.md
new file mode 100644
index 00000000000..38a64027f7c
--- /dev/null
+++ b/nixos/doc/manual/development/linking-nixos-tests-to-packages.section.md
@@ -0,0 +1,6 @@
+# Linking NixOS tests to packages {#sec-linking-nixos-tests-to-packages}
+
+You can link NixOS module tests to the packages that they exercised,
+so that the tests can be run automatically during code review when the package gets changed.
+This is
+[described in the nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#ssec-nixos-tests-linking).
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
index 702fc03f668..67dc09fc715 100644
--- a/nixos/doc/manual/development/nixos-tests.xml
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -16,4 +16,5 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test
+
diff --git a/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml b/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml
new file mode 100644
index 00000000000..666bbec6162
--- /dev/null
+++ b/nixos/doc/manual/from_md/development/linking-nixos-tests-to-packages.section.xml
@@ -0,0 +1,10 @@
+
+ Linking NixOS tests to packages
+
+ You can link NixOS module tests to the packages that they exercised,
+ so that the tests can be run automatically during code review when
+ the package gets changed. This is
+ described
+ in the nixpkgs manual.
+
+
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 567a8b6f3b9..d5e7745c53f 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -396,7 +396,7 @@ let
};
};
- idsAreUnique = set: idAttr: !(fold (name: args@{ dup, acc }:
+ idsAreUnique = set: idAttr: !(foldr (name: args@{ dup, acc }:
let
id = builtins.toString (builtins.getAttr idAttr (builtins.getAttr name set));
exists = builtins.hasAttr id acc;
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 3e88a4c20ad..524dae57010 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -35,6 +35,14 @@ in {
'';
};
+ hardware.wirelessRegulatoryDatabase = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Load the wireless regulatory database at boot.
+ '';
+ };
+
};
@@ -58,6 +66,7 @@ in {
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
rtl8723bs-firmware
];
+ hardware.wirelessRegulatoryDatabase = true;
})
(mkIf cfg.enableAllFirmware {
assertions = [{
@@ -75,5 +84,8 @@ in {
b43FirmwareCutter
] ++ optional (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) facetimehd-firmware;
})
+ (mkIf cfg.wirelessRegulatoryDatabase {
+ hardware.firmware = [ pkgs.wireless-regdb ];
+ })
];
}
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 8160bfef4a3..a2ac5c58528 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -39,7 +39,7 @@ let
if c x then true
else lib.traceSeqN 1 x false;
in traceXIfNot isConfig;
- merge = args: fold (def: mergeConfig def.value) {};
+ merge = args: foldr (def: mergeConfig def.value) {};
};
overlayType = mkOptionType {
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 0ca71b413ce..debb2a39705 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -279,7 +279,7 @@ let
src_plan = plan;
tsformat = timestampFormat;
zend_delay = toString sendDelay;
- } // fold (a: b: a // b) {} (
+ } // foldr (a: b: a // b) {} (
map mkDestAttrs (builtins.attrValues destinations)
);
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 35639e1bbc8..9b0a5bba2fe 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -194,7 +194,7 @@ let
# We need to handle the last column specially here, because it's
# open-ended (command + args).
lines = [ labels labelDefaults ] ++ (map (l: init l ++ [""]) masterCf);
- in fold foldLine (genList (const 0) (length labels)) lines;
+ in foldr foldLine (genList (const 0) (length labels)) lines;
# Pad a string with spaces from the right (opposite of fixedWidthString).
pad = width: str: let
@@ -203,7 +203,7 @@ let
in str + optionalString (padWidth > 0) padding;
# It's + 2 here, because that's the amount of spacing between columns.
- fullWidth = fold (width: acc: acc + width + 2) 0 maxWidths;
+ fullWidth = foldr (width: acc: acc + width + 2) 0 maxWidths;
formatLine = line: concatStringsSep " " (zipListsWith pad maxWidths line);
diff --git a/nixos/modules/services/networking/autossh.nix b/nixos/modules/services/networking/autossh.nix
index a8d9a027e9f..245f2bfc2cf 100644
--- a/nixos/modules/services/networking/autossh.nix
+++ b/nixos/modules/services/networking/autossh.nix
@@ -79,7 +79,7 @@ in
systemd.services =
- lib.fold ( s : acc : acc //
+ lib.foldr ( s : acc : acc //
{
"autossh-${s.name}" =
let
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 064018057cd..790de4ace01 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -6,7 +6,6 @@ let
cfg = config.networking.networkmanager;
basePackages = with pkgs; [
- crda
modemmanager
networkmanager
networkmanager-fortisslvpn
@@ -404,6 +403,8 @@ in {
}
];
+ hardware.wirelessRegulatoryDatabase = true;
+
environment.etc = with pkgs; {
"NetworkManager/NetworkManager.conf".source = configFile;
diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix
index bfc358cb12f..a20fa615af8 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@@ -160,7 +160,7 @@ in
users.groups.nylon.gid = config.ids.gids.nylon;
- systemd.services = fold (a: b: a // b) {} nylonUnits;
+ systemd.services = foldr (a: b: a // b) {} nylonUnits;
};
}
diff --git a/nixos/modules/services/networking/quicktun.nix b/nixos/modules/services/networking/quicktun.nix
index fb783c83646..438e67d5ebb 100644
--- a/nixos/modules/services/networking/quicktun.nix
+++ b/nixos/modules/services/networking/quicktun.nix
@@ -87,7 +87,7 @@ with lib;
};
config = mkIf (cfg != []) {
- systemd.services = fold (a: b: a // b) {} (
+ systemd.services = foldr (a: b: a // b) {} (
mapAttrsToList (name: qtcfg: {
"quicktun-${name}" = {
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index b6afd83a9ab..9e433ad1a98 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -351,7 +351,7 @@ in
config = mkIf (cfg.networks != { }) {
- environment.etc = fold (a: b: a // b) { }
+ environment.etc = foldr (a: b: a // b) { }
(flip mapAttrsToList cfg.networks (network: data:
flip mapAttrs' data.hosts (host: text: nameValuePair
("tinc/${network}/hosts/${host}")
diff --git a/nixos/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix
index 35ff67937fc..f41b6ec2740 100644
--- a/nixos/modules/services/networking/wakeonlan.nix
+++ b/nixos/modules/services/networking/wakeonlan.nix
@@ -19,7 +19,7 @@ let
${ethtool} -s ${interface} ${methodParameter {inherit method password;}}
'';
- concatStrings = fold (x: y: x + y) "";
+ concatStrings = foldr (x: y: x + y) "";
lines = concatStrings (map (l: line l) interfaces);
in
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index c0a4ce40760..494d21cc867 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -241,7 +241,8 @@ in {
environment.systemPackages = [ package ];
services.dbus.packages = [ package ];
- services.udev.packages = [ pkgs.crda ];
+
+ hardware.wirelessRegulatoryDatabase = true;
# FIXME: start a separate wpa_supplicant instance per interface.
systemd.services.wpa_supplicant = let
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 4e2f25cd27f..d3e4923a993 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -125,7 +125,7 @@ let
else showWarnings config.warnings baseSystem;
# Replace runtime dependencies
- system = fold ({ oldDependency, newDependency }: drv:
+ system = foldr ({ oldDependency, newDependency }: drv:
pkgs.replaceDependency { inherit oldDependency newDependency drv; }
) baseSystemAssertWarn config.system.replaceRuntimeDependencies;
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index c6ec9acd54c..e183bc3648c 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -75,7 +75,7 @@ let
else "${convertedFont}");
});
- bootDeviceCounters = fold (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {}
+ bootDeviceCounters = foldr (device: attr: attr // { ${device} = (attr.${device} or 0) + 1; }) {}
(concatMap (args: args.devices) cfg.mirroredBoots);
convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {}
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index dd337de9869..06117d19af4 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -8,7 +8,7 @@ let
keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs;
keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs;
anyEncrypted =
- fold (j: v: v || j.encrypted.enable) false encDevs;
+ foldr (j: v: v || j.encrypted.enable) false encDevs;
encryptedFSOptions = {
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index d9f7ce5d2c3..ea13d396c46 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -333,15 +333,15 @@ in
set -eu
# if the pstore module is builtin it will have mounted the persistent store automatically. it may also be already mounted for other reasons.
${pkgs.util-linux}/bin/mountpoint -q /sys/fs/pstore || ${pkgs.util-linux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore
- # wait up to five seconds (arbitrary, happened within one in testing) for the backend to be registered and the files to appear. a systemd path unit cannot detect this happening; and succeeding after a restart would not start dependent units.
- TRIES=50
+ # wait up to 1.5 seconds for the backend to be registered and the files to appear. a systemd path unit cannot detect this happening; and succeeding after a restart would not start dependent units.
+ TRIES=15
while [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do
if (( $TRIES )); then
sleep 0.1
TRIES=$((TRIES-1))
else
echo "Persistent Storage backend was not registered in time." >&2
- exit 1
+ break
fi
done
'';
diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix
index f6ec6a0ec69..2c8e986fa86 100644
--- a/pkgs/applications/blockchains/chia/default.nix
+++ b/pkgs/applications/blockchains/chia/default.nix
@@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "chia";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "chia-blockchain";
rev = version;
- sha256 = "sha256-ZYncyaX9gqBhDKiC87A2xI7VeU0zGsmm3Sx45lwgnrg=";
+ sha256 = "sha256-yS0/Fy2dj8VIbwv2J9sehP0VN0f/YDxu1k9WkaeEz8M=";
};
patches = [
diff --git a/pkgs/applications/blockchains/lndmanage.nix b/pkgs/applications/blockchains/lndmanage.nix
index 56db469ff45..3c7e28d831e 100644
--- a/pkgs/applications/blockchains/lndmanage.nix
+++ b/pkgs/applications/blockchains/lndmanage.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "lndmanage";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "bitromortac";
repo = pname;
rev = "v${version}";
- sha256 = "19sqf7cjslwpfzcdbyq182dx7gnn9hii77sahbnh88v69qxgwzvb";
+ sha256 = "1p73wdxv3fca2ga4nqpjk5lig7bj2v230lh8niw490p5y7hhnggl";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d27c9c9af65..07e0a62b901 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,6 +1,7 @@
{ lib
, mkDerivation
, fetchurl
+, fetchFromGitHub
, poppler_utils
, pkg-config
, libpng
@@ -94,7 +95,15 @@ mkDerivation rec {
python
regex
sip
- zeroconf
+ (zeroconf.overrideAttrs (oldAttrs: rec {
+ version = "0.31.0";
+ src = fetchFromGitHub {
+ owner = "jstasiak";
+ repo = "python-zeroconf";
+ rev = version;
+ sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj";
+ };
+ }))
# the following are distributed with calibre, but we use upstream instead
odfpy
] ++ lib.optional (unrarSupport) unrardll
diff --git a/pkgs/applications/misc/coreaction/default.nix b/pkgs/applications/misc/coreaction/default.nix
new file mode 100644
index 00000000000..be9d02bf339
--- /dev/null
+++ b/pkgs/applications/misc/coreaction/default.nix
@@ -0,0 +1,41 @@
+{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }:
+
+mkDerivation rec {
+ pname = "coreaction";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore/coreapps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-5qEZNLvbgLoAOXij0wXoVw2iyvytsYZikSJDm6F6ddc=";
+ };
+
+ patches = [
+ ## Fix Plugin Error: "The shared library was not found." "libbatery.so"
+ (fetchpatch {
+ url = "https://gitlab.com/cubocore/coreapps/coreaction/-/commit/1d1307363614a117978723eaad2332e6e8c05b28.patch";
+ sha256 = "039x19rsm23l9vxd5mnbl6gvc3is0igahf47kv54v6apz2q72l3f";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtsvg
+ qtbase
+ libcsys
+ libcprime
+ ];
+
+ meta = with lib; {
+ description = "A side bar for showing widgets from the C Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/coreaction";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix
index 32ca4b0e06c..dc692b67730 100644
--- a/pkgs/applications/misc/corectrl/default.nix
+++ b/pkgs/applications/misc/corectrl/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec{
pname = "corectrl";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchFromGitLab {
owner = "corectrl";
repo = "corectrl";
rev = "v${version}";
- sha256 = "sha256-xRyc7FYzG8MnhQ8DjIUHYLeUZCZQdi4j1v1fG7F0+G8=";
+ sha256 = "sha256-o8u9WnkK/6VZ+wlJ9I5Ti6ADjV9VXraRGpSWkDQv5JQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/coregarage/default.nix b/pkgs/applications/misc/coregarage/default.nix
new file mode 100644
index 00000000000..6d665479764
--- /dev/null
+++ b/pkgs/applications/misc/coregarage/default.nix
@@ -0,0 +1,33 @@
+{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }:
+
+mkDerivation rec {
+ pname = "coregarage";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore/coreapps";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-2pOQwSj+QKwpHVJp7VCyq6QpVW5wLUf/BE7ReXrJ78s=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ libcprime
+ libarchive
+ libarchive-qt
+ ];
+
+ meta = with lib; {
+ description = "A settings manager for the C Suite";
+ homepage = "https://gitlab.com/cubocore/coreapps/coregarage";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 28c965a72b5..f722b2315c0 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -43,6 +43,20 @@ let
mv ./all/electrum/tests $out
'';
};
+
+ py = python3.override {
+ packageOverrides = self: super: {
+
+ aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec {
+ version = "0.18.7";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0";
+ };
+ });
+ };
+ };
+
in
python3.pkgs.buildPythonApplication {
@@ -66,7 +80,7 @@ python3.pkgs.buildPythonApplication {
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
- propagatedBuildInputs = with python3.pkgs; [
+ propagatedBuildInputs = with py.pkgs; [
aiohttp
aiohttp-socks
aiorpcx
@@ -87,7 +101,10 @@ python3.pkgs.buildPythonApplication {
ckcc-protocol
keepkey
trezor
- ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ];
+ ] ++ lib.optionals enableQt [
+ pyqt5
+ qdarkstyle
+ ];
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index b617e7b2ea1..3f71bd2be22 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.18.1";
+ version = "1.18.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1e231ed7122a753430d92f8c6240a99defa2b307d57f1a4cc3e48910269331a9";
+ sha256 = "786772ce774929ef1ba64d8394dbab329a72447fd8b930968bc1fb0aacdba567";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 6daafc204eb..377835489a2 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -75,15 +75,16 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
# https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
- gnSystemLibraries = [
+ gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [
"ffmpeg"
+ "snappy"
+ ] ++ [
"flac"
"libjpeg"
"libpng"
"libwebp"
"libxslt"
"opus"
- "snappy"
"zlib"
];
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index a6df334a97d..98197e90025 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,9 +31,9 @@
}
},
"dev": {
- "version": "93.0.4577.8",
- "sha256": "1x6i5bmcnj8bkpcb9gcyd1m9nzpq206yyprxrnpak117k7abr2b1",
- "sha256bin64": "0qjfb9jxr2gmwb1dsvl6yzz06vsjny2l3icrsdcm0pl6r6davk2w",
+ "version": "93.0.4577.15",
+ "sha256": "07gbpa1z6cnbmv8008y92ldg53w48rjx0slvgsrw4gk9cnvmnpz0",
+ "sha256bin64": "0sb3m2mbq6g3mnps7g6xziziwv6sng34410ww5jyx82mw0q0sxig",
"deps": {
"gn": {
"version": "2021-07-08",
diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix
index 6f5da5b92a6..2427570a59d 100644
--- a/pkgs/applications/networking/browsers/icecat-bin/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix
@@ -4,6 +4,7 @@
, autoPatchelfHook
, wrapGAppsHook
, gnome2
+, gtk2
, nss
, xdg-utils
, xorg
@@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf
glib
gnome2.GConf
- gnome2.gtk
+ gtk2
gtk3
libX11
libXScrnSaver
diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 374062f0d80..b98f6a79822 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloudflared";
- version = "2021.7.0";
+ version = "2021.7.3";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
- sha256 = "sha256-FQejuKBDUCCcEq9ZmSMigdvqowTurCYEhOiXQN7exIE=";
+ sha256 = "sha256-p9FNH5obQfEQZRoOr35ORH+6dwbcNgSXjARF9WA7t9E=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
index 46215db3eb5..add76012ad3 100644
--- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
@@ -1,5 +1,14 @@
-{ fetchFromGitHub, lib, stdenv, gnome, cmake, pkg-config,
- libappindicator-gtk3, gst_all_1, pcre }:
+{ fetchFromGitHub
+, lib
+, stdenv
+, gtkmm3
+, webkitgtk
+, cmake
+, pkg-config
+, libappindicator-gtk3
+, gst_all_1
+, pcre
+}:
stdenv.mkDerivation rec {
pname = "whatsapp-for-linux";
@@ -18,8 +27,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome.gtkmm
- gnome.webkitgtk
+ gtkmm3
+ webkitgtk
libappindicator-gtk3
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix
index ced8b2fd415..e82680e36b3 100644
--- a/pkgs/applications/networking/juju/default.nix
+++ b/pkgs/applications/networking/juju/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
- version = "2.9.7";
+ version = "2.9.9";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
- sha256 = "sha256-jGrN0tsLO8gmkyZ1zNYzZd29mCQgLP7lSF0LkOygbyc=";
+ sha256 = "sha256-36/fatztop2eB1z9DfnseQXw0Di3Wss72IfgdnKpsNU=";
};
- vendorSha256 = "sha256-0JNoOSNxJrJkph8OGzgQ7sdslnGC36e3Ap0uMpqriX0=";
+ vendorSha256 = "sha256-MH9lZNc9KevovZJCN2nClmqJbRSwYoQ4Jb0CXqBBUd0=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 53fe3d6f949..eff838256f5 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -42,11 +42,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
- version = "3.40.1";
+ version = "3.40.3";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g";
+ sha256 = "/SkjomENe/6212+FMLpAJkBOIf0nOrKKLFtQCJIeDVw=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
index 2e2b7da9a4c..feca7bd2018 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "notmuch-bower";
- version = "0.12";
+ version = "0.13";
src = fetchFromGitHub {
owner = "wangp";
repo = "bower";
rev = version;
- sha256 = "0hvvlbvad6h73iiyn9xshlj073p2ddchgh0pyizh9gi8niir4fn5";
+ sha256 = "0r5s16pc3ym5nd33lv9ljv1p1gpb7yysrdni4g7w7yvjrnwk35l6";
};
nativeBuildInputs = [ gawk mercury pandoc ];
@@ -18,10 +18,12 @@ stdenv.mkDerivation rec {
makeFlags = [ "PARALLEL=-j$(NIX_BUILD_CORES)" "bower" "man" ];
installPhase = ''
+ runHook preInstall
mkdir -p $out/bin
mv bower $out/bin/
mkdir -p $out/share/man/man1
mv bower.1 $out/share/man/man1/
+ runHook postInstall
'';
enableParallelBuilding = true;
@@ -29,8 +31,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/wangp/bower";
description = "A curses terminal client for the Notmuch email system";
- maintainers = with maintainers; [ erictapen ];
- license = licenses.gpl3;
+ maintainers = with maintainers; [ jgart ];
+ license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix
index bc960ac12d4..7ed9e00d3f8 100644
--- a/pkgs/applications/networking/mumble/overlay.nix
+++ b/pkgs/applications/networking/mumble/overlay.nix
@@ -8,8 +8,6 @@ in stdenv.mkDerivation {
inherit (mumble) src;
- phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
installPhase = ''
mkdir -p $out/lib
ln -s ${mumble}/lib/libmumble.so.1 $out/lib/
diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix
index e1936bf06a7..493cde9749b 100644
--- a/pkgs/applications/networking/pcloud/default.nix
+++ b/pkgs/applications/networking/pcloud/default.nix
@@ -15,13 +15,13 @@
# ^1 https://github.com/NixOS/nixpkgs/issues/69338
{
- # Build dependencies
- appimageTools, autoPatchelfHook, fetchzip, lib, stdenv,
+ # Build dependencies
+ appimageTools, autoPatchelfHook, fetchzip, lib, stdenv
- # Runtime dependencies;
- # A few additional ones (e.g. Node) are already shipped together with the
- # AppImage, so we don't have to duplicate them here.
- alsa-lib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev
+ # Runtime dependencies;
+ # A few additional ones (e.g. Node) are already shipped together with the
+ # AppImage, so we don't have to duplicate them here.
+, alsa-lib, dbus-glib, fuse, gnome, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev
}:
let
@@ -94,7 +94,7 @@ in stdenv.mkDerivation {
# This is required for the file picker dialog - otherwise pcloud just
# crashes
- export XDG_DATA_DIRS="${gnome.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
+ export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
exec "$out/app/pcloud"
EOF
diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 506f129d359..8159ae25167 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more
-, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3
+, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3
, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
freetype
gdk-pixbuf
gnome2.gtkglext
- gnome.webkitgtk
+ webkitgtk
gtk2
gtk2-x11
gtk3
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index d2251da7007..c9390e70d25 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -11,7 +11,8 @@ let
name = perl.name + "-wrapper-for-gnucash";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]);
- phases = [ "installPhase" ];
+ dontUnpack = true;
+
installPhase = ''
mkdir -p $out/bin
for script in ${perl}/bin/*; do
@@ -40,10 +41,10 @@ stdenv.mkDerivation rec {
})
];
- nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ];
+ nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ];
buildInputs = [
- boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales
+ boost icu libxml2 libxslt gettext isocodes gtk3 glibcLocales
webkitgtk dconf libofx aqbanking gwenhywfar libdbi
libdbiDrivers guile
perlWrapper perl
diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix
index eb2c0b0f1e7..db3c15454bb 100644
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
- version = "0.53.1";
+ version = "0.54.1";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "0hddq1nijxhr6kgf7gydw0nh07lh86fs8srkhm29ik4hmv8ch19p";
+ sha256 = "16sv938sdbs01byqwngrfqmzb81zfhvk72ar53l68cg8qjvzs5ml";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/biology/mrbayes/builder.sh b/pkgs/applications/science/biology/mrbayes/builder.sh
deleted file mode 100644
index 5b3a54946fc..00000000000
--- a/pkgs/applications/science/biology/mrbayes/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# builder for mrbayes - note: only builds on Unix
-
-source $stdenv/setup
-
-tar xvfz $src
-cd mrbayes-*
-make
-mkdir -p $out/bin
-cp -v mb $out/bin
diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix
index 9acfea1a146..e4c2bbe6565 100644
--- a/pkgs/applications/science/biology/mrbayes/default.nix
+++ b/pkgs/applications/science/biology/mrbayes/default.nix
@@ -1,18 +1,18 @@
-{lib, stdenv, fetchurl, readline}:
+{ lib, stdenv, fetchFromGitHub, readline }:
stdenv.mkDerivation rec {
- # FIXME: replace Makefile so we can build MPI & MAC support
+ pname = "mrbayes";
+ version = "3.2.7a";
- name = "mrbayes-3.1.2";
- src = fetchurl {
- url = "mirror://sourceforge/mrbayes/${name}.tar.gz";
- sha256 = "1x7j8ca5wjrqrxmcpvd375ydm3s2pbkzykv8xfhg1jc037g560n6";
+ src = fetchFromGitHub {
+ owner = "NBISweden";
+ repo = "MrBayes";
+ rev = "v${version}";
+ sha256 = "sha256-pkkxZ6YHRn/I1SJpT9A+EK4S5hWGmFdcDBJS0zh5mLA=";
};
- builder = ./builder.sh;
- buildInputs = [readline];
meta = with lib; {
- description = "Bayesian Inference of Phylogeny";
+ description = "Bayesian Inference of Phylogeny";
longDescription = ''
Bayesian inference of phylogeny is based upon a
quantity called the posterior probability distribution of trees, which is
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
MrBayes uses a simulation technique called Markov chain Monte Carlo (or
MCMC) to approximate the posterior probabilities of trees.
'';
- license = licenses.gpl2;
- homepage = "http://mrbayes.csit.fsu.edu/";
+ maintainers = with maintainers; [ ];
+ license = licenses.gpl2Plus;
+ homepage = "https://nbisweden.github.io/MrBayes/";
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index f48fe4b1ec4..a38055d9b21 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
};
- nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ];
+ nativeBuildInputs = [ pkg-config asciidoc ] ++ [ python wrapPython ];
buildInputs = [
- openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
+ openssl zlib libxml2 libxslt docbook_xsl luajit
];
pythonPath = [ pygments markdown ];
@@ -48,10 +48,15 @@ stdenv.mkDerivation rec {
preBuild = ''
mkdir -p git
tar --strip-components=1 -xf "$gitSrc" -C git
-
- makeFlagsArray+=(prefix="$out" CGIT_SCRIPT_PATH="$out/cgit/")
'';
+ makeFlags = [
+ "prefix=$(out)"
+ "CGIT_SCRIPT_PATH=$out/cgit/"
+ "CC=${stdenv.cc.targetPrefix}cc"
+ "AR=${stdenv.cc.targetPrefix}ar"
+ ];
+
# Install manpage.
postInstall = ''
# xmllint fails:
diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix
index b559a85d44c..d18ca43cbf7 100644
--- a/pkgs/applications/video/ccextractor/default.nix
+++ b/pkgs/applications/video/ccextractor/default.nix
@@ -4,13 +4,13 @@
with lib;
stdenv.mkDerivation rec {
pname = "ccextractor";
- version = "0.90";
+ version = "0.91";
src = fetchFromGitHub {
owner = "CCExtractor";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-NVFCwUZZVt8GrWXWyvoF8UrUZ/ix+GWubKtc3218k7o=";
+ sha256 = "sha256-VqJQaYzH8psQJfnDariV4q7SkDiXRz9byR51C8DzVEs=";
};
sourceRoot = "source/src";
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 352af7754c7..affc585ed35 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -38,7 +38,6 @@ let
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ dpkg ];
- phases = [ "unpackPhase" "installPhase" ];
unpackPhase = "dpkg-deb -x ${src} ./";
installPhase = ''
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 6098aeba051..7aee50d5064 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -8,6 +8,7 @@
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
+, ncurses
, onlyLibVLC ? false
, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook
, jackSupport ? false
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
- fluidsynth wayland wayland-protocols
+ fluidsynth wayland wayland-protocols ncurses
] ++ optional (!stdenv.hostPlatform.isAarch64) live555
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ])
diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh
deleted file mode 100644
index 210f11e1328..00000000000
--- a/pkgs/applications/virtualization/8086tiny/builder.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-
-source $stdenv/setup
-
-unpackPhase
-cd $sourceRoot
-
-make 8086tiny
-
-if [ $bios ]; then
- cd bios_source
- nasm -f bin bios.asm -o bios
- cd ..
-fi
-
-mkdir -p $out/bin $out/share/$name $out/share/doc/$name/images
-
-install -m 755 8086tiny $out/bin
-install -m 644 fd.img $out/share/$name/8086tiny-floppy.img
-install -m 644 bios_source/bios.asm $out/share/$name/8086tiny-bios-src.asm
-install -m 644 docs/8086tiny.css $out/share/doc/$name
-install -m 644 docs/doc.html $out/share/doc/$name
-for i in docs/images/*.gif
-do
- install -m 644 $i $out/share/doc/$name/images
-done
-if [ $bios ]; then
- install -m 644 bios_source/bios $out/share/$name/8086tiny-bios
-else
- install -m 644 bios $out/share/$name/8086tiny-bios
-fi
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
deleted file mode 100644
index c58d488f583..00000000000
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, localBios ? true, nasm ? null
-, sdlSupport ? true, SDL ? null }:
-
-assert sdlSupport -> (SDL != null);
-
-stdenv.mkDerivation rec {
-
- pname = "8086tiny";
- version = "1.25";
-
- src = fetchFromGitHub {
- owner = "adriancable";
- repo = pname;
- rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a";
- sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w";
- };
-
- buildInputs = with lib;
- optionals localBios [ nasm ]
- ++ optionals sdlSupport [ SDL ];
-
- bios = localBios;
-
- builder = ./builder.sh;
-
- meta = with lib; {
- description = "An open-source small 8086 emulator";
- longDescription = ''
- 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts)
- Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS
- Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny
- emulates a "late 80's era" PC XT-type machine.
-
- 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the
- "unobfuscated" version :)
- '';
- homepage = "https://github.com/adriancable/8086tiny";
- license = licenses.mit;
- maintainers = [ maintainers.AndersonTorres ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/virtualization/tiny8086/default.nix b/pkgs/applications/virtualization/tiny8086/default.nix
new file mode 100644
index 00000000000..60d69432cde
--- /dev/null
+++ b/pkgs/applications/virtualization/tiny8086/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, localBios ? true
+, nasm
+, sdlSupport ? true
+, SDL
+}:
+
+stdenv.mkDerivation rec {
+ pname = "8086tiny";
+ version = "1.25";
+
+ src = fetchFromGitHub {
+ owner = "adriancable";
+ repo = pname;
+ rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a";
+ sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w";
+ };
+
+ buildInputs = lib.optional localBios nasm
+ ++ lib.optional sdlSupport SDL;
+
+ makeFlags = [ "8086tiny" ];
+
+ postBuild = lib.optionalString localBios ''
+ (
+ cd bios_source
+ nasm -f bin bios.asm -o bios
+ )
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images
+
+ install -m 755 8086tiny $out/bin
+ install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img
+ install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm
+ install -m 644 docs/8086tiny.css $out/share/doc/8086tiny
+ install -m 644 docs/doc.html $out/share/doc/$name
+
+ for i in docs/images/\*.gif; do
+ install -m 644 $i $out/share/doc/8086tiny/images
+ done
+
+ ${if localBios then
+ "install -m 644 bios_source/bios $out/share/8086tiny/8086tiny-bios"
+ else
+ "install -m 644 bios $out/share/8086tiny/8086tiny-bios"}
+ '';
+
+ meta = with lib; {
+ description = "An open-source small 8086 emulator";
+ longDescription = ''
+ 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts)
+ Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS
+ Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny
+ emulates a "late 80's era" PC XT-type machine.
+
+ 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the
+ "unobfuscated" version :)
+ '';
+ homepage = "https://github.com/adriancable/8086tiny";
+ license = licenses.mit;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix
index 056c56b4118..205fcabc713 100644
--- a/pkgs/data/misc/xorg-rgb/default.nix
+++ b/pkgs/data/misc/xorg-rgb/default.nix
@@ -1,20 +1,22 @@
-{lib, stdenv, fetchurl, pkg-config, xorgproto}:
+{ lib, stdenv, fetchurl, pkg-config, xorgproto }:
+
stdenv.mkDerivation rec {
pname = "rgb";
version = "1.0.6";
src = fetchurl {
- url = "http://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2";
+ url = "https://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2";
sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv";
};
- nativeBuildInputs = [pkg-config];
- buildInputs = [xorgproto];
- meta = {
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ xorgproto ];
+
+ meta = with lib; {
description = "X11 colorname to RGB mapping database";
- license = lib.licenses.mit;
- maintainers = [lib.maintainers.raskin];
- platforms = lib.platforms.linux;
- homepage = "http://xorg.freedesktop.org/";
+ license = licenses.mit;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.linux;
+ homepage = "https://xorg.freedesktop.org/";
};
}
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index 5fdfc0db1d6..936c4578ea3 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
buildInputs = [
# TODO: review if we really need this all
- (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 pam pexpect distro ]))
+ (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro ]))
atk
cacert
cinnamon-control-center
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index a0c02e26db0..08f0ee22714 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -34,13 +34,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
- version = "0.9+4052";
+ version = "0.9+4221";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
- rev = "687f381b6985d9dda7e11535628e2fafff267af5";
- sha256 = "15lcj798ckh9zwvdqb5gnvicilsxjyxv01gcviijg310hq62n7vf";
+ rev = "9600f20be887b707f6d5d3f74dec58b336e2464e";
+ sha256 = "0xbvbnhc6qvcq1c8zxfyf4ws959c824z660nrghfxyzkrjl8wi1h";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
index 0253df176ed..083741d58e9 100644
--- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
+++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix
@@ -1,7 +1,7 @@
{ fetchFromGitHub, lib, mkDerivation, standard-library }:
mkDerivation rec {
- version = "0.3";
+ version = "0.4";
pname = "functional-linear-algebra";
buildInputs = [ standard-library ];
@@ -10,7 +10,7 @@ mkDerivation rec {
repo = "functional-linear-algebra";
owner = "ryanorendorff";
rev = "v${version}";
- sha256 = "032gl35x1qzaigc3hbg9dc40zr0nyjld175cb9m8b15rlz9xzjn2";
+ sha256 = "05jk3792k9xf8iiwzm2hwlvd25f2pqqr3gppmqjf8xb9199i8fk0";
};
preConfigure = ''
@@ -18,8 +18,6 @@ mkDerivation rec {
'';
meta = with lib; {
- # Remove if a version compatible with agda 2.6.2 is made
- broken = true;
homepage = "https://github.com/ryanorendorff/functional-linear-algebra";
description = ''
Formalizing linear algebra in Agda by representing matrices as functions
diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix
index ba4155db1e3..b5b4bc556f6 100644
--- a/pkgs/development/libraries/eventlog/default.nix
+++ b/pkgs/development/libraries/eventlog/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
- meta = {
+ meta = with lib; {
description = "Syslog event logger library";
longDescription = ''
The EventLog library aims to be a replacement of the simple syslog() API
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
combination of description and tag/value pairs.
'';
homepage = "https://www.balabit.com/support/community/products/";
- license = lib.licenses.bsd3;
- platforms = lib.platforms.unix;
+ license = licenses.bsd3;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libcsys/default.nix b/pkgs/development/libraries/libcsys/default.nix
new file mode 100644
index 00000000000..cec6e501bb5
--- /dev/null
+++ b/pkgs/development/libraries/libcsys/default.nix
@@ -0,0 +1,31 @@
+{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja, }:
+
+mkDerivation rec {
+ pname = "libcsys";
+ version = "4.2.0";
+
+ src = fetchFromGitLab {
+ owner = "cubocore";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-9LH95uJJIn4FHfnikGi5UCI6nUNW+1cSZnJ/KpZDI5Y=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ buildInputs = [
+ qtbase
+ udisks2
+ ];
+
+ meta = with lib; {
+ description = "Library for managing drive and getting system resource information in real time";
+ homepage = "https://gitlab.com/cubocore/libcsys";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index be328c54c08..47cd849f92c 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv
-, fetchurl, autoreconfHook, gettext
+, fetchurl, autoreconfHook, gettext, netbsd
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
# on Darwin, so disable NLS for now.
++ lib.optional stdenv.hostPlatform.isDarwin "--disable-nls";
- nativeBuildInputs = [ gettext ]
+ nativeBuildInputs =
+ if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ]
# Need to regenerate configure script with newer version in order to pass
# "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper`
# which doesn't work with the bootstrapTools bash, so can only do this
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 45d5e0a40eb..46f2751938e 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python ];
- buildInputs =
- [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
- libwebp proj python sqlite zlib
+ buildInputs = [
+ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
+ libwebp proj python sqlite zlib
- # optional inputs
- postgresql
- ];
+ # optional inputs
+ postgresql
+ ];
propagatedBuildInputs = [ libxml2 ];
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 4c21eb27422..f4bfa96a6ff 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -1,8 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+}:
stdenv.mkDerivation rec {
pname = "wolfssl";
- version = "4.8.0";
+ version = "4.8.1";
src = fetchFromGitHub {
owner = "wolfSSL";
@@ -11,12 +15,25 @@ stdenv.mkDerivation rec {
sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h";
};
- # almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed
- configureFlags = [ "--enable-all" "--enable-reproducible-build" "--enable-pkcs11" "--enable-tls13" "--enable-base64encode" ];
+ # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed
+ configureFlags = [
+ "--enable-all"
+ "--enable-base64encode"
+ "--enable-pkcs11"
+ "--enable-reproducible-build"
+ "--enable-tls13"
+ ];
- outputs = [ "out" "dev" "doc" "lib" ];
+ outputs = [
+ "dev"
+ "doc"
+ "lib"
+ "out"
+ ];
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [
+ autoreconfHook
+ ];
postInstall = ''
# fix recursive cycle:
@@ -28,9 +45,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A small, fast, portable implementation of TLS/SSL for embedded devices";
- homepage = "https://www.wolfssl.com/";
- platforms = platforms.all;
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ mcmtroffaes ];
+ homepage = "https://www.wolfssl.com/";
+ platforms = platforms.all;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ fab mcmtroffaes ];
};
}
diff --git a/pkgs/development/ocaml-modules/pecu/default.nix b/pkgs/development/ocaml-modules/pecu/default.nix
index 0059bbdec3c..22c1913635f 100644
--- a/pkgs/development/ocaml-modules/pecu/default.nix
+++ b/pkgs/development/ocaml-modules/pecu/default.nix
@@ -1,21 +1,21 @@
-{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest }:
+{ lib, buildDunePackage, ocaml, fetchurl, fmt, alcotest, crowbar, astring }:
buildDunePackage rec {
pname = "pecu";
- version = "0.5";
+ version = "0.6";
useDune2 = true;
minimumOCamlVersion = "4.03";
src = fetchurl {
- url = "https://github.com/mirage/pecu/releases/download/v0.5/pecu-v0.5.tbz";
- sha256 = "713753cd6ba3f4609a26d94576484e83ffef7de5f2208a2993576a1b22f0e0e7";
+ url = "https://github.com/mirage/pecu/releases/download/v${version}/pecu-v${version}.tbz";
+ sha256 = "a9d2b7da444c83b20f879f6c3b7fc911d08ac1e6245ad7105437504f9394e5c7";
};
- # fmt availability
- doCheck = lib.versionAtLeast ocaml.version "4.05";
- checkInputs = [ fmt alcotest ];
+ # crowbar availability
+ doCheck = lib.versionAtLeast ocaml.version "4.08";
+ checkInputs = [ fmt alcotest crowbar astring ];
meta = with lib; {
description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)";
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 6d468b5f480..b9ee3af9ed8 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -1,21 +1,26 @@
{ lib
, buildPythonPackage
-, pythonOlder
-, fetchPypi
+, fetchFromGitHub
+, mock
, protobuf
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
, zeroconf
}:
buildPythonPackage rec {
pname = "aioesphomeapi";
- version = "5.0.1";
+ version = "5.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-2IxXhAysQiqqEd4Mfjgc5vX0+D60rof2nPJDXy9tRVs=";
+ src = fetchFromGitHub {
+ owner = "esphome";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "09hhkwkphyqa31yd1mmpz8xmyz6hav8vwf36v8xc4v6g1xm9l6f5";
};
propagatedBuildInputs = [
@@ -23,8 +28,11 @@ buildPythonPackage rec {
zeroconf
];
- # no tests implemented
- doCheck = false;
+ checkInputs = [
+ mock
+ pytest-asyncio
+ pytestCheckHook
+ ];
pythonImportsCheck = [
"aioesphomeapi"
diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix
index 8e2078f5212..eae5b4a537c 100644
--- a/pkgs/development/python-modules/aiorpcx/default.nix
+++ b/pkgs/development/python-modules/aiorpcx/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "aiorpcx";
- version = "0.18.7";
+ version = "0.22.1";
src = fetchPypi {
inherit version;
pname = "aiorpcX";
- sha256 = "808a9ec9172df11677a0f7b459b69d1a6cf8b19c19da55541fa31fb1afce5ce7";
+ sha256 = "0lx54bcinp44fmr8q4bbffsqbkg8kdcwykf9i5jj0bj3sfzgf9k0";
};
propagatedBuildInputs = [ attrs ];
diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix
index 17d9160ce56..3f9faad56e0 100644
--- a/pkgs/development/python-modules/aiowinreg/default.nix
+++ b/pkgs/development/python-modules/aiowinreg/default.nix
@@ -3,23 +3,28 @@
, fetchPypi
, pythonOlder
, winacl
+, prompt_toolkit
}:
buildPythonPackage rec {
pname = "aiowinreg";
- version = "0.0.5";
+ version = "0.0.6";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "096663ec3db35fdc7ccc1c2d0d64a11cf64f4baa48955088e42b6a649ce418a5";
+ sha256 = "0h0r9xrz1n8y75f2p21f7phqrlpsymyiipmgzr0lj591irzjmjjy";
};
- propagatedBuildInputs = [ winacl ];
+ propagatedBuildInputs = [
+ prompt_toolkit
+ winacl
+ ];
# Project doesn't have tests
doCheck = false;
+
pythonImportsCheck = [ "aiowinreg" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix
index 772b8fbaa04..dc132d102f2 100644
--- a/pkgs/development/python-modules/amcrest/default.nix
+++ b/pkgs/development/python-modules/amcrest/default.nix
@@ -4,26 +4,30 @@
, fetchFromGitHub
, mock
, pytestCheckHook
+, pythonOlder
, requests
, responses
, urllib3
+, typing-extensions
}:
buildPythonPackage rec {
pname = "amcrest";
- version = "1.7.2";
+ version = "1.8.0";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "tchellomello";
repo = "python-amcrest";
rev = version;
- sha256 = "06gbrshf6vqvq3k813d1w37k2kmps0g6msa4lp2f9xvzw3iczshy";
+ sha256 = "180c0g840vh8dg4f08j0r29pdnhisav93d3axfvicd8fsb2cn36g";
};
propagatedBuildInputs = [
argcomplete
requests
urllib3
+ typing-extensions
];
checkInputs = [
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 4c6a5e19078..ac34c336cad 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "anyio";
- version = "3.2.1";
+ version = "3.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "agronholm";
repo = pname;
rev = version;
- sha256 = "0fiqzsgr9c0yicsh1pwhyc6z4qyr2ng42dakyy4a81w9cff38had";
+ sha256 = "sha256-bMnAijFLXZSgTWsalT/J4sJ0Jrc1kFaQHJArwXnQFaQ=";
};
preBuild = ''
@@ -57,8 +57,13 @@ buildPythonPackage rec {
mock
];
+ disabledTests = [
+ # block devices access
+ "test_is_block_device"
+ ];
+
disabledTestPaths = [
- # lots of DNS lookups
+ # lots of DNS lookups
"tests/test_sockets.py"
] ++ lib.optionals stdenv.isDarwin [
# darwin sandboxing limitations
diff --git a/pkgs/development/python-modules/async-dns/default.nix b/pkgs/development/python-modules/async-dns/default.nix
index 3067269aac9..375e72d24fd 100644
--- a/pkgs/development/python-modules/async-dns/default.nix
+++ b/pkgs/development/python-modules/async-dns/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "async-dns";
- version = "1.1.10";
+ version = "2.0.0";
disabled = pythonOlder "3.6";
format = "pyproject";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "gera2ld";
repo = "async_dns";
rev = "v${version}";
- sha256 = "1yxmdlf2n66kp2mprsd4bvfsf63l4c4cfkjm2rm063pmlifz2fvj";
+ sha256 = "0vn7hxvpzikd7q61a27fwzal4lwsra2063awyr6fjpy6lh3cjdwf";
};
nativeBuildInputs = [
@@ -26,7 +26,7 @@ buildPythonPackage rec {
checkPhase = ''
export HOME=$TMPDIR
# Test needs network access
- rm tests/test_resolver.py
+ rm -r tests/resolver
${python.interpreter} -m unittest
'';
diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix
index e75e474bdab..9592deccc6c 100644
--- a/pkgs/development/python-modules/blspy/default.nix
+++ b/pkgs/development/python-modules/blspy/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "blspy";
- version = "1.0.2";
+ version = "1.0.5";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-N1mk83uZrzSty2DyXfKiVp85z/jmztiUSRXKfNBRJV4=";
+ hash = "sha256-uDXzAdGzfyRbsMVllLNd3DK8F/GfovdX293z5Mel6eg=";
};
patches = [
diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch
index f9c41d9420b..416163a744b 100644
--- a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch
+++ b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch
@@ -23,7 +23,7 @@ index faecc61..3272116 100644
-if (DEFINED ENV{RELIC_MAIN})
- set(RELIC_GIT_TAG "origin/main")
-else ()
-- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c")
+- set(RELIC_GIT_TAG "b7b2266a0e4ee6f628f61d3ab638f524a18b52f1")
-endif ()
-
-message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}")
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 65919542057..8d8e5ec00dc 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
- python, twisted, jinja2, zope_interface, sqlalchemy,
- sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq,
- txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial,
- isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
- parameterized, git, openssh, glibcLocales, ldap3, nixosTests }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
+, python, twisted, jinja2, zope_interface, sqlalchemy
+, sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq
+, txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial
+, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins
+, parameterized, git, openssh, glibcLocales, ldap3, nixosTests
+}:
let
withPlugins = plugins: buildPythonPackage {
@@ -56,7 +57,7 @@ let
boto3
moto
mock
- python-lz4
+ lz4
setuptoolsTrial
isort
pylint
diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix
index e9f4e326654..587c2fbf3c7 100644
--- a/pkgs/development/python-modules/chiapos/default.nix
+++ b/pkgs/development/python-modules/chiapos/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "chiapos";
- version = "1.0.3";
+ version = "1.0.4";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-2Ye0gaOsv/Hg1363E6+NmezsK9EcLEZVKKUHikM2hr0=";
+ sha256 = "sha256-flI1vwtD0H28UDMcEEELECewkXZ6vf/XEYMqRKy5R6w=";
};
patches = [
diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
index dc1cfddcc41..25102116969 100644
--- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
+++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
@@ -3,7 +3,7 @@ index 9b4a2f5..86f849c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,22 +18,19 @@ include(FetchContent)
-
+ else()
FetchContent_Declare(
pybind11-src
- GIT_REPOSITORY https://github.com/pybind/pybind11.git
@@ -11,6 +11,7 @@ index 9b4a2f5..86f849c 100644
+ SOURCE_DIR @pybind11_src@
)
FetchContent_MakeAvailable(pybind11-src)
+ endif()
FetchContent_Declare(
cxxopts
diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix
index 6d18a7ba6d1..f374378d986 100644
--- a/pkgs/development/python-modules/gast/default.nix
+++ b/pkgs/development/python-modules/gast/default.nix
@@ -1,28 +1,18 @@
{ lib
, fetchFromGitHub
-, fetchpatch
, buildPythonPackage
, astunparse
}:
buildPythonPackage rec {
pname = "gast";
- version = "0.5.0";
-
- # TODO: remove this patch on the next release, this fixes a bug with parsing
- # assignment expressions e.g., `x := 1`.
- patches = [
- (fetchpatch {
- url = "https://github.com/serge-sans-paille/gast/commit/3cc9b4d05a80e4bb42882de00df314aaa1e6e591.patch";
- sha256 = "0ylpn0x0a4y6139vd048blsh77yd08npjcn4b5ydf89xnji5mlm1";
- })
- ];
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "serge-sans-paille";
repo = "gast";
rev = version;
- sha256 = "0qsg36knv0k2ppzbr5m4w6spxxw7a77lw88y8vjx7m176bajnsbw";
+ sha256 = "1gph45frnj47lfr6idiyxrb3gk7vzc9rni9cijmcyz10dyx5kgwa";
};
checkInputs = [ astunparse ];
diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix
index 898737ca7b4..fe5f8ae9f11 100644
--- a/pkgs/development/python-modules/inotify-simple/default.nix
+++ b/pkgs/development/python-modules/inotify-simple/default.nix
@@ -2,17 +2,19 @@
buildPythonPackage rec {
pname = "inotify-simple";
- version = "1.2.1";
+ version = "1.3.5";
src = fetchPypi {
pname = "inotify_simple";
inherit version;
- sha256 = "132craajflksgxxwjawj73nn1ssv8jn58j3k5vvyiq03avbz4sfv";
+ sha256 = "0a61bh087cq5wfrvz680hg5pmykb9gmy26kwyn6ims2akkjgyh44";
};
# The package has no tests
doCheck = false;
+ pythonImportsCheck = [ "inotify_simple" ];
+
meta = with lib; {
description = "A simple Python wrapper around inotify";
homepage = "https://github.com/chrisjbillington/inotify_simple";
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index e8d2ced7602..aad27b5ae63 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -5,7 +5,7 @@
, stdenv
, numpydoc
, pytestCheckHook
-, python-lz4
+, lz4
, setuptools
, sphinx
}:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
};
checkInputs = [ sphinx numpydoc pytestCheckHook ];
- propagatedBuildInputs = [ python-lz4 setuptools ];
+ propagatedBuildInputs = [ lz4 setuptools ];
pytestFlagsArray = [ "joblib/test" ];
disabledTests = [
diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
similarity index 100%
rename from pkgs/development/python-modules/python-lz4/default.nix
rename to pkgs/development/python-modules/lz4/default.nix
diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix
index 354eace5047..6605009b8fd 100644
--- a/pkgs/development/python-modules/matrix-client/default.nix
+++ b/pkgs/development/python-modules/matrix-client/default.nix
@@ -1,25 +1,40 @@
{ lib
, buildPythonPackage
, fetchPypi
+, pytestCheckHook
, requests
-, pytest, pytest-runner, responses
+, responses
+, urllib3
}:
buildPythonPackage rec {
pname = "matrix_client";
- version = "0.3.2";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw";
+ sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06";
};
- checkInputs = [ pytest pytest-runner responses ];
+ propagatedBuildInputs = [
+ requests
+ urllib3
+ ];
- propagatedBuildInputs = [ requests ];
+ checkInputs = [
+ pytestCheckHook
+ responses
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py --replace \
+ "pytest-runner~=5.1" ""
+ '';
+
+ pythonImportsCheck = [ "matrix_client" ];
meta = with lib; {
- description = "Matrix Client-Server SDK";
+ description = "Python Matrix Client-Server SDK";
homepage = "https://github.com/matrix-org/matrix-python-sdk";
license = licenses.asl20;
maintainers = with maintainers; [ olejorgenb ];
diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix
index b9553765fb4..22dbea2cd51 100644
--- a/pkgs/development/python-modules/nexia/default.nix
+++ b/pkgs/development/python-modules/nexia/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "nexia";
- version = "0.9.10";
+ version = "0.9.11";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bdraco";
repo = pname;
rev = version;
- sha256 = "0k97i243ap1sap5smvfmpsjqzkx5adjvi14awv82pcp52ckzkbi9";
+ sha256 = "0ql08nfvh6rjhjdh78gzih7az95m0fc9wxc22yqmlc9grifnp9i5";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix
index 8184c6d0d18..d4a07857e3a 100644
--- a/pkgs/development/python-modules/pglast/default.nix
+++ b/pkgs/development/python-modules/pglast/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pglast";
- version = "3.0";
+ version = "3.3";
# PyPI tarball does not include all the required files
src = fetchFromGitHub {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "0yi24wj19rzw5dvppm8g3hnfskyzbrqw14q8x9f2q5zi8g6xnnrd";
+ sha256 = "0l7nvbs1x1qil6mc0rxk7925i5xr3nbqnv0vakx3yv911kj3yhgv";
};
disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix
index cb72e69af77..a115d42472a 100644
--- a/pkgs/development/python-modules/prawcore/default.nix
+++ b/pkgs/development/python-modules/prawcore/default.nix
@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "prawcore";
- version = "2.2.0";
+ version = "2.3.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "bde42fad459c4dcfe0f22a18921ef4981ee7cd286ea1de3eb697ba91838c9123";
+ sha256 = "0vgmhjddqxnz5vy70dyqvakak51fg1nk6j3xavkc83d8nzacrwfs";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyrituals/default.nix b/pkgs/development/python-modules/pyrituals/default.nix
index 6b3b9f91c1e..e7674fd3ea7 100644
--- a/pkgs/development/python-modules/pyrituals/default.nix
+++ b/pkgs/development/python-modules/pyrituals/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyrituals";
- version = "0.0.5";
+ version = "0.0.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "milanmeu";
repo = pname;
rev = version;
- sha256 = "sha256-iWJhjAUXkoH3MMJ5PFj2rjIy2e0nn57cRoEF6KMfrQg=";
+ sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g";
};
propagatedBuildInputs = [ aiohttp ];
diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index 228e0d74ebc..3a4e4af54de 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -1,26 +1,29 @@
{ lib
, buildPythonPackage
+, fetchFromGitHub
, isPyPy
, python
-, pkgs
, pillow
, pycairo
+, pkg-config
+, boost
+, cairo
+, harfbuzz
+, icu
+, libjpeg
+, libpng
+, libtiff
+, libwebp
+, mapnik
+, proj
+, zlib
}:
-let
- boost = pkgs.boost.override {
- enablePython = true;
- inherit python;
- };
- mapnik = pkgs.mapnik.override {
- inherit python boost;
- };
-
-in buildPythonPackage rec {
+buildPythonPackage rec {
pname = "python-mapnik";
version = "unstable-2020-02-24";
- src = pkgs.fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "mapnik";
repo = "python-mapnik";
rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b";
@@ -29,10 +32,8 @@ in buildPythonPackage rec {
disabled = isPyPy;
doCheck = false; # doesn't find needed test data files
- preBuild = let
- pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
- in ''
- export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
+ preBuild = ''
+ export BOOST_PYTHON_LIB="boost_python${"${lib.versions.major python.version}${lib.versions.minor python.version}"}"
export BOOST_THREAD_LIB="boost_thread"
export BOOST_SYSTEM_LIB="boost_system"
export PYCAIRO=true
@@ -40,7 +41,7 @@ in buildPythonPackage rec {
nativeBuildInputs = [
mapnik # for mapnik_config
- pkgs.pkgconfig
+ pkg-config
];
patches = [
@@ -50,7 +51,6 @@ in buildPythonPackage rec {
buildInputs = [
mapnik
boost
- ] ++ (with pkgs; [
cairo
harfbuzz
icu
@@ -60,15 +60,16 @@ in buildPythonPackage rec {
libwebp
proj
zlib
- ]);
+ ];
+
propagatedBuildInputs = [ pillow pycairo ];
- pythonImportsCheck = [ "mapnik" ] ;
+ pythonImportsCheck = [ "mapnik" ];
meta = with lib; {
description = "Python bindings for Mapnik";
+ maintainers = with maintainers; [ ];
homepage = "https://mapnik.org";
- license = licenses.lgpl21;
+ license = licenses.lgpl21;
};
-
}
diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix
index cf445fd9681..779703723ee 100644
--- a/pkgs/development/python-modules/pytile/default.nix
+++ b/pkgs/development/python-modules/pytile/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pytile";
- version = "5.2.2";
+ version = "5.2.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-oVtTR5zucYvnaPO0i4sEBBU4nafq7GUfx3kPdSvptDo=";
+ sha256 = "01gxq6dbqjmsqndjcbqv79wd2wgs7krm0rn47k883gh2xg9sn606";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index 07f21881c50..202c8254f6b 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -1,21 +1,21 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchFromGitHub
-, isPy27
-, lib
+, pythonOlder
, pytestCheckHook
, tokenize-rt
}:
buildPythonPackage rec {
pname = "pyupgrade";
- version = "2.21.0";
- disabled = isPy27;
+ version = "2.23.0";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "asottile";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-W0zaziTkXReEuLhcd6jEHH/dS1YSZNiWDro+tTH7Ftg=";
+ sha256 = "0w1r9s3kr539vwfb7ld7jmr8q4jkr7jsnk51x50wji7jzs627a8i";
};
checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix
index 6a557a1eff5..38faa10a928 100644
--- a/pkgs/development/python-modules/ttp/default.nix
+++ b/pkgs/development/python-modules/ttp/default.nix
@@ -19,14 +19,14 @@ let
in
buildPythonPackage rec {
pname = "ttp";
- version = "0.7.1";
+ version = "0.7.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "dmulyalin";
repo = pname;
rev = version;
- sha256 = "1fmg5gz297bpr550s4vfq6vs7j042bp1mrdmqz1b7nz29c2khbz6";
+ sha256 = "sha256-dYjE+EMfCVHLRAqT1KM7o8VEopJ/TwAEMphYXuj38Wk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix
new file mode 100644
index 00000000000..6829df668b2
--- /dev/null
+++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, httpretty, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "youtube-transcript-api";
+ version = "0.4.1";
+
+ # PyPI tarball is missing some test files
+ src = fetchFromGitHub {
+ owner = "jdepoix";
+ repo = "youtube-transcript-api";
+ rev = "v${version}";
+ sha256 = "1gpk13j1n2bifwsg951gmrfnq8kfxjr15rq46dxn1bhyk9hr1zql";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ checkInputs = [ mock httpretty pytestCheckHook ];
+
+ pythonImportsCheck = [ "youtube_transcript_api" ];
+
+ meta = with lib; {
+ description = "Python API which allows you to get the transcripts/subtitles for a given YouTube video";
+ homepage = "https://github.com/jdepoix/youtube-transcript-api";
+ license = licenses.mit;
+ maintainers = [ maintainers.marsam ];
+ };
+}
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 680217acfbb..ffd3b78cedd 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -17,7 +17,7 @@ let
inherit sha256;
};
- phases = "installPhase";
+ dontUnpack = true;
installPhase = ''
install -Dm755 $src $out/bin/amm
diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index a093dd31c10..cc991af145b 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1r4z0z2c1drjd4ynpf36dklxs3hq1wdnzh63mk2yk4mmk75xg4mk";
};
- phases = [ "installPhase" ];
+ dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix
index 75fb29db882..8b34f981a6e 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cloud-nuke";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-rxWTh+iltD1kcntlu9sovwG/mQPmukYbw8V2FAFi1KE=";
+ sha256 = "sha256-eua+/bfKuIG1TuoC0tA4+O0H2D+u8AbcJIFLDIbzVYg=";
};
- vendorSha256 = "sha256-mfNbcnJ62v6tdEhOtA0P9lDoD5HmLBAtNcrv1H3/mSE=";
+ vendorSha256 = "sha256-+rr9TDRIYta0ejOE48O+nZDluvqvSTuGBpRBPZifazA=";
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix
index 6578bf8bf71..975254b83d7 100644
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec {
click
colorama
configparser
- diff_cover
+ diff-cover
jinja2
oyaml
pathspec
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 07a094dd0e8..1c23ca5bf8d 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -105,23 +105,23 @@ rec {
headers = "0c7qms8vbirblg6z86s19p5l472p3h8lw1rj7ckgnwna4b68vn33";
};
- electron_12 = mkElectron "12.0.14" {
- x86_64-linux = "a75886b5aad27c64232ec0ec47d8c3c1d696ab968007cd8bfa5db87b33e8a5e7";
- x86_64-darwin = "03b30610f23be9ef835a78e9d4babc52ff32e29ff33c51218b1b8970c3bd6062";
- i686-linux = "0bb86208173da28250f261b162657c3614b859fb561df54cbd25b566d619c75c";
- armv7l-linux = "bd743c6eec434aedb80e7e5eef58dfe9f133bc48015d263dc12a119dd1276e32";
- aarch64-linux = "1f287496cc61c67db25339f8f79d09ace952edeaca47ea664766425ceaebc2a3";
- aarch64-darwin = "50171b32c927ab5b658da5b4459eca5ddb5df89cc655ae753cc6d02b4ed9b30d";
- headers = "1znhnily1gl2f58f0ny1fa3yilmm4xn5fcdvqkjh4czv5c12rrbg";
+ electron_12 = mkElectron "12.0.15" {
+ x86_64-linux = "0ba1803ba64f2c155dcfc5452a4b7c034390aaea6197395b6195693b5d0bf605";
+ x86_64-darwin = "7da73a8e3eb82a035f0d720709dbbb44cac0166d52ad4858fca9f3d96e6a32ed";
+ i686-linux = "597f5710e6e55e4fb75c769af6e3c7db1924f6795f417e3ff6b37c4da2ae39fc";
+ armv7l-linux = "01138b036812e5461a5871c2f8912baf0adf316df6597eb5c4fd3df8d41fb95e";
+ aarch64-linux = "fe24cf90e3768cafa9939a0107261a97b4f132f9dec24bf0d1d15b591cdad2d6";
+ aarch64-darwin = "c48323f1fd6cd4ebc67a248a83bd7c460a640bf32613d4fecf6be705f3d6803c";
+ headers = "1gbnjgf1pfbca2czn8j74rafiwmgc64nxi6drzm1b7qy2f6lxrl0";
};
- electron_13 = mkElectron "13.1.6" {
- x86_64-linux = "6f28af0a3ccb20b0d2e4f26ea4698d5b89b81e860cbd40a446c2a8223fdf0101";
- x86_64-darwin = "e2bde9b3b2ee092b80d18439780c4ecb4620da1ead9fcae00cc603f3a56fda3e";
- i686-linux = "7c266148fba83c3eb912c5ccd7cd7c24829bc93b380378cba0480b02c38f5d42";
- armv7l-linux = "8d54ec6babc06b118038d2d4f49cab84ec6d5617c645266b88dd829c02354e77";
- aarch64-linux = "d24ba0e3f8624ec611fb2e9165c08b227ba799196b0f2787cad8c60f1cc23b5b";
- aarch64-darwin = "0fa29c1ba89ab906c5ba20216c505b6d8d3fbccdc58cd397146783bddeff1dd4";
- headers = "122ppxayj1fijzfdpnh3wqyi636dq53j8imyf46ik8fkvgmrw2mz";
+ electron_13 = mkElectron "13.1.7" {
+ x86_64-linux = "0bb38a5e45609a8c46dd6173447a45477651f3c2ea58f724807d79c8e4a8876e";
+ x86_64-darwin = "be8d05a7f853b9e7020c095c3d8075269832ccf821ca9785135884e6bc893df8";
+ i686-linux = "2a1c84ca8fd2a5b10b918bda11c5e546f4b77f85484a32af24ed44d6f877587d";
+ armv7l-linux = "3d4ed4cbd2ea9dd01d5ad09ed5b408762c69b5827be6fdae2e19681f2a159509";
+ aarch64-linux = "68e174bee2a686926ec2da193831aefc16ff8ec43b46e423044918e6d25d5925";
+ aarch64-darwin = "95489cc66c5638d95cde80189a5ae3477ce09c6cfa4c421b1e8bceea94f4dfba";
+ headers = "0zsnkgixch0c6ihg4drdx9a7gsl35wwfsphgiz80mhbw84slvq0n";
};
}
diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix
index d3833d3b147..2802a05f8ad 100644
--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
- version = "0.12.15";
+ version = "0.12.16";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
- sha256 = "sha256-Ikt8kBkwI9AQrWp9j4Zaf+BqGVcyhyagBDjTGZm/dzQ=";
+ sha256 = "sha256-rDPjxr6gaaH55l72dMaZsGCxayM8Nodjn3fppydpjZk=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix
index c20993fbea9..a392bee26fd 100644
--- a/pkgs/development/tools/frugal/default.nix
+++ b/pkgs/development/tools/frugal/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "frugal";
- version = "3.14.6";
+ version = "3.14.7";
src = fetchFromGitHub {
owner = "Workiva";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MtQz/9+e2l4FQ1E299KtRzFpX67FynHdsvcMA4CqKUo=";
+ sha256 = "sha256-mCfM2G+FhKDwPg0NqLIAe8F5MRZVJ0tcIY9FBuLpRpE=";
};
subPackages = [ "." ];
- vendorSha256 = "sha256-Y7lh+U4FKiht2PgACWSXwGTx+y8aJi22KEhqxHPooCw=";
+ vendorSha256 = "sha256-onbvW3vjuAL+grLfvJR14jxVpoue+YZAeFMOS8ktS1A=";
meta = with lib; {
description = "Thrift improved";
diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix
index 15a3a683403..5c11b87f76f 100644
--- a/pkgs/development/tools/jsduck/default.nix
+++ b/pkgs/development/tools/jsduck/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
gemset = ./gemset.nix;
};
- phases = [ "installPhase" ];
+ dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ env ];
diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix
index 7c8ad17c5a0..06b5f5c35bb 100644
--- a/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/pkgs/development/tools/libsigrokdecode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }:
+{ lib, stdenv, fetchurl, pkg-config, glib, python3, check }:
stdenv.mkDerivation rec {
pname = "libsigrokdecode";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ glib python3 libsigrok check ];
+ buildInputs = [ glib python3 ];
+ checkInputs = [ check ];
+ doCheck = true;
meta = with lib; {
description = "Protocol decoding library for the sigrok signal analysis software suite";
diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index b85ca99a9e6..617f981ee2f 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk deps ];
- phases = [ "installPhase" ];
+ dontUnpack = true;
extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m";
diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix
index bcc0687f55b..1aef6d52075 100644
--- a/pkgs/development/tools/misc/chruby/default.nix
+++ b/pkgs/development/tools/misc/chruby/default.nix
@@ -19,8 +19,6 @@ in stdenv.mkDerivation rec {
sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx";
};
- phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
-
patches = lib.optionalString (rubies != null) [
./env.patch
];
diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix
index 2387ab1bd41..27840481a10 100644
--- a/pkgs/development/tools/misc/distcc/masq.nix
+++ b/pkgs/development/tools/misc/distcc/masq.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation {
name = "distcc-masq-${gccRaw.name}";
- phases = [ "installPhase" ];
+ dontUnpack = true;
+
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix
index 23ec0643d77..4d17680471d 100644
--- a/pkgs/development/tools/misc/watson-ruby/default.nix
+++ b/pkgs/development/tools/misc/watson-ruby/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "watson-ruby";
version = (import ./gemset.nix).watson-ruby.version;
- phases = [ "installPhase" ];
+ dontUnpack = true;
installPhase = let
env = bundlerEnv {
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index f5276510e61..da85be92671 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -30,8 +30,6 @@ in stdenv.mkDerivation rec {
"117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c";
};
- phases = [ "unpackPhase" "installPhase" ];
-
installPhase = ''
mkdir -p $out/share/nwjs
cp -R * $out/share/nwjs
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 7d0175ac912..2ca79410b85 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -47,8 +47,6 @@ in stdenv.mkDerivation rec {
"0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964";
};
- phases = [ "unpackPhase" "installPhase" ];
-
# we have runtime deps like sqlite3 that should remain
dontPatchELF = true;
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 361f64046ce..913871314cf 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -34,7 +34,7 @@ buildDunePackage rec {
buildInputs = [ findlib ] ++ propagatedBuildInputs;
- phases = [ "installPhase" ];
+ dontUnpack = true;
installPhase = ''
mkdir -p "$out"/${path}
diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/development/tools/parse-cli-bin/default.nix
index 7cda74db5ef..33dbd0fec18 100644
--- a/pkgs/development/tools/parse-cli-bin/default.nix
+++ b/pkgs/development/tools/parse-cli-bin/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
};
- phases = "installPhase";
+ dontUnpack = true;
installPhase = ''
mkdir -p "$out/bin"
diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/development/tools/pgtop/default.nix
index 03b3ef89265..722f701892e 100644
--- a/pkgs/development/tools/pgtop/default.nix
+++ b/pkgs/development/tools/pgtop/default.nix
@@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec {
outputs = [ "out" ];
- buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWPUserAgent ];
+ buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWP ];
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
postInstall = lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 58a634ee86c..2a9e240e7af 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -52,12 +52,6 @@ self: super:
}
);
- anyio = super.anyio.overridePythonAttrs (old: {
- postPatch = ''
- substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")'
- '';
- });
-
astroid = super.astroid.overridePythonAttrs (
old: rec {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 45efd813a38..0565127f8d0 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -17,21 +17,24 @@ let
};
in
stdenv.mkDerivation {
- name = "${baseName}-${version}";
+ pname = baseName;
+ inherit version;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk deps ];
- doCheck = true;
-
- phases = [ "installPhase" "checkPhase" ];
+ dontUnpack = true;
installPhase = ''
+ runHook preInstall
+
makeWrapper ${jre}/bin/java $out/bin/${baseName} \
--add-flags "-cp $CLASSPATH org.scalafmt.cli.Cli"
+
+ runHook postInstall
'';
- checkPhase = ''
+ installCheckPhase = ''
$out/bin/${baseName} --version | grep -q "${version}"
'';
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index d1a6330df7b..308cf7b8f54 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.12.1";
+ version = "1.12.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-kNwRnoUkX2dmj6ii9fRu/Hv4V3/sz6ag+wUPf93tmTQ=";
+ sha256 = "sha256-xIFJv/roTD7sq7vCy4JDwe8gYDMuZd34vyjS08xeijI=";
};
- cargoSha256 = "sha256-5ukTSzDFCkBQ1UFfnpz1fFzJSHBYUoZAvhPGMkr/fIs=";
+ cargoSha256 = "sha256-aETAFh5yTE+ZonDC0ITdaZ2YN3/SpYROsXP47aNEICE=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix
new file mode 100644
index 00000000000..519398a738b
--- /dev/null
+++ b/pkgs/games/ecwolf/default.nix
@@ -0,0 +1,52 @@
+{stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2}:
+
+let
+ desktopItem = makeDesktopItem {
+ name = "ecwolf";
+ exec = "ecwolf";
+ comment = "Enhanced Wolfenstein 3D port";
+ desktopName = "Wolfenstein 3D";
+ categories = "Game;";
+ };
+in
+stdenv.mkDerivation rec {
+ pname = "ecwolf";
+ version = "1.3.3";
+
+ src = fetchurl {
+ url = "https://maniacsvault.net/ecwolf/files/ecwolf/1.x/${pname}-${version}-src.tar.xz";
+ sha256 = "1sbdv672dz47la5a5qwmdi1v258k9kc5dkx7cdj2b6gk8nbm2srl";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+ buildInputs = [ zlib bzip2 libjpeg SDL SDL_mixer gtk2 copyDesktopItems ];
+
+ desktopItems = [ desktopItem ];
+
+ # Change the location where the ecwolf executable looks for the ecwolf.pk3
+ # file.
+ #
+ # By default, it expects the PK3 file to reside in the same directory as the
+ # executable, which is not desirable.
+ # We will adjust the code so that it can be retrieved from the share/
+ # directory.
+
+ preConfigure = ''
+ sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h
+ '';
+
+ # Install the required PK3 file in the required data directory
+ postInstall = ''
+ mkdir -p $out/share/ecwolf
+ cp ecwolf.pk3 $out/share/ecwolf
+ '';
+
+ meta = with lib; {
+ description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms";
+ homepage = "https://maniacsvault.net/ecwolf/";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ sander ];
+ # Darwin is untested (supported by upstream)
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index f2e61d18ee2..6accb486d57 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "6.12";
+ version = "6.13";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
- sha256 = "1a6fnxb4rci310m0wjcs9cnmpj88775q70qk7xi3k06z1qqbx4pv";
+ sha256 = "sha256-4DohoBHUXSrp8iIED7dpC5cVY3bnQx+GHyAHPq8k8oo=";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
@@ -65,11 +65,10 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "1mg5yrw5jk2nbdp9mcqc3iar01lr76lmm1py95wify9p2bqzavpp";
+ sha256 = "sha256-3IpO+eQ/+DiQZH6en5Q/p+j441LDvjn4i9Ex7PY8KCk=";
owner = "wine-staging";
repo = "wine-staging";
- # Replace back on next release: rev = "v${version}";
- rev = "v6.12.1";
+ rev = "v${version}";
disabledPatchsets = [ ];
};
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4a7201c2906..b2d5a726fa2 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -425,12 +425,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-07-24";
+ version = "2021-07-25";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "139ca9bb8685a2d9b807d869a49a85fcd42811f7";
- sha256 = "1739vvb9rzlkyrq63lgadhf2azaszy2xhy52hw91rczg8xw7zfc5";
+ rev = "393fbc24cab3fdfaffca85e286e01c84bcf748c9";
+ sha256 = "08pcp6dh6kibppndf97nzj90iw1qv51s4zk3vq59z16w32zwkzda";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -1667,12 +1667,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
- version = "2021-07-08";
+ version = "2021-07-24";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
- rev = "f3ca66b6a2a42eb01ffc255ac03039177b888951";
- sha256 = "08wzq5i86wxdyhl2yrl9ggfhng92pfx5d7rhmxfcm4abnnl9sj07";
+ rev = "d5bf63e50c1c7923f1de2d10d8d822f6eb8c872e";
+ sha256 = "14h8kd01674i82npc2b58ivhj2d80nb1x8v0j7ag5c5n24p1nphf";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@@ -1941,6 +1941,18 @@ final: prev:
meta.homepage = "https://github.com/buoto/gotests-vim/";
};
+ goto-preview = buildVimPluginFrom2Nix {
+ pname = "goto-preview";
+ version = "2021-06-20";
+ src = fetchFromGitHub {
+ owner = "rmagatti";
+ repo = "goto-preview";
+ rev = "39aa1e0334b577c59c4f7177ef36624bdd83f100";
+ sha256 = "0rr22r1yp7s3hqfdqf48wlv2bqw9j5izwgm3np7x1ygp85xizcbg";
+ };
+ meta.homepage = "https://github.com/rmagatti/goto-preview/";
+ };
+
goyo-vim = buildVimPluginFrom2Nix {
pname = "goyo-vim";
version = "2020-08-29";
@@ -2748,12 +2760,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2021-07-23";
+ version = "2021-07-24";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "726aac6f8f05c94418cd3e9d6c05705e8b1ae743";
- sha256 = "0v5lpcbmlghyfifwys51acihbhawg87bmapjay52g591cjzcd9ak";
+ rev = "e9f4d03aaacc8af6ebd17833dfb5804a6abbd021";
+ sha256 = "0k86j2rq5ykav8i6gna91v893j4panyr7l2cyp6vrrkj441bx5ww";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@@ -3432,12 +3444,12 @@ final: prev:
nord-nvim = buildVimPluginFrom2Nix {
pname = "nord-nvim";
- version = "2021-07-23";
+ version = "2021-07-24";
src = fetchFromGitHub {
owner = "shaunsingh";
repo = "nord.nvim";
- rev = "b7209e7657dcc786b844a920894a517571da1317";
- sha256 = "1iaslrhq18myxwla41n3kllvwcn3hb5zcgfl3h6zw4ar8n9pvwdr";
+ rev = "f58f77dee66babac1a859c2b552797d8128e1f86";
+ sha256 = "12jway928hhm8s9sbwaqzjjzdgrpvz1gr09q4q5wxicfqaln4cd1";
};
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
@@ -3828,12 +3840,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-07-23";
+ version = "2021-07-24";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "65a059b34d5bc77db01372c589f582b17524a2f9";
- sha256 = "1f0iig48frgd75ccan8yqlxh5j84ywb6im1qsmq17gyfjs4vbqbx";
+ rev = "296fe9b8611061a1054c05922dbaa134f2b712b2";
+ sha256 = "0qxdd3z4696xf3nnaxmww3gs0ijfi2bw5aq9ywnqxpb3n734iapd";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -4044,12 +4056,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-07-22";
+ version = "2021-07-25";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "fdf005f5697742da121391d31ad42a47842264f9";
- sha256 = "15amdgzdiaf0srzzwy2pgk7d44bwls5pzj2088xf1206754znsas";
+ rev = "92dcbe5b1052c2cec1b5455a624710dd1e899777";
+ sha256 = "0mh3ghbz38inwlcv4sqrpmyzwxr62j10d4873p9d5zb6j68ajxn9";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -4489,12 +4501,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools-nvim";
- version = "2021-07-23";
+ version = "2021-07-24";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
- rev = "160aeb66e46e863802c2e4c5a772c3858bc02fd0";
- sha256 = "108nxkbybl1fvyawgq0mzbi2c5fadycxj0pnnnsw8alycyjln13f";
+ rev = "27e1555146331f42ebb07fb7ba0a196b75e03dde";
+ sha256 = "13dr30nifxrkjj7rf8dyv9p942dinjcpiy24sbfwni2ibmyf2p52";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@@ -9755,12 +9767,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-07-18";
+ version = "2021-07-24";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "830659752b8914f6b4567a00448901246e4d1841";
- sha256 = "1zdi1kblk03gwifpg1nanq4ppn9xw6af92l3li86ziw89bv3bad9";
+ rev = "d1439f47a481b8665fbfa8511c6ae4e7514bdfc7";
+ sha256 = "0brs97yhnfbkyyz6fzhs7s7kjwgwrw6kkinyycq51idxqdqvk4s8";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e134963d453..fc699509360 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -575,6 +575,7 @@ RishabhRD/popfix
rktjmp/fwatch.nvim@main
rktjmp/lush.nvim@main
rmagatti/auto-session@main
+rmagatti/goto-preview@main
rodjek/vim-puppet
romainl/vim-cool
romainl/vim-qf
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 32335990534..2941c95bb4e 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,5 +1,18 @@
-{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq
-, shellcheck, moreutils, racket-minimal, clojure-lsp
+{ config
+, lib
+, buildEnv
+, callPackage
+, vscode-utils
+, asciidoctor
+, nodePackages
+, jdk
+, llvmPackages_8
+, nixpkgs-fmt
+, jq
+, shellcheck
+, moreutils
+, racket-minimal
+, clojure-lsp
}:
let
@@ -172,12 +185,10 @@ let
version = "0.0.1";
sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=";
};
- nativeBuildInputs = [ jq ];
+ nativeBuildInputs = [ jq moreutils ];
postInstall = ''
cd "$out/$installPrefix"
- tmp_package_json=$(mktemp)
- jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json > "$tmp_package_json"
- mv "$tmp_package_json" package.json
+ jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json
'';
meta = with lib; {
license = licenses.mit;
@@ -533,14 +544,6 @@ let
};
eugleo.magic-racket = buildVscodeMarketplaceExtension {
- meta = with lib; {
- changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog";
- description = "The best coding experience for Racket in VS Code ";
- downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket";
- homepage = "https://github.com/Eugleo/magic-raket";
- license = licenses.agpl3Only;
-
- };
mktplcRef = {
name = "magic-racket";
publisher = "evzen-wybitul";
@@ -552,6 +555,13 @@ let
cd "$out/$installPrefix"
jq '.contributes.configuration.properties."magic-racket.general.racketPath".default = "${racket-minimal}/bin/racket"' package.json | sponge package.json
'';
+ meta = with lib; {
+ changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog";
+ description = "The best coding experience for Racket in VS Code ";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket";
+ homepage = "https://github.com/Eugleo/magic-racket";
+ license = licenses.agpl3Only;
+ };
};
file-icons.file-icons = buildVscodeMarketplaceExtension {
@@ -1330,12 +1340,10 @@ let
version = "0.14.4";
sha256 = "05z314sw9nqym3qlj7dcwm0fz1hb23xppzqn3nr2wcj17hs8zz4m";
};
- nativeBuildInputs = [ jq ];
+ nativeBuildInputs = [ jq moreutils ];
postInstall = ''
cd "$out/$installPrefix"
- tmp_package_json=$(mktemp)
- jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json > "$tmp_package_json"
- mv "$tmp_package_json" package.json
+ jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json | sponge package.json
'';
meta = {
license = lib.licenses.mit;
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
index 88a32f174d5..1c3d8fbbaf7 100644
--- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
@@ -43,7 +43,8 @@ stdenv.mkDerivation {
curlOpts = "-r ${dmgRange}";
};
- phases = [ "buildPhase" ];
+ dontUnpack = true;
+ dontInstall = true;
buildInputs = [ cpio xz ];
diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
index 3181072ea18..4ef9370c844 100644
--- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix
@@ -9,11 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "cef3ce537d213e020af794cecf9de207e2882c375ceda39102eb6fa2580bad8d";
};
- phases = [ "unpackPhase" "installPhase" ];
-
installPhase = ''
+ runHook preInstall
+
DESTDIR="$out" ./install
find $out \( -name 'README.*' -or -name 'LICEN[SC]E.*' -or -name '*.txt' \) | xargs rm
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 598dac90bab..7f4f0f2d6bb 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -70,7 +70,7 @@ assert stdenv.isLinux;
let
# Combine the `features' attribute sets of all the kernel patches.
- kernelFeatures = lib.fold (x: y: (x.features or {}) // y) ({
+ kernelFeatures = lib.foldr (x: y: (x.features or {}) // y) ({
iwlwifi = true;
efiBootStub = true;
needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
index 758f6fd998a..701f5d3b104 100644
--- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
- version = "5.13.4";
+ version = "5.13.5";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@@ -12,7 +12,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
- sha256 = "sha256-jSV5dL6myB4WeokYBwoBtQaOfLaUgvseYtReyjLGOhU=";
+ sha256 = "sha256-Vhshu3mNkQ58TEOUBOuF7jLBlablxg/BioUyd96lI5g=";
};
structuredExtraConfig = with lib.kernel; {
diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/pkgs/servers/dict/dictd-db-collector.nix
index f635c98602d..faf0fd24831 100644
--- a/pkgs/servers/dict/dictd-db-collector.nix
+++ b/pkgs/servers/dict/dictd-db-collector.nix
@@ -1,80 +1,82 @@
-{stdenv, lib, dict}:
-({dictlist, allowList ? ["127.0.0.1"], denyList ? []}:
+{ stdenv, lib, dict }:
+({ dictlist, allowList ? [ "127.0.0.1" ], denyList ? [ ] }:
+
/*
- dictlist is a list of form
- [ { filename = /path/to/files/basename;
- name = "name"; } ]
- basename.dict.dz and basename.index should be
- dict files. Or look below for other options.
- allowList is a list of IP/domain *-wildcarded strings
- denyList is the same..
+ dictlist is a list of form
+ [ { filename = /path/to/files/basename;
+ name = "name"; } ]
+ basename.dict.dz and basename.index should be
+ dict files. Or look below for other options.
+ allowList is a list of IP/domain *-wildcarded strings
+ denyList is the same..
*/
let
- link_arguments = map
- (x: '' "${x.filename}" '')
- dictlist;
- databases = lib.concatStrings (map (x :
- "${x.name} ${x.filename}\n") dictlist);
- allow = lib.concatStrings (map (x: "allow ${x}\n") allowList);
- deny = lib.concatStrings (map (x: "deny ${x}\n") denyList);
- accessSection = "
- access {
- ${allow}
- ${deny}
- }
- ";
- installPhase = ''
- mkdir -p $out/share/dictd
- cd $out/share/dictd
- echo "${databases}" >databases.names
- echo "${accessSection}" > dictd.conf
- for j in ${toString link_arguments}; do
- name="$(egrep ' '"$j"\$ databases.names)"
- name=''${name% $j}
- if test -d "$j"; then
- if test -d "$j"/share/dictd ; then
- echo "Got store path $j"
- j="$j"/share/dictd
- fi
- echo "Directory reference: $j"
- i=$(ls "$j""/"*.index)
- i="''${i%.index}";
- else
- i="$j";
- fi
- echo "Basename is $i"
- locale=$(cat "$(dirname "$i")"/locale)
- base="$(basename "$i")"
- echo "Locale is $locale"
- export LC_ALL=$locale
- export LANG=$locale
- if test -e "$i".dict.dz; then
- ln -s "$i".dict.dz
- else
- cp "$i".dict .
- dictzip "$base".dict
- fi
- ln -s "$i".index .
- dictfmt_index2word --locale $locale < "$base".index > "$base".word || true
- dictfmt_index2suffix --locale $locale < "$base".index > "$base".suffix || true
+ link_arguments = map
+ (x: '' "${x.filename}" '')
+ dictlist;
+ databases = lib.concatStrings (map
+ (x:
+ "${x.name} ${x.filename}\n")
+ dictlist);
+ allow = lib.concatStrings (map (x: "allow ${x}\n") allowList);
+ deny = lib.concatStrings (map (x: "deny ${x}\n") denyList);
+ accessSection = "
+ access {
+ ${allow}
+ ${deny}
+ }
+";
+ installPhase = ''
+ mkdir -p $out/share/dictd
+ cd $out/share/dictd
+ echo "${databases}" >databases.names
+ echo "${accessSection}" > dictd.conf
+ for j in ${toString link_arguments}; do
+ name="$(egrep ' '"$j"\$ databases.names)"
+ name=''${name% $j}
+ if test -d "$j"; then
+ if test -d "$j"/share/dictd ; then
+ echo "Got store path $j"
+ j="$j"/share/dictd
+ fi
+ echo "Directory reference: $j"
+ i=$(ls "$j""/"*.index)
+ i="''${i%.index}";
+ else
+ i="$j";
+ fi
+ echo "Basename is $i"
+ locale=$(cat "$(dirname "$i")"/locale)
+ base="$(basename "$i")"
+ echo "Locale is $locale"
+ export LC_ALL=$locale
+ export LANG=$locale
+ if test -e "$i".dict.dz; then
+ ln -s "$i".dict.dz
+ else
+ cp "$i".dict .
+ dictzip "$base".dict
+ fi
+ ln -s "$i".index .
+ dictfmt_index2word --locale $locale < "$base".index > "$base".word || true
+ dictfmt_index2suffix --locale $locale < "$base".index > "$base".suffix || true
- echo "database $name {" >> dictd.conf
- echo " data $out/share/dictd/$base.dict.dz" >> dictd.conf
- echo " index $out/share/dictd/$base.index" >> dictd.conf
- echo " index_word $out/share/dictd/$base.word" >> dictd.conf
- echo " index_suffix $out/share/dictd/$base.suffix" >> dictd.conf
- echo "}" >> dictd.conf
- done
- '';
+ echo "database $name {" >> dictd.conf
+ echo " data $out/share/dictd/$base.dict.dz" >> dictd.conf
+ echo " index $out/share/dictd/$base.index" >> dictd.conf
+ echo " index_word $out/share/dictd/$base.word" >> dictd.conf
+ echo " index_suffix $out/share/dictd/$base.suffix" >> dictd.conf
+ echo "}" >> dictd.conf
+ done
+ '';
in
stdenv.mkDerivation {
name = "dictd-dbs";
- phases = ["installPhase"];
- buildInputs = [dict];
+ buildInputs = [ dict ];
inherit installPhase;
})
diff --git a/pkgs/servers/dict/wiktionary/builder.sh b/pkgs/servers/dict/wiktionary/builder.sh
deleted file mode 100644
index 65652ad4bdb..00000000000
--- a/pkgs/servers/dict/wiktionary/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/share/dictd/
-cd $out/share/dictd
-
-python -O "$convert" "$src"
-dictzip wiktionary-en.dict
-echo en_US.UTF-8 > locale
diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix
index 3a01120f3a6..05df86f3a78 100644
--- a/pkgs/servers/dict/wiktionary/default.nix
+++ b/pkgs/servers/dict/wiktionary/default.nix
@@ -1,23 +1,33 @@
{ lib, stdenv, fetchurl, python2, dict, glibcLocales }:
stdenv.mkDerivation rec {
- version = "20210201";
pname = "dict-db-wiktionary";
+ version = "20210201";
src = fetchurl {
url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs";
};
- convert = ./wiktionary2dict.py;
- buildInputs = [ python2 dict glibcLocales ];
- builder = ./builder.sh;
+ # script in nixpkgs does not support python2
+ nativeBuildInputs = [ python2 dict glibcLocales ];
+
+ dontUnpack = true;
+
+ installPhase = ''
+ mkdir -p $out/share/dictd/
+ cd $out/share/dictd
+
+ ${python2.interpreter} -O ${./wiktionary2dict.py} "${src}"
+ dictzip wiktionary-en.dict
+ echo en_US.UTF-8 > locale
+ '';
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "DICT version of English Wiktionary";
- homepage = "http://en.wiktionary.org/";
+ homepage = "https://en.wiktionary.org/";
maintainers = with maintainers; [ qyliss ];
platforms = platforms.all;
license = with licenses; [ cc-by-sa-30 fdl11Plus ];
diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix
index 35290de6b24..acb8c139be6 100644
--- a/pkgs/servers/gerbera/default.nix
+++ b/pkgs/servers/gerbera/default.nix
@@ -65,13 +65,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gerbera";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchFromGitHub {
repo = "gerbera";
owner = "gerbera";
rev = "v${version}";
- sha256 = "sha256-bJIT/qQOKTy2l0wsumlGNvaGqzb2mK0hHKG0S6mEG3o=";
+ sha256 = "sha256-RVFzATHNCW4lR9dVrtY2fo2BiJrXPCpelBaUXBwOWyY=";
};
postPatch = lib.optionalString enableMysql ''
diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix
index 1ff50079ebd..57623a8026b 100644
--- a/pkgs/servers/gonic/default.nix
+++ b/pkgs/servers/gonic/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoModule, fetchFromGitHub
+{ lib, stdenv, buildGoModule, fetchFromGitHub
, pkg-config, taglib, alsa-lib
-, zlib
+, zlib, AudioToolbox, AppKit
# Disable on-the-fly transcoding,
# removing the dependency on ffmpeg.
@@ -12,16 +12,18 @@
buildGoModule rec {
pname = "gonic";
- version = "0.12.2";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "sentriz";
repo = pname;
- rev = "7d420f61a90739cd82a81c2740274c538405d950";
- sha256 = "0ix33cbhik1580h1jgv6n512dcgip436wmljpiw53c9v438k0ps5";
+ rev = "v${version}";
+ sha256 = "08zr5cbmn25wfi1sjfsb311ycn1855x57ypyn5165zcz49pcfzxn";
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ taglib alsa-lib zlib ];
+ buildInputs = [ taglib zlib ]
+ ++ lib.optionals stdenv.isLinux [ alsa-lib ]
+ ++ lib.optionals stdenv.isDarwin [ AudioToolbox AppKit ];
vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
# TODO(Profpatsch): write a test for transcoding support,
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 2fddaae47b2..6af26256772 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -23,22 +23,20 @@ let
++ lib.optional withLDAP "-lldap");
in stdenv.mkDerivation rec {
-
pname = "postfix";
-
- version = "3.6.1";
+ version = "3.6.2";
src = fetchurl {
- url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
- sha256 = "sha256-IKgFYlYB57lZiSIIMsj6FM43TwcR2gVBiPjOxqkv1xw=";
+ url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz";
+ sha256 = "sha256-UHMj0g17P3BfSc+MB9Q3xtgJC+0H4Vo8DsQF7a1Up9Q=";
};
nativeBuildInputs = [ makeWrapper m4 ];
buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
- ++ lib.optional withPgSQL postgresql
- ++ lib.optional withMySQL libmysqlclient
- ++ lib.optional withSQLite sqlite
- ++ lib.optional withLDAP openldap;
+ ++ lib.optional withPgSQL postgresql
+ ++ lib.optional withMySQL libmysqlclient
+ ++ lib.optional withSQLite sqlite
+ ++ lib.optional withLDAP openldap;
hardeningDisable = [ "format" ];
hardeningEnable = [ "pie" ];
@@ -103,6 +101,6 @@ in stdenv.mkDerivation rec {
description = "A fast, easy to administer, and secure mail server";
license = with licenses; [ ipl10 epl20 ];
platforms = platforms.linux;
- maintainers = with maintainers; [ globin dotlambda ];
+ maintainers = with maintainers; [ globin dotlambda lewo ];
};
}
diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index d5bc0171699..8e7c5a0425d 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -6,11 +6,11 @@
let
self = stdenv.mkDerivation rec {
pname = "mysql";
- version = "8.0.25";
+ version = "8.0.26";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
- sha256 = "c16aa9cf621bc028efba2bb11f3c36a323b125fa0d108ff92fab60e46309206e";
+ sha256 = "sha256-293Nx3L4BscRo3MTY6UPPTWeqsnF0UgAhHKKHCzl2k0=";
};
patches = [
diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix
index 7906c92ba88..bb5eda93a59 100644
--- a/pkgs/tools/audio/tts/default.nix
+++ b/pkgs/tools/audio/tts/default.nix
@@ -1,5 +1,5 @@
{ lib
-, python38
+, python3
, fetchFromGitHub
, fetchpatch
}:
@@ -10,26 +10,19 @@
# $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan
#
# If you upgrade from an old version you may have to delete old models from ~/.local/share/tts
-# Also note that your tts version might not support all available models so check:
-# https://github.com/coqui-ai/TTS/releases/tag/v0.1.2
#
# For now, for deployment check the systemd unit in the pull request:
# https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136
-let
- python3 = python38;
-in python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "tts";
- version = "0.1.2";
-
- # https://github.com/coqui-ai/TTS/issues/570
- disabled = python3.pythonAtLeast "3.9";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "coqui-ai";
repo = "TTS";
rev = "v${version}";
- sha256 = "1qgiaqn7iqxyf54qgnpmli69nw9s3gmi9qv874jsgycykc10hjg4";
+ sha256 = "0akhiaaqz53bf5zyps3vgjifmgh5wvcc9r4lrq9hmj3dds03vkjq";
};
postPatch = ''
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index d6ee1720430..72f142105b7 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bdf2psf";
- version = "1.204";
+ version = "1.205";
src = fetchurl {
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
- sha256 = "sha256-oyBkt52mWM2FiaM++s5Uoe7Wd0v1oLM7HjWKDjIonGE=";
+ sha256 = "sha256-elFmsqtndo4ReR4IoyhC56k0PMqy5QrUxOGUQLGeu0I=";
};
nativeBuildInputs = [ dpkg ];
diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix
index d66d413fcc3..27407987d85 100644
--- a/pkgs/tools/misc/disfetch/default.nix
+++ b/pkgs/tools/misc/disfetch/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "disfetch";
- version = "1.24";
+ version = "2.2";
src = fetchFromGitHub {
owner = "llathasa-veleth";
repo = "disfetch";
rev = version;
- sha256 = "sha256-Uoc5xSyLXXEqdyYn71NK8c8A/1wQ6djYn/HHJwGg5vc=";
+ sha256 = "sha256-93nh1MDE2YO53lH2jDdKxgHh6v2KkAFo2Oyg+6ZpD+M=";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 69a67a6e918..c82782bae90 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -16,13 +16,13 @@ let
in
with python.pkgs; buildPythonApplication rec {
pname = "esphome";
- version = "1.20.0";
+ version = "1.20.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4=";
+ sha256 = "sha256-uCMxtMEOWrlOpc8SXDzleLY5VfyizmSh1tWgxTLUjzg=";
};
patches = [
diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix
index 838572d9297..f9136f14e61 100644
--- a/pkgs/tools/misc/flameshot/default.nix
+++ b/pkgs/tools/misc/flameshot/default.nix
@@ -1,4 +1,12 @@
-{ mkDerivation, lib, fetchFromGitHub, qtbase, cmake, qttools, qtsvg }:
+{ mkDerivation
+, lib
+, fetchFromGitHub
+, qtbase
+, cmake
+, qttools
+, qtsvg
+, nix-update-script
+}:
mkDerivation rec {
pname = "flameshot";
@@ -11,6 +19,12 @@ mkDerivation rec {
sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2";
};
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = pname;
+ };
+ };
+
nativeBuildInputs = [ cmake qttools qtsvg ];
buildInputs = [ qtbase ];
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index 5e805920b68..d2446829b28 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "0.173.2";
+ version = "0.174.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-X7Tj50A0CwkGUyKGsCj6LBAlNZwMhFk/gDEgG1KNjx0=";
+ sha256 = "sha256-oHH5/w1G0xlhmnUe6/qS0++qtBdDd6dUw6JfWYAWIh8=";
};
- vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM=";
+ vendorSha256 = "sha256-P91wi2Fqo9+Yccqoqmsx0IbjSGUpiKIh7uOsgsR9c+0=";
buildFlagsArray = [
"-ldflags="
diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix
new file mode 100644
index 00000000000..8bc70967b16
--- /dev/null
+++ b/pkgs/tools/misc/interactsh/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "interactsh";
+ version = "0.0.3";
+
+ src = fetchFromGitHub {
+ owner = "projectdiscovery";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0a3jfdnhh5idf2j14gppjxmdhqnyymg42z7nlnbr2zaigkvgz487";
+ };
+
+ vendorSha256 = "sha256-hLnxtARre+7HqEtU7bB9SvEieOaAoBM6VFUnKvLCD60=";
+
+ modRoot = ".";
+ subPackages = [
+ "cmd/interactsh-client"
+ "cmd/interactsh-server"
+ ];
+
+ # Test files are not part of the release tarball
+ doCheck = false;
+
+ meta = with lib; {
+ description = "An Out of bounds interaction gathering server and client library";
+ longDescription = ''
+ Interactsh is an Open-Source Solution for Out of band Data Extraction,
+ A tool designed to detect bugs that cause external interactions,
+ For example - Blind SQLi, Blind CMDi, SSRF, etc.
+ '';
+ homepage = "https://github.com/projectdiscovery/interactsh";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hanemile ];
+ };
+}
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index 96027677fa8..a5a5b727a8d 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -21,7 +21,10 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
- patches = [ ./pipelight.patch ];
+ patches = [
+ ./pipelight.patch
+ ./wine-6.13-new-args.patch
+ ];
configurePhase = ''
patchShebangs .
diff --git a/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch b/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch
new file mode 100644
index 00000000000..b67af621f64
--- /dev/null
+++ b/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch
@@ -0,0 +1,42 @@
+diff --git a/src/windows/pluginloader/apihook.c b/src/windows/pluginloader/apihook.c
+index 80bf726..6b80f70 100644
+--- a/src/windows/pluginloader/apihook.c
++++ b/src/windows/pluginloader/apihook.c
+@@ -42,7 +42,9 @@
+ #include "common/common.h"
+ #include "pluginloader.h"
+
++#define new cnew
+ #include // for PVOID and other types
++#undef new
+ #include // for memset
+
+ void* patchDLLExport(PVOID ModuleBase, const char* functionName, void* newFunctionPtr){
+diff --git a/src/windows/pluginloader/npnfunctions.c b/src/windows/pluginloader/npnfunctions.c
+index e4e38aa..19f29d5 100644
+--- a/src/windows/pluginloader/npnfunctions.c
++++ b/src/windows/pluginloader/npnfunctions.c
+@@ -41,7 +41,9 @@
+ #include "common/common.h"
+ #include "pluginloader.h"
+
++#define new cnew
+ #include
++#undef new
+
+ /* Shockwave sometimes calls the function with a wrong instance? Is this a wine bug? */
+ NPP shockwaveInstanceBug = NULL;
+diff --git a/src/windows/pluginloader/pluginloader.c b/src/windows/pluginloader/pluginloader.c
+index 8f1170a..99dbceb 100644
+--- a/src/windows/pluginloader/pluginloader.c
++++ b/src/windows/pluginloader/pluginloader.c
+@@ -50,7 +50,9 @@
+ #include "pluginloader.h"
+ #include "apihook.h"
+
++#define new cnew
+ #include
++#undef new
+ #include // for CoInitializeEx
+ #include
+
diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix
index 163728a37c6..6fa2041de3c 100644
--- a/pkgs/tools/security/dnsrecon/default.nix
+++ b/pkgs/tools/security/dnsrecon/default.nix
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
format = "other";
pythonPath = with python3.pkgs; [
- dns netaddr lxml
+ dnspython netaddr lxml
];
postPatch = ''
diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix
index df466b0012d..fb87251d737 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/tools/security/doppler/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "doppler";
- version = "3.26.0";
+ version = "3.31.0";
src = fetchFromGitHub {
owner = "dopplerhq";
repo = "cli";
rev = version;
- sha256 = "sha256-x6LQDQ+DRfP4d87OWEppqk4FV7SHuRMog4m0DOWkvF4=";
+ sha256 = "sha256-jmOHr32mDnjY3n9/nU/YaQ/ZuVsCKTo2likM2homToM=";
};
- vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY=";
+ vendorSha256 = "sha256-yb7L4GSKtlwagwdxBMd5aSk9fre1NKKsy6CM4Iv2ya8=";
buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}";
diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index ccb93c95f89..5cd7f4f63bf 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
- version = "2021-07-24";
+ version = "2021-07-27";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
- sha256 = "sha256-UMajZExQjrbXon/tNYt+xp9LM7QRVXefGHDYuu949AQ=";
+ sha256 = "077y7rzvmv0kzwrhm592fsjd2lv839b5wzf59vq9cd3j313bdaab";
};
installPhase = ''
diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix
index b41f6bc67fc..1229620c21c 100644
--- a/pkgs/tools/security/fido2luks/default.nix
+++ b/pkgs/tools/security/fido2luks/default.nix
@@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "fido2luks";
- version = "0.2.17";
+ version = "0.2.19";
src = fetchFromGitHub {
owner = "shimunn";
repo = pname;
rev = version;
- sha256 = "sha256-rrtPMCgp2Xe8LXzFN57rzay2kyPaLT1+2m1NZQ9EsW4=";
+ sha256 = "sha256-o21KdsAE9KznobdMMKfVmVnENsLW3cMZjssnrsoN+KY=";
};
buildInputs = [ cryptsetup ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
'';
- cargoSha256 = "sha256-5CzQuzmKuEi4KTR1jNh4avwqA3qYzTj+rV/zbIeUjAM=";
+ cargoSha256 = "sha256-8JFe3mivf2Ewu1nLMugeeK+9ZXAGPHaqCyKfWfwLOc8=";
meta = with lib; {
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix
index 4539f10e50d..96ef86d18d1 100644
--- a/pkgs/tools/security/fulcio/default.nix
+++ b/pkgs/tools/security/fulcio/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "fulcio";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
- rev = version;
- sha256 = "sha256-+HWzhg+LTKpr9VJ9mzQghwOuGgp3EBb4/zltaqp0zHw=";
+ rev = "v${version}";
+ sha256 = "sha256-MvLQMGPyJYqYUljLqsr+qJeeYnxdH9aNGkWpDRvOeh8=";
};
- vendorSha256 = "sha256-1tR1vUm5eFBS93kELQoKWEyFlfMF28GBI8VEHxTyeM4=";
+ vendorSha256 = "sha256-pRL0et+UOi/tzuQz/Q7UmSA+pVhLJYR8lG8NAbPN9PU=";
ldflags = [ "-s" "-w" ];
@@ -18,22 +18,23 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
- installShellCompletion --cmd fulcio \
- --bash <($out/bin/fulcio completion bash) \
- --fish <($out/bin/fulcio completion fish) \
- --zsh <($out/bin/fulcio completion zsh)
+ mv $out/bin/fulcio $out/bin/fulcio-server
+ installShellCompletion --cmd fulcio-server \
+ --bash <($out/bin/fulcio-server completion bash) \
+ --fish <($out/bin/fulcio-server completion fish) \
+ --zsh <($out/bin/fulcio-server completion zsh)
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
- $out/bin/fulcio --help
+ $out/bin/fulcio-server --help
runHook postInstallCheck
'';
meta = with lib; {
homepage = "https://github.com/sigstore/fulcio";
- changelog = "https://github.com/sigstore/fulcio/releases/tag/${version}";
+ changelog = "https://github.com/sigstore/fulcio/releases/tag/v${version}";
description = "A Root-CA for code signing certs - issuing certificates based on an OIDC email address";
license = licenses.asl20;
maintainers = with maintainers; [ lesuisse jk ];
diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix
index 3f674bef7bc..3a205ebdb1e 100644
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@@ -5,7 +5,7 @@
buildGoModule rec {
pname = "nuclei";
- version = "2.4.0";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
@@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A=";
};
- vendorSha256 = "sha256-Ok2VUwtqhlp6NwLbQX9KAaGiZtzmfWG0LcqtBBDk22A=";
+ vendorSha256 = "0q6vwh809bfa5ns62zg6vika588199zl3nq26xx5m1ka1d9rak9s";
modRoot = "./v2";
subPackages = [
diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/tools/text/angle-grinder/default.nix
index f9f5736015b..02235b057d4 100644
--- a/pkgs/tools/text/angle-grinder/default.nix
+++ b/pkgs/tools/text/angle-grinder/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "angle-grinder";
- version = "0.16";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "rcoh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-cGYhGcNalmc/Gr7mY1Fycs8cZYaIy622DFIL64LT+gE=";
+ sha256 = "sha256-jG3jHFqFOrIT/e5oyLOEckw5C3LIs7amFAa4QDEI/EY=";
};
- cargoSha256 = "sha256-LJ7zudUeso28zJqLhqWGWqf+L4o75rJjtTx9BpWKRIE=";
+ cargoSha256 = "sha256-Rkex+fnnacV+DCRpX3Zh9J3vGuG4QfFhFezHTs33peY=";
meta = with lib; {
description = "Slice and dice logs on the command line";
diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix
index 4ee45bf4bc8..fbb6fdb0fe0 100644
--- a/pkgs/tools/typesetting/tex/nix/default.nix
+++ b/pkgs/tools/typesetting/tex/nix/default.nix
@@ -77,7 +77,7 @@ rec {
in if fn != null then [{key = fn;}] ++ xs
else xs;
- in pkgs.lib.fold foundDeps [] deps;
+ in pkgs.lib.foldr foundDeps [] deps;
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30aa57a1ec4..5e9edbebedf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2931,6 +2931,8 @@ in
inklecate = callPackage ../development/compilers/inklecate {};
+ interactsh = callPackage ../tools/misc/interactsh { };
+
interlock = callPackage ../servers/interlock {};
iotools = callPackage ../tools/misc/iotools { };
@@ -3906,6 +3908,8 @@ in
qtbase = qt5.qtbase;
};
+ coregarage = libsForQt5.callPackage ../applications/misc/coregarage { };
+
c14 = callPackage ../applications/networking/c14 { };
corehunt = libsForQt5.callPackage ../applications/misc/corehunt { };
@@ -6394,6 +6398,8 @@ in
libscrypt = callPackage ../development/libraries/libscrypt { };
+ libcsys = libsForQt5.callPackage ../development/libraries/libcsys { };
+
libcprime = libsForQt5.callPackage ../development/libraries/libcprime { };
libcloudproviders = callPackage ../development/libraries/libcloudproviders { };
@@ -9359,7 +9365,7 @@ in
tinycbor = callPackage ../development/libraries/tinycbor { };
- tiny8086 = callPackage ../applications/virtualization/8086tiny { };
+ tiny8086 = callPackage ../applications/virtualization/tiny8086 { };
tinyemu = callPackage ../applications/virtualization/tinyemu { };
@@ -13459,7 +13465,9 @@ in
sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
};
- libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
+ libsigrokdecode = callPackage ../development/tools/libsigrokdecode {
+ python3 = python38;
+ };
# special forks used for dsview
libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { };
@@ -23484,6 +23492,8 @@ in
copyq = libsForQt5.callPackage ../applications/misc/copyq { };
+ coreaction = libsForQt5.callPackage ../applications/misc/coreaction { };
+
corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };
coriander = callPackage ../applications/video/coriander {
@@ -24593,7 +24603,9 @@ in
gollum = callPackage ../applications/misc/gollum { };
- gonic = callPackage ../servers/gonic { };
+ gonic = callPackage ../servers/gonic {
+ inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox;
+ };
googleearth = callPackage ../applications/misc/googleearth { };
@@ -28911,6 +28923,8 @@ in
eboard = callPackage ../games/eboard { };
+ ecwolf = callPackage ../games/ecwolf { };
+
eduke32 = callPackage ../games/eduke32 { };
egoboo = callPackage ../games/egoboo { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 294c90f6656..1726c3798e2 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -60,6 +60,8 @@ mapAliases ({
pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
pytestquickcheck = pytest-quickcheck; # added 2021-07-20
pytestrunner = pytest-runner; # added 2021-01-04
+ python-lz4 = lz4; # added 2018-06-01
+ python-pam = pam; # added 2020-09-07.
pytest_xdist = pytest-xdist; # added 2021-01-04
python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9708579cabc..e2d85d8ca67 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4260,7 +4260,7 @@ in {
lyricwikia = callPackage ../development/python-modules/lyricwikia { };
- lz4 = self.python-lz4; # alias 2018-12-05
+ lz4 = callPackage ../development/python-modules/lz4 { };
lzstring = callPackage ../development/python-modules/lzstring { };
@@ -5085,9 +5085,6 @@ in {
palettable = callPackage ../development/python-modules/palettable { };
- # Alias. Added 2020-09-07.
- pam = self.python-pam;
-
pamela = callPackage ../development/python-modules/pamela { };
pamqp = callPackage ../development/python-modules/pamqp { };
@@ -7069,8 +7066,6 @@ in {
python-ly = callPackage ../development/python-modules/python-ly { };
- python-lz4 = callPackage ../development/python-modules/python-lz4 { };
-
python-lzf = callPackage ../development/python-modules/python-lzf { };
python-lzo = callPackage ../development/python-modules/python-lzo {
@@ -7079,7 +7074,18 @@ in {
python_magic = callPackage ../development/python-modules/python-magic { };
- python-mapnik = callPackage ../development/python-modules/python-mapnik { };
+ python-mapnik = let
+ boost = pkgs.boost.override {
+ enablePython = true;
+ inherit python;
+ };
+ in callPackage ../development/python-modules/python-mapnik {
+ inherit (pkgs) pkg-config cairo harfbuzz icu libjpeg libpng libtiff libwebp proj zlib;
+ inherit boost;
+ mapnik = pkgs.mapnik.override {
+ inherit python boost;
+ };
+ };
python-markdown-math = callPackage ../development/python-modules/python-markdown-math { };
@@ -9462,6 +9468,8 @@ in {
youtube-search = callPackage ../development/python-modules/youtube-search { };
+ youtube-transcript-api = callPackage ../development/python-modules/youtube-transcript-api { };
+
yowsup = callPackage ../development/python-modules/yowsup { };
yq = callPackage ../development/python-modules/yq {