diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 3 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8dc329df059..2a74d06051be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11144,6 +11144,8 @@ with pkgs; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; + subdl = callPackage ../applications/video/subdl { }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; suil-qt4 = callPackage ../development/libraries/audio/suil { @@ -12018,6 +12020,8 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; + lwan = callPackage ../servers/http/lwan { }; + mailman = callPackage ../servers/mail/mailman { }; mattermost = callPackage ../servers/mattermost { }; @@ -12099,6 +12103,7 @@ with pkgs; oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + openafs = callPackage ../servers/openafs { tsmbac = null; ncurses = null; }; openpts = callPackage ../servers/openpts { }; openresty = callPackage ../servers/http/openresty { }; @@ -13083,7 +13088,7 @@ with pkgs; rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; - openafsClient = callPackage ../servers/openafs-client { }; + openafs = callPackage ../servers/openafs/module.nix { }; facetimehd = callPackage ../os-specific/linux/facetimehd { }; @@ -14952,8 +14957,6 @@ with pkgs; emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { - overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl; inherit emacs texinfo makeWrapper runCommand; @@ -16444,6 +16447,8 @@ with pkgs; diffpdf = callPackage ../applications/misc/diffpdf { }; + diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; + mlocate = callPackage ../tools/misc/mlocate { }; mypaint = callPackage ../applications/graphics/mypaint { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 3acc6d0ebec6..99863eb76a88 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -32,9 +32,7 @@ # `meta` with `platforms` and `homepage` set to something you are # unlikely to want to override for most packages -{ overrides - -, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand +{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand , emacs, texinfo, lndir, makeWrapper , trivialBuild diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc81116cf3e6..2c40d1299345 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3786,9 +3786,6 @@ in { }; }); - nose-parameterized = warn "Warning: `nose-parameterized` is deprecated! Use `parameterized` instead." - (callPackage ../development/python-modules/nose-parameterized {}); - neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; version = "0.3.1"; |