diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-25 16:32:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 16:32:48 -0500 |
| commit | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (patch) | |
| tree | 745ae7c1d7e5f666ccb2fa3fa038bfb0e51bd011 /pkgs/applications/editors | |
| parent | 11d26c797fb4010f5cae07848902e7fad8a9d3a9 (diff) | |
| parent | ee8fa757f36b80a34fa97f8ee686f92abe742cf1 (diff) | |
| download | nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.gz nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.bz2 nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.lz nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.xz nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.tar.zst nixlib-98f2f08b4b9b204912c1c097a08cd26151fae0bb.zip | |
Merge pull request #41009 from matthewbauer/normalize-names
Add versions to packages missing it
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/neovim/wrapper.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/okteta/default.nix | 41 |
2 files changed, 25 insertions, 18 deletions
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index a27b5a41ac70..f1ec03cb42ee 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -51,7 +51,7 @@ let in stdenv.mkDerivation { - inherit name; + name = "neovim-${stdenv.lib.getVersion neovim}"; buildCommand = let bin="${neovim}/bin/nvim"; in '' if [ ! -x "${bin}" ] then diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 770eb63dc69e..abbffeb91807 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,27 +1,34 @@ -{ - mkDerivation, lib, fetchurl, - extra-cmake-modules, kdoctools, - qtscript, kconfig, kinit, karchive, kcrash, - kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, - shared-mime-info -}: +{ stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig +, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts +, qca-qt5, shared-mime-info }: -let +stdenv.mkDerivation rec { + name = "okteta-${version}"; version = "17.12.3"; -in mkDerivation rec { - name = "okteta"; + src = fetchurl { - url = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz"; + url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz"; sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; }; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ peterhoeg bkchr ]; - }; + nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; buildInputs = [ shared-mime-info ]; + propagatedBuildInputs = [ - kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 - karchive kcrash + kconfig + kinit + kcmutils + kconfigwidgets + knewstuff + kparts + qca-qt5 + karchive + kcrash ]; + + meta = with stdenv.lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg bkchr ]; + platforms = platforms.linux; + }; } |