diff --git a/lib/strings.nix b/lib/strings.nix
index 49fa0196a0b2..86c92bdaa15b 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -95,7 +95,7 @@ rec {
result with the specified separator interspersed between
elements.
- Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string
+ Type: concatMapStringsSep :: string -> (a -> string) -> [a] -> string
Example:
concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"]
@@ -112,7 +112,7 @@ rec {
/* Same as `concatMapStringsSep`, but the mapping function
additionally receives the position of its argument.
- Type: concatIMapStringsSep :: string -> (int -> string -> string) -> [string] -> string
+ Type: concatIMapStringsSep :: string -> (int -> a -> string) -> [a] -> string
Example:
concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index f03b9443d23b..d019bb318096 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -446,8 +446,8 @@
password for the root user, e.g.
setting root password...
-Enter new UNIX password: ***
-Retype new UNIX password: ***
+New password: ***
+Retype new password: ***
For unattended installations, it is possible to use
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 239b62a40266..66a14fa05b28 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -1,30 +1,34 @@
-{ lib, stdenv, fetchurl, alsa-lib, gtk2, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook, alsa-lib, gtk3, libpulseaudio }:
stdenv.mkDerivation rec {
pname = "praat";
- version = "6.0.43";
+ version = "6.1.50";
- src = fetchurl {
- url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
- sha256 = "1l13bvnl7sv8v6s5z63201bhzavnj6bnqcj446akippsam13z4sf";
+ src = fetchFromGitHub {
+ owner = "praat";
+ repo = "praat";
+ rev = "v${version}";
+ sha256 = "11cw4292pml71hdnfy8y91blwyh45dyam1ywr09355zk44c5njpq";
};
configurePhase = ''
- cp makefiles/makefile.defs.linux.alsa makefile.defs
+ cp makefiles/makefile.defs.linux.pulse makefile.defs
'';
installPhase = ''
- mkdir -p $out/bin
- cp praat $out/bin
+ install -Dt $out/bin praat
'';
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsa-lib gtk2 ];
+ nativeBuildInputs = [ pkg-config wrapGAppsHook ];
+ buildInputs = [ alsa-lib gtk3 libpulseaudio ];
- meta = {
+ enableParallelBuilding = true;
+
+ meta = with lib; {
description = "Doing phonetics by computer";
homepage = "https://www.fon.hum.uva.nl/praat/";
- license = lib.licenses.gpl2Plus; # Has some 3rd-party code in it though
- platforms = lib.platforms.linux;
+ license = licenses.gpl2Plus; # Has some 3rd-party code in it though
+ maintainers = with maintainers; [ orivej ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix
new file mode 100644
index 000000000000..31c256f46c8e
--- /dev/null
+++ b/pkgs/applications/system/qjournalctl/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, qtbase
+, qmake
+, pkg-config
+, libssh
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "qjournalctl";
+ version = "0.6.3";
+
+ src = fetchFromGitHub {
+ owner = "pentix";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0j27cmfq29mwrbjfrrwi6m1grcamhbfhk47xzlfsx5wr2q9m6qkz";
+ };
+
+ postPatch = ''
+ substituteInPlace qjournalctl.pro --replace /usr/ $out/
+ '';
+
+ nativeBuildInputs = [
+ qmake
+ pkg-config
+ wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ libssh
+ qtbase
+ ];
+
+ meta = with lib; {
+ description = "Qt-based graphical user interface for systemd's journalctl command";
+ homepage = "https://github.com/pentix/qjournalctl";
+ license = licenses.gpl3Only;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ dtzWill srgom romildo ];
+ };
+}
diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix
index 30e273271ae3..0b88bc1ab1c9 100644
--- a/pkgs/development/compilers/koka/default.nix
+++ b/pkgs/development/compilers/koka/default.nix
@@ -4,12 +4,12 @@
, parsec, process, regex-compat, text, time }:
let
- version = "2.1.4";
+ version = "2.1.9";
src = fetchFromGitHub {
owner = "koka-lang";
repo = "koka";
rev = "v${version}";
- sha256 = "sha256-MPMA8ZErEKv1SrkliLsy35k88GrdsPqIK6yokQreIjE=";
+ sha256 = "0xny4x1a2lzwgmng60bni7rxfjx5ns70qbfp703qwms54clvj5wy";
fetchSubmodules = true;
};
kklib = stdenv.mkDerivation {
diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
index 973b792f5bc8..a63617ba2a2a 100644
--- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
+++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
@@ -38,9 +38,17 @@ buildPythonPackage rec {
# Various tests try to access credential files which are not included with the source distribution
disabledTests = [
- "test_iam" "test_cwd" "test_configure_service" "test_get_authenticator"
- "test_read_external_sources_2" "test_files_duplicate_parts" "test_files_list"
- "test_files_dict" "test_retry_config_external" "test_gzip_compression_external"
+ "test_configure_service"
+ "test_cp4d_authenticator"
+ "test_cwd"
+ "test_files_dict"
+ "test_files_duplicate_parts"
+ "test_files_list"
+ "test_get_authenticator"
+ "test_gzip_compression_external"
+ "test_iam"
+ "test_read_external_sources_2"
+ "test_retry_config_external"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix
index 7684f1a689cb..3698d8b2e368 100644
--- a/pkgs/development/python-modules/ibm-watson/default.nix
+++ b/pkgs/development/python-modules/ibm-watson/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "ibm-watson";
- version = "5.2.0";
+ version = "5.2.1";
src = fetchFromGitHub {
owner = "watson-developer-cloud";
repo = "python-sdk";
rev = "v${version}";
- sha256 = "1abink5mv9nw506nwm9hlvnr1lq6dkxxj2j12iwphcyd7xs63n2s";
+ sha256 = "sha256-0F4BZf0D0dqGm0OkJaSgmH5RxEA8KCzOlbnhIQVsgzQ=";
};
checkInputs = [
@@ -40,8 +40,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
- --replace websocket-client==0.48.0 websocket-client>=0.48.0 \
- --replace ibm_cloud_sdk_core==3.3.6 ibm_cloud_sdk_core>=3.3.6
+ --replace websocket-client==1.1.0 websocket-client>=1.1.0
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix
index cf7fd53d1657..cef64c084f2f 100644
--- a/pkgs/development/python-modules/pyatv/default.nix
+++ b/pkgs/development/python-modules/pyatv/default.nix
@@ -19,13 +19,13 @@
buildPythonPackage rec {
pname = "pyatv";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "postlund";
repo = pname;
rev = "v${version}";
- sha256 = "1slr6l0gw0mf1zhp40bjf5bib45arw1cy4fqkg0gvdk1hx79828m";
+ sha256 = "sha256-/ccmYNOYE+RkJiJbGkQgdYE8/X4xzyRT4dkMa/qSZEc=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index 34fbcff42f13..9d06569dfdc3 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "python-gitlab";
- version = "2.8.0";
+ version = "2.9.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f3364a8d1e813a0b3e68485db1e1881d8653b0e03b9a41f2c59544fce4930101";
+ sha256 = "sha256-LFGxTN2aaAKDFaKw6IUl03YJZziPmfqlfeiQK0VGW+Y=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix
index e0c6769b07d7..7bd426706886 100644
--- a/pkgs/development/python-modules/scp/default.nix
+++ b/pkgs/development/python-modules/scp/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "scp";
- version = "0.13.4";
+ version = "0.13.5";
src = fetchPypi {
inherit pname version;
- sha256 = "e60948dd3e1aa13da21aa1bf8a025fabbbc2816ed04f1a1272410247d1a86f15";
+ sha256 = "sha256-CrLukXi4vlPcXJ/i8zdh4BokNQh/XJ+1tUUZhzxlDWA=";
};
propagatedBuildInputs = [
@@ -25,10 +25,12 @@ buildPythonPackage rec {
#The Pypi package doesn't include the test
doCheck = false;
+ pythonImportsCheck = [ "scp" ];
+
meta = with lib; {
homepage = "https://github.com/jbardin/scp.py";
description = "SCP module for paramiko";
- license = licenses.lgpl3;
+ license = licenses.lgpl21Only;
maintainers = with maintainers; [ xnaveira ];
};
}
diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index a93de053c446..0d8ca351096c 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -1,21 +1,25 @@
{ lib, stdenv, fetchurl, fetchpatch
-, getopt, tzdata
+, getopt, tzdata, ksh
+, pkgsMusl # for passthru.tests
}:
stdenv.mkDerivation rec {
pname = "bmake";
- version = "20210420";
+ version = "20210621";
src = fetchurl {
url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
- sha256 = "1ajq8v5rq3pl5y9h1hlscs83007fsyk3lhcp87z09ma370lm3ra7";
+ sha256 = "0gpzv75ibzqz1j1h0hdjgx1v7hkl3i5cb5yf6q9sfcgx0bvb55xa";
};
# Make tests work with musl
# * Disable deptgt-delete_on_error test (alpine does this too)
+ # * Disable shell-ksh test (ksh doesn't compile with musl)
# * Fix test failing due to different strerror(3) output for musl and glibc
postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
- sed -i unit-tests/Makefile -e '/deptgt-delete_on_error/d'
+ sed -i unit-tests/Makefile \
+ -e '/deptgt-delete_on_error/d' \
+ -e '/shell-ksh/d'
substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename"
'';
@@ -28,6 +32,8 @@ stdenv.mkDerivation rec {
./fix-unexport-env-test.patch
# Fix localtime tests without global /etc/zoneinfo directory
./fix-localtime-test.patch
+ # Always enable ksh test since it checks in a impure location /bin/ksh
+ ./unconditional-ksh-test.patch
# decouple tests from build phase
(fetchpatch {
name = "separate-tests.patch";
@@ -68,7 +74,11 @@ stdenv.mkDerivation rec {
'';
doCheck = true;
- checkInputs = [ tzdata ];
+ checkInputs = [
+ tzdata
+ ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [
+ ksh
+ ];
checkPhase = ''
runHook preCheck
@@ -79,6 +89,10 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
+ passthru.tests = {
+ bmakeMusl = pkgsMusl.bmake;
+ };
+
meta = with lib; {
description = "Portable version of NetBSD 'make'";
homepage = "http://www.crufty.net/help/sjg/bmake.html";
diff --git a/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch b/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch
new file mode 100644
index 000000000000..117b85da16d1
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch
@@ -0,0 +1,12 @@
+--- bmake/unit-tests/Makefile.orig 2021-07-04 19:13:09.068094922 +0200
++++ bmake/unit-tests/Makefile 2021-07-04 19:13:14.630080696 +0200
+@@ -295,9 +295,7 @@
+ TESTS+= sh-single-line
+ TESTS+= shell-csh
+ TESTS+= shell-custom
+-.if exists(/bin/ksh)
+ TESTS+= shell-ksh
+-.endif
+ TESTS+= shell-sh
+ TESTS+= suff-add-later
+ TESTS+= suff-clear-regular
diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/development/tools/build-managers/redo-c/Makefile
index f2c43cc5003c..5a1dd74c5b84 100644
--- a/pkgs/development/tools/build-managers/redo-c/Makefile
+++ b/pkgs/development/tools/build-managers/redo-c/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-Os
+CFLAGS ?= -Os
all: redo links
diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix
index 40708b7877a9..14d33cba0395 100644
--- a/pkgs/development/tools/build-managers/redo-c/default.nix
+++ b/pkgs/development/tools/build-managers/redo-c/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "redo-c";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "leahneukirchen";
repo = pname;
rev = "v${version}";
- sha256 = "11wc2sgw1ssdm83cjdc6ndnp1bv5mzhbw7njw47mk7ri1ic1x51b";
+ sha256 = "sha256-oZcaBgESIaD7/SUBE7luh7axucKTEzXPVkQAQs2NCXE=";
};
postPatch = ''
diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix
index c0baf9f39645..549c3d11e3ac 100644
--- a/pkgs/development/tools/rust/cargo-bloat/default.nix
+++ b/pkgs/development/tools/rust/cargo-bloat/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-bloat";
- version = "0.10.0";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
- sha256 = "0bqzzh8vfqm7dpnb0fv4calnhsg9p3c5j06ycvg621p4zp4fydh2";
+ sha256 = "sha256-VcdZ/dKqFFQs8ItNEj407z1pWJqpHwwIsuNnsQ8KU/8=";
};
- cargoSha256 = "0f7hmwrs99qdvhn4lvs8cqva68w2y04fy3ca1xlhk7ncdmclcc4g";
+ cargoSha256 = "sha256-1TIGv0yVhkhThqZiQW9JrvFd0eouTlr8kgN/g7b4vDM=";
meta = with lib; {
description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";
diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index 1237645ebaec..66429f338ac1 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ncdu";
- version = "1.15.1";
+ version = "1.16";
src = fetchurl {
url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
- sha256 = "1c1zxalm5asyhn4p1hd51h7khw17515gbqmvdz63kc8xpx6xqbdh";
+ sha256 = "1m0gk09jaz114piidiw8fkg0id5l6nhz1cg5nlaf1yl3l595g49b";
};
buildInputs = [ ncurses ];
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index 8daa2f10d7e1..e852fdb1c2d4 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "kea";
- version = "1.9.8";
+ version = "1.9.9";
src = fetchurl {
url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-EAi1Ic3YEF0or37At48saKwmAczTwf5GtbEsQNopbl0=";
+ sha256 = "sha256-iVSWBR1+SkXlkwMii2PXpcxFSXYigz4lfNnMZBvS2kM=";
};
patches = [ ./dont-create-var.patch ];
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index f1fe05276396..6726e5b751ab 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tcpdump";
- version = "4.99.0";
+ version = "4.99.1";
src = fetchurl {
url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz";
- sha256 = "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc";
+ sha256 = "sha256-ebNphfsnAxRmGNh8Ss3j4Gi5HFU/uT8CGjN/F1/RDr4=";
};
postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d36d592650f8..1ba9a1be9b9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8200,6 +8200,8 @@ in
qhull = callPackage ../development/libraries/qhull { };
+ qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };
+
qjoypad = callPackage ../tools/misc/qjoypad { };
qmk = callPackage ../tools/misc/qmk { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 124a9533dccd..887ae8a149a2 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -38,6 +38,7 @@ mapAliases ({
dateutil = python-dateutil; # added 2021-07-03
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
diff_cover = diff-cover; # added 2021-07-02
+ dftfit = throw "it's dependency lammps-cython no longer builds";
dns = dnspython; # Alias for compatibility, 2017-12-10
faulthandler = throw "faulthandler is built into ${python.executable}";
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
@@ -45,6 +46,7 @@ mapAliases ({
google_api_python_client = google-api-python-client; # added 2021-03-19
googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
HAP-python = hap-python; # added 2021-06-01
+ lammps-cython = throw "no longer builds and is unmaintained";
MechanicalSoup = mechanicalsoup; # added 2021-06-01
privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20