diff options
| -rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/office/ledger/2.6.3.nix | 41 | ||||
| -rw-r--r-- | pkgs/applications/video/ffmpeg-normalize/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/build-support/emacs/setup-hook.sh | 30 | ||||
| -rw-r--r-- | pkgs/tools/backup/rdedup/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
7 files changed, 63 insertions, 58 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index f5b7741a5cf..464e9ed38c4 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -505,8 +505,10 @@ in PrintMotd no # handled by pam_motd AuthorizedKeysFile ${toString cfg.authorizedKeysFiles} - AuthorizedKeysCommand ${cfg.authorizedKeysCommand} - AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser} + ${optionalString (cfg.authorizedKeysCommand != "none") '' + AuthorizedKeysCommand ${cfg.authorizedKeysCommand} + AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser} + ''} ${flip concatMapStrings cfg.hostKeys (k: '' HostKey ${k.path} diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 98653517b5e..1ab22a73c63 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley adisbladis ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix deleted file mode 100644 index 60fff1d0131..00000000000 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, emacs, gmp, pcre, expat }: - -stdenv.mkDerivation rec { - name = "ledger2-2.6.3"; - - src = fetchurl { - url = "https://github.com/downloads/ledger/ledger/${name}.tar.gz"; - sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k"; - }; - - buildInputs = [ emacs gmp pcre expat ]; - - configureFlags = [ - "CPPFLAGS=-DNDEBUG" - "CFLAGS=-O3" - "CXXFLAGS=-O3" - ]; - - doCheck = true; - - # Patchelf breaks the hard-coded rpath to ledger's libamounts.0.so and - # libledger-2.6.3.so. Fortunately, libtool chooses proper rpaths to - # begin with, so we can just disable patchelf to avoid the issue. - dontPatchELF = true; - - meta = { - homepage = https://ledger-cli.org/; - description = "A double-entry accounting system with a command-line reporting interface"; - license = "BSD"; - - longDescription = '' - Ledger is a powerful, double-entry accounting system that is accessed - from the UNIX command-line. This may put off some users, as there is - no flashy UI, but for those who want unparalleled reporting access to - their data, there really is no alternative. - ''; - - platforms = stdenv.lib.platforms.all; - broken = true; # https://hydra.nixos.org/build/59124559/nixlog/1 - }; -} diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix new file mode 100644 index 00000000000..d992e42ebff --- /dev/null +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonApplication +, fetchPypi +, ffmpeg +, tqdm +}: + +buildPythonApplication rec { + pname = "ffmpeg-normalize"; + version = "1.15.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0161939f864e973b11d50170c657baf3e1433147f46c74a74ed5025a822e9a2d"; + }; + + propagatedBuildInputs = [ ffmpeg tqdm ]; + + checkPhase = '' + $out/bin/ffmpeg-normalize --help > /dev/null + ''; + + meta = with lib; { + description = "Normalize audio via ffmpeg"; + homepage = "https://github.com/slhck/ffmpeg-normalize"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index b210511d670..8f074e0b406 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh @@ -1,13 +1,25 @@ addEmacsVars () { - if test -d $1/share/emacs/site-lisp; then - # it turns out, that the trailing : is actually required + for lispDir in \ + "$1/share/emacs/site-lisp" \ + "$1/share/emacs/site-lisp/"* \ + "$1/share/emacs/site-lisp/elpa/"*; do + # Add the path to the Emacs load path if it is a directory + # containing .el files and it has not already been added to the + # load path. + if [[ -d $lispDir && "$(echo "$lispDir"/*.el)" && ${EMACSLOADPATH-} != *"$lispDir":* ]] ; then + # It turns out, that the trailing : is actually required # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html - export EMACSLOADPATH="$1/share/emacs/site-lisp:${EMACSLOADPATH-}" - fi + export EMACSLOADPATH="$lispDir:${EMACSLOADPATH-}" + fi + done } -# If this is for a wrapper derivation, emacs and the dependencies are all -# run-time dependencies. If this is for precompiling packages into bytecode, -# emacs is a compile-time dependency of the package. -addEnvHooks "$hostOffset" addEmacsVars -addEnvHooks "$targetOffset" addEmacsVars +if [[ ! -v emacsHookDone ]]; then + emacsHookDone=1 + + # If this is for a wrapper derivation, emacs and the dependencies are all + # run-time dependencies. If this is for precompiling packages into bytecode, + # emacs is a compile-time dependency of the package. + addEnvHooks "$hostOffset" addEmacsVars + addEnvHooks "$targetOffset" addEmacsVars +fi diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index b3cf971970a..1ed5bfd9ef8 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -13,9 +13,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7"; }; - cargoSha256 = "1zvg68ilgpnd95b36jvna9h1jr5d72x1a0g6flw2x6sd0msc0mdw"; + cargoSha256 = "0akwb7ak4h1i1zk4wcn27zyqjz6mrchs47014xbzw22rj8h8dx92"; - patches = [ + cargoPatches = [ ./v3.1.1-fix-Cargo.lock.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79fe6d38124..e2bc8a135eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11446,6 +11446,8 @@ in ffmpeg-sixel = callPackage ../development/libraries/ffmpeg-sixel { }; + ffmpeg-normalize = python3Packages.callPackage ../applications/video/ffmpeg-normalize { }; + ffms = callPackage ../development/libraries/ffms { }; fftw = callPackage ../development/libraries/fftw { }; @@ -20228,11 +20230,12 @@ in linuxband = callPackage ../applications/audio/linuxband { }; - ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger { + ledger = callPackage ../applications/office/ledger { + # Boost >= 1.67 changed the name of boost python; ledger's cmake build needs + # an update to find it: + # https://www.boost.org/doc/libs/1_68_0/libs/python/doc/html/rn.html boost = boost15x; }; - ledger = ledger3; ledger-autosync = callPackage ../applications/office/ledger-autosync { }; |