diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 2c96b94ca43c..28d7c82f8575 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -520,11 +520,7 @@ in
XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
''}
- ${if cfg.forwardX11 then ''
- X11Forwarding yes
- '' else ''
- X11Forwarding no
- ''}
+ X11Forwarding ${if cfg.forwardX11 then "yes" else "no"}
${optionalString cfg.allowSFTP ''
Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags}
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 494d21cc8678..6238a351b998 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -42,11 +42,6 @@ in {
description = ''
The interfaces wpa_supplicant will use. If empty, it will
automatically use all wireless interfaces.
-
- The automatic discovery of interfaces does not work reliably on boot:
- it may fail and leave the system without network. When possible, specify
- a known interface name.
-
'';
};
@@ -230,14 +225,6 @@ in {
message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive'';
});
- warnings =
- optional (cfg.interfaces == [] && config.systemd.services.wpa_supplicant.wantedBy != [])
- ''
- No network interfaces for wpa_supplicant have been configured: the service
- may randomly fail to start at boot. You should specify at least one using the option
- networking.wireless.interfaces.
- '';
-
environment.systemPackages = [ package ];
services.dbus.packages = [ package ];
@@ -258,31 +245,45 @@ in {
wantedBy = [ "multi-user.target" ];
stopIfChanged = false;
- path = [ package ];
+ path = [ package pkgs.udev ];
script = let
configStr = if cfg.allowAuxiliaryImperativeNetworks
then "-c /etc/wpa_supplicant.conf -I ${configFile}"
else "-c ${configFile}";
in ''
- if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]
- then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
+ if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then
+ echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
fi
+
iface_args="-s -u -D${cfg.driver} ${configStr}"
+
${if ifaces == [] then ''
- for i in $(cd /sys/class/net && echo *); do
- DEVTYPE=
- UEVENT_PATH=/sys/class/net/$i/uevent
- if [ -e "$UEVENT_PATH" ]; then
- source "$UEVENT_PATH"
- if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
- args+="''${args:+ -N} -i$i $iface_args"
- fi
- fi
+ # detect interfaces automatically
+
+ # check if there are no wireless interface
+ if ! find -H /sys/class/net/* -name wireless | grep -q .; then
+ # if so, wait until one appears
+ echo "Waiting for wireless interfaces"
+ grep -q '^ACTION=add' < <(stdbuf -oL -- udevadm monitor -s net/wlan -pu)
+ # Note: the above line has been carefully written:
+ # 1. The process substitution avoids udevadm hanging (after grep has quit)
+ # until it tries to write to the pipe again. Not even pipefail works here.
+ # 2. stdbuf is needed because udevadm output is buffered by default and grep
+ # may hang until more udev events enter the pipe.
+ fi
+
+ # add any interface found to the daemon arguments
+ for name in $(find -H /sys/class/net/* -name wireless | cut -d/ -f 5); do
+ echo "Adding interface $name"
+ args+="''${args:+ -N} -i$name $iface_args"
done
'' else ''
+ # add known interfaces to the daemon arguments
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
''}
+
+ # finally start daemon
exec wpa_supplicant $args
'';
};
diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix
index 628b4c46cba5..d98e3b37514f 100644
--- a/pkgs/applications/editors/vim/vimacs.nix
+++ b/pkgs/applications/editors/vim/vimacs.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "vimacs";
- version = vimPackage.version;
+ version = lib.getVersion vimPackage;
vimPackage = if useMacvim then macvim else vim_configurable;
buildInputs = [ vimPackage vimPlugins.vimacs ];
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 901b9a340fea..0a6f1569cd4e 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, cln, pkg-config, readline, gmp, python3 }:
stdenv.mkDerivation rec {
- name = "ginac-1.8.0";
+ name = "ginac-1.8.1";
src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
- sha256 = "0l9byzfxq3f9az5pcdldnl95ws8mpirkqky46f973mvxi5541d24";
+ sha256 = "sha256-8WldvWsYcGHvP7pQdkjJ1tukOPczsFjBb5J4y9z14as=";
};
propagatedBuildInputs = [ cln ];
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index a636c2c3e599..1fbb099e0139 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "7.7.1";
+ version = "7.7.2";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "sha256-nFXj40PfHctymBcZoiJNzkvAsFnABD300/aUqNpUn2c=";
+ sha256 = "sha256-jL0XLw0V0ED+lDBn3sGaJmm96zQwXue333UuYGHjB64=";
};
dontBuild = true;
diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index 8a829aa3c91c..f92f2f0affe4 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "dyncall";
version = "1.2";
src = fetchurl {
- url = "https://www.dyncall.org/r1.2/dyncall-1.2.tar.gz";
+ url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz";
# https://www.dyncall.org/r1.2/SHA256
sha256 = "sha256-6IFUwCQ0IVYHBPXHKUr73snpka+gYB1a3/UELqgYCNc=";
};
diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix
index 635f8b8a6159..7781c936b929 100644
--- a/pkgs/development/libraries/libnbd/default.nix
+++ b/pkgs/development/libraries/libnbd/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "libnbd";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchurl {
url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz";
- hash = "sha256-UDLH5IMuKI6mAO/9VNmI8pCbxv94tCCQYRKZn2DBclg=";
+ hash = "sha256-qF9IFZGj+9Zuw00+9pbgAhBUk+eUIAxhYNJAMWxmWo0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index bdc6a44f00b8..2b8f006a7558 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -2,13 +2,17 @@
stdenv.mkDerivation rec {
pname = "portmidi";
- version = "217";
+ version = "234";
src = fetchurl {
- url = "mirror://sourceforge/portmedia/portmidi-src-${version}.zip";
- sha256 = "03rfsk7z6rdahq2ihy5k13qjzgx757f75yqka88v3gc0pn9ais88";
+ url = "mirror://sourceforge/portmedia/portmedia-code-r${version}.zip";
+ sha256 = "1g7i8hgarihycadbgy2f7lifiy5cbc0mcrcazmwnmbbh1bqx6dyp";
};
+ prePatch = ''
+ cd portmidi/trunk
+ '';
+
cmakeFlags = let
#base = "${jdk}/jre/lib/${jdk.architecture}";
in [
diff --git a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff
index 975dbb57b59d..15ed874f172f 100644
--- a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff
+++ b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff
@@ -12,17 +12,17 @@ index 4919b78..758eccb 100644
if(UNIX)
diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
-index e171047..aafa09c 100644
+index cbeeade..f765430 100644
--- a/pm_common/CMakeLists.txt
+++ b/pm_common/CMakeLists.txt
@@ -22,7 +22,7 @@ else(APPLE OR WIN32)
endif(APPLE OR WIN32)
if(APPLE)
-- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk CACHE
+- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk CACHE
+ set(CMAKE_OSX_SYSROOT / CACHE
- PATH "-isysroot parameter for compiler" FORCE)
- set(CMAKE_C_FLAGS "-mmacosx-version-min=10.5" CACHE
+ PATH "-isysroot parameter for compiler")
+ set(CMAKE_C_FLAGS "-mmacosx-version-min=10.6" CACHE
STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE)
@@ -54,10 +54,6 @@ if(UNIX)
diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix
index 3d1236a03dbb..9f50c80bf7a1 100644
--- a/pkgs/development/libraries/spglib/default.nix
+++ b/pkgs/development/libraries/spglib/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "spglib";
- version = "1.16.1";
+ version = "1.16.2";
src = fetchFromGitHub {
owner = "atztogo";
repo = "spglib";
rev = "v${version}";
- sha256 = "1sk59nnar9npka4mdcfh4154ja46i35y4gbq892kwqidzyfs80in";
+ sha256 = "1sbrk26xyvlhqxxv9cq2ycxwbiafgmh7lf221377zpqq8q3iavd7";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index d68318355d88..5f09dda0f44a 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "bleach";
- version = "3.3.0";
+ version = "3.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM=";
+ sha256 = "1yma53plrlw2llaqxv8yk0g5al0vvlywwzym18b78m3rm6jq6r1h";
};
checkInputs = [ pytest pytest-runner ];
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 556576459695..1bd8fd5f63cc 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
- version = "0.45.1";
+ version = "0.46.0";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
- sha256 = "sha256-ZDPlYoLAQLXiV+LUMdu/8v3TrG5/Zz4+r4PtThrLAas=";
+ sha256 = "109ma1qlhifj5hs530zfnvc6mqv5grfmcq3s57wawq9nzq0gpfy8";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix
index 130b44c09694..5560f3811fa3 100644
--- a/pkgs/development/python-modules/pyopenuv/default.nix
+++ b/pkgs/development/python-modules/pyopenuv/default.nix
@@ -2,6 +2,7 @@
, aiohttp
, aresponses
, asynctest
+, backoff
, buildPythonPackage
, fetchFromGitHub
, poetry-core
@@ -13,19 +14,22 @@
buildPythonPackage rec {
pname = "pyopenuv";
- version = "2.0.2";
+ version = "2.1.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
- sha256 = "sha256-QVgNwu/NXSV9nbRN0POBCdKCv6xdp4uSEzFAiHkhVaQ=";
+ sha256 = "sha256-S2X7cTArjiWOFjQGnrZ4AuhgN8t18wf9d6i9X5thRZg=";
};
nativeBuildInputs = [ poetry-core ];
- propagatedBuildInputs = [ aiohttp ];
+ propagatedBuildInputs = [
+ aiohttp
+ backoff
+ ];
checkInputs = [
aresponses
diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
index 588e9053adb0..042aff09a5fc 100644
--- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
@@ -1,11 +1,12 @@
{ lib, stdenv, fetchurl, perl, autoconf }:
stdenv.mkDerivation rec {
- name = "automake-1.16.4";
+ # When updating, beware of https://github.com/NixOS/nixpkgs/pull/131928#issuecomment-896614165
+ name = "automake-1.16.3";
src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.xz";
- sha256 = "sha256-gPrMCYhaV+bUnQaXLArhCJxfqPTUx8/luupY5QhfE20=";
+ sha256 = "0fmz2fhmzcpacnprl5msphvaflwiy0hvpgmqlgfny72ddijzfazz";
};
nativeBuildInputs = [ autoconf perl ];
diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
deleted file mode 100644
index 586fc03687c5..000000000000
--- a/pkgs/development/web/now-cli/default.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ stdenv, lib, fetchurl }:
-stdenv.mkDerivation rec {
- pname = "now-cli";
- version = "15.8.7";
-
- # TODO: switch to building from source, if possible
- src = fetchurl {
- url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
- sha256 = "1x6nsn9qmsy4hk7l2dsyabc7fxkwwwl1y1852vs4dgxi8w1hax93";
- };
-
- sourceRoot = ".";
- unpackCmd = ''
- gunzip -c $curSrc > now-linux
- '';
-
- dontBuild = true;
-
- installPhase = ''
- mkdir $out
- mkdir $out/bin
- cp now-linux $out/bin/now
- '';
-
- # now is a node program packaged using zeit/pkg.
- # thus, it contains hardcoded offsets.
- # patchelf shifts these locations when it expands headers.
-
- # this could probably be generalised into allowing any program packaged
- # with zeit/pkg to be run on nixos.
-
- preFixup = let
- libPath = lib.makeLibraryPath [stdenv.cc.cc];
- in ''
-
- orig_size=$(stat --printf=%s $out/bin/now)
-
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/now
- patchelf --set-rpath ${libPath} $out/bin/now
- chmod +x $out/bin/now
-
- new_size=$(stat --printf=%s $out/bin/now)
-
- ###### zeit-pkg fixing starts here.
- # we're replacing plaintext js code that looks like
- # PAYLOAD_POSITION = '1234 ' | 0
- # [...]
- # PRELUDE_POSITION = '1234 ' | 0
- # ^-----20-chars-----^^------22-chars------^
- # ^-- grep points here
- #
- # var_* are as described above
- # shift_by seems to be safe so long as all patchelf adjustments occur
- # before any locations pointed to by hardcoded offsets
-
- var_skip=20
- var_select=22
- shift_by=$(expr $new_size - $orig_size)
-
- function fix_offset {
- # $1 = name of variable to adjust
- location=$(grep -obUam1 "$1" $out/bin/now | cut -d: -f1)
- location=$(expr $location + $var_skip)
-
- value=$(dd if=$out/bin/now iflag=count_bytes,skip_bytes skip=$location \
- bs=1 count=$var_select status=none)
- value=$(expr $shift_by + $value)
-
- echo -n $value | dd of=$out/bin/now bs=1 seek=$location conv=notrunc
- }
-
- fix_offset PAYLOAD_POSITION
- fix_offset PRELUDE_POSITION
-
- '';
- dontStrip = true;
-
-
-
- meta = with lib; {
- homepage = "https://zeit.co/now";
- description = "The Command Line Interface for Now - Global Serverless Deployments";
- license = licenses.asl20;
- platforms = platforms.linux;
- maintainers = [ maintainers.bhall ];
- };
-}
diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
index f76fc761abbc..50e9c447f2fc 100644
--- a/pkgs/misc/emulators/fceux/default.nix
+++ b/pkgs/misc/emulators/fceux/default.nix
@@ -1,40 +1,24 @@
-{lib, stdenv, fetchFromGitHub, scons, zlib, SDL, lua5_1, pkg-config}:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, SDL2, lua5_1, minizip, x264 }:
-stdenv.mkDerivation {
- pname = "fceux-unstable";
- version = "2020-01-29";
+stdenv.mkDerivation rec {
+ pname = "fceux";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "TASVideos";
- repo = "fceux";
- rev = "fb8d46d9697cb24b0ebe79d84eedf282f69ab337";
- sha256 = "0gpz411dzfwx9mr34yi4zb1hphd5hha1nvwgzxki0sviwafca992";
+ repo = pname;
+ rev = "${pname}-${version}";
+ sha256 = "sha256-i0mb0vy46D97oOpAjMw3CPbG4w/LWP9YRVEMWjdYgs0=";
};
- nativeBuildInputs = [ pkg-config scons ];
- buildInputs = [
- zlib SDL lua5_1
- ];
+ nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+ buildInputs = [ SDL2 lua5_1 minizip x264 ];
- sconsFlags = "OPENGL=false GTK=false CREATE_AVI=false LOGO=false";
- prefixKey = "--prefix=";
-
- # sed allows scons to find libraries in nix.
- # mkdir is a hack to make scons succeed. It still doesn't
- # actually put the files in there due to a bug in the SConstruct file.
- # OPENGL doesn't work because fceux dlopens the library.
- preBuild = ''
- sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct
- export CC="gcc"
- export CXX="g++"
- mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps"
- '';
-
- meta = {
+ meta = with lib; {
description = "A Nintendo Entertainment System (NES) Emulator";
- license = lib.licenses.gpl2;
- maintainers = [ lib.maintainers.scubed2 ];
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ sbruder scubed2 ];
homepage = "http://www.fceux.com/";
- platforms = lib.platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 6677be105bb9..0231c5fb6053 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2021.8.5";
+ version = "2021.8.6";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 384766852c2e..060a00006052 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -62,23 +62,6 @@ let
(mkOverride "pylast" "4.2.0"
"0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3")
- # Pinned due to API changes in pyopenuv>=1.1.0
- (self: super: {
- pyopenuv = super.pyopenuv.overridePythonAttrs (oldAttrs: rec {
- version = "1.0.13";
- src = fetchFromGitHub {
- owner = "bachya";
- repo = "pyopenuv";
- rev = version;
- sha256 = "1gx9xjkyvqqy8410lnbshq1j5y4cb0cdc4m505g17rwdzdwb01y8";
- };
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace "poetry.masonry.api" "poetry.core.masonry.api"
- '';
- });
- })
-
# Pinned due to API changes in pyruckus>0.12
(self: super: {
pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec {
@@ -138,7 +121,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2021.8.5";
+ hassVersion = "2021.8.6";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -155,7 +138,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "0alyr87vm0szljw1lgdsv7085rl0m9r16nwdprwskhcjlwllk1bh";
+ sha256 = "1hahxvvlk32dbmv2lhn67w1ii5g24znvjqgsq318qv8c2qh5z5ws";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix
index 3cb15c1e9765..4e8daf38453c 100644
--- a/pkgs/servers/web-apps/cryptpad/default.nix
+++ b/pkgs/servers/web-apps/cryptpad/default.nix
@@ -75,7 +75,15 @@ let
chmod +x $out/bin/cryptpad
'';
- meta.maintainers = with lib.maintainers; [ davhau ];
+ meta = {
+ longDescription = ''
+ CryptPad is a collaboration suite that is end-to-end-encrypted and open-source.
+ It is built to enable collaboration, synchronizing changes to documents in real time.
+ Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored.
+ '';
+ maintainers = with lib.maintainers; [ davhau ];
+ mainProgram = "cryptpad";
+ };
};
in
diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix
index 7b522dd93b80..0126d68ed2d0 100644
--- a/pkgs/tools/admin/afterburn/default.nix
+++ b/pkgs/tools/admin/afterburn/default.nix
@@ -2,21 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "afterburn";
- version = "5.0.0";
+ version = "5.1.0";
src = fetchFromGitHub {
owner = "coreos";
repo = "afterburn";
rev = "v${version}";
- sha256 = "sha256-sdgAZuT8bIX4eWN7nLNNyclxazmCBr5kDFS6s6cRXVU=";
+ sha256 = "sha256-5dzgvoR6qGlVz0RJ1j9B4yna1aCbOczVLcU++GWNEL8=";
};
- cargoSha256 = "sha256-IzcaaQjge2z49XwyFcPHX/AMjvrbcOLw0J1qBzHw7Is=";
+ cargoSha256 = "sha256-cqipYIH/XHMe7ppsXPVnDfsUqXoIep7CHiOGEPbZK4M=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
- patchPhase = ''
+ postPatch = ''
substituteInPlace ./systemd/afterburn-checkin.service --replace /usr/bin $out/bin
substituteInPlace ./systemd/afterburn-firstboot-checkin.service --replace /usr/bin $out/bin
substituteInPlace ./systemd/afterburn-sshkeys@.service.in --replace /usr/bin $out/bin
diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix
index bd15661a0e00..b78cafe566a6 100644
--- a/pkgs/tools/graphics/agi/default.nix
+++ b/pkgs/tools/graphics/agi/default.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "agi";
- version = "2.1.0-dev-20210804";
+ version = "2.1.0-dev-20210809";
src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
- sha256 = "sha256-ptxESGdgGus4ZfCvpOYCcURdPSLZEFq3iYy/MmetJCU=";
+ sha256 = "sha256-n1a35syStFbhpVGyi/7oxWzBb2lXyVZd3K8/Bt8b0Lg=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix
index 3d91dd6d9abb..fc078ca64dfd 100644
--- a/pkgs/tools/misc/infracost/default.nix
+++ b/pkgs/tools/misc/infracost/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "infracost";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
- sha256 = "sha256-OQwMO9bhPK+Wjob8rAFYJQRpAYf1bPdRi2BjETjpSpE=";
+ sha256 = "sha256-B9byIortXH9v1aZNVU55uXA+5w7rdLijoE+JNq3OZlE=";
};
- vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8=";
+ vendorSha256 = "sha256-TfaT5xPzdyTR0sH+EsZKCNXONkfjDRvT/jevAVQt+Zg=";
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index cef09241420d..f9d9224e91b1 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/pkgs/tools/networking/cksfv/default.nix
@@ -1,17 +1,18 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "cksfv";
version = "1.3.15";
src = fetchurl {
- url = "http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2";
+ url = "https://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2";
sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1";
};
meta = with lib; {
- homepage = "http://zakalwe.fi/~shd/foss/cksfv/";
+ homepage = "https://zakalwe.fi/~shd/foss/cksfv/";
description = "A tool for verifying files against a SFV checksum file";
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
license = licenses.gpl2;
};
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 60dbd1c323b7..681bda5b4e1b 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -5,7 +5,7 @@ buildGoPackage rec {
version = "0.7.4";
src = fetchurl {
- url = "http://viric.name/soft/filegive/filegive-${version}.tar.gz";
+ url = "https://viric.name/soft/filegive/filegive-${version}.tar.gz";
sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy";
};
@@ -14,7 +14,7 @@ buildGoPackage rec {
goPackagePath = "viric.name/soft/filegive";
meta = with lib; {
- homepage = "http://viric.name/cgi-bin/filegive";
+ homepage = "https://viric.name/cgi-bin/filegive";
description = "Easy p2p file sending program";
license = licenses.agpl3Plus;
maintainers = [ maintainers.viric ];
diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 47c017ee98c9..0e92047c63fa 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-08-06";
+ version = "2021-08-11";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
- sha256 = "sha256-aKF/6SuSAk319QqGmyUu91//ofvPtHxX2Uv8FxhzqCM=";
+ sha256 = "sha256-OSEG0pWnxSvUS1h9v1j9/poo15ZoouNqiG+qB/JrOHc=";
};
installPhase = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 54d112a31d95..87c582987468 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -526,6 +526,7 @@ mapAliases ({
nmap-unfree = nmap; # added 2021-04-06
nologin = shadow; # added 2018-04-25
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27
+ now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05
nxproxy = nx-libs; # added 2019-02-15
nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";
oauth2_proxy = oauth2-proxy; # added 2021-04-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebcd77714422..d8cc410c3385 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6701,8 +6701,6 @@ with pkgs;
nodejs = pkgs.nodejs;
});
- now-cli = callPackage ../development/web/now-cli {};
-
np2kai = callPackage ../misc/emulators/np2kai { };
ox = callPackage ../applications/editors/ox { };
@@ -31345,7 +31343,7 @@ with pkgs;
faustStk = callPackage ../applications/audio/faustStk { };
- fceux = callPackage ../misc/emulators/fceux { };
+ fceux = libsForQt5.callPackage ../misc/emulators/fceux { };
flockit = callPackage ../tools/backup/flockit { };