diff options
Diffstat (limited to 'pkgs/development/libraries')
188 files changed, 285 insertions, 288 deletions
diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index fcb708c829bef..94b36b855f25f 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, xorg, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "AntTweakBar-1.16"; buildInputs = [ unzip xorg.libX11 libGLU_combined ]; diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix index dc88b7b12ef39..f15009c2f5d9e 100644 --- a/pkgs/development/libraries/SDL_gpu/default.nix +++ b/pkgs/development/libraries/SDL_gpu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "SDL_gpu-unstable"; version = "2019-01-24"; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 7b8fb67a30f1f..66fa8888fd195 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "SDL_sixel"; version = "1.2-nightly"; diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 307f57d20cf5b..22f1566ad0ace 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -2,7 +2,7 @@ # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "appstream-qt"; inherit (appstream) version src prePatch; diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 4b8093f74031c..17093deae00fc 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -19,7 +19,7 @@ let sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "argp-standalone-1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 992119faf65ec..fa9a45f1ed3cb 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -160,7 +160,7 @@ in rec { ### Languages - af = buildOfficialDict rec { + af = buildOfficialDict { language = "af"; version = "0.50-0"; fullName = "Afrikaans"; @@ -168,7 +168,7 @@ in rec { sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; }; - am = buildOfficialDict rec { + am = buildOfficialDict { language = "am"; version = "0.03-1"; fullName = "Amharic"; @@ -176,7 +176,7 @@ in rec { sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; }; - ar = buildOfficialDict rec { + ar = buildOfficialDict { language = "ar"; version = "1.2-0"; fullName = "Arabic"; @@ -184,7 +184,7 @@ in rec { sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; }; - ast = buildOfficialDict rec { + ast = buildOfficialDict { language = "ast"; version = "0.01"; fullName = "Asturian"; @@ -192,7 +192,7 @@ in rec { sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; }; - az = buildOfficialDict rec { + az = buildOfficialDict { language = "az"; version = "0.02-0"; fullName = "Azerbaijani"; @@ -200,7 +200,7 @@ in rec { sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; }; - be = buildOfficialDict rec { + be = buildOfficialDict { language = "be"; version = "0.01"; fullName = "Belarusian"; @@ -208,7 +208,7 @@ in rec { sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; }; - bg = buildOfficialDict rec { + bg = buildOfficialDict { language = "bg"; version = "4.1-0"; fullName = "Bulgarian"; @@ -216,7 +216,7 @@ in rec { sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; }; - bn = buildOfficialDict rec { + bn = buildOfficialDict { language = "bn"; version = "0.01.1-1"; fullName = "Bengali"; @@ -224,7 +224,7 @@ in rec { sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; }; - br = buildOfficialDict rec { + br = buildOfficialDict { language = "br"; version = "0.50-2"; fullName = "Breton"; @@ -232,7 +232,7 @@ in rec { sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; }; - ca = buildOfficialDict rec { + ca = buildOfficialDict { language = "ca"; version = "2.1.5-1"; fullName = "Catalan"; @@ -240,7 +240,7 @@ in rec { sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; - cs = buildOfficialDict rec { + cs = buildOfficialDict { language = "cs"; version = "20040614-1"; fullName = "Czech"; @@ -248,7 +248,7 @@ in rec { sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; }; - csb = buildOfficialDict rec { + csb = buildOfficialDict { language = "csb"; version = "0.02-0"; fullName = "Kashubian"; @@ -256,7 +256,7 @@ in rec { sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; }; - cy = buildOfficialDict rec { + cy = buildOfficialDict { language = "cy"; version = "0.50-3"; fullName = "Welsh"; @@ -264,7 +264,7 @@ in rec { sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; }; - da = buildOfficialDict rec { + da = buildOfficialDict { language = "da"; version = "1.4.42-1"; fullName = "Danish"; @@ -272,7 +272,7 @@ in rec { sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; - de = buildOfficialDict rec { + de = buildOfficialDict { language = "de"; version = "20030222-1"; fullName = "German"; @@ -280,7 +280,7 @@ in rec { sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; - de-alt = buildOfficialDict rec { + de-alt = buildOfficialDict { language = "de-alt"; version = "2.1-1"; fullName = "German - Old Spelling"; @@ -288,7 +288,7 @@ in rec { sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; }; - el = buildOfficialDict rec { + el = buildOfficialDict { language = "el"; version = "0.08-0"; fullName = "Greek"; @@ -296,7 +296,7 @@ in rec { sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; }; - en = buildOfficialDict rec { + en = buildOfficialDict { language = "en"; version = "2018.04.16-0"; fullName = "English"; @@ -304,7 +304,7 @@ in rec { sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; }; - eo = buildOfficialDict rec { + eo = buildOfficialDict { language = "eo"; version = "2.1.20000225a-2"; fullName = "Esperanto"; @@ -312,7 +312,7 @@ in rec { sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; - es = buildOfficialDict rec { + es = buildOfficialDict { language = "es"; version = "1.11-2"; fullName = "Spanish"; @@ -320,7 +320,7 @@ in rec { sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; - et = buildOfficialDict rec { + et = buildOfficialDict { language = "et"; version = "0.1.21-1"; fullName = "Estonian"; @@ -328,7 +328,7 @@ in rec { sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; }; - fa = buildOfficialDict rec { + fa = buildOfficialDict { language = "fa"; version = "0.11-0"; fullName = "Persian"; @@ -336,7 +336,7 @@ in rec { sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; }; - fi = buildOfficialDict rec { + fi = buildOfficialDict { language = "fi"; version = "0.7-0"; fullName = "Finnish"; @@ -344,7 +344,7 @@ in rec { sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; }; - fo = buildOfficialDict rec { + fo = buildOfficialDict { language = "fo"; version = "0.2.16-1"; fullName = "Faroese"; @@ -352,7 +352,7 @@ in rec { sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; }; - fr = buildOfficialDict rec { + fr = buildOfficialDict { language = "fr"; version = "0.50-3"; fullName = "French"; @@ -360,7 +360,7 @@ in rec { sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; - fy = buildOfficialDict rec { + fy = buildOfficialDict { language = "fy"; version = "0.12-0"; fullName = "Frisian"; @@ -368,7 +368,7 @@ in rec { sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; }; - ga = buildOfficialDict rec { + ga = buildOfficialDict { language = "ga"; version = "4.5-0"; fullName = "Irish"; @@ -376,7 +376,7 @@ in rec { sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; }; - gd = buildOfficialDict rec { + gd = buildOfficialDict { language = "gd"; version = "0.1.1-1"; fullName = "Scottish Gaelic"; @@ -384,7 +384,7 @@ in rec { sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; }; - gl = buildOfficialDict rec { + gl = buildOfficialDict { language = "gl"; version = "0.5a-2"; fullName = "Galician"; @@ -392,7 +392,7 @@ in rec { sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; }; - grc = buildOfficialDict rec { + grc = buildOfficialDict { language = "grc"; version = "0.02-0"; fullName = "Ancient Greek"; @@ -400,7 +400,7 @@ in rec { sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; }; - gu = buildOfficialDict rec { + gu = buildOfficialDict { language = "gu"; version = "0.03-0"; fullName = "Gujarati"; @@ -408,7 +408,7 @@ in rec { sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; }; - gv = buildOfficialDict rec { + gv = buildOfficialDict { language = "gv"; version = "0.50-0"; fullName = "Manx Gaelic"; @@ -416,7 +416,7 @@ in rec { sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; }; - he = buildOfficialDict rec { + he = buildOfficialDict { language = "he"; version = "1.0-0"; fullName = "Hebrew"; @@ -424,7 +424,7 @@ in rec { sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; }; - hi = buildOfficialDict rec { + hi = buildOfficialDict { language = "hi"; version = "0.02-0"; fullName = "Hindi"; @@ -432,7 +432,7 @@ in rec { sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; }; - hil = buildOfficialDict rec { + hil = buildOfficialDict { language = "hil"; version = "0.11-0"; fullName = "Hiligaynon"; @@ -440,7 +440,7 @@ in rec { sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; }; - hr = buildOfficialDict rec { + hr = buildOfficialDict { language = "hr"; version = "0.51-0"; fullName = "Croatian"; @@ -448,7 +448,7 @@ in rec { sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; }; - hsb = buildOfficialDict rec { + hsb = buildOfficialDict { language = "hsb"; version = "0.02-0"; fullName = "Upper Sorbian"; @@ -456,7 +456,7 @@ in rec { sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; }; - hu = buildOfficialDict rec { + hu = buildOfficialDict { language = "hu"; version = "0.99.4.2-0"; fullName = "Hungarian"; @@ -464,7 +464,7 @@ in rec { sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; }; - hus = buildOfficialDict rec { + hus = buildOfficialDict { language = "hus"; version = "0.03-1"; fullName = "Huastec"; @@ -472,7 +472,7 @@ in rec { sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; }; - hy = buildOfficialDict rec { + hy = buildOfficialDict { language = "hy"; version = "0.10.0-0"; fullName = "Armenian"; @@ -480,7 +480,7 @@ in rec { sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; }; - ia = buildOfficialDict rec { + ia = buildOfficialDict { language = "ia"; version = "0.50-1"; fullName = "Interlingua"; @@ -488,7 +488,7 @@ in rec { sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; }; - id = buildOfficialDict rec { + id = buildOfficialDict { language = "id"; version = "1.2-0"; fullName = "Indonesian"; @@ -496,7 +496,7 @@ in rec { sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; }; - is = buildOfficialDict rec { + is = buildOfficialDict { language = "is"; version = "0.51.1-0"; fullName = "Icelandic"; @@ -504,7 +504,7 @@ in rec { sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; }; - it = buildOfficialDict rec { + it = buildOfficialDict { language = "it"; version = "2.2_20050523-0"; fullName = "Italian"; @@ -512,7 +512,7 @@ in rec { sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; - kn = buildOfficialDict rec { + kn = buildOfficialDict { language = "kn"; version = "0.01-1"; fullName = "Kannada"; @@ -520,7 +520,7 @@ in rec { sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; }; - ku = buildOfficialDict rec { + ku = buildOfficialDict { language = "ku"; version = "0.20-1"; fullName = "Kurdi"; @@ -528,7 +528,7 @@ in rec { sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; }; - ky = buildOfficialDict rec { + ky = buildOfficialDict { language = "ky"; version = "0.01-0"; fullName = "Kirghiz"; @@ -536,7 +536,7 @@ in rec { sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; }; - la = buildOfficialDict rec { + la = buildOfficialDict { language = "la"; version = "20020503-0"; fullName = "Latin"; @@ -544,7 +544,7 @@ in rec { sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; - lt = buildOfficialDict rec { + lt = buildOfficialDict { language = "lt"; version = "1.2.1-0"; fullName = "Lithuanian"; @@ -552,7 +552,7 @@ in rec { sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; }; - lv = buildOfficialDict rec { + lv = buildOfficialDict { language = "lv"; version = "0.5.5-1"; fullName = "Latvian"; @@ -560,7 +560,7 @@ in rec { sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; }; - mg = buildOfficialDict rec { + mg = buildOfficialDict { language = "mg"; version = "0.03-0"; fullName = "Malagasy"; @@ -568,7 +568,7 @@ in rec { sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; }; - mi = buildOfficialDict rec { + mi = buildOfficialDict { language = "mi"; version = "0.50-0"; fullName = "Maori"; @@ -576,7 +576,7 @@ in rec { sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; }; - mk = buildOfficialDict rec { + mk = buildOfficialDict { language = "mk"; version = "0.50-0"; fullName = "Macedonian"; @@ -584,7 +584,7 @@ in rec { sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; }; - ml = buildOfficialDict rec { + ml = buildOfficialDict { language = "ml"; version = "0.03-1"; fullName = "Malayalam"; @@ -592,7 +592,7 @@ in rec { sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; }; - mn = buildOfficialDict rec { + mn = buildOfficialDict { language = "mn"; version = "0.06-2"; fullName = "Mongolian"; @@ -600,7 +600,7 @@ in rec { sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; }; - mr = buildOfficialDict rec { + mr = buildOfficialDict { language = "mr"; version = "0.10-0"; fullName = "Marathi"; @@ -608,7 +608,7 @@ in rec { sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; }; - ms = buildOfficialDict rec { + ms = buildOfficialDict { language = "ms"; version = "0.50-0"; fullName = "Malay"; @@ -616,7 +616,7 @@ in rec { sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; }; - mt = buildOfficialDict rec { + mt = buildOfficialDict { language = "mt"; version = "0.50-0"; fullName = "Maltese"; @@ -624,7 +624,7 @@ in rec { sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; }; - nb = buildOfficialDict rec { + nb = buildOfficialDict { language = "nb"; version = "0.50.1-0"; fullName = "Norwegian Bokmal"; @@ -632,7 +632,7 @@ in rec { sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; }; - nds = buildOfficialDict rec { + nds = buildOfficialDict { language = "nds"; version = "0.01-0"; fullName = "Low Saxon"; @@ -640,7 +640,7 @@ in rec { sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; }; - nl = buildOfficialDict rec { + nl = buildOfficialDict { language = "nl"; version = "0.50-2"; fullName = "Dutch"; @@ -652,7 +652,7 @@ in rec { ''; }; - nn = buildOfficialDict rec { + nn = buildOfficialDict { language = "nn"; version = "0.50.1-1"; fullName = "Norwegian Nynorsk"; @@ -660,7 +660,7 @@ in rec { sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; }; - ny = buildOfficialDict rec { + ny = buildOfficialDict { language = "ny"; version = "0.01-0"; fullName = "Chichewa"; @@ -668,7 +668,7 @@ in rec { sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; }; - or = buildOfficialDict rec { + or = buildOfficialDict { language = "or"; version = "0.03-1"; fullName = "Oriya"; @@ -676,7 +676,7 @@ in rec { sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; }; - pa = buildOfficialDict rec { + pa = buildOfficialDict { language = "pa"; version = "0.01-1"; fullName = "Punjabi"; @@ -684,7 +684,7 @@ in rec { sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; }; - pl = buildOfficialDict rec { + pl = buildOfficialDict { language = "pl"; version = "6.0_20061121-0"; fullName = "Polish"; @@ -692,7 +692,7 @@ in rec { sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; - pt_BR = buildOfficialDict rec { + pt_BR = buildOfficialDict { language = "pt_BR"; version = "20090702-0"; fullName = "Brazilian Portuguese"; @@ -700,7 +700,7 @@ in rec { sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; - pt_PT = buildOfficialDict rec { + pt_PT = buildOfficialDict { language = "pt_PT"; version = "20070510-0"; fullName = "Portuguese"; @@ -708,7 +708,7 @@ in rec { sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; }; - qu = buildOfficialDict rec { + qu = buildOfficialDict { language = "qu"; version = "0.02-0"; fullName = "Quechua"; @@ -716,7 +716,7 @@ in rec { sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; }; - ro = buildOfficialDict rec { + ro = buildOfficialDict { language = "ro"; version = "3.3-2"; fullName = "Romanian"; @@ -724,7 +724,7 @@ in rec { sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; - ru = buildOfficialDict rec { + ru = buildOfficialDict { language = "ru"; version = "0.99f7-1"; fullName = "Russian"; @@ -732,7 +732,7 @@ in rec { sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; - rw = buildOfficialDict rec { + rw = buildOfficialDict { language = "rw"; version = "0.50-0"; fullName = "Kinyarwanda"; @@ -740,7 +740,7 @@ in rec { sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; }; - sc = buildOfficialDict rec { + sc = buildOfficialDict { language = "sc"; version = "1.0"; fullName = "Sardinian"; @@ -748,7 +748,7 @@ in rec { sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; }; - sk = buildOfficialDict rec { + sk = buildOfficialDict { language = "sk"; version = "2.01-2"; fullName = "Slovak"; @@ -756,7 +756,7 @@ in rec { sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; }; - sl = buildOfficialDict rec { + sl = buildOfficialDict { language = "sl"; version = "0.50-0"; fullName = "Slovenian"; @@ -764,7 +764,7 @@ in rec { sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; }; - sr = buildOfficialDict rec { + sr = buildOfficialDict { language = "sr"; version = "0.02"; fullName = "Serbian"; @@ -772,7 +772,7 @@ in rec { sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; }; - sv = buildOfficialDict rec { + sv = buildOfficialDict { language = "sv"; version = "0.51-0"; fullName = "Swedish"; @@ -780,7 +780,7 @@ in rec { sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; }; - sw = buildOfficialDict rec { + sw = buildOfficialDict { language = "sw"; version = "0.50-0"; fullName = "Swahili"; @@ -788,7 +788,7 @@ in rec { sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; }; - ta = buildOfficialDict rec { + ta = buildOfficialDict { language = "ta"; version = "20040424-1"; fullName = "Tamil"; @@ -796,7 +796,7 @@ in rec { sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; }; - te = buildOfficialDict rec { + te = buildOfficialDict { language = "te"; version = "0.01-2"; fullName = "Telugu"; @@ -804,7 +804,7 @@ in rec { sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; }; - tet = buildOfficialDict rec { + tet = buildOfficialDict { language = "tet"; version = "0.1.1"; fullName = "Tetum"; @@ -812,7 +812,7 @@ in rec { sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; }; - tk = buildOfficialDict rec { + tk = buildOfficialDict { language = "tk"; version = "0.01-0"; fullName = "Turkmen"; @@ -820,7 +820,7 @@ in rec { sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; }; - tl = buildOfficialDict rec { + tl = buildOfficialDict { language = "tl"; version = "0.02-1"; fullName = "Tagalog"; @@ -828,7 +828,7 @@ in rec { sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; }; - tn = buildOfficialDict rec { + tn = buildOfficialDict { language = "tn"; version = "1.0.1-0"; fullName = "Setswana"; @@ -836,7 +836,7 @@ in rec { sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; }; - tr = buildOfficialDict rec { + tr = buildOfficialDict { language = "tr"; version = "0.50-0"; fullName = "Turkish"; @@ -844,7 +844,7 @@ in rec { sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; - uk = buildOfficialDict rec { + uk = buildOfficialDict { language = "uk"; version = "1.4.0-0"; fullName = "Ukrainian"; @@ -852,7 +852,7 @@ in rec { sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; }; - uz = buildOfficialDict rec { + uz = buildOfficialDict { language = "uz"; version = "0.6-0"; fullName = "Uzbek"; @@ -860,7 +860,7 @@ in rec { sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; }; - vi = buildOfficialDict rec { + vi = buildOfficialDict { language = "vi"; version = "0.01.1-1"; fullName = "Vietnamese"; @@ -868,7 +868,7 @@ in rec { sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; }; - wa = buildOfficialDict rec { + wa = buildOfficialDict { language = "wa"; version = "0.50-0"; fullName = "Walloon"; @@ -876,7 +876,7 @@ in rec { sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; }; - yi = buildOfficialDict rec { + yi = buildOfficialDict { language = "yi"; version = "0.01.1-1"; fullName = "Yiddish"; @@ -884,7 +884,7 @@ in rec { sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; }; - zu = buildOfficialDict rec { + zu = buildOfficialDict { language = "zu"; version = "0.50-0"; fullName = "Zulu"; @@ -894,7 +894,7 @@ in rec { ### Jargons - en-computers = buildTxtDict rec { + en-computers = buildTxtDict { shortName = "en-computers"; fullName = "English Computer Jargon"; @@ -913,7 +913,7 @@ in rec { }; }; - en-science = buildTxtDict rec { + en-science = buildTxtDict { shortName = "en-science"; fullName = "English Scientific Jargon"; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 978376eb4fa78..6f10283b07bfb 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lv2-unstable"; version = "2017-07-08"; diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index f8b1006d2eb78..2ac3115af2aa7 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsndfile }: -rec { +{ vampSDK = stdenv.mkDerivation { name = "vamp-sdk-2.7.1"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 9582e54ffacaa..f66d9369c20a4 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -2,7 +2,7 @@ let version = "1.9.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "avro-c"; inherit version; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 05203d6c233ae..af0053519e3d1 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { python3 ]; - passthru.utests = stdenv.mkDerivation rec { + passthru.utests = stdenv.mkDerivation { pname = "beignet-utests"; inherit version src; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 503e4b0fa43b2..62f050cbcb85c 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -22,7 +22,7 @@ let inherit (stdenv.lib) optional optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "blitz++-0.10"; src = fetchurl { url = mirror://sourceforge/blitz/blitz-0.10.tar.gz; diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index 0a38f35af753e..bcb452ea4f866 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.55.0"; patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ]; diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index f4931dfe54740..fb65e49c500c1 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.59.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix index b6d74234f799b..646f4652f77da 100644 --- a/pkgs/development/libraries/boost/1.60.nix +++ b/pkgs/development/libraries/boost/1.60.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.60.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix index 871ef392c1ae9..a1b3c51d0e692 100644 --- a/pkgs/development/libraries/boost/1.62.nix +++ b/pkgs/development/libraries/boost/1.62.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.62.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix index c4749bc3ee411..a8b459f4b12ff 100644 --- a/pkgs/development/libraries/boost/1.63.nix +++ b/pkgs/development/libraries/boost/1.63.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.63.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix index 1cf9bfa51f4b2..32632f79d2250 100644 --- a/pkgs/development/libraries/boost/1.64.nix +++ b/pkgs/development/libraries/boost/1.64.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.64.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix index 9837e1c691930..922c09ba7fe9c 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.65.1"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index b44c1a3823a90..0a99717a79970 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.66.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 406e63b9622b5..a2fe9447c1254 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.67.0"; patches = [ diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix index cd980439b7101..4d98172c6d05f 100644 --- a/pkgs/development/libraries/boost/1.68.nix +++ b/pkgs/development/libraries/boost/1.68.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.68.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix index 959fa851fe22a..95c4aa854a463 100644 --- a/pkgs/development/libraries/boost/1.69.nix +++ b/pkgs/development/libraries/boost/1.69.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.69.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix index 5f7b39c1189eb..45a8bdb931859 100644 --- a/pkgs/development/libraries/boost/1.70.nix +++ b/pkgs/development/libraries/boost/1.70.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.70.0"; src = fetchurl { diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 3c27281571afe..9283f37a8c470 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, premake4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bootil-unstable-2015-12-17"; meta = { diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 7db73f5ad47c3..67e2794c8a293 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, perl, go }: # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "boringssl"; version = "2017-02-23"; diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index ba7b51bb0e4e9..7710747d8004f 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "brigand"; version = "1.3.0"; diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 97fe7e5129931..8b0901832d11e 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -2,7 +2,7 @@ , Cocoa, OpenGL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bullet"; version = "2019-03-27"; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index d9e69b8e75129..3b7e870b4fe98 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -6,7 +6,7 @@ # The celt codec has been deprecated and is now a part of the opus codec -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "celt"; inherit version; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 80b6480323be5..74fd12ffea268 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,6 +1,6 @@ { fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "coin"; version = "unstable-2019-06-12"; diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index 2585a7abaed1d..dfebccc88e356 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cpp-ipfs-api"; version = "2017-01-04"; diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index aa0708daaa7fd..9b6407715df5d 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -3,7 +3,7 @@ let pname = "cxxtest"; version = "4.4"; -in python2Packages.buildPythonApplication rec { +in python2Packages.buildPythonApplication { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 76e30e921ba19..dc668a233b06b 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ]; diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 7894e4c732628..1223cb897e861 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ]; diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index bafca3bd52d23..642054b5a0184 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index 96f7668aa903b..dee07a9637e6f 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; license = stdenv.lib.licenses.agpl3; diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index a6ff37bee97ad..cfc95de155522 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dyncall"; version = "1.0"; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 566f8bfd8d15c..13617d67bf574 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "elementary-cmake-modules"; version = "0.1.0"; diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index 4fc85aee69f6c..e968e09459a07 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -2,7 +2,7 @@ openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "embree"; version = "2.17.4"; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index ec6f07f0953ab..21f63e07335df 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; version = "0.27.2"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index 439342a50b850..f5ef8e850ddc7 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ffmpeg-sixel"; version = "nightly-2.3.x"; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index bc5de5f9730fa..07dbaeef16546 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -9,7 +9,7 @@ let withDoc = stdenv.cc.isGNU; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fftw-${precision}-${version}"; src = fetchurl { diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 0b4172cdc764a..4ac8150274cfc 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, alsaLib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flite-2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 2ee0af8cfc131..5b98d6523b9a2 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,7 +1,7 @@ { runCommand, lib, fontconfig, fontDirectories }: runCommand "fc-cache" - rec { + { buildInputs = [ fontconfig.bin ]; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 100c00eea497b..04903cc5e9eee 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "funambol-client-cpp-9.0.0"; src = fetchurl { diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index b7043b61c8a62..1a3447f6674f1 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -2,7 +2,7 @@ let newtonsoft-json = dotnetPackages.NewtonsoftJson; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gdata-sharp"; version = "2.2.0.0"; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index d44bcdda9aedd..51e981a2a338e 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; let version = "1.0.22"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gloox"; inherit version; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index e914f9d78eef7..638d483b60e97 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -13,7 +13,7 @@ let sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnu-config"; version = "2019-04-15"; diff --git a/pkgs/development/libraries/gnutls-kdh/3.5.nix b/pkgs/development/libraries/gnutls-kdh/3.5.nix index e245496c63acd..015163b32931a 100644 --- a/pkgs/development/libraries/gnutls-kdh/3.5.nix +++ b/pkgs/development/libraries/gnutls-kdh/3.5.nix @@ -1,6 +1,6 @@ { callPackage, fetchFromGitHub, autoreconfHook, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 812128fb12fb6..8b118fe94834a 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -3,7 +3,7 @@ , glib, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsettings-qt"; version = "0.1.20170824"; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 0ba3bf354235a..ebaf694f04e95 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; version = "2018-05-07"; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index d9afecc6d0c15..a140859b69315 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -2,7 +2,7 @@ , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-oauth"; version = "2018-10-15"; diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index b9eecaf0946f5..af57950ac653f 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-sasl"; version = "2018-10-15"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 8acaefcedf463..27036ad86edf9 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -4,7 +4,7 @@ let ver_maj = "0.10"; ver_min = "11"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gstreamermm-${ver_maj}.${ver_min}"; src = fetchurl { diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 6588b8ab44073..1af62e14d8d2b 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -15,7 +15,7 @@ , json-glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gthree"; version = "unstable-2019-08-21"; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 26d0b5c359583..8cf9baa0c9926 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gtk-mac-integration-2.0.8"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 4fa369e299d24..7fbc1bfe1eaac 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -6,7 +6,7 @@ let mkDict = { name, readmeFile, dictFileName, ... }@args: - stdenv.mkDerivation (rec { + stdenv.mkDerivation ({ inherit name; installPhase = '' # hunspell dicts @@ -542,7 +542,7 @@ in rec { /* ITALIAN */ it_IT = it-it; - it-it = mkDictFromLinguistico rec { + it-it = mkDictFromLinguistico { shortName = "it-it"; dictFileName = "it_IT"; shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico"; @@ -598,7 +598,7 @@ in rec { /* SWEDISH */ sv_SE = sv-se; - sv-se = mkDictFromDSSO rec { + sv-se = mkDictFromDSSO { shortName = "sv-se"; dictFileName = "sv_SE"; shortDescription = "Swedish (Sweden)"; @@ -606,7 +606,7 @@ in rec { # Finlandian Swedish (hello Linus Torvalds) sv_FI = sv-fi; - sv-fi = mkDictFromDSSO rec { + sv-fi = mkDictFromDSSO { shortName = "sv-fi"; dictFileName = "sv_FI"; shortDescription = "Swedish (Finland)"; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 297365be87497..3a642c8837a3e 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -3,7 +3,7 @@ let version = "2.6.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ign-math2"; inherit version; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 31b9a4b0e9f7a..0e7603db58564 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ign-transport"; inherit version; inherit src; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 2beff09d0b4e5..f74477eab3847 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, tcl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "incrtcl"; version = "4.0.4"; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 20a60f1a102db..13c71dc8f7047 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 68e2a7377919d..1f2aeda80cfec 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, ant, jdk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hydra-ant-logger"; version = "2010.2"; diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 1ebf2c2e21e54..21e3c4d3424eb 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -8,7 +8,7 @@ let sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kinetic-cpp-client-2015-04-14"; src = fetchgit { diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 3f84706bffb3b..71e88559dee64 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kmsxx"; version = "2018-10-23"; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index a8ddab2978d13..48fb0f1153e78 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -4,7 +4,7 @@ }: let srcs = import ./srcs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libagar"; inherit (srcs) version src; diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 43d66b8251cfd..4295971d5a0b1 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: let srcs = import ./srcs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libagar-test"; inherit (srcs) version src; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index b20850e88ff07..9aedde923f0be 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libbap"; version = "master-2019-04-05"; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 5af8acb5ed769..89ca984767b3e 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -3,7 +3,7 @@ , libiberty, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libbfd"; inherit (binutils-unwrapped) version src; diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index 10a4c276ebd5e..bfc7fe1d9498a 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libcredis-0.2.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 3fd2a328558eb..352d2b17406b8 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -16,7 +16,7 @@ let }; in rec { - libdwarf = stdenv.mkDerivation rec { + libdwarf = stdenv.mkDerivation { pname = "libdwarf"; inherit version; @@ -37,7 +37,7 @@ in rec { inherit meta src; }; - dwarfdump = stdenv.mkDerivation rec { + dwarfdump = stdenv.mkDerivation { pname = "dwarfdump"; inherit version; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 8555449f28bdf..9650f540fcfba 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libESMTP"; version = "1.0.6"; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 0c8a7084e095b..e007ab2f95af2 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -2,7 +2,7 @@ zlib, libpng, boost, qt5, guile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libfive"; version = "2018-07-01"; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index c0595ac93d1ce..8ddce0aa98c60 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libnfc, openssl , libobjc ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libfreefare"; version = "0.4.0"; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index ba9eab432029b..9ba3cdbd09aac 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -2,7 +2,7 @@ , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libgdiplus-5.6.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index b82c547fb331c..f1483c38c154e 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -4,7 +4,7 @@ , libxnd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libgumath"; version = "unstable-2018-11-27"; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 9c3d9faf1f4fc..265b5d8379629 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -8,7 +8,7 @@ let pname = "libhandy"; version = "0.0.10"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; outputs = [ "out" "dev" "devdoc" "glade" ]; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index ab1858c51a612..08a88bfee459a 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -2,7 +2,7 @@ let inherit (buildPackages.buildPackages) gcc; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libiberty-${gcc.cc.version}"; inherit (gcc.cc) src; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index c4dca659d3660..fccf4b3d50f23 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libipfix"; version = "110209"; src = fetchurl { diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix index 0f2c9dce28a22..4e9c165e71fb5 100644 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ b/pkgs/development/libraries/libjpeg-drop/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libjpeg-drop-9b"; srcs = [ diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index ba92bdd516557..b62f0f116a099 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: let version = "7.6.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "libjson"; inherit version; src = fetchurl { diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 92e7d26f5afa0..b4e9f2bdf8850 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libksi-2015-07-03"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index d9f460d44e8ce..c51cb9baead6c 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, curl, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "liblastfm-SF-0.5"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index a61c21ffec5fc..6dfb95d1fb837 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -4,7 +4,7 @@ let version = "3.10.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "liblouis"; inherit version; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 2ce11b998a1a3..4a4074e2f2296 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libmcrypt-2.5.8"; src = fetchurl { diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index d2fba5cddd82a..57053103417a5 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libmemcached-1.0.18"; src = fetchurl { diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index e4010280f4bdd..9ffbc95b1fd14 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -5,7 +5,7 @@ let version = "1.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libmpc"; inherit version; # to avoid clash with the MPD client diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index cde4251e2c697..518991120f7a7 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -2,7 +2,7 @@ let version = "1.3.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "libmypaint"; inherit version; diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 6c4fc798f335e..a522c72fc7667 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libndtypes"; version = "unstable-2018-11-27"; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 695ddadb5f398..3d069d7a168d5 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libusb, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libnfc"; version = "1.7.1"; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index c0c66bc1a4a01..4049a18145c72 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -2,7 +2,7 @@ let version = "1.0.3"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libnih"; inherit version; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index c42cd3206b418..aa307f68ca00e 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -3,7 +3,7 @@ , libiberty, libbfd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopcodes"; inherit (binutils-unwrapped) version src; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 752be52963cb8..01da76749baba 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -4,7 +4,7 @@ let version = "1.3.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopus"; inherit version; diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index e1d70bee6c4c8..9b91e32f22852 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -3,7 +3,7 @@ let version = "0.2.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopusenc"; inherit version; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 54ee86f0a39ac..4be744e7ba936 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, protobuf}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libosmpbf-1.3.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f1c7874e313e3..41a2a1b669d8d 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -2,7 +2,7 @@ , qtbase, qtmultimedia }: let - generic = version: sha256: prefix: stdenv.mkDerivation rec { + generic = version: sha256: prefix: stdenv.mkDerivation { pname = "libqmatrixclient"; inherit version; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index bdca44dc7d030..d85c9e94ebdff 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -2,7 +2,7 @@ let version = "1.8.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libspatialindex"; inherit version; diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix index 67d6d8d42ead4..2f6b2835c4e32 100644 --- a/pkgs/development/libraries/libstemmer/default.nix +++ b/pkgs/development/libraries/libstemmer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libstemmer-2017-03-02"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 7a25980a38b99..6d95d81e5d9c9 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtcod"; version = "1.5.1"; diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index 139de830972fd..043acee0cfeb8 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtelnet"; version = "0.21+45f2d5c"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 9bccff49b5404..e9267df5047b2 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -3,7 +3,7 @@ let generic = { version, sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "libtoxcore"; inherit version; @@ -42,7 +42,7 @@ let }; }; -in rec { +in { libtoxcore_0_1 = generic { version = "0.1.11"; sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index c3981f5c58eae..6cd5f9122a4f7 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tox-core-new-20160727"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 9a3671c325897..4959674f0ad28 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -2,7 +2,7 @@ let version = "1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtxc_dxtn_s2tc"; inherit version; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 446d30c609ee0..e333e73de3ffe 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -6,7 +6,7 @@ let backend = if stdenv.isDarwin then "darwin" else "unix"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${shortName}-${version}"; src = fetchgit { url = "https://github.com/andlabs/libui.git"; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index a0ec3b74cc17f..1adddadcc5eac 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -12,7 +12,7 @@ , autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libunity"; version = "unstable-2019-03-19"; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 75e935d18d90c..48dbc5f395c8d 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -4,7 +4,7 @@ , libtool }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libvterm-neovim"; version = "2018-11-26"; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 9eb891544b5f1..eb031eb2a9d79 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -4,7 +4,7 @@ , libndtypes }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libxnd"; version = "unstable-2018-11-27"; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index 9aa189586f054..e1bf4fca7b553 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libykclient"; version = "unstable-2019-03-18"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 857f5247cd51f..0098116563aed 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "linenoise"; version = "1.0.10"; # Its version 1.0 plus 10 commits diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 8b0aecdab1686..8c691f7759166 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "liquid-dsp"; version = "20170307"; diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 9c1815f840b4e..2df7ef94cf36d 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -8,7 +8,7 @@ let hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = requireFile { url = sourceInfo.url; sha256 = sourceInfo.hash; diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index ab8c2c9385f89..ccf246c044e99 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "log4shib"; version = "1.0.9"; diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 50baad6a7a0b8..7ca7456f78979 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, boost-build, lua, boost}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "luabind-0.9.1"; src = fetchurl { diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index ebd68134ba554..38261bd1e53a0 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -2,7 +2,7 @@ , fetchgit, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mediastreamer-openh264"; version = "0.0pre20160801"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 117722ae16a34..cf1bdaf643233 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ let branch = head (splitString "." version); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mesa"; inherit version; diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index 3493bc5d96797..287241a75c927 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "miniball"; version = "3.0"; diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 04f84d49f8440..c8ea3315f8b7a 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "msgpack"; inherit version; diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix index 7117599d15ec3..f936fc8b3df6e 100644 --- a/pkgs/development/libraries/mumlib/default.nix +++ b/pkgs/development/libraries/mumlib/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig , boost, openssl, log4cpp, libopus, protobuf }: -with lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation { pname = "mumlib"; version = "unstable-2018-12-12"; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index 423a93b69a804..37bfb05c4eef6 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -4,7 +4,7 @@ , ninja }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mutest"; version = "unstable-2019-08-26"; diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index 140dbcc937b5f..3dac7c93e84ba 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -3,7 +3,7 @@ let pname = "mypaint-brushes"; version = "1.3.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 6ec288f985b07..8164f4ec9729a 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mysocketw-031026"; src = fetchurl { url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 83d01f85d0a45..2e29ab395d6b1 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -2,7 +2,7 @@ let version = "2.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ndpi"; inherit version; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 65679c7e28251..a79c42a1c8f44 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "neardal-0.7-post-git-20150930"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index d78a31d65cd36..064ef34439800 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -4,7 +4,7 @@ , version, src , ...}: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "nettle-${version}"; inherit src; diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index 798f9d3a39658..b7d46cd5537d5 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nvidia-video-sdk-6.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 5aeb07de92359..4d4505c3e703e 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.5"; pname = "openbr"; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 9ce8bb618bf99..d0cc6396b8d8c 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -2,7 +2,7 @@ , version # "12" for "1.2", "22" for "2.2" and so on }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "opencl-headers-${version}-2017-07-18"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index e35f5375fd982..d7f897ebcf831 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -139,7 +139,7 @@ let printEnabled = enabled : if enabled then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "opencv"; inherit version src; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 5732ce9e1cace..153737e2761e7 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -152,7 +152,7 @@ let printEnabled = enabled : if enabled then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "opencv"; inherit version src; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 5d26063adb61d..b8a3c4a81e00d 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "openexrid-unstable"; version = "2017-09-17"; diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index abc60f026e578..4a7927bfcb2e6 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "openfx"; version = "1.4"; diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix index 2a625f32e7ff6..beb151f0d2de9 100644 --- a/pkgs/development/libraries/openjpeg/1.x.nix +++ b/pkgs/development/libraries/openjpeg/1.x.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.5.2"; branch = "1.5"; revision = "version.1.5.2"; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 55d003d2d92b4..64ed6cb58f0b9 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -23,7 +23,7 @@ let mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openjpeg"; inherit version; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 46028d3a7ea48..e2f6411471662 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -3,7 +3,7 @@ }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openssl-chacha"; version = "2016-08-22"; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index c3407289f020d..3d5988f8114ee 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -5,7 +5,7 @@ let version = "2018-11-13"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "openzwave"; inherit version; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 44293d52da485..d788f1eff346c 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -3,7 +3,7 @@ , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pangolin"; version = "2017-08-02"; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index d90a27ed54587..b08936dd34de6 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "partio"; version = "2018-03-01"; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 32fc27f9ab4da..5a02229cb0e20 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -3,7 +3,7 @@ , portaudio, alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pcaudiolib"; version = "2016-07-19"; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 6d2896ac3396f..2e111240758d6 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -13,7 +13,7 @@ let else if (variant == "cpp") then "pcre-cpp" else variant; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 67f343d603806..ef7633dadaf36 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -14,7 +14,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 829ecdb86e064..98c6be85672c3 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -15,7 +15,7 @@ assert withQt4 -> qt4 != null; assert !withQt4 -> qtbase != null; assert !withQt4 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 2dd0cc10c947c..dc32c4ebfb054 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -15,7 +15,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qttools != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index fb108dd7c2572..4ec1177778578 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -35,7 +35,7 @@ , libXmu }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "10.4.1"; pname = "geant4"; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index dd39fbbc84b7a..3d6891c48e2bb 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -14,7 +14,7 @@ let boost_python = boost.override { enablePython = true; inherit python; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (geant4_nomt) version src; pname = "g4py"; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 89248597f5d99..92b56467aee9a 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, pkgconfig, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "portaudio-190600-20161030"; src = fetchurl { diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index ffe7f46b77d8a..37958038601cc 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; # XXX: This is to deactivate Java support. - patches = stdenv.lib.singleton (fetchurl rec { + patches = stdenv.lib.singleton (fetchurl { url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/" + "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch"; sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h"; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 8f6adaf03d9be..7839547ee9283 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -2,7 +2,7 @@ let version = "1.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ppl"; inherit version; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 957b59a6f662a..01f74bc48eb7d 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -6,7 +6,7 @@ }: let -mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { +mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { pname = "protobuf"; inherit version; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 773e31391758d..3c08537db0b6b 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protobuf"; inherit version; diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix index c3a815c45ac89..304f9d61f397f 100644 --- a/pkgs/development/libraries/protobufc/1.3.nix +++ b/pkgs/development/libraries/protobufc/1.3.nix @@ -1,6 +1,6 @@ { callPackage, fetchFromGitHub, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.3.1"; src = fetchFromGitHub { owner = "protobuf-c"; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 91c0ae5624e87..838fa7de82610 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protobuf-c"; inherit version; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 596dc543e3352..92f927ee39859 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "qhull-2016.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 083e0a51b813e..03247f9d695b7 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,5 +1,5 @@ {stdenv, qtdeclarative, fetchFromGitHub, qmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "qml-box2d-2018-04-06"; src = fetchFromGitHub { owner = "qml-box2d"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index d3f4a8e88e2ef..b156a1cbf992f 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-11-24"; pname = "qmltermwidget-unstable"; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index dd50e6ec03983..a033f477afb08 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,6 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }: -mkDerivation rec { +mkDerivation { name = "qtstyleplugins-2017-03-11"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index 96a2347c50fa5..afb4e0daeb66e 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rabbitmq-java-client-3.3.4"; src = fetchurl { diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index e36b6f9488a58..2b60c3cbf546e 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "re2"; version = "20190401"; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index f9a20a535cb3d..73ed823d2be58 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "readline-6.3p08"; src = fetchurl { diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 75beddcd22ca6..53d30019f28d4 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "5.6.0"; pname = "papi"; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index d22858d64d0c9..26ec1237601f0 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -38,7 +38,7 @@ let ''; cub = { - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "NVlabs"; repo = "cub"; rev = "v1.7.4"; diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 3c448abeccf6d..f0f5829ce4658 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -10,7 +10,7 @@ , addOpenGLRunpath }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; inherit version; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 2e5bb5e371f54..5a62578481c6b 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -11,7 +11,7 @@ let version = "3.8.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "liblapack"; inherit version; src = fetchurl { diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index c9c26ca0d66c3..ff29ae82c5ce3 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -2,7 +2,7 @@ assert stdenv ? cc && stdenv.cc.libc != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "scmccid-5.0.11"; src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { diff --git a/pkgs/development/libraries/sdformat/3.nix b/pkgs/development/libraries/sdformat/3.nix index 116f248b3b4e8..b78f1d5624ca1 100644 --- a/pkgs/development/libraries/sdformat/3.nix +++ b/pkgs/development/libraries/sdformat/3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, callPackage, ... } @ args: -callPackage ./default.nix (args // rec { +callPackage ./default.nix (args // { version = "3.7.0"; srchash-sha256 = "07kn8bgvj9mwwinsp2cbmz11z7zw2lgnj61mi1gi1pjg7q9in98q"; }) diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix index f81eb9b259e89..66ad311387f88 100644 --- a/pkgs/development/libraries/sdformat/default.nix +++ b/pkgs/development/libraries/sdformat/default.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = fetchurl { url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2"; sha256 = srchash-sha256; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index cf73e205830b1..4726221a40d95 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -7,7 +7,7 @@ let version = "2.5.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sfml"; inherit version; diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index 2f3ec44a08cec..d9fcea767d5ea 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, mesa, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "soil"; src = fetchurl { diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index edcb3549c310b..4a744c08ae33e 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sonic"; version = "2016-03-01"; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 98226ce20f4a0..79084ceda1c32 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,6 +1,6 @@ { fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soqt"; version = "1.6.0a"; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 50ba9c944ab5f..11ba48c59716b 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -1,6 +1,6 @@ { fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soxt"; version = "unstable-2019-06-14"; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index e4c1f8eb5f681..739dfc3bc5b47 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fuse, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sqlar"; version = "2018-01-07"; diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index 440f0c22ea6f4..c2353c7b70612 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stb"; version = "20180211"; diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 8992c7e75c056..401c2562167f8 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, zlib, cmake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "taglib-1.9.1"; src = fetchurl { diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 61d9c710801c2..507f2fb275b7c 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, tcl, tk, fetchpatch } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.4.3"; pname = "tix"; src = fetchurl { diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix index 141f6da14ce49..3058af46ab57e 100644 --- a/pkgs/development/libraries/tk/8.5.nix +++ b/pkgs/development/libraries/tk/8.5.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, tcl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 5013db64bbae9..c30f9a8194785 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, tcl, stdenv, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index d7162067debad..13e8f783915d0 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tnt"; version = "3.0.12"; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 5609f1d67d17f..2913360768925 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; src = fetchgit { diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index 46b65a08eaab3..e1284c39aa3be 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -2,7 +2,7 @@ , autoreconfHook, pkgconfig , libsndfile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "twolame"; version = "2017-09-27"; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index e1f3c0bd39c2a..e6cd082763966 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -3,7 +3,7 @@ let version = "2.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uthash"; inherit version; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix index 7f9e8508a657f..d62a8524644d7 100644 --- a/pkgs/development/libraries/v8/3.14.nix +++ b/pkgs/development/libraries/v8/3.14.nix @@ -11,7 +11,7 @@ let arch = if stdenv.is64bit then "x64" else "ia32"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "v8"; inherit version; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 77cd3be0cbdae..2b0a807bfa75f 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -6,7 +6,7 @@ let version = "0.3.11"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "volume_key"; inherit version; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 95d420627c7d7..5bb3788a3b47f 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -6,7 +6,7 @@ let in assert version == vulkan-headers.version; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vulkan-loader"; inherit version; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 60f911765992e..958257ffe76d7 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -6,7 +6,7 @@ let generic = { version, sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "wt"; inherit version; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 362f704a05d8d..9d317fe00d291 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -2,7 +2,7 @@ , libuuid, zlib }: let - generic = version: sha256: stdenv.mkDerivation rec { + generic = version: sha256: stdenv.mkDerivation { pname = "xapian"; inherit version; passthru = { inherit version; }; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 705bd6b87fc6d..4764c1bdb93cd 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig , xorg, gnum4, libxcb, gperf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xcb-util-cursor-0.1.1-3-unstable"; version = "2017-04-05"; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 3e54944a3779e..25c5bf4588877 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -4,7 +4,7 @@ let version = "1.2.28"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xmlsec"; inherit version; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 5a267bbfe7678..bd87d306b9659 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -3,7 +3,7 @@ let fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xsd"; version = "4.0.0"; diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index 6305b6c03a46a..d3df30e03e18a 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "yojimbo"; version = "1.1"; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 58e1940a3ef4d..bb5b602b64ac2 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -1,6 +1,6 @@ { stdenv, zookeeper, bash }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}"; src = zookeeper.src; |