diff options
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 23 | ||||
-rw-r--r-- | pkgs/applications/editors/nano/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/tiled/default.nix | 4 |
3 files changed, 11 insertions, 20 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f57c1b71b13dc..9574ec43a612b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -33,8 +33,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (import ./libgenerated.nix lib self) melpaDerivation; super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson)); - generic = import ./melpa-generic.nix; - overrides = rec { shared = { # Expects bash to be at /bin/bash @@ -131,20 +129,20 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # upstream issue: missing file header initsplit = markBroken super.initsplit; - irony = super.irony.overrideAttrs(old: { + irony = super.irony.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; preConfigure = '' cd server ''; preBuild = '' make + install -D bin/irony-server $out/bin/irony-server + cd .. ''; - postInstall = '' - mkdir -p $out - mv $out/share/emacs/site-lisp/elpa/*/server/bin $out - rm -rf $out/share/emacs/site-lisp/elpa/*/server - ''; - preCheck = '' + checkPhase = '' cd source/server + make check + cd ../.. ''; dontUseCmakeBuildDir = true; doCheck = true; @@ -396,13 +394,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; - # Fails with "package does not untar cleanly into ..." - irony = shared.irony.overrideAttrs(old: { - meta = old.meta // { - broken = true; - }; - }); - orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 0ce0e011ae6f8..aea585ce8d661 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "4.3"; + version = "4.4"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfzv91bs50davlq0"; + sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 4fa93d78235ec..b0b80a4ec001d 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake , python, qtbase, qttools }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "tiled"; version = "1.2.4"; |