diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2018-05-28 05:59:57 -0700 |
|---|---|---|
| committer | Ryan Mulligan <ryan@ryantm.com> | 2018-05-28 05:59:57 -0700 |
| commit | af9d10a91b5ef0518ee12b220470735076974210 (patch) | |
| tree | ef7ede43a31b0b5998799f33dc8f0e8fdf254db3 /pkgs/applications/editors | |
| parent | f0d6411c22d91723fef3f935adf35c7884a4dc76 (diff) | |
| download | nixlib-af9d10a91b5ef0518ee12b220470735076974210.tar nixlib-af9d10a91b5ef0518ee12b220470735076974210.tar.gz nixlib-af9d10a91b5ef0518ee12b220470735076974210.tar.bz2 nixlib-af9d10a91b5ef0518ee12b220470735076974210.tar.lz nixlib-af9d10a91b5ef0518ee12b220470735076974210.tar.xz nixlib-af9d10a91b5ef0518ee12b220470735076974210.tar.zst nixlib-af9d10a91b5ef0518ee12b220470735076974210.zip | |
treewide: fix derivation names
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/manuskript/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/editors/neovim/neovim-remote.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/wxhexeditor/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/yi/wrapper.nix | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index fc27e4a00f7e..815af2103d58 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -1,11 +1,11 @@ { stdenv, zlib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - name = "manuskript"; + pname = "manuskript"; version = "0.3.0"; src = fetchFromGitHub { - repo = name; + repo = pname; owner = "olivierkes"; rev = version; sha256 = "0bqxc4a8kyi6xz1zs0dp85wxl9h4v8lzc6073bbcsn1zg4y59ys7"; @@ -19,15 +19,15 @@ python3Packages.buildPythonApplication rec { patchPhase = '' substituteInPlace manuskript/ui/welcome.py \ - --replace sample-projects $out/share/${name}/sample-projects + --replace sample-projects $out/share/${pname}/sample-projects ''; buildPhase = ''''; installPhase = '' - mkdir -p $out/share/${name} + mkdir -p $out/share/${pname} cp -av bin/ i18n/ libs/ manuskript/ resources/ icons/ $out - cp -r sample-projects/ $out/share/${name} + cp -r sample-projects/ $out/share/${pname} ''; doCheck = false; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 1c99429a7fe2..c4d2be4c740b 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,13 +4,13 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { name = "neovim-remote-${version}"; - version = "v1.8.6"; + version = "1.8.6"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; - rev = version; + rev = "v${version}"; sha256 = "0x01zpmxi37jr7j2az2bd8902h7zhkpg6kpvc8xmll9f7703zz2l"; }; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 85d9b0546d62..5597bf0d0b3c 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "wxHexEditor-${version}"; - version = "v0.24"; + version = "0.24"; src = fetchFromGitHub { repo = "wxHexEditor"; owner = "EUA"; - rev = version; + rev = "v${version}"; sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 916f296b3fcc..e20c0a3cbca7 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -8,8 +8,8 @@ let yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); in -stdenv.mkDerivation { - name = "yi-custom"; +stdenv.mkDerivation rec { + name = "yi-custom-${version}"; version = "0.0.0.1"; unpackPhase = "true"; nativeBuildInputs = [ makeWrapper ]; |