diff options
| author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2019-08-26 21:40:19 +0000 |
| commit | 35d68ef143412f579544eaac7aaa87e29f84b15e (patch) | |
| tree | 7e4cc2079e73fde7e1cacdbeb17a4ea290f0a02e /pkgs/tools/typesetting | |
| parent | fe9c9f719d143632d31ac2b01f5f7cfbad161ce1 (diff) | |
| download | nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.gz nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.bz2 nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.lz nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.xz nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.tar.zst nixpkgs-35d68ef143412f579544eaac7aaa87e29f84b15e.zip | |
treewide: remove redundant quotes
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/kindlegen/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 4 |
2 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index 2c0e2f29d24..80023e05ec4 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -5,22 +5,22 @@ let fileVersion = builtins.replaceStrings [ "." ] [ "_" ] version; sha256 = { - "x86_64-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - "i686-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - "x86_64-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - "i686-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - "x86_64-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - "i686-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); + x86_64-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; + i686-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; + x86_64-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; + i686-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; + x86_64-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; + i686-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; + }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); url = { - "x86_64-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - "i686-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - "x86_64-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - "i686-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - "x86_64-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - "i686-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); + x86_64-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; + i686-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; + x86_64-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; + i686-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; + x86_64-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; + i686-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; + }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); in stdenv.mkDerivation rec { pname = "kindlegen"; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index a3b58e7274d..651ff88b6f2 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -84,8 +84,8 @@ let # the fake derivations are used for filtering of hyphenation patterns else { inherit pname version; tlType = "run"; } )] - ++ lib.optional (attrs.sha512 ? "doc") (mkPkgV "doc") - ++ lib.optional (attrs.sha512 ? "source") (mkPkgV "source") + ++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc") + ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source") ++ lib.optional (bin ? ${pname}) ( bin.${pname} // { inherit pname; tlType = "bin"; } ) ++ combinePkgs (attrs.deps or {}); |