From eaa61e39418b9684765ca4aed4defebd0ed850a7 Mon Sep 17 00:00:00 2001 From: chessai Date: Fri, 3 Jul 2020 14:38:21 -0700 Subject: [PATCH 01/81] puppeteer-cli: init --- pkgs/tools/graphics/puppeteer-cli/default.nix | 20 + pkgs/tools/graphics/puppeteer-cli/yarn.lock | 490 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 512 insertions(+) create mode 100644 pkgs/tools/graphics/puppeteer-cli/default.nix create mode 100644 pkgs/tools/graphics/puppeteer-cli/yarn.lock diff --git a/pkgs/tools/graphics/puppeteer-cli/default.nix b/pkgs/tools/graphics/puppeteer-cli/default.nix new file mode 100644 index 000000000000..585059f3f537 --- /dev/null +++ b/pkgs/tools/graphics/puppeteer-cli/default.nix @@ -0,0 +1,20 @@ +{ fetchFromGitHub, makeWrapper, stdenv, chromium, mkYarnPackage +}: + +mkYarnPackage rec { + pname = "puppeteer-cli"; + version = "1.5.1"; + src = fetchFromGitHub { + owner = "JarvusInnovations"; + repo = "puppeteer-cli"; + rev = "v${version}"; + sha256 = "0xrb8r4qc9ds7wmfd30nslnkqylxqfwr4gqf7b30v651sjyds29x"; + }; + packageJSON = src + "/package.json"; + yarnLock = ./yarn.lock; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/puppeteer \ + --set PUPPETEER_EXECUTABLE_PATH ${chromium}/bin/chromium + ''; +} diff --git a/pkgs/tools/graphics/puppeteer-cli/yarn.lock b/pkgs/tools/graphics/puppeteer-cli/yarn.lock new file mode 100644 index 000000000000..2e462f69abb0 --- /dev/null +++ b/pkgs/tools/graphics/puppeteer-cli/yarn.lock @@ -0,0 +1,490 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@types/mime-types@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73" + integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= + +agent-base@5: + version "5.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" + integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== + +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-styles@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +async-limiter@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +camelcase@^5.0.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +debug@4, debug@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + +debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +extract-zip@^1.6.6: + version "1.7.0" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" + integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== + dependencies: + concat-stream "^1.6.2" + debug "^2.6.9" + mkdirp "^0.5.4" + yauzl "^2.10.0" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +file-url@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/file-url/-/file-url-3.0.0.tgz#247a586a746ce9f7a8ed05560290968afc262a77" + integrity sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA== + +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +glob@^7.1.3: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +https-proxy-agent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" + integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== + dependencies: + agent-base "5" + debug "4" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.3, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-url@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52" + integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww== + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + +mime-db@1.44.0: + version "1.44.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" + integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== + +mime-types@^2.1.25: + version "2.1.27" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" + integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + dependencies: + mime-db "1.44.0" + +mime@^2.0.3: + version "2.4.6" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" + integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp@^0.5.4: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +p-limit@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== + dependencies: + p-limit "^2.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +proxy-from-env@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +puppeteer@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.1.1.tgz#ccde47c2a688f131883b50f2d697bd25189da27e" + integrity sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg== + dependencies: + "@types/mime-types" "^2.1.0" + debug "^4.1.0" + extract-zip "^1.6.6" + https-proxy-agent "^4.0.0" + mime "^2.0.3" + mime-types "^2.1.25" + progress "^2.0.1" + proxy-from-env "^1.0.0" + rimraf "^2.6.1" + ws "^6.1.0" + +querystringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" + integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== + +readable-stream@^2.2.2: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +rimraf@^2.6.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +url-parse@^1.4.7: + version "1.4.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" + integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + dependencies: + async-limiter "~1.0.0" + +y18n@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + +yargs-parser@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + +yargs@^13.3.0: + version "13.3.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" + integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.2" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b65cca00093d..a56c54be573b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10986,6 +10986,8 @@ in puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; + puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli {}; + pyrseas = callPackage ../development/tools/database/pyrseas { }; qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; From a7fff1ac0966e2a4465c40a21a1f94cf0c2dcc02 Mon Sep 17 00:00:00 2001 From: chessai Date: Sat, 18 Jul 2020 19:31:58 -0700 Subject: [PATCH 02/81] specify yarnNix in puppeteer-cli --- pkgs/tools/graphics/puppeteer-cli/default.nix | 2 +- pkgs/tools/graphics/puppeteer-cli/yarn.nix | 605 ++++++++++++++++++ 2 files changed, 606 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/graphics/puppeteer-cli/yarn.nix diff --git a/pkgs/tools/graphics/puppeteer-cli/default.nix b/pkgs/tools/graphics/puppeteer-cli/default.nix index 585059f3f537..9b3d38ae8d2e 100644 --- a/pkgs/tools/graphics/puppeteer-cli/default.nix +++ b/pkgs/tools/graphics/puppeteer-cli/default.nix @@ -10,8 +10,8 @@ mkYarnPackage rec { rev = "v${version}"; sha256 = "0xrb8r4qc9ds7wmfd30nslnkqylxqfwr4gqf7b30v651sjyds29x"; }; - packageJSON = src + "/package.json"; yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/puppeteer \ diff --git a/pkgs/tools/graphics/puppeteer-cli/yarn.nix b/pkgs/tools/graphics/puppeteer-cli/yarn.nix new file mode 100644 index 000000000000..773acc84f352 --- /dev/null +++ b/pkgs/tools/graphics/puppeteer-cli/yarn.nix @@ -0,0 +1,605 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_types_mime_types___mime_types_2.1.0.tgz"; + path = fetchurl { + name = "_types_mime_types___mime_types_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz"; + sha1 = "9ca52cda363f699c69466c2a6ccdaad913ea7a73"; + }; + } + { + name = "agent_base___agent_base_5.1.1.tgz"; + path = fetchurl { + name = "agent_base___agent_base_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz"; + sha1 = "e8fb3f242959db44d63be665db7a8e739537a32c"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "async_limiter___async_limiter_1.0.1.tgz"; + path = fetchurl { + name = "async_limiter___async_limiter_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; + sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "extract_zip___extract_zip_1.7.0.tgz"; + path = fetchurl { + name = "extract_zip___extract_zip_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; + sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + }; + } + { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + } + { + name = "file_url___file_url_3.0.0.tgz"; + path = fetchurl { + name = "file_url___file_url_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-url/-/file-url-3.0.0.tgz"; + sha1 = "247a586a746ce9f7a8ed05560290968afc262a77"; + }; + } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz"; + sha1 = "702b71fb5520a132a66de1f67541d9e62154d82b"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_url___is_url_1.2.4.tgz"; + path = fetchurl { + name = "is_url___is_url_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz"; + sha1 = "04a4df46d28c4cff3d73d01ff06abeb318a1aa52"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "mime_db___mime_db_1.44.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + }; + } + { + name = "mime_types___mime_types_2.1.27.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + }; + } + { + name = "mime___mime_2.4.6.tgz"; + path = fetchurl { + name = "mime___mime_2.4.6.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; + sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "path_exists___path_exists_3.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + path = fetchurl { + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; + }; + } + { + name = "puppeteer___puppeteer_2.1.1.tgz"; + path = fetchurl { + name = "puppeteer___puppeteer_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.1.1.tgz"; + sha1 = "ccde47c2a688f131883b50f2d697bd25189da27e"; + }; + } + { + name = "querystringify___querystringify_2.1.1.tgz"; + path = fetchurl { + name = "querystringify___querystringify_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz"; + sha1 = "60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "requires_port___requires_port_1.0.0.tgz"; + path = fetchurl { + name = "requires_port___requires_port_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "url_parse___url_parse_1.4.7.tgz"; + path = fetchurl { + name = "url_parse___url_parse_1.4.7.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz"; + sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "ws___ws_6.2.1.tgz"; + path = fetchurl { + name = "ws___ws_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; + sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; + }; + } + { + name = "y18n___y18n_4.0.0.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; + sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + }; + } + { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; + }; + } + { + name = "yargs___yargs_13.3.2.tgz"; + path = fetchurl { + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + } + ]; +} From ba32ac13b0dc25461c44329294a0b94ea9168e20 Mon Sep 17 00:00:00 2001 From: chessai Date: Sat, 18 Jul 2020 19:47:41 -0700 Subject: [PATCH 03/81] add packageJSON locally too, to avoid IFD --- pkgs/tools/graphics/puppeteer-cli/default.nix | 1 + pkgs/tools/graphics/puppeteer-cli/package.json | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/tools/graphics/puppeteer-cli/package.json diff --git a/pkgs/tools/graphics/puppeteer-cli/default.nix b/pkgs/tools/graphics/puppeteer-cli/default.nix index 9b3d38ae8d2e..c01ee232fa7b 100644 --- a/pkgs/tools/graphics/puppeteer-cli/default.nix +++ b/pkgs/tools/graphics/puppeteer-cli/default.nix @@ -10,6 +10,7 @@ mkYarnPackage rec { rev = "v${version}"; sha256 = "0xrb8r4qc9ds7wmfd30nslnkqylxqfwr4gqf7b30v651sjyds29x"; }; + packageJSON = ./package.json; yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/puppeteer-cli/package.json b/pkgs/tools/graphics/puppeteer-cli/package.json new file mode 100644 index 000000000000..993d5122bbb7 --- /dev/null +++ b/pkgs/tools/graphics/puppeteer-cli/package.json @@ -0,0 +1,18 @@ +{ + "name": "puppeteer-cli", + "version": "1.5.1", + "description": "A command-line wrapper for generating PDF prints and PNG screenshots with Puppeteer. Aims to be a easy replacement for the deprecated wkhtmltopdf.", + "bin": { + "puppeteer": "./index.js" + }, + "author": "Chris Alfano ", + "license": "MIT", + "repository": "JarvusInnovations/puppeteer-cli", + "dependencies": { + "file-url": "^3.0.0", + "is-url": "^1.2.4", + "puppeteer": "^2.0.0", + "url-parse": "^1.4.7", + "yargs": "^13.3.0" + } +} From ca903403330dd0e066a92aee6b1b80b45feb7eb4 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 8 Jan 2021 17:47:18 +0100 Subject: [PATCH 04/81] pythonPackages.PyGithub: 1.51 -> 1.54.1 --- pkgs/development/python-modules/pyGithub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index c82f18d377d3..c91b81796507 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.51"; + version = "1.54.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "1hz5fc3rkryl4vzxmmwx75p25wk0ida54lf6bz7261rm5hb05r7j"; + sha256 = "1nl74bp5ikdnrc8xq0qr25ryl1mvarf0xi43k8w5jzlrllhq0nkq"; }; checkInputs = [ httpretty parameterized pytestCheckHook ]; From b578c282172626ffc848d12622cdc81ab5aaa89e Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:34:24 -0500 Subject: [PATCH 05/81] nvidia-docker: split out libnvidia-container into separate drv --- .../avoid-static-libtirpc-build.patch | 0 .../libnvc.nix => libnvidia-container/default.nix} | 12 ++++++++++-- .../libnvc-ldconfig-and-path-fixes.patch | 0 .../modprobe.patch | 0 .../virtualization/nvidia-docker/default.nix | 5 ----- 5 files changed, 10 insertions(+), 7 deletions(-) rename pkgs/applications/virtualization/{nvidia-docker => libnvidia-container}/avoid-static-libtirpc-build.patch (100%) rename pkgs/applications/virtualization/{nvidia-docker/libnvc.nix => libnvidia-container/default.nix} (87%) rename pkgs/applications/virtualization/{nvidia-docker => libnvidia-container}/libnvc-ldconfig-and-path-fixes.patch (100%) rename pkgs/applications/virtualization/{nvidia-docker => libnvidia-container}/modprobe.patch (100%) diff --git a/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch b/pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch similarity index 100% rename from pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch rename to pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix similarity index 87% rename from pkgs/applications/virtualization/nvidia-docker/libnvc.nix rename to pkgs/applications/virtualization/libnvidia-container/default.nix index 95d66582618e..f57863cba11c 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -7,6 +7,8 @@ , libseccomp , rpcsvc-proto , libtirpc +, makeWrapper + }: let modp-ver = "450.57"; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NVIDIA"; - repo = "libnvidia-container"; + repo = pname; rev = "v${version}"; sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq"; }; @@ -64,10 +66,15 @@ stdenv.mkDerivation rec { popd ''; + postInstall = '' + wrapProgram $out/bin/nvidia-container-cli \ + --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib + ''; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; - nativeBuildInputs = [ pkgconfig rpcsvc-proto ]; + nativeBuildInputs = [ pkgconfig rpcsvc-proto makeWrapper ]; buildInputs = [ libelf libcap libseccomp libtirpc ]; @@ -76,5 +83,6 @@ stdenv.mkDerivation rec { description = "NVIDIA container runtime library"; license = licenses.bsd3; platforms = platforms.linux; + maintainers = with maintainers; [ cpcloud ]; }; } diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch similarity index 100% rename from pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch rename to pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch diff --git a/pkgs/applications/virtualization/nvidia-docker/modprobe.patch b/pkgs/applications/virtualization/libnvidia-container/modprobe.patch similarity index 100% rename from pkgs/applications/virtualization/nvidia-docker/modprobe.patch rename to pkgs/applications/virtualization/libnvidia-container/modprobe.patch diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index 0df2efebd820..ac2b9db0c5cd 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -13,7 +13,6 @@ }: with lib; let - libnvidia-container = callPackage ./libnvc.nix { }; isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ { name = "runc"; @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { cp nvidia-docker bin substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} - cp ${libnvidia-container}/bin/nvidia-container-cli bin cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin ''; @@ -83,9 +81,6 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,etc} cp -r bin $out - wrapProgram $out/bin/nvidia-container-cli \ - --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib - # nvidia-container-runtime invokes docker-runc or runc if that isn't available on PATH wrapProgram $out/bin/nvidia-container-runtime --prefix PATH : ${isolatedContainerRuntimePath} From 27cd42fd6d4f61c0980455b975a4d5c037a463dd Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:35:06 -0500 Subject: [PATCH 06/81] nvidia-docker: use pname for repo attribute --- pkgs/applications/virtualization/nvidia-docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index ac2b9db0c5cd..c8c085906227 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NVIDIA"; - repo = "nvidia-docker"; + repo = pname; rev = "v${version}"; sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h"; }; From 610ec202dcea5a06baeec789ff625b20a663a114 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:39:16 -0500 Subject: [PATCH 07/81] nvidia-docker: split out nvidia-container-runtime into separate drv --- .../nvidia-container-runtime/default.nix | 68 +++++++++++++++++++ .../virtualization/nvidia-docker/default.nix | 30 -------- 2 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 pkgs/applications/virtualization/nvidia-container-runtime/default.nix diff --git a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix new file mode 100644 index 000000000000..66d133db63a5 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix @@ -0,0 +1,68 @@ +{ lib +, glibc +, fetchFromGitHub +, makeWrapper +, buildGoPackage +, linkFarm +, writeShellScript +, containerRuntimePath +, configTemplate +}: +let + isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ + { + name = "runc"; + path = containerRuntimePath; + } + ]; + warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" '' + set -eo pipefail + + if [ -n "$XDG_CONFIG_HOME" ]; then + echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)" + fi + ''; +in +buildGoPackage rec { + pname = "nvidia-container-runtime"; + version = "3.4.0"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = pname; + rev = "v${version}"; + sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr"; + }; + goPackagePath = "github.com/${pname}/src"; + buildFlagsArray = [ "-ldflags=" "-s -w" ]; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + mv $out/bin/{src,nvidia-container-runtime} + mkdir -p $out/etc/nvidia-container-runtime + + # nvidia-container-runtime invokes docker-runc or runc if that isn't + # available on PATH. + # + # Also set XDG_CONFIG_HOME if it isn't already to allow overriding + # configuration. This in turn allows users to have the nvidia container + # runtime enabled for any number of higher level runtimes like docker and + # podman, i.e., there's no need to have mutually exclusivity on what high + # level runtime can enable the nvidia runtime because each high level + # runtime has its own config.toml file. + wrapProgram $out/bin/nvidia-container-runtime \ + --run "${warnIfXdgConfigHomeIsSet}" \ + --prefix PATH : ${isolatedContainerRuntimePath} \ + --set-default XDG_CONFIG_HOME $out/etc + + cp ${configTemplate} $out/etc/nvidia-container-runtime/config.toml + + substituteInPlace $out/etc/nvidia-container-runtime/config.toml \ + --subst-var-by glibcbin ${lib.getBin glibc} + ''; + meta = with lib; { + homepage = "https://github.com/NVIDIA/nvidia-container-runtime"; + description = "NVIDIA container runtime"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index c8c085906227..2a4d8db7e4ba 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -9,33 +9,9 @@ , glibc , docker , linkFarm -, containerRuntimePath ? "${docker}/libexec/docker/runc" }: with lib; let - isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ - { - name = "runc"; - path = containerRuntimePath; - } - ]; - - nvidia-container-runtime = buildGoPackage rec { - pname = "nvidia-container-runtime"; - version = "3.4.0"; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "nvidia-container-runtime"; - rev = "v${version}"; - sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr"; - }; - goPackagePath = "github.com/nvidia-container-runtime/src"; - buildFlagsArray = [ "-ldflags=" "-s -w" ]; - postInstall = '' - mv $out/bin/{src,nvidia-container-runtime} - ''; - }; - nvidia-container-toolkit = buildGoModule rec { pname = "nvidia-container-toolkit"; version = "1.3.0"; @@ -65,8 +41,6 @@ stdenv.mkDerivation rec { sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h"; }; - nativeBuildInputs = [ makeWrapper ]; - buildPhase = '' mkdir bin @@ -74,16 +48,12 @@ stdenv.mkDerivation rec { substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin - cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin ''; installPhase = '' mkdir -p $out/{bin,etc} cp -r bin $out - # nvidia-container-runtime invokes docker-runc or runc if that isn't available on PATH - wrapProgram $out/bin/nvidia-container-runtime --prefix PATH : ${isolatedContainerRuntimePath} - cp ${./config.toml} $out/etc/config.toml substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc} From e67c679649a2f03baf161c3c89a01611045546ed Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:40:45 -0500 Subject: [PATCH 08/81] nvidia-docker: split out nvidia-container-toolkit into separate drv --- .../nvidia-container-toolkit/default.nix | 41 +++++++++++++++++++ .../virtualization/nvidia-docker/default.nix | 19 --------- 2 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/virtualization/nvidia-container-toolkit/default.nix diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix new file mode 100644 index 000000000000..cb5629935657 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, callPackage +, makeWrapper +, containerRuntimePath +, configTemplate +}: +let + nvidia-container-runtime = callPackage ../nvidia-container-runtime { + inherit containerRuntimePath configTemplate; + }; +in +buildGoModule rec { + pname = "nvidia-container-toolkit"; + version = "1.3.0"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = pname; + rev = "v${version}"; + sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; + }; + vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; + buildFlagsArray = [ "-ldflags=" "-s -w" ]; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + mv $out/bin/{pkg,${pname}} + ln -s $out/bin/nvidia-container-{toolkit,runtime-hook} + + wrapProgram $out/bin/nvidia-container-toolkit \ + --add-flags "-config ${nvidia-container-runtime}/etc/nvidia-container-runtime/config.toml" + ''; + + meta = with lib; { + homepage = "https://github.com/NVIDIA/nvidia-container-toolkit"; + description = "NVIDIA container runtime hook"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index 2a4d8db7e4ba..e0425ec32a26 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -12,23 +12,6 @@ }: with lib; let - nvidia-container-toolkit = buildGoModule rec { - pname = "nvidia-container-toolkit"; - version = "1.3.0"; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "nvidia-container-toolkit"; - rev = "v${version}"; - sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; - }; - vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; - buildFlagsArray = [ "-ldflags=" "-s -w" ]; - postInstall = '' - mv $out/bin/{pkg,${pname}} - cp $out/bin/{${pname},nvidia-container-runtime-hook} - ''; - }; - in stdenv.mkDerivation rec { pname = "nvidia-docker"; @@ -46,8 +29,6 @@ stdenv.mkDerivation rec { cp nvidia-docker bin substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} - - cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin ''; installPhase = '' From 91b47ae43c44138734b4ffacad6f9eb84506fe8b Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:43:12 -0500 Subject: [PATCH 09/81] nvidia-docker: podman-config.toml -> nvidia-podman/config.toml --- .../podman-config.toml => nvidia-podman/config.toml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/applications/virtualization/{nvidia-docker/podman-config.toml => nvidia-podman/config.toml} (100%) diff --git a/pkgs/applications/virtualization/nvidia-docker/podman-config.toml b/pkgs/applications/virtualization/nvidia-podman/config.toml similarity index 100% rename from pkgs/applications/virtualization/nvidia-docker/podman-config.toml rename to pkgs/applications/virtualization/nvidia-podman/config.toml From 8f1a64953ebb0d8cb53d20cc74bea2a894a98a2b Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:45:10 -0500 Subject: [PATCH 10/81] nixos/docker: remove nvidia-container-runtime/config.toml creation from module --- nixos/modules/virtualisation/docker.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ec257801b330..3efb13c2912d 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -215,9 +215,6 @@ in message = "Option enableNvidia requires 32bit support libraries"; }]; } - (mkIf cfg.enableNvidia { - environment.etc."nvidia-container-runtime/config.toml".source = "${pkgs.nvidia-docker}/etc/config.toml"; - }) ]); imports = [ From 50f70cb8ed78342515397879f635de07deb06b28 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:45:25 -0500 Subject: [PATCH 11/81] nixos/podman: remove nvidia-container-runtime/config.toml creation from module --- nixos/modules/virtualisation/podman.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 36c0ca8dfea3..b61b4197b8c5 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -117,8 +117,5 @@ in } ]; } - (lib.mkIf cfg.enableNvidia { - environment.etc."nvidia-container-runtime/config.toml".source = "${nvidia-docker}/etc/podman-config.toml"; - }) ]); } From 3e57cbdd3ca2a9a0e6b23478bc90c2e6991f7011 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:48:07 -0500 Subject: [PATCH 12/81] nixos/podman: remove assertion that docker and podman nvidia runtimes cannot both be enabled --- nixos/modules/virtualisation/podman.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index b61b4197b8c5..e1ccc8c34cec 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -111,10 +111,6 @@ in assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; message = "Option dockerCompat conflicts with docker"; } - { - assertion = cfg.enableNvidia -> !config.virtualisation.docker.enableNvidia; - message = "Option enableNvidia conflicts with docker.enableNvidia"; - } ]; } ]); From 6b5b64173f2a40695ed1129f104b2a5e11ddd0f0 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:49:15 -0500 Subject: [PATCH 13/81] nvidia-docker: no longer perform templating of container runtime config files --- .../virtualization/nvidia-docker/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index e0425ec32a26..50c864fdc47e 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -32,14 +32,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/{bin,etc} - cp -r bin $out - - cp ${./config.toml} $out/etc/config.toml - substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc} - - cp ${./podman-config.toml} $out/etc/podman-config.toml - substituteInPlace $out/etc/podman-config.toml --subst-var-by glibcbin ${lib.getBin glibc} + mkdir -p $out/bin + cp bin/nvidia-docker $out/bin ''; meta = { From e94a0228c5bac3c82faaf97aaad6384e5ba9c668 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:49:46 -0500 Subject: [PATCH 14/81] nvidia-docker: clean up drv inputs --- .../virtualization/nvidia-docker/default.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index 50c864fdc47e..a17839fabb58 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -1,18 +1,4 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, callPackage -, makeWrapper -, buildGoModule -, buildGoPackage -, glibc -, docker -, linkFarm -}: - -with lib; let -in +{ stdenv, lib, fetchFromGitHub, callPackage }: stdenv.mkDerivation rec { pname = "nvidia-docker"; version = "2.5.0"; From ca2aa77d7bd8695d3bd3b763d354b5c1ca5dcc36 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:50:59 -0500 Subject: [PATCH 15/81] nixpkgs: use symlinkJoin to share container runtime config for runtimes that support nvidia GPUs --- pkgs/top-level/all-packages.nix | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42b6c9d60268..d90cabd1f037 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15415,7 +15415,32 @@ in nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; - nvidia-docker = callPackage ../applications/virtualization/nvidia-docker { }; + mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: + symlinkJoin { + name = "nvidia-containers-${name}"; + paths = [ + (callPackage ../applications/virtualization/libnvidia-container { }) + (callPackage ../applications/virtualization/nvidia-container-runtime { + inherit containerRuntimePath configTemplate; + }) + (callPackage ../applications/virtualization/nvidia-container-toolkit { + inherit containerRuntimePath configTemplate; + }) + ] ++ additionalPaths; + }; + + nvidia-docker = mkNvidiaContainerPkg { + name = "docker"; + containerRuntimePath = "${docker}/libexec/docker/runc"; + configTemplate = ../applications/virtualization/nvidia-docker/config.toml; + additionalPaths = [ (callPackage ../applications/virtualization/nvidia-docker { }) ]; + }; + + nvidia-podman = mkNvidiaContainerPkg { + name = "podman"; + containerRuntimePath = "${runc}/bin/runc"; + configTemplate = ../applications/virtualization/nvidia-podman/config.toml; + }; nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; From a873cbc218187f5b6e0f6c6a6111927f6c327f17 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 09:52:32 -0500 Subject: [PATCH 16/81] nixos/podman: use shared config drvs to populate podman module --- nixos/modules/virtualisation/podman.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index e1ccc8c34cec..98da5a096d91 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -2,7 +2,6 @@ let cfg = config.virtualisation.podman; toml = pkgs.formats.toml { }; - nvidia-docker = pkgs.nvidia-docker.override { containerRuntimePath = "${pkgs.runc}/bin/runc"; }; inherit (lib) mkOption types; @@ -100,8 +99,8 @@ in containersConf.extraConfig = lib.optionalString cfg.enableNvidia (builtins.readFile (toml.generate "podman.nvidia.containers.conf" { engine = { - conmon_env_vars = [ "PATH=${lib.makeBinPath [ nvidia-docker ]}" ]; - runtimes.nvidia = [ "${nvidia-docker}/bin/nvidia-container-runtime" ]; + conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ]; + runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ]; }; })); }; From d93754bb40c559435ce18c8c21ee8e8fcbd4330e Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 10:17:26 -0500 Subject: [PATCH 17/81] nvidia-docker: fix lib access --- pkgs/applications/virtualization/nvidia-docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index a17839fabb58..07dfc3fdb6dc 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { cp bin/nvidia-docker $out/bin ''; - meta = { + meta = with lib; { homepage = "https://github.com/NVIDIA/nvidia-docker"; description = "NVIDIA container runtime for Docker"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with lib.maintainers; [ cpcloud ]; + maintainers = with maintainers; [ cpcloud ]; }; } From b0b92e598d86dd03620128b4fb31b2dd5b39aed2 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sat, 9 Jan 2021 15:36:41 -0500 Subject: [PATCH 18/81] libnvidia-container: remove line break --- pkgs/applications/virtualization/libnvidia-container/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index f57863cba11c..15ded8b671d4 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -8,7 +8,6 @@ , rpcsvc-proto , libtirpc , makeWrapper - }: let modp-ver = "450.57"; From bc43141b48a9b1fa9ade937a6d557c94ed24c244 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 10 Jan 2021 07:58:25 -0500 Subject: [PATCH 19/81] nvidia-container-runtime: format --- .../virtualization/nvidia-container-runtime/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix index 66d133db63a5..9fe1920789a0 100644 --- a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix @@ -26,15 +26,18 @@ in buildGoPackage rec { pname = "nvidia-container-runtime"; version = "3.4.0"; + src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr"; }; + goPackagePath = "github.com/${pname}/src"; buildFlagsArray = [ "-ldflags=" "-s -w" ]; nativeBuildInputs = [ makeWrapper ]; + postInstall = '' mv $out/bin/{src,nvidia-container-runtime} mkdir -p $out/etc/nvidia-container-runtime @@ -58,6 +61,7 @@ buildGoPackage rec { substituteInPlace $out/etc/nvidia-container-runtime/config.toml \ --subst-var-by glibcbin ${lib.getBin glibc} ''; + meta = with lib; { homepage = "https://github.com/NVIDIA/nvidia-container-runtime"; description = "NVIDIA container runtime"; From f91f9eacd676ac5b54e8e2858bcbc0e3c39be9f4 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 10 Jan 2021 07:58:41 -0500 Subject: [PATCH 20/81] nvidia-container-toolkit: format --- .../virtualization/nvidia-container-toolkit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index cb5629935657..fd6edc64a0f6 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -14,15 +14,18 @@ in buildGoModule rec { pname = "nvidia-container-toolkit"; version = "1.3.0"; + src = fetchFromGitHub { owner = "NVIDIA"; repo = pname; rev = "v${version}"; sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; }; + vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; buildFlagsArray = [ "-ldflags=" "-s -w" ]; nativeBuildInputs = [ makeWrapper ]; + postInstall = '' mv $out/bin/{pkg,${pname}} ln -s $out/bin/nvidia-container-{toolkit,runtime-hook} From 8169d5c64451122b4867b5457a1d628354162fbe Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 10 Jan 2021 08:09:36 -0500 Subject: [PATCH 21/81] nvidia-container-toolkit: pass nvidia-container-runtime into drv --- .../nvidia-container-toolkit/default.nix | 8 +------- pkgs/top-level/all-packages.nix | 12 +++++++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index fd6edc64a0f6..1ef9603195d0 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -3,14 +3,8 @@ , buildGoModule , callPackage , makeWrapper -, containerRuntimePath -, configTemplate +, nvidia-container-runtime }: -let - nvidia-container-runtime = callPackage ../nvidia-container-runtime { - inherit containerRuntimePath configTemplate; - }; -in buildGoModule rec { pname = "nvidia-container-toolkit"; version = "1.3.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90cabd1f037..ff32fe785933 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15416,15 +15416,17 @@ in nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: - symlinkJoin { + let + nvidia-container-runtime = callPackage ../applications/virtualization/nvidia-container-runtime { + inherit containerRuntimePath configTemplate; + }; + in symlinkJoin { name = "nvidia-containers-${name}"; paths = [ (callPackage ../applications/virtualization/libnvidia-container { }) - (callPackage ../applications/virtualization/nvidia-container-runtime { - inherit containerRuntimePath configTemplate; - }) + nvidia-container-runtime (callPackage ../applications/virtualization/nvidia-container-toolkit { - inherit containerRuntimePath configTemplate; + inherit nvidia-container-runtime; }) ] ++ additionalPaths; }; From 7eed27754c278d2f671fe6e41705780acdc959a5 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 10 Jan 2021 08:52:23 -0500 Subject: [PATCH 22/81] libnvidia-container: fix license --- .../applications/virtualization/libnvidia-container/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index 15ded8b671d4..e7cfb3c7a587 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/NVIDIA/libnvidia-container"; description = "NVIDIA container runtime library"; - license = licenses.bsd3; + license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cpcloud ]; }; From 8f33bef20fd242c31537c45408357f266b83892e Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 10 Jan 2021 08:52:50 -0500 Subject: [PATCH 23/81] nvidia-container-runtime: fix license --- .../virtualization/nvidia-container-runtime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix index 9fe1920789a0..92717b988919 100644 --- a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix @@ -65,7 +65,7 @@ buildGoPackage rec { meta = with lib; { homepage = "https://github.com/NVIDIA/nvidia-container-runtime"; description = "NVIDIA container runtime"; - license = licenses.bsd3; + license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cpcloud ]; }; From 5af3dd4a96e3f327f2e4b641297f0708c080a014 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 10 Jan 2021 08:53:07 -0500 Subject: [PATCH 24/81] nvidia-container-toolkit: fix license --- .../virtualization/nvidia-container-toolkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 1ef9603195d0..19647bce6317 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/NVIDIA/nvidia-container-toolkit"; description = "NVIDIA container runtime hook"; - license = licenses.bsd3; + license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cpcloud ]; }; From 4cd4468144b150e68dab9a7454f3ddc28b592353 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 10 Jan 2021 08:53:26 -0500 Subject: [PATCH 25/81] nvidia-container-toolkit: remove unused input --- .../virtualization/nvidia-container-toolkit/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 19647bce6317..4276f71a409b 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , buildGoModule -, callPackage , makeWrapper , nvidia-container-runtime }: From caf2a8d9eaa653a9989e14629198c515ba398ea9 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 10 Jan 2021 08:54:18 -0500 Subject: [PATCH 26/81] nvidia-docker/nvidia-podman: inherit name directly --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff32fe785933..b0146c934a91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15421,7 +15421,7 @@ in inherit containerRuntimePath configTemplate; }; in symlinkJoin { - name = "nvidia-containers-${name}"; + inherit name; paths = [ (callPackage ../applications/virtualization/libnvidia-container { }) nvidia-container-runtime @@ -15432,14 +15432,14 @@ in }; nvidia-docker = mkNvidiaContainerPkg { - name = "docker"; + name = "nvidia-docker"; containerRuntimePath = "${docker}/libexec/docker/runc"; configTemplate = ../applications/virtualization/nvidia-docker/config.toml; additionalPaths = [ (callPackage ../applications/virtualization/nvidia-docker { }) ]; }; nvidia-podman = mkNvidiaContainerPkg { - name = "podman"; + name = "nvidia-podman"; containerRuntimePath = "${runc}/bin/runc"; configTemplate = ../applications/virtualization/nvidia-podman/config.toml; }; From a129a5e2d9a1be27c78ef33ab49b7882ce1e1b78 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 10 Jan 2021 19:21:27 +0100 Subject: [PATCH 27/81] xpra: add update script --- pkgs/tools/X11/xpra/default.nix | 5 ++++- pkgs/tools/X11/xpra/update.sh | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 pkgs/tools/X11/xpra/update.sh diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 3f1bf557ae8e..13315dda5346 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -110,7 +110,10 @@ in buildPythonApplication rec { enableParallelBuilding = true; - passthru = { inherit xf86videodummy; }; + passthru = { + inherit xf86videodummy; + updateScript = ./update.sh; + }; meta = { homepage = "http://xpra.org/"; diff --git a/pkgs/tools/X11/xpra/update.sh b/pkgs/tools/X11/xpra/update.sh new file mode 100755 index 000000000000..c1b408a0beef --- /dev/null +++ b/pkgs/tools/X11/xpra/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl perl common-updater-scripts + +version=$(curl https://xpra.org/src/ | perl -ne 'print "$1\n" if /xpra-([[:digit:].]+)\./' | sort -V | tail -n1) +update-source-version xpra "$version" From e3dac9b6b3c9241a7371e2d88fdb2f461b43bd6d Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 11 Jan 2021 11:05:59 +0100 Subject: [PATCH 28/81] xpra: 4.0.2 -> 4.0.6 --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 13315dda5346..ef05e1b10c1b 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -30,11 +30,11 @@ let in buildPythonApplication rec { pname = "xpra"; - version = "4.0.2"; + version = "4.0.6"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "1cs39jzi59hkl421xmhi549ndmdfzkg0ap45f4nlsn9zr9zwmp3x"; + sha256 = "nGcvbZFGYd2nQ75LL4YN+xcWb7UsViA3OAqpcrTwieg="; }; patches = [ From 9ecc4fccb52a86388bc0317369f530bd11a8f234 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Jan 2021 12:13:11 +0100 Subject: [PATCH 29/81] python3Packages.aresponses: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/aresponses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index 56093192d6c7..7906a10cbe76 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "aresponses"; - version = "2.0.0"; + version = "2.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "58693a6b715edfa830a20903ee1d1b2a791251923f311b3bebf113e8ff07bb35"; + sha256 = "1jn7x7ldqsz5cd190jqjil0kqyimd1d0yxfzzp41ky0p72lvd68a"; }; propagatedBuildInputs = [ From 66a81b872f6866bfcb5b208c46db11609d095408 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Jan 2021 12:16:08 +0100 Subject: [PATCH 30/81] python3Packages.aresponses: use GitHub as source and enable tests --- .../python-modules/aresponses/default.nix | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index 7906a10cbe76..2407adefd5ce 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -1,12 +1,11 @@ { lib -, buildPythonPackage -, fetchPypi -# propagatedBuildInputs , aiohttp -# buildInputs +, buildPythonPackage +, fetchFromGitHub +, isPy3k , pytest , pytest-asyncio -, isPy3k +, pytestCheckHook }: buildPythonPackage rec { @@ -15,9 +14,11 @@ buildPythonPackage rec { disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "1jn7x7ldqsz5cd190jqjil0kqyimd1d0yxfzzp41ky0p72lvd68a"; + src = fetchFromGitHub { + owner = "CircleUp"; + repo = pname; + rev = version; + sha256 = "0dc1y4s6kpmr0ar63kkyghvisgbmb8qq5wglmjclrpzd5180mjcl"; }; propagatedBuildInputs = [ @@ -29,13 +30,24 @@ buildPythonPackage rec { pytest-asyncio ]; - # tests only distributed via git repository, not pypi - doCheck = false; + checkInputs = [ + aiohttp + pytestCheckHook + pytest-asyncio + ]; + + # Disable tests which requires network access + disabledTests = [ + "test_foo" + "test_passthrough" + ]; + + pythonImportsCheck = [ "aresponses" ]; meta = with lib; { description = "Asyncio testing server"; homepage = "https://github.com/circleup/aresponses"; license = licenses.mit; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ makefu ]; }; } From ae6a8f945769801e4830bcf814f0f1179f7712df Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 12 Jan 2021 05:56:35 +0100 Subject: [PATCH 31/81] sudo: 1.9.4p2 -> 1.9.5p1 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 776823a6a280..3271af4a4b54 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.4p2"; + version = "1.9.5p1"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3"; + sha256 = "10kqdfbfpf3vk5ihz5gwynv4pxdf1lg6ircrlanyygb549yg7pad"; }; prePatch = '' From 7a62c0bc957116b7fa61d469cf008038d34d5e2e Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Tue, 12 Jan 2021 10:14:14 +0100 Subject: [PATCH 32/81] nixos/tor: fix openFirewall when ORPort isInt --- nixos/modules/services/security/tor.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 390dcfccfec3..54c2c2dea23a 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -909,8 +909,11 @@ in networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = - concatMap (o: optional (isInt o && o > 0 || o ? "port" && isInt o.port && o.port > 0) o.port) - (flatten [ + concatMap (o: + if isInt o && o > 0 then [o] + else if o ? "port" && isInt o.port && o.port > 0 then [o.port] + else [] + ) (flatten [ cfg.settings.ORPort cfg.settings.DirPort ]); From 423b9b2a707ca20ab8a268ac3735d6d4f9149705 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Wed, 13 Jan 2021 15:51:18 +0100 Subject: [PATCH 33/81] ceph: 15.2.7 -> 15.2.8 --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index d87c6331b794..8a0b987fb109 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -122,10 +122,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.7"; + version = "15.2.8"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "082lpx1rsifjh636zypxy6ccs6nfkcm9azxp5ghvr5mvx9chmyrj"; + sha256 = "1nmrras3g2zapcd06qr5m7y4zkymnr0r53jkpicjw2g4q7wfmib4"; }; in rec { ceph = stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c05b23df5793..d33f8a79a1df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2956,7 +2956,7 @@ in libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { - boost = boost16x.override { enablePython = true; python = python38; }; + boost = boost172.override { enablePython = true; python = python38; }; }) ceph ceph-client; From f398566d3a29b82e8bd07386bb9e6ae356b74944 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 28 Dec 2020 17:02:41 +0100 Subject: [PATCH 34/81] hydron: unstable-2019-02-17 -> 3.0.4 --- pkgs/servers/hydron/default.nix | 22 ++--- pkgs/servers/hydron/deps.nix | 138 -------------------------------- 2 files changed, 11 insertions(+), 149 deletions(-) delete mode 100644 pkgs/servers/hydron/deps.nix diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 3a67f6143483..8b950ec12c54 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, ffmpeg-full, graphicsmagick -, quicktemplate, go-bindata, easyjson }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }: -buildGoPackage { - pname = "hydron-unstable"; - version = "2019-02-17"; - goPackagePath = "github.com/bakape/hydron"; - goDeps = ./deps.nix; +buildGoModule rec { + pname = "hydron"; + version = "3.0.4"; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "824789fb108966432e507143db39b358dd7ff233"; - sha256 = "1xxykjf5iyavm12gd6nx4j8x2mlzzn7x8vm0j5009lsir98qr5zn"; + rev = "v${version}"; + sha256 = "BfMkKwz7ITEnAIMGUHlBH/Dn9yLjWKoqFWupPo1s2cs="; }; - nativeBuildInputs = [ pkgconfig go-bindata ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg-full graphicsmagick quicktemplate easyjson ]; + vendorSha256 = "1ngig5zw0gf1mkjjsfvvn09rncb36rg274cbi3glp8wzfcr8aip3"; + runVend = true; + + buildInputs = [ ffmpeg ]; meta = with lib; { homepage = "https://github.com/bakape/hydron"; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix deleted file mode 100644 index 08f165af76b2..000000000000 --- a/pkgs/servers/hydron/deps.nix +++ /dev/null @@ -1,138 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/Masterminds/squirrel"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/squirrel"; - rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c"; - sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq"; - }; - } - { - goPackagePath = "github.com/bakape/boorufetch"; - fetch = { - type = "git"; - url = "https://github.com/bakape/boorufetch"; - rev = "90aee10269a138a08ce49cd91635500336657a82"; - sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk"; - }; - } - { - goPackagePath = "github.com/bakape/thumbnailer"; - fetch = { - type = "git"; - url = "https://github.com/bakape/thumbnailer"; - rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949"; - sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk"; - }; - } - { - goPackagePath = "github.com/chai2010/webp"; - fetch = { - type = "git"; - url = "https://github.com/chai2010/webp"; - rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab"; - sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh"; - }; - } - { - goPackagePath = "github.com/dimfeld/httptreemux"; - fetch = { - type = "git"; - url = "https://github.com/dimfeld/httptreemux"; - rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff"; - sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp"; - }; - } - { - goPackagePath = "github.com/gorilla/handlers"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/handlers"; - rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05"; - sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli"; - }; - } - { - goPackagePath = "github.com/lann/builder"; - fetch = { - type = "git"; - url = "https://github.com/lann/builder"; - rev = "47ae307949d02aa1f1069fdafc00ca08e1dbabac"; - sha256 = "1kg9jy1rciznj627hafpq2mi7hr5d3ssgqcpwrm3bnlk9sqnydil"; - }; - } - { - goPackagePath = "github.com/lann/ps"; - fetch = { - type = "git"; - url = "https://github.com/lann/ps"; - rev = "62de8c46ede02a7675c4c79c84883eb164cb71e3"; - sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "9eb73efc1fcc404148b56765b0d3f61d9a5ef8ee"; - sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "1de009706dbeb9d05f18586f0735fcdb7c524481"; - sha256 = "0y4wq6wwj9ivqr397wcr6n0bd9m85qpk367bp65hkfi9x3mnlcb4"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1"; - sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz"; - }; - } - { - goPackagePath = "github.com/nwaples/rardecode"; - fetch = { - type = "git"; - url = "https://github.com/nwaples/rardecode"; - rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7"; - sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; - }; - } - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; - sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; - }; - } - { - goPackagePath = "github.com/valyala/quicktemplate"; - fetch = { - type = "git"; - url = "https://github.com/valyala/quicktemplate"; - rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; - sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d8887717615a059821345a5c23649351b52a1c0b"; - sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; - }; - } -] From cb0267fdf8c08798b86d05117c640a1dc781fd77 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 7 Jan 2021 13:12:06 +0100 Subject: [PATCH 35/81] python3Packages.geopy: unstable-2019-11-10 -> 2.1.0 --- pkgs/development/python-modules/geopy/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index fdf478d16103..6b8dedd04369 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -6,8 +6,8 @@ }: buildPythonPackage rec { - pname = "geopy-unstable"; - version = "2019-11-10"; + pname = "geopy"; + version = "2.1.0"; disabled = !isPy3k; # only Python 3 doCheck = false; # Needs network access @@ -15,10 +15,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ geographiclib ]; src = fetchFromGitHub { - owner = "geopy"; - repo = "geopy"; - rev = "531b7de6126838a3e69370227aa7f2086ba52b89"; - sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39"; + owner = pname; + repo = pname; + rev = version; + sha256 = "0239a4achk49ngagb6aqy6cgzfwgbxir07vwi13ysbpx78y0l4g9"; }; meta = with lib; { From 6faf1402f31d0655290caf566aa2917f7eb3c6ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 14 Jan 2021 00:06:55 +0100 Subject: [PATCH 36/81] python3Packages.geopy: update test part and meta --- .../python-modules/geopy/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 6b8dedd04369..693a4221ee09 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -1,18 +1,16 @@ -{ lib, stdenv +{ lib +, async_generator , buildPythonPackage , fetchFromGitHub -, isPy3k , geographiclib +, isPy3k +, pytestCheckHook }: buildPythonPackage rec { pname = "geopy"; version = "2.1.0"; - disabled = !isPy3k; # only Python 3 - doCheck = false; # Needs network access - - propagatedBuildInputs = [ geographiclib ]; src = fetchFromGitHub { owner = pname; @@ -21,10 +19,24 @@ buildPythonPackage rec { sha256 = "0239a4achk49ngagb6aqy6cgzfwgbxir07vwi13ysbpx78y0l4g9"; }; + propagatedBuildInputs = [ geographiclib ]; + + checkInputs = [ + async_generator + pytestCheckHook + ]; + + # Exclude tests which perform API calls + pytestFlagsArray = [ "--ignore test/geocoders/" ]; + pythonImportsCheck = [ "geopy" ]; + + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://github.com/geopy/geopy"; description = "Python Geocoding Toolbox"; - license = licenses.mit; - maintainers = with maintainers; [GuillaumeDesforges]; + changelog = "https://github.com/geopy/geopy/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ GuillaumeDesforges ]; }; } From 6026f1cdeb855d7e229a0fda10d3d791bf8f5da5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 14 Jan 2021 00:07:22 +0100 Subject: [PATCH 37/81] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dae44b9588e6..c7cb55f844ec 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -39,7 +39,7 @@ "apns" = ps: with ps; [ ]; # missing inputs: apns2 "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; - "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy + "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj From 27830c70b1e2a5bfb7d95313807e396fc2c1a6ac Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Thu, 14 Jan 2021 09:25:06 +0100 Subject: [PATCH 38/81] wxmac: 3.0.4 -> 3.0.5.1 --- pkgs/development/libraries/wxwidgets/3.0/mac.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 1b4c67024515..a6973f53de8f 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes , derez, rez, setfile -, AGL, Cocoa, Kernel +, AGL, Cocoa, Kernel, WebKit }: stdenv.mkDerivation rec { - version = "3.0.4"; + version = "3.0.5.1"; pname = "wxmac"; src = fetchzip { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat libiconv libjpeg libpng libtiff zlib derez rez setfile - AGL Cocoa Kernel + AGL Cocoa Kernel WebKit ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c565f77f3dde..c0aab40bbd6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16883,7 +16883,7 @@ in }; wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; inherit (darwin.stubs) setfile rez derez; }; From a0c29488618fbffaab5779e49551ce9c279fcb9e Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Thu, 14 Jan 2021 09:25:45 +0100 Subject: [PATCH 39/81] python3Packages.wxpython_4_0: fix darwin build --- .../python-modules/wxPython/4.0.nix | 24 +++++++++++++++---- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 406493362c46..a1cee317e345 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -9,10 +9,18 @@ , python , doxygen , ncurses -, wxGTK +, libintl , numpy , pillow , six +, wxGTK +, wxmac +, IOKit +, Carbon +, Cocoa +, AudioToolbox +, OpenGL +, CoreFoundation }: buildPythonPackage rec { @@ -26,8 +34,16 @@ buildPythonPackage rec { doCheck = false; - nativeBuildInputs = [ pkgconfig which doxygen wxGTK ]; - buildInputs = [ ncurses wxGTK.gtk ]; + nativeBuildInputs = [ pkgconfig which doxygen ] + ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]); + + buildInputs = [ ncurses libintl ] + ++ (if stdenv.isDarwin + then + [ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ] + else + [ wxGTK.gtk ] + ); DOXYGEN = "${doxygen}/bin/doxygen"; @@ -50,7 +66,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py install --skip-build --prefix=$out ''; - passthru = { inherit wxGTK; }; + passthru = { wxWidgets = if stdenv.isDarwin then wxmac else wxGTK; }; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fc535f60f4f..e6fdcace9517 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8121,6 +8121,7 @@ in { wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { inherit (pkgs) pkgconfig; + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; wxGTK = pkgs.wxGTK30.override { withGtk2 = false; withWebKit = true; From bb2879d59391b8b2814ef1a8d165d5d65726e6ea Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Thu, 14 Jan 2021 09:24:21 +0100 Subject: [PATCH 40/81] mavproxy: fix darwin build --- .../science/robotics/mavproxy/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 8e7c5bddd961..22a32f89bded 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial -, setuptools, wxPython_4_0 }: +{ stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial +, setuptools, wxPython_4_0, billiard, gnureadline }: buildPythonApplication rec { pname = "MAVProxy"; @@ -10,6 +10,11 @@ buildPythonApplication rec { sha256 = "fe046481b793b592334749249620fce8a463f4c46b394ff744645975465d677b"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "opencv-python" "" + ''; + propagatedBuildInputs = [ matplotlib numpy @@ -17,7 +22,7 @@ buildPythonApplication rec { pyserial setuptools wxPython_4_0 - ]; + ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; # No tests doCheck = false; From c94c8b3be53667152d9ab2283d7dfea60ac512e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 14 Jan 2021 12:06:37 +0000 Subject: [PATCH 41/81] iosevka-bin: 4.3.0 -> 4.4.0 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 42 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index b86460a50fd0..f3bd8dab013c 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index d86f1ea3cfdc..6b6cd00f49ab 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1m4qkn1abj6a9famy5cvnl9xk7690mglpj358xg01fnkmrm8ayzf"; - iosevka-aile = "0ry949kdnxlahg9a2qn758klb9yvv2wniwadb4hj2xz65zzfyv7i"; - iosevka-curly = "08ac8xprk3sq8lvgxlxp1z19bx0ndr7ga17kzxlqd4r96qjgab0p"; - iosevka-curly-slab = "1zmihfk32clp4ajywg9w6pbq3dh068s9d4bxzpgvicsfvbl04irk"; - iosevka-etoile = "09bk4myxg51m9xfyrljxm4r7gq1361x2yzlik99qp5anpxflf2jf"; - iosevka-slab = "10x6wwcicwy7rawrg563l5qfbp6vsaim82q3ifd6zqxxc71m33yd"; - iosevka-sparkle = "1f59j1cs11gabrk3m78bay96jpwz7lfc8z34ns9kx4bd43w0xnkx"; - iosevka-ss01 = "1kvsgghqc04mdqmbn2c98yqr062lav6aqawbdk1nsqyzihb09wq3"; - iosevka-ss02 = "06ri8ihinz6bd6swrxf500j1hfl8y9dfm7hjgm3hpdch4fcrhrnz"; - iosevka-ss03 = "110bwfikcxyr8s6p5l29wiyyfhnfv5p2bjlqrzs46pzpyj9g4730"; - iosevka-ss04 = "064nq0zphsik097ynv71p7007w0ysld1a0phfxmc0199s8qdahid"; - iosevka-ss05 = "0c99yp2fxsmx6pwqdlr217rh5khk79fnl8i35a19wf0z3sm4kcna"; - iosevka-ss06 = "0wfxcryhfwcqb2gd227qyiv1a3vzxig79bkp20cpb215w1hn6hkw"; - iosevka-ss07 = "141qpwbjy34v088a29fmj7nipvdxwh4l99wwyaq5ycbgj8743k93"; - iosevka-ss08 = "08yihjqp1fc6l1in9jk8dnlf9fwqahqv76di4xy9vk1dhgi1bd09"; - iosevka-ss09 = "01ad5dif3hwd2yf3y3sa58acqbps5kyivbxmsdqwpl5cvl2f9i83"; - iosevka-ss10 = "0aljyqqxw4mijkwzbq8hcpmpxm34ylp9pfcvisca2k7dspg17n2l"; - iosevka-ss11 = "1cz8ri184mdj6q67rdasbg7fjbhla2vj85lrkhy2avk515av2c2g"; - iosevka-ss12 = "0hif6sgk7r2d235sghaf9nqn7qr58rgj43ipc0pr5lykaraqi7md"; - iosevka-ss13 = "1wrzn9m2vvnc2sfh3wqgmr5ci3mpi0fmbzlvkf0j2hspkfy4d8iw"; - iosevka-ss14 = "1d71qbbd2b6nqdaxns70m3qm9qr03l5ld84fqlfcsmxdsnlhhx3k"; + iosevka = "0qkxqdx3vs53djiibc4ib3qj61fygxvxfcvs7yi08vdhd9qbxhjg"; + iosevka-aile = "053f6b1z0w1089y608k4wmspgljn9lyzyggq168k0110z9vlfjhf"; + iosevka-curly = "04kc7f6gqqxbdkdh1k4z4b28f8pj09npb87fx4zr41wkzkxmavcf"; + iosevka-curly-slab = "1pdm2g3a1nfc8w53r3sdifwypj3diil16jy6sgvgpmk7klf804vf"; + iosevka-etoile = "10vw53cd317qxhvws11zf98756vfn836assw3rbns6zpfrj7a2xg"; + iosevka-slab = "01ynv6b7fqdd98imfr14xcgrhp20yffa3n738iz5qnr75vqpnfdc"; + iosevka-sparkle = "1nw63dd1ccj8cp1x06alfxdvdlw9ibin41llmc0jla0nz7n8vsp3"; + iosevka-ss01 = "0g54rghx6z0a9azckvgh7njq12rsr1zzskgrm3f29rin8fdwvvd9"; + iosevka-ss02 = "0jhl75bwd76vp9hpvqgj7awpvibv4pk5vjab97n53b4bdxdxh1rf"; + iosevka-ss03 = "1ki5q7gafgm2iayjn82wrnwkfb3nbcr2xsrgs2vsw5lm9plawbmd"; + iosevka-ss04 = "03933skk5zqxrkj5m0j90cxrv4fmjfbp7ai5fywmhjzq92xbcr97"; + iosevka-ss05 = "014dglqr17adyj2229vvzhz61jpkgj33ngkav5sh2dj5wcx6b137"; + iosevka-ss06 = "07z87rm0rb9n6d7h0kmp51dnnglmr0wbwmplc5mlv036fcrdibaj"; + iosevka-ss07 = "1672n5ynd5fv8dwnwg8aa50ny74ad9gbx2xlk2ixih7ajv15p19d"; + iosevka-ss08 = "1jqdqg6dzrnq6y0g7ls2ya3dh0j00xj2k41aajvdqw342n08h27k"; + iosevka-ss09 = "1p1v0byb2nh11k362zxjrbvzbbryh2wk76dsd1zwyjrlgqq6qa81"; + iosevka-ss10 = "12c940w8vy1hjhi7cxgqsb23ip60xw1ydzhx5cv4ycxmi5745wqq"; + iosevka-ss11 = "0s6fvh5pw119w872w4rvamiwssryx4a98c7fhr737nzgiqy4iyz5"; + iosevka-ss12 = "14gjqmn807cv3dbvkm2i6dz6if46fbrkr8ls5shwalnl8qj3d06c"; + iosevka-ss13 = "1qd04cani9jzp1hjs8g6b42bmxvjyyxdha122816s0rg9i46mpcc"; + iosevka-ss14 = "0q109ahk7ww66brxgldgmr61m2qzpyhi1q21591wg1br5cn2d52w"; } From bca9aa192a06c4054fc766505ef7964af091090f Mon Sep 17 00:00:00 2001 From: Michael Reilly Date: Thu, 14 Jan 2021 10:41:01 -0500 Subject: [PATCH 42/81] katago: 1.6.1 -> 1.8.0 --- pkgs/games/katago/default.nix | 50 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 9499d47c42f3..283aa70f8d0d 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -1,43 +1,32 @@ { stdenv , gcc8Stdenv -, lib -, libzip , boost , cmake -, makeWrapper +, cudatoolkit +, cudnn +, eigen , fetchFromGitHub , fetchpatch -, cudnn ? null -, cudatoolkit ? null -, mesa ? null -, opencl-headers ? null -, ocl-icd ? null -, gperftools ? null -, eigen ? null +, gperftools +, lib +, libzip +, makeWrapper +, mesa +, ocl-icd +, opencl-headers +, openssl +, writeShellScriptBin , enableAVX2 ? stdenv.hostPlatform.avx2Support , enableBigBoards ? false , enableCuda ? false +, enableContrib ? false , enableGPU ? true , enableTcmalloc ? true }: assert !enableGPU -> ( - eigen != null && !enableCuda); -assert enableCuda -> ( - mesa != null && - cudatoolkit != null && - cudnn != null); - -assert !enableCuda -> ( - !enableGPU || ( - opencl-headers != null && - ocl-icd != null)); - -assert enableTcmalloc -> ( - gperftools != null); - let env = if enableCuda then gcc8Stdenv @@ -45,15 +34,18 @@ let in env.mkDerivation rec { pname = "katago"; - version = "1.6.1"; + version = "1.8.0"; + githash = "8ffda1fe05c69c67342365013b11225d443445e8"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "030ff9prnvpadgcb4x4hx6b6ggg10bwqcj8vd8nwrdz9sjq67yf7"; + sha256 = "18r75xjj6vv2gbl92k9aa5bd0cxf09zl1vxlji148y0xbvgv6p8c"; }; + fakegit = writeShellScriptBin "git" "echo ${githash}"; + nativeBuildInputs = [ cmake makeWrapper @@ -70,6 +62,8 @@ in env.mkDerivation rec { ] ++ lib.optionals (enableGPU && !enableCuda) [ opencl-headers ocl-icd + ] ++ lib.optionals enableContrib [ + openssl ] ++ lib.optionals enableTcmalloc [ gperftools ]; @@ -84,6 +78,10 @@ in env.mkDerivation rec { "-DUSE_BACKEND=CUDA" ] ++ lib.optionals (enableGPU && !enableCuda) [ "-DUSE_BACKEND=OPENCL" + ] ++ lib.optionals enableContrib [ + "-DBUILD_DISTRIBUTED=1" + "-DNO_GIT_REVISION=OFF" + "-DGIT_EXECUTABLE=${fakegit}/bin/git" ] ++ lib.optionals enableTcmalloc [ "-DUSE_TCMALLOC=ON" ] ++ lib.optionals enableBigBoards [ From 6429b459a15fcbcf72a1d07738eff7d88f5ef72b Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Wed, 13 Jan 2021 23:33:35 +0100 Subject: [PATCH 43/81] uthenticode: init at 1.0.4 --- .../libraries/uthenticode/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/uthenticode/default.nix diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix new file mode 100644 index 000000000000..9957eccd4267 --- /dev/null +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, pe-parse }: + +stdenv.mkDerivation rec { + pname = "uthenticode"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "uthenticode"; + rev = "v${version}"; + sha256 = "16j91cki63zk4d7wzwvq8al98l8hmvcdil3vfp44ink4q4bfswkx"; + }; + + patches = [ + # adds USE_SYSTEM_GTEST cmake flag, the patch won't be necessary in next versions + (fetchpatch { + url = "https://github.com/trailofbits/uthenticode/commit/7a4c5499c8e5ea7bfae1c620e1f96c112866b1dd.patch"; + sha256 = "17637j5zwp71jmi803mv1z04arld3k3kmrm8nvrkpg08q5kizh28"; + }) + ]; + + cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_SYSTEM_GTEST=1" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ pe-parse openssl gtest ]; + + doCheck = true; + checkPhase = "test/uthenticode_test"; + + meta = with lib; { + description = "A small cross-platform library for verifying Authenticode digital signatures."; + homepage = "https://github.com/trailofbits/uthenticode"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5eba394290a..ecaedcc9e7ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16702,6 +16702,8 @@ in uthash = callPackage ../development/libraries/uthash { }; + uthenticode = callPackage ../development/libraries/uthenticode { }; + utmps = skawarePackages.utmps; ucommon = ucommon_openssl; From f06be1bcf9582015dcfdfad84fa77279ff54009f Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Thu, 14 Jan 2021 01:24:20 +0100 Subject: [PATCH 44/81] coqPackages.mathcomp-abel: init at 1.0.0 --- .../coq-modules/mathcomp-abel/default.nix | 23 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/coq-modules/mathcomp-abel/default.nix diff --git a/pkgs/development/coq-modules/mathcomp-abel/default.nix b/pkgs/development/coq-modules/mathcomp-abel/default.nix new file mode 100644 index 000000000000..2a8c006b27cb --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-abel/default.nix @@ -0,0 +1,23 @@ +{ coq, mkCoqDerivation, mathcomp, mathcomp-real-closed, lib, version ? null }: + +mkCoqDerivation { + + namePrefix = [ "coq" "mathcomp" ]; + pname = "abel"; + owner = "math-comp"; + + release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3"; + + inherit version; + defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.10" "8.13") (range "1.11.0" "1.12.0") ]; out = "1.0.0"; } + ] null; + + propagatedBuildInputs = [ mathcomp.field mathcomp-real-closed ]; + + meta = with lib; { + description = "Abel - Galois and Abel - Ruffini Theorems"; + license = licenses.cecill-b; + maintainers = [ maintainers.cohencyril ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index c67d489de628..1ded50ce7632 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -50,6 +50,7 @@ let mathcomp-solvable = self.mathcomp.solvable; mathcomp-field = self.mathcomp.field; mathcomp-character = self.mathcomp.character; + mathcomp-abel = callPackage ../development/coq-modules/mathcomp-abel {}; mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {}; mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {}; mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; From b4255f82c0bdbb7e8ddd2b73256a331f10f16cfd Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 14 Jan 2021 20:36:47 +0000 Subject: [PATCH 45/81] nano: 5.4 -> 5.5 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index bd8ad4b3d20d..980b297cecc0 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.4"; + version = "5.5"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "1sc6xl9935k9s9clkv83hapijka4qknfnj6f15c3b1i2n84396gy"; + sha256 = "0jkyd3yzcidnvnj1k9bmplzlbd303x6xxblpp5np7zs1kfzq22rr"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From 2e34288f0d8cf01eea228c7dbc50af9589b885f3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 11:31:39 +0700 Subject: [PATCH 46/81] pkgs/games: stdenv.lib -> lib --- pkgs/games/abbaye-des-morts/default.nix | 2 +- pkgs/games/adom/default.nix | 2 +- pkgs/games/alephone/default.nix | 2 +- pkgs/games/andyetitmoves/default.nix | 6 +++--- pkgs/games/arena/default.nix | 8 ++++---- pkgs/games/arx-libertatis/default.nix | 4 ++-- pkgs/games/assaultcube/default.nix | 6 +++--- pkgs/games/astromenace/default.nix | 6 +++--- pkgs/games/azimuth/default.nix | 8 ++++---- pkgs/games/ball-and-paddle/default.nix | 8 ++++---- pkgs/games/beret/default.nix | 4 ++-- pkgs/games/bitsnbots/default.nix | 6 +++--- pkgs/games/blackshades/default.nix | 8 ++++---- pkgs/games/blobby/default.nix | 4 ++-- pkgs/games/bsdgames/default.nix | 8 ++++---- pkgs/games/cataclysm-dda/common.nix | 2 +- pkgs/games/chessdb/default.nix | 6 +++--- pkgs/games/chiaki/default.nix | 4 ++-- pkgs/games/chocolate-doom/default.nix | 10 +++++----- pkgs/games/ckan/default.nix | 2 +- pkgs/games/cockatrice/default.nix | 8 ++++---- pkgs/games/construo/default.nix | 10 +++++----- pkgs/games/crack-attack/default.nix | 8 ++++---- pkgs/games/crafty/default.nix | 8 ++++---- pkgs/games/crispy-doom/default.nix | 8 ++++---- pkgs/games/crrcsim/default.nix | 6 +++--- pkgs/games/cutemaze/default.nix | 2 +- pkgs/games/cuyo/default.nix | 12 ++++++------ pkgs/games/dhewm3/default.nix | 2 +- pkgs/games/domination/default.nix | 4 ++-- pkgs/games/eboard/default.nix | 4 ++-- pkgs/games/eduke32/default.nix | 2 +- pkgs/games/egoboo/default.nix | 8 ++++---- pkgs/games/endgame-singularity/default.nix | 10 +++++----- pkgs/games/enyo-doom/default.nix | 8 ++++---- pkgs/games/eternity-engine/default.nix | 8 ++++---- pkgs/games/extremetuxracer/default.nix | 8 ++++---- pkgs/games/exult/default.nix | 10 +++++----- pkgs/games/ezquake/default.nix | 2 +- pkgs/games/factorio/default.nix | 12 ++++++------ pkgs/games/factorio/mods.nix | 4 ++-- pkgs/games/factorio/utils.nix | 4 ++-- pkgs/games/fairymax/default.nix | 8 ++++---- pkgs/games/flare/engine.nix | 2 +- pkgs/games/freecell-solver/default.nix | 4 ++-- pkgs/games/freeciv/default.nix | 2 +- pkgs/games/freedink/default.nix | 10 +++++----- pkgs/games/freedroidrpg/default.nix | 4 ++-- pkgs/games/frozen-bubble/default.nix | 6 +++--- pkgs/games/fsg/default.nix | 6 +++--- pkgs/games/galaxis/default.nix | 4 ++-- pkgs/games/gargoyle/default.nix | 4 ++-- pkgs/games/gav/default.nix | 6 +++--- pkgs/games/gltron/default.nix | 8 ++++---- pkgs/games/gmad/default.nix | 8 ++++---- pkgs/games/gnubg/default.nix | 4 ++-- pkgs/games/gnuchess/default.nix | 8 ++++---- pkgs/games/gnugo/default.nix | 6 +++--- pkgs/games/gogui/default.nix | 8 ++++---- pkgs/games/gtetrinet/default.nix | 8 ++++---- pkgs/games/gtypist/default.nix | 2 +- pkgs/games/hawkthorne/default.nix | 6 +++--- pkgs/games/icbm3d/default.nix | 6 +++--- pkgs/games/instead/default.nix | 4 ++-- pkgs/games/jumpnbump/default.nix | 4 ++-- pkgs/games/keeperrl/default.nix | 6 +++--- pkgs/games/kobodeluxe/default.nix | 6 +++--- pkgs/games/koboredux/default.nix | 4 ++-- pkgs/games/lbreakout2/default.nix | 2 +- pkgs/games/liquidwar/5.nix | 2 +- pkgs/games/lugaru/default.nix | 6 +++--- pkgs/games/macopix/default.nix | 6 +++--- pkgs/games/megaglest/default.nix | 4 ++-- pkgs/games/minecraft/default.nix | 8 ++++---- pkgs/games/minetest/default.nix | 2 +- pkgs/games/moon-buggy/default.nix | 8 ++++---- pkgs/games/multimc/default.nix | 2 +- pkgs/games/n2048/default.nix | 10 +++++----- pkgs/games/naev/default.nix | 8 ++++---- pkgs/games/nethack/default.nix | 2 +- pkgs/games/neverball/default.nix | 6 +++--- pkgs/games/nexuiz/default.nix | 8 ++++---- pkgs/games/njam/default.nix | 6 +++--- pkgs/games/nudoku/default.nix | 2 +- pkgs/games/nxengine-evo/default.nix | 8 ++++---- pkgs/games/odamex/default.nix | 8 ++++---- pkgs/games/oilrush/default.nix | 10 +++++----- pkgs/games/openarena/default.nix | 8 ++++---- pkgs/games/openclonk/default.nix | 2 +- pkgs/games/openlierox/default.nix | 6 +++--- pkgs/games/openra/common.nix | 4 ++-- pkgs/games/openra/engine.nix | 4 ++-- pkgs/games/openra/mod.nix | 4 ++-- pkgs/games/openrw/default.nix | 2 +- pkgs/games/openspades/default.nix | 2 +- pkgs/games/openttd/default.nix | 10 +++++----- pkgs/games/opentyrian/default.nix | 4 ++-- pkgs/games/openxcom/default.nix | 8 ++++---- pkgs/games/papermc/default.nix | 8 ++++---- pkgs/games/pingus/default.nix | 8 ++++---- pkgs/games/planetaryannihilation/default.nix | 8 ++++---- pkgs/games/pokerth/default.nix | 6 ++---- pkgs/games/pong3d/default.nix | 6 +++--- pkgs/games/prboom/default.nix | 12 ++++++------ pkgs/games/quake2/yquake2/wrapper.nix | 2 +- pkgs/games/quake3/wrapper/default.nix | 2 +- pkgs/games/quakespasm/default.nix | 6 +++--- pkgs/games/quantumminigolf/default.nix | 8 ++++---- pkgs/games/r2mod_cli/default.nix | 2 +- pkgs/games/racer/default.nix | 6 +++--- pkgs/games/residualvm/default.nix | 12 +++++------- pkgs/games/rftg/default.nix | 6 +++--- pkgs/games/rigsofrods/default.nix | 4 ++-- pkgs/games/rili/default.nix | 8 ++++---- pkgs/games/robotfindskitten/default.nix | 4 ++-- pkgs/games/scid-vs-pc/default.nix | 4 ++-- pkgs/games/scid/default.nix | 4 ++-- pkgs/games/scrolls/default.nix | 6 +++--- pkgs/games/sil/default.nix | 18 +++++++++--------- pkgs/games/simutrans/default.nix | 4 ++-- pkgs/games/sm64ex/default.nix | 2 +- pkgs/games/soldat-unstable/default.nix | 6 +++--- pkgs/games/speed-dreams/default.nix | 8 ++++---- pkgs/games/spring/default.nix | 6 +++--- pkgs/games/steam/steam.nix | 2 +- pkgs/games/tcl2048/default.nix | 8 ++++---- pkgs/games/teetertorture/default.nix | 6 +++--- pkgs/games/teeworlds/default.nix | 6 +++--- pkgs/games/the-powder-toy/default.nix | 3 +-- pkgs/games/tibia/default.nix | 9 ++++----- pkgs/games/tinyfugue/default.nix | 4 ++-- pkgs/games/torcs/default.nix | 8 ++++---- pkgs/games/trackballs/default.nix | 4 ++-- pkgs/games/trigger/default.nix | 8 ++++---- pkgs/games/tuxpaint/default.nix | 10 +++++----- pkgs/games/ue4/default.nix | 8 ++++---- pkgs/games/ue4demos/default.nix | 8 ++++---- pkgs/games/ufoai/default.nix | 10 +++++----- pkgs/games/ultimatestunts/default.nix | 8 ++++---- pkgs/games/ultrastardx/default.nix | 2 +- pkgs/games/uqm/3dovideo.nix | 4 ++-- pkgs/games/uqm/default.nix | 2 +- pkgs/games/vdrift/default.nix | 8 ++++---- pkgs/games/vectoroids/default.nix | 6 +++--- pkgs/games/vessel/default.nix | 4 ++-- pkgs/games/vms-empire/default.nix | 6 ++---- pkgs/games/warzone2100/default.nix | 2 +- pkgs/games/wesnoth/default.nix | 2 +- pkgs/games/worldofgoo/default.nix | 4 ++-- pkgs/games/xboard/default.nix | 8 ++++---- pkgs/games/xonotic/default.nix | 6 +++--- pkgs/games/xpilot/bloodspilot-client.nix | 8 ++++---- pkgs/games/xskat/default.nix | 4 ++-- pkgs/games/xsnow/default.nix | 6 +++--- pkgs/games/xsok/default.nix | 10 +++++----- pkgs/games/zandronum/fmod.nix | 2 +- pkgs/games/zandronum/sqlite.nix | 2 +- pkgs/games/zangband/default.nix | 4 ++-- pkgs/games/zod/default.nix | 4 ++-- 159 files changed, 457 insertions(+), 465 deletions(-) diff --git a/pkgs/games/abbaye-des-morts/default.nix b/pkgs/games/abbaye-des-morts/default.nix index 5e536d2b18df..3091c8feff22 100644 --- a/pkgs/games/abbaye-des-morts/default.nix +++ b/pkgs/games/abbaye-des-morts/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "DESTDIR=" ]; - preBuild = stdenv.lib.optionalString stdenv.cc.isClang + preBuild = lib.optionalString stdenv.cc.isClang '' substituteInPlace Makefile \ --replace -fpredictive-commoning "" diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index c5ffe950983a..dc4f1f47f7b1 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -5,7 +5,7 @@ let inherit (xorg) libXext libX11; - lpath = "${stdenv.cc.cc.lib}/lib64:" + stdenv.lib.makeLibraryPath [ + lpath = "${stdenv.cc.cc.lib}/lib64:" + lib.makeLibraryPath [ zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsaLib libpulseaudio]; in diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 7691001edacf..44202da16eaf 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -93,7 +93,7 @@ in self // { ''; meta = alephone.meta // { - license = stdenv.lib.licenses.free; + license = lib.licenses.free; hydraPlatforms = [ ]; } // meta; }); diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 84c1f545a383..f939f5b2bac9 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: +{ lib, stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: let plainName = "andyetitmoves"; version = "1.2.2"; @@ -68,8 +68,8 @@ stdenv.mkDerivation { homepage = "http://www.andyetitmoves.net/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [bluescreen303]; + maintainers = with lib.maintainers; [bluescreen303]; }; } diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix index beba98b6316a..7320a405bb1c 100644 --- a/pkgs/games/arena/default.nix +++ b/pkgs/games/arena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk-pixbuf, libX11 }: +{ lib, stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk-pixbuf, libX11 }: # Arena is free software in the sense of "free beer" but not as in "free # speech". We can install it as we please, but we cannot re-distribute it in @@ -7,7 +7,7 @@ let - inherit (stdenv.lib) makeLibraryPath; + inherit (lib) makeLibraryPath; libDir = "lib64"; in @@ -66,9 +66,9 @@ stdenv.mkDerivation rec { UCI protocol I, II. Furthermore, compatible to Chess960, DGT electronic chess board & DGT clocks and much more. ''; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = ["x86_64-linux"]; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; }; } diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index b82ee2a3a991..945ebf7b785e 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, boost +{ lib, stdenv, fetchFromGitHub, cmake, zlib, boost , openal, glm, freetype, libGLU, SDL2, epoxy , dejavu_fonts, inkscape, optipng, imagemagick , withCrashReporter ? !stdenv.isDarwin @@ -8,7 +8,7 @@ , gdb ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "arx-libertatis"; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 423130a53561..a3284bb3ab65 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -1,8 +1,8 @@ -{ fetchFromGitHub, stdenv, makeDesktopItem, openal, pkgconfig, libogg, +{ fetchFromGitHub, lib, stdenv, makeDesktopItem, openal, pkgconfig, libogg, libvorbis, SDL, SDL_image, makeWrapper, zlib, file, client ? true, server ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://assault.cubers.net"; maintainers = [ ]; platforms = platforms.linux; # should work on darwin with a little effort. - license = stdenv.lib.licenses.zlib; + license = lib.licenses.zlib; }; } diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 1882f5a9b68d..cbe2385ea125 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU, libGL, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: +{ fetchurl, lib, stdenv, cmake, xlibsWrapper, libGLU, libGL, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Hardcore 3D space shooter with spaceship upgrade possibilities"; homepage = "https://www.viewizard.com/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index 67bbd8558c3a..dcc67533fac1 100644 --- a/pkgs/games/azimuth/default.nix +++ b/pkgs/games/azimuth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, SDL, which, installTool ? false }: +{ lib, stdenv, fetchFromGitHub, SDL, which, installTool ? false }: stdenv.mkDerivation rec { pname = "azimuth"; @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { bosses to tangle with. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://mdsteele.games/azimuth/index.html"; - maintainers = with stdenv.lib.maintainers; [ marius851000 ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ marius851000 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index 862905efd3bb..7fe74dc47d93 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, SDL, SDL_image, SDL_mixer, SDL_ttf, guile, gettext }: +{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_ttf, guile, gettext }: stdenv.mkDerivation rec { name = "ballandpaddle-0.8.1"; @@ -31,14 +31,14 @@ stdenv.mkDerivation rec { with Guile. Follow the example level sets and the documentation. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/ballandpaddle/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; - hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index db9e6b96902a..e59fc7eb2740 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ]; NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; - NIX_CFLAGS_LINK = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin + NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework OpenGL -framework Cocoa"; patches = [ ./use-home-dir.patch ]; diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 52286b32f90f..a3bd399a5ffd 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, lua, libGLU, libGL }: +{ lib, stdenv, fetchurl, SDL, lua, libGLU, libGL }: stdenv.mkDerivation rec { name = "bitsnbots-20111230"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple puzzle game with moving robots"; homepage = "http://moikmellah.org/blog/?page_id=19"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index e47e430d84c9..7fe4a6087f79 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, SDL, libGLU, libGL, openal, libvorbis, freealut, SDL_image}: +{lib, stdenv, fetchsvn, SDL, libGLU, libGL, openal, libvorbis, freealut, SDL_image}: stdenv.mkDerivation { name = "blackshades-svn-110"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { homepage = "http://icculus.org/blackshades/"; description = "Protect the VIP"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 98c31f4e9fe8..afa0a22722a4 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }: +{ lib, stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }: stdenv.mkDerivation rec { pname = "blobby-volley"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/blobby" ''; - meta = with stdenv.lib; { + meta = with lib; { description = ''A blobby volleyball game''; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 41414a573a66..04a86c0b83cf 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles }: +{ lib, stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles }: stdenv.mkDerivation { name = "bsd-games-2.17"; @@ -60,8 +60,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.t2-project.org/packages/bsd-games.html"; description = "Ports of all the games from NetBSD-current that are free"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index c41b0df5a80d..81df46d4314e 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -5,7 +5,7 @@ }: let - inherit (stdenv.lib) optionals optionalString; + inherit (lib) optionals optionalString; cursesDeps = [ gettext ncurses ] ++ optionals stdenv.isDarwin [ CoreFoundation ]; diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 76862c4bffe1..656e4ab6add3 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, tcl, tk, libX11, makeWrapper }: +{ lib, stdenv, fetchurl, tcl, tk, libX11, makeWrapper }: stdenv.mkDerivation { name = "chessdb-3.6.19-beta-1"; - + src = fetchurl { url = "mirror://sourceforge/chessdb/ChessDB-3.6.19-beta-1.tar.gz"; sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62"; @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = "http://chessdb.sourceforge.net/"; description = "A free chess database"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index e3a2560ac101..33abfe644651 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -43,10 +43,10 @@ mkDerivation rec { qtsvg protobuf SDL2 - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libevdev udev - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 1b77a72f8d0b..2336bd5e0169 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: +{ lib, stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "chocolate-doom"; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://chocolate-doom.org/"; description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + hydraPlatforms = lib.platforms.linux; # darwin times out + maintainers = with lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index b0a509ce4db1..052982bf15d6 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper mono ]; - libraries = stdenv.lib.makeLibraryPath [ gtk2 curl ]; + libraries = lib.makeLibraryPath [ gtk2 curl ]; buildPhase = "true"; diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index f8b90f87a723..d47e0d5521db 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mkDerivation, cmake, protobuf +{ lib, stdenv, fetchFromGitHub, mkDerivation, cmake, protobuf , qtbase, qtmultimedia, qttools, qtwebsockets, wrapQtAppsHook }: @@ -22,8 +22,8 @@ mkDerivation rec { meta = { homepage = "https://github.com/Cockatrice/Cockatrice"; description = "A cross-platform virtual tabletop for multiplayer card games"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ evanjs ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ evanjs ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 815c2f3fab40..2565d8599a53 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , libX11 , zlib @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ libX11 zlib xorgproto ] - ++ stdenv.lib.optional (libGL != null) libGL - ++ stdenv.lib.optional (libGLU != null) libGLU - ++ stdenv.lib.optional (freeglut != null) freeglut; + ++ lib.optional (libGL != null) libGL + ++ lib.optional (libGLU != null) libGLU + ++ lib.optional (freeglut != null) freeglut; preConfigure = '' substituteInPlace src/Makefile.in \ @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { description = "Masses and springs simulation game"; homepage = "http://fs.fsf.org/construo/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 05c829441ad9..b5fe9467d2e0 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: +{ lib, stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: stdenv.mkDerivation { name = "crack-attack-1.1.14"; @@ -28,8 +28,8 @@ stdenv.mkDerivation { meta = { description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; homepage = "https://www.nongnu.org/crack-attack/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.piotr ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.piotr ]; }; } diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 191baa7e5923..1328488dde3a 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "crafty"; @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.craftychess.com/"; description = "Chess program developed by Dr. Robert M. Hyatt"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.jwiegley ]; + license = lib.licenses.unfree; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.jwiegley ]; }; } diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index 70e191fe887b..f9e6acb44b0c 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }: +{ lib, stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }: stdenv.mkDerivation rec { pname = "crispy-doom"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom. Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ neonfuz ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ neonfuz ]; }; } diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index e57d6bcab066..741f402870a8 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, plib, libjpeg }: +{ lib, stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, plib, libjpeg }: let version = "0.9.13"; in @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A model-airplane flight simulator"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 89fdc7e9d870..0cd16e433dfa 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { buildInputs = [ qtsvg ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv CuteMaze.app $out/Applications ''; diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix index 72c55fc18112..871812e097a9 100644 --- a/pkgs/games/cuyo/default.nix +++ b/pkgs/games/cuyo/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, zlib }: +{ lib, stdenv, fetchurl, SDL, SDL_mixer, zlib }: stdenv.mkDerivation { pname = "cuyo"; version = "2.1.0"; - + src = fetchurl { url = "https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz"; sha256 = "17yqv924x7yvwix7yz9jdhgyar8lzdhqvmpvv0any8rdkajhj23c"; }; buildInputs = [ SDL SDL_mixer zlib ]; - + meta = { homepage = "http://karimmi.de/cuyo"; description = "Stacking blocks game, with different rules for each level"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; - + } diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index edec85a1c650..b5caa603eaf8 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/dhewm/dhewm3"; description = "Doom 3 port to SDL"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; maintainers = with maintainers; [ MP2E ]; platforms = with platforms; linux; }; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 37c7d37741b8..2fc4f8d36cb4 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchsvn # jdk8 is needed for building, but the game runs on newer jres as well , jdk8 @@ -76,7 +76,7 @@ in stdenv.mkDerivation { install -Dm644 build/game/resources/icon.png $out/share/pixmaps/domination.png ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://domination.sourceforge.net/"; downloadPage = "http://domination.sourceforge.net/download.shtml"; description = "A game that is a bit like the board game Risk or RisiKo"; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index b11cc90d11f1..57cd5b4176e1 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, pkgconfig, gtk2 }: +{ lib, stdenv, fetchurl, perl, pkgconfig, gtk2 }: stdenv.mkDerivation { name = "eboard-1.1.1"; @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.bergo.eng.br/eboard/"; description = "Chess interface for Unix-like systems"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index f264fd0b9e32..8f90faa03817 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; nativeBuildInputs = [ makeWrapper pkgconfig ] - ++ stdenv.lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; + ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; postPatch = '' substituteInPlace source/build/src/glbuild.cpp \ diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 138ad8a757f1..56ebcb1444ed 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_ttf }: +{ lib, stdenv, fetchurl, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_ttf }: stdenv.mkDerivation rec { # pf5234 (a developer?) at freenode #egoboo told me that I better use 2.7.3 until @@ -50,10 +50,10 @@ stdenv.mkDerivation rec { description = "3D dungeon crawling adventure"; homepage = "http://www.freedink.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like - # maintainers = [ stdenv.lib.maintainers.bjg ]; - # platforms = stdenv.lib.platforms.all; + # maintainers = [ lib.maintainers.bjg ]; + # platforms = lib.platforms.all; }; } diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index 4e855dbd053f..f220a85e0eb6 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , unzip @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { rev = "v${version}"; sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; }) - ] ++ stdenv.lib.optional enableDefaultMusicPack ( + ] ++ lib.optional enableDefaultMusicPack ( fetchurl { url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pygame numpy polib ]; # Add the music - postInstall = stdenv.lib.optionalString enableDefaultMusicPack '' + postInstall = lib.optionalString enableDefaultMusicPack '' cp -R "../endgame-singularity-music-007" \ "$(echo $out/lib/python*/site-packages/singularity)/music" # ↑ we cannot glob on [...]/music, it doesn't exist yet @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { A simulation of a true AI. Go from computer to computer, pursued by the entire world. Keep hidden, and you might have a chance ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fgaz ]; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix index bcb98fc8cca9..10cce9f3bf81 100644 --- a/pkgs/games/enyo-doom/default.nix +++ b/pkgs/games/enyo-doom/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchFromGitLab, cmake, qtbase }: +{ mkDerivation, lib, stdenv, fetchFromGitLab, cmake, qtbase }: mkDerivation rec { pname = "enyo-doom"; @@ -18,8 +18,8 @@ mkDerivation rec { meta = { homepage = "https://gitlab.com/sdcofer70/enyo-doom"; description = "Frontend for Doom engines"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.tadfisher ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.tadfisher ]; }; } diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 72e2af9025d3..421115561055 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { pname = "eternity-engine"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://doomworld.com/eternity"; description = "New school Doom port by James Haley"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 1c0a47e4b617..8ea19c93dfeb 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU, libGL, libX11, xorgproto, tcl, freeglut, freetype +{ lib, stdenv, fetchurl, libGLU, libGL, libX11, xorgproto, tcl, freeglut, freetype , sfml, libXi , libXmu, libXext, libXt, libSM, libICE , libpng, pkgconfig, gettext, intltool @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { longDescription = '' ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/extremetuxracer/"; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index adbf4dd07025..6dd9d711a287 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, SDL2, libogg, libvorbis, zlib, unzip }: +{ lib, stdenv, fetchurl, pkgconfig, SDL2, libogg, libvorbis, zlib, unzip }: let @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://exult.sourceforge.net/"; description = "A reimplementation of the Ultima VII game engine"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; - hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; + hydraPlatforms = lib.platforms.linux; # darwin times out + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 143a7d94015a..1251c38e0fda 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { expat curl jansson libpng libjpeg libGLU libGL libXxf86vm pcre SDL2 vim speex ]; - installPhase = with stdenv.lib; let + installPhase = with lib; let sys = last (splitString "-" stdenv.hostPlatform.system); arch = head (splitString "-" stdenv.hostPlatform.system); in '' diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 4535f31f2623..9db8a95746d4 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem , alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , libSM, libICE, libXext, factorio-utils , releaseType @@ -13,7 +13,7 @@ assert releaseType == "alpha" let - inherit (stdenv.lib) importJSON; + inherit (lib) importJSON; helpMsg = '' @@ -83,7 +83,7 @@ let if !needsAuth then fetchurl { inherit name url sha256; } else - (stdenv.lib.overrideDerivation + (lib.overrideDerivation (fetchurl { inherit name url sha256; curlOpts = [ @@ -168,8 +168,8 @@ let version 1.0 in mid 2020. ''; homepage = "https://www.factorio.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen priegger lukegb ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ Baughn elitak erictapen priegger lukegb ]; platforms = [ "x86_64-linux" ]; }; }; @@ -180,7 +180,7 @@ let buildInputs = [ makeWrapper libpulseaudio ]; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ alsaLib libpulseaudio libX11 diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix index 5c9b4f0628a2..8d9976689cc4 100644 --- a/pkgs/games/factorio/mods.nix +++ b/pkgs/games/factorio/mods.nix @@ -2,12 +2,12 @@ # mods. It will eventually be replaced by a nixos-channel that will provide # derivations for most or all of the mods tracked through the official mod # manager site. -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , factorio-utils , allRecommendedMods ? true , allOptionalMods ? false }: -with stdenv.lib; +with lib; let modDrv = factorio-utils.modDrv { inherit allRecommendedMods allOptionalMods; }; in diff --git a/pkgs/games/factorio/utils.nix b/pkgs/games/factorio/utils.nix index 2764592a3246..be5b7fd5eccc 100644 --- a/pkgs/games/factorio/utils.nix +++ b/pkgs/games/factorio/utils.nix @@ -1,7 +1,7 @@ # This file provides a top-level function that will be used by both nixpkgs and nixos # to generate mod directories for use at runtime by factorio. -{ stdenv }: -with stdenv.lib; +{ lib, stdenv }: +with lib; { mkModDirDrv = mods: # a list of mod derivations let diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index b5e3afa9e3b7..e0d2fdd82525 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "fairymax"; version = "4.8"; @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { and board sizes up to 12x8. A Linux port exists in the format of a debian package. ''; - license = stdenv.lib.licenses.free ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; }; } diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 22a12fda0545..2b2738b41089 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ] - ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.isDarwin Cocoa; meta = with lib; { description = "Free/Libre Action Roleplaying Engine"; diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index 1845ba825eb2..af75dbfa2265 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, cmake +{ lib, stdenv, fetchurl, pkgconfig, cmake , perl, gmp, libtap, gperf , perlPackages, python3 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "freecell-solver"; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 31532a6c2e29..cec3349b2a65 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -8,7 +8,7 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "freeciv"; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index 735a49bee622..fff8426c16a7 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx +{ lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx , pkgconfig, intltool, fontconfig, libzip, zip, zlib }: let @@ -52,10 +52,10 @@ in stdenv.mkDerivation rec { ''; homepage = "http://www.freedink.org/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.all; - hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin + maintainers = [ lib.maintainers.bjg ]; + platforms = lib.platforms.all; + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index aab2b748d1a1..ad84005c1551 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; + url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz"; sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"; }; @@ -15,7 +15,7 @@ in stdenv.mkDerivation { buildInputs = [ SDL SDL_image SDL_gfx SDL_mixer libogg libvorbis lua5_3 libjpeg libpng zlib - ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ] ++ lib.optional stdenv.isDarwin libiconv; meta = with lib; { description = "Isometric 3D RPG similar to game Diablo"; diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix index 3b562ee44f2e..6798b4d1b9ef 100644 --- a/pkgs/games/frozen-bubble/default.nix +++ b/pkgs/games/frozen-bubble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, pkgconfig, SDL, SDL_mixer, SDL_Pango, glib }: +{ lib, stdenv, fetchurl, perlPackages, pkgconfig, SDL, SDL_mixer, SDL_Pango, glib }: perlPackages.buildPerlModule { pname = "frozen-bubble"; @@ -19,7 +19,7 @@ perlPackages.buildPerlModule { meta = { description = "Puzzle with Bubbles"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ puckipedia ]; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ puckipedia ]; }; } diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index b8a0d5ff3c76..909ea662400e 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU, libGL, wxGTK, libX11, xorgproto +{ lib, stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU, libGL, wxGTK, libX11, xorgproto , runtimeShell }: stdenv.mkDerivation { @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "Cellular automata engine tuned towards the likes of Falling Sand"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix index 19df8db78a0a..a3847e73c8da 100644 --- a/pkgs/games/galaxis/default.nix +++ b/pkgs/games/galaxis/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ncurses, xmlto }: +{ lib, stdenv, fetchurl, ncurses, xmlto }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "galaxis"; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 78bffaf16af5..f6bbce2bf902 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz"; }; - nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ jam pkgconfig ] ++ lib.optional stdenv.isDarwin cctools; buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; + ++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index e42afefb8308..b8390455377b 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net} : +{lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net} : stdenv.mkDerivation { name = "gav-0.9.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Remake of AV Arcade Volleyball"; homepage = "http://gav.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index f6d74b6e9b75..45267579c9b9 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, libGLU, libGL, zlib, libpng, libvorbis, libmikmod, SDL_sound } : +{lib, stdenv, fetchurl, SDL, libGLU, libGL, zlib, libpng, libvorbis, libmikmod, SDL_sound } : stdenv.mkDerivation rec { name = "gltron-0.70"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gltron.org/"; description = "Game based on the movie Tron"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix index aad53a7915a5..eb893882ff58 100644 --- a/pkgs/games/gmad/default.nix +++ b/pkgs/games/gmad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, premake4, bootil }: +{ lib, stdenv, fetchFromGitHub, premake4, bootil }: stdenv.mkDerivation rec { name = "gmad-unstable-2015-04-16"; @@ -6,9 +6,9 @@ stdenv.mkDerivation rec { meta = { description = "Garry's Mod Addon Creator and Extractor"; homepage = "https://github.com/garrynewman/gmad"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.abigailbuccaneer ]; + platforms = lib.platforms.all; }; src = fetchFromGitHub { diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index edfde5ea3e94..f3d897d32af3 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }: +{ lib, stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }: let version = "1.06.002"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-gtk" "--with--board3d" ]; - meta = with stdenv.lib; + meta = with lib; { description = "World class backgammon application"; homepage = "http://www.gnubg.org/"; license = licenses.gpl3; diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index a7b279334966..69ec574a644f 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, makeWrapper}: +{lib, stdenv, fetchurl, flex, makeWrapper}: let s = # Generated upstream information rec { @@ -28,8 +28,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "GNU Chess engine"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 069d14756e33..e33c27bf9eb4 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gnugo"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Go - A computer go player"; homepage = "https://www.gnu.org/software/gnugo/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index b13a145ff5e8..8eb989a8f474 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, openjdk, unzip, makeWrapper }: +{ fetchurl, lib, stdenv, openjdk, unzip, makeWrapper }: let version = "1.4.9"; @@ -20,10 +20,10 @@ in stdenv.mkDerivation { done ''; meta = { - maintainers = [ stdenv.lib.maintainers.cleverca22 ]; + maintainers = [ lib.maintainers.cleverca22 ]; description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; homepage = "http://gogui.sourceforge.net/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index f3cc9ab0006d..ef815b3baccd 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, intltool, pkgconfig, libgnome, libgnomeui, GConf }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, intltool, pkgconfig, libgnome, libgnomeui, GConf }: stdenv.mkDerivation { name = "gtetrinet-0.7.11"; @@ -37,8 +37,8 @@ stdenv.mkDerivation { that is played over the internet. ''; homepage = "http://gtetrinet.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.chris-martin ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.chris-martin ]; }; } diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index 52794ca3218b..d0ddf43fe2a2 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper ncurses perl fortune ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin libiconv; preFixup = '' wrapProgram "$out/bin/typefortune" \ diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index 819845309927..3da78349dbb1 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, love, curl, zip }: +{ fetchgit, lib, stdenv, love, curl, zip }: stdenv.mkDerivation { version = "0.12.1"; @@ -32,8 +32,8 @@ stdenv.mkDerivation { Hawthorne's inheritance. ''; homepage = "https://www.reddit.com/r/hawkthorne"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ campadrenalin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ campadrenalin ]; broken = true; }; } diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index 71ecfacb37ec..7edf7cd477e1 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11}: +{lib, stdenv, fetchurl, libX11}: stdenv.mkDerivation { name = "icbm3d-0.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.newbreedsoftware.com/icbm3d/"; description = "3D vector-based clone of the atari game Missile Command"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 02a54dc7604c..0450e8eafd03 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -65,8 +65,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Simple text adventure interpreter for Unix and Windows"; homepage = "https://instead.syscall.ru/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/games/jumpnbump/default.nix b/pkgs/games/jumpnbump/default.nix index d81aece0e821..b502b4f1396d 100644 --- a/pkgs/games/jumpnbump/default.nix +++ b/pkgs/games/jumpnbump/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitLab , fetchzip , SDL2, SDL2_mixer, SDL2_net @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms ''; - meta = with stdenv.lib; { + meta = with lib; { description = "cute, true multiplayer platform game with bunnies"; homepage = "https://libregames.gitlab.io/jumpnbump/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix index 568a0449ac28..bd49b821f9e1 100644 --- a/pkgs/games/keeperrl/default.nix +++ b/pkgs/games/keeperrl/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { sourceRoot = "source"; - srcs = [ free-src ] ++ stdenv.lib.optional unfree_assets assets; + srcs = [ free-src ] ++ lib.optional unfree_assets assets; - postUnpack = stdenv.lib.optionalString unfree_assets '' + postUnpack = lib.optionalString unfree_assets '' mv data $sourceRoot ''; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cp -r data_free $out/share cp -r data_contrib $out/share - ${stdenv.lib.optionalString unfree_assets "cp -r data $out/share"} + ${lib.optionalString unfree_assets "cp -r data $out/share"} ''; meta = with lib; { diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 5620cee185d8..cd5dc3cc2bc7 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, libGLU, libGL} : +{lib, stdenv, fetchurl, SDL, SDL_image, libGLU, libGL} : stdenv.mkDerivation { name = "kobodeluxe-0.5.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = "http://olofson.net/kobodl/"; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix index 746e9d6bbef0..622dd2de50e3 100644 --- a/pkgs/games/koboredux/default.nix +++ b/pkgs/games/koboredux/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , requireFile @@ -10,7 +10,7 @@ , useProprietaryAssets ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "koboredux"; version = "0.7.5.1"; diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index 24797952d589..818cd31fa59a 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; - hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin + hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index 8abb1c7d53ee..db0c7a61ddb7 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ allegro ]; - configureFlags = stdenv.lib.optional stdenv.isx86_64 "--disable-asm"; + configureFlags = lib.optional stdenv.isx86_64 "--disable-asm"; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix index 877a3880a00e..12e9cfc2d634 100644 --- a/pkgs/games/lugaru/default.nix +++ b/pkgs/games/lugaru/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitLab, cmake, openal, pkgconfig, libogg, +{ lib, stdenv, fetchFromGitLab, cmake, openal, pkgconfig, libogg, libvorbis, SDL2, makeWrapper, libpng, libjpeg_turbo, libGLU }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://osslugaru.gitlab.io"; maintainers = [ ]; platforms = platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index f88b763aaf86..01a923838f0d 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, openssl }: +{ lib, stdenv, fetchurl, pkgconfig, gtk, openssl }: stdenv.mkDerivation rec { name = "macopix-1.7.4"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Mascot Constructive Pilot for X"; homepage = "http://rosegray.sakura.ne.jp/macopix/index-e.html"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 0660d196f1eb..c97ea55882b0 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc +{ lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib , fetchFromGitHub @@ -48,7 +48,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; license = licenses.gpl3; homepage = "http://megaglest.org/"; diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 814abd698cee..462cbc48af6f 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -41,7 +41,7 @@ let categories = "Game;"; }; - envLibPath = stdenv.lib.makeLibraryPath [ + envLibPath = lib.makeLibraryPath [ curl libpulseaudio systemd @@ -50,7 +50,7 @@ let libXxf86vm # needed only for versions <1.13 ]; - libPath = stdenv.lib.makeLibraryPath ([ + libPath = lib.makeLibraryPath ([ alsaLib atk cairo @@ -137,8 +137,8 @@ stdenv.mkDerivation rec { # Do not create `GPUCache` in current directory makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ --prefix LD_LIBRARY_PATH : ${envLibPath} \ - --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ - --set JAVA_HOME ${stdenv.lib.getBin jre} \ + --prefix PATH : ${lib.makeBinPath [ jre ]} \ + --set JAVA_HOME ${lib.getBin jre} \ --run "cd /tmp" \ "''${gappsWrapperArgs[@]}" ''; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 763c7f4bd67d..ddb415a6ad2f 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -4,7 +4,7 @@ , leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa }: -with stdenv.lib; +with lib; let boolToCMake = b: if b then "ON" else "OFF"; diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index 9de24c1ae9dc..6f099a88b2c6 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses}: +{lib, stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { baseName = "moon-buggy"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { meta = { description = ''A simple character graphics game where you drive some kind of car across the moon's surface''; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.rybern]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.rybern]; + platforms = lib.platforms.linux; homepage = "https://www.seehuhn.de/pages/moon-buggy"; }; } diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 6ac2e65b5776..7a723e0347ea 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -2,7 +2,7 @@ let jdk = jdk8; - libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; + libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in mkDerivation rec { pname = "multimc"; version = "0.6.11"; diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix index f5ff0b4690e9..42424fe9ef4e 100644 --- a/pkgs/games/n2048/default.nix +++ b/pkgs/games/n2048/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ncurses}: +{lib, stdenv, fetchurl, ncurses}: let - s = + s = rec { baseName = "n2048"; version = "0.1"; @@ -27,9 +27,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Console implementation of 2048 game''; - license = stdenv.lib.licenses.bsd2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://www.dettus.net/n2048/"; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index c328199b377c..4e5b70367633 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis +{ lib, fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis , libpng, libGLU, libGL, makeWrapper, zlib, freetype }: let @@ -34,9 +34,9 @@ stdenv.mkDerivation { meta = { description = "2D action/rpg space game"; homepage = "http://www.naev.org"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index a922064f78b6..361752b714df 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - preFixup = stdenv.lib.optionalString qtMode '' + preFixup = lib.optionalString qtMode '' wrapQtApp "$out/games/nethack" ''; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 99ce818d04d1..431dfd58a81c 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext +{ lib, stdenv, fetchurl, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext , physfs }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://neverball.org/"; description = "Tilt the floor to roll a ball"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index e055e27d2cdb..60085d5c85b3 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , # required for both unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora , libogg, libmodplug @@ -11,7 +11,7 @@ let version = "2.5.2"; - version_short = stdenv.lib.replaceChars [ "." ] [ "" ] version; + version_short = lib.replaceChars [ "." ] [ "" ] version; in stdenv.mkDerivation { pname = "nexuiz"; inherit version; @@ -71,7 +71,7 @@ in stdenv.mkDerivation { meta = { description = "A free fast-paced first-person shooter"; homepage = "http://www.alientrap.org/games/nexuiz"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 5022a92a7cd1..1833840d2e35 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }: +{lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }: stdenv.mkDerivation { name = "njam-1.25"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = "http://trackballs.sourceforge.net/"; description = "Cross-platform pacman-like game"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix index d10807071a97..b8ef2b3cbed4 100644 --- a/pkgs/games/nudoku/default.nix +++ b/pkgs/games/nudoku/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig gettext ]; buildInputs = [ ncurses ]; - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-nls"; + configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-nls"; meta = with lib; { description = "An ncurses based sudoku game"; diff --git a/pkgs/games/nxengine-evo/default.nix b/pkgs/games/nxengine-evo/default.nix index 909737a68049..e3df235b7573 100644 --- a/pkgs/games/nxengine-evo/default.nix +++ b/pkgs/games/nxengine-evo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchpatch , fetchurl , cmake @@ -54,12 +54,12 @@ stdenv.mkDerivation rec { meta = { description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; - license = with stdenv.lib.licenses; [ + license = with lib.licenses; [ gpl3 # Game engine unfreeRedistributable # Game assets, freeware ]; - maintainers = [ stdenv.lib.maintainers.scubed2 ]; + maintainers = [ lib.maintainers.scubed2 ]; homepage = "https://github.com/nxengine/nxengine-evo"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index ba220a720cd1..de66d8996b4b 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net, wxGTK30 }: +{ lib, stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net, wxGTK30 }: stdenv.mkDerivation rec { pname = "odamex"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://odamex.net/"; description = "A client/server port for playing old-school Doom online"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 6a05a566524d..b78baee725d4 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,7 +1,7 @@ -{ stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr +{ lib, stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr , libXrender, fontconfig, freetype, openal, runtimeShell }: -let inherit (stdenv.lib) makeLibraryPath; in +let inherit (lib) makeLibraryPath; in stdenv.mkDerivation { name = "oilrush"; @@ -69,9 +69,9 @@ stdenv.mkDerivation { of Tower Defense. ''; homepage = "http://oilrush-game.com/"; - license = stdenv.lib.licenses.unfree; - #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; + #maintainers = with lib.maintainers; [ astsmtl ]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 577eafb6a8ca..7b1f793895ed 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }: +{ lib, fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }: stdenv.mkDerivation { pname = "openarena"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = let gameDir = "$out/openarena-$version"; interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; - libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl openal ]; + libPath = lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl openal ]; arch = { "x86_64-linux" = "x86_64"; "i386-linux" = "i386"; @@ -36,8 +36,8 @@ stdenv.mkDerivation { meta = { description = "Crossplatform openarena client"; homepage = "http://openarena.ws/"; - maintainers = [ stdenv.lib.maintainers.wyvie ]; + maintainers = [ lib.maintainers.wyvie ]; platforms = [ "i386-linux" "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index db9b4760b253..dff9eea788f0 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { postInstall = '' mv -v $out/games/openclonk $out/bin/ - '' + stdenv.lib.optionalString enableSoundtrack '' + '' + lib.optionalString enableSoundtrack '' ln -sv ${soundtrack_src} $out/share/games/openclonk/Music.ocg ''; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 7bda06b8457a..fefac190b0a3 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib +{ lib, stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib , libxml2, pkg-config, curl, cmake, libzip }: stdenv.mkDerivation { @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { homepage = "http://openlierox.net"; description = "Real-time game with Worms-like shooting"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 51f941771777..4f90cecb16bb 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -1,13 +1,13 @@ /* The reusable code, and package attributes, between OpenRA engine packages (engine.nix) and out-of-tree mod packages (mod.nix). */ -{ stdenv, makeSetupHook, curl, unzip, dos2unix, pkgconfig, makeWrapper +{ lib, stdenv, makeSetupHook, curl, unzip, dos2unix, pkgconfig, makeWrapper , lua, mono, dotnetPackages, python , libGL, freetype, openal, SDL2 , zenity }: -with stdenv.lib; +with lib; let path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity); diff --git a/pkgs/games/openra/engine.nix b/pkgs/games/openra/engine.nix index 7d2d007d0758..365dc3d26793 100644 --- a/pkgs/games/openra/engine.nix +++ b/pkgs/games/openra/engine.nix @@ -7,14 +7,14 @@ This package could be seen as providing a set of in-tree mods, while the `mod.nix` pacakges provide a single out-of-tree mod. */ -{ stdenv +{ lib, stdenv , packageAttrs , patchEngine , wrapLaunchGame , engine }: -with stdenv.lib; +with lib; stdenv.mkDerivation (recursiveUpdate packageAttrs rec { name = "${pname}-${version}"; diff --git a/pkgs/games/openra/mod.nix b/pkgs/games/openra/mod.nix index 8df5922a4418..4d0a18e6334e 100644 --- a/pkgs/games/openra/mod.nix +++ b/pkgs/games/openra/mod.nix @@ -6,7 +6,7 @@ The engine is relatively small and quick to build, so this is not much of a problem. Building a mod will result in a wrapper script that starts the mod inside the specified engine. */ -{ stdenv +{ lib, stdenv , packageAttrs , patchEngine , wrapLaunchGame @@ -14,7 +14,7 @@ , engine }: -with stdenv.lib; +with lib; let engineSourceName = engine.src.name or "engine"; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 7258ed6550c5..4064023fafd3 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg_3 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; + ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with lib; { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index fdd429e376fe..58ac3f8df799 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 8c0755127cbe..8cb8ca8ea24d 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which makeWrapper ]; buildInputs = [ SDL2 libpng xz zlib freetype fontconfig libxdg_basedir ] - ++ stdenv.lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; + ++ lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; prefixKey = "--prefix-dir="; @@ -51,23 +51,23 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/games/ $out/bin - ${stdenv.lib.optionalString withOpenGFX '' + ${lib.optionalString withOpenGFX '' cp ${opengfx}/* $out/share/games/openttd/baseset ''} mkdir -p $out/share/games/openttd/data - ${stdenv.lib.optionalString withOpenSFX '' + ${lib.optionalString withOpenSFX '' cp ${opensfx}/*.{obs,cat} $out/share/games/openttd/data ''} mkdir $out/share/games/openttd/baseset/openmsx - ${stdenv.lib.optionalString withOpenMSX '' + ${lib.optionalString withOpenMSX '' cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/baseset/openmsx ''} - ${stdenv.lib.optionalString withFluidSynth '' + ${lib.optionalString withFluidSynth '' wrapProgram $out/bin/openttd \ --add-flags -m \ --add-flags extmidi:cmd=${playmidi}/bin/playmidi diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 9872a3ee05f1..43c8e08c79f5 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchzip, SDL, SDL_net}: +{ lib, stdenv, fetchurl, fetchzip, SDL, SDL_net }: stdenv.mkDerivation rec { pname = "opentyrian"; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = ''Open source port of the game "Tyrian"''; homepage = "https://bitbucket.org/opentyrian/opentyrian"; # This does not account of Tyrian data. - # license = stdenv.lib.licenses.gpl2; + # license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 3ec186400541..8c115e9b3120 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib, openssl, libyamlcpp, boost +{lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: let version = "1.0.0.2019.10.18"; in @@ -19,9 +19,9 @@ stdenv.mkDerivation { description = "Open source clone of UFO: Enemy Unknown"; homepage = "https://openxcom.org"; repositories.git = "https://github.com/SupSuper/OpenXcom.git"; - maintainers = [ stdenv.lib.maintainers.cpages ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; + maintainers = [ lib.maintainers.cpages ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 15b05b56d843..f06d41495a81 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, jre }: +{ lib, stdenv, fetchurl, bash, jre }: let mcVersion = "1.16.4"; buildNum = "296"; @@ -29,8 +29,8 @@ in stdenv.mkDerivation { meta = { description = "High-performance Minecraft Server"; homepage = "https://papermc.io/"; - license = stdenv.lib.licenses.gpl3Only; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ aaronjanse ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ aaronjanse ]; }; } diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 81e22b90e97f..bc3b591d5c72 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer +{lib, stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer , pkgconfig, libGLU, libGL, git, jsoncpp }: stdenv.mkDerivation rec { pname = "pingus"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = ''A puzzle game with mechanics similar to Lemmings''; - platforms = stdenv.lib.platforms.linux; - maintainers = [stdenv.lib.maintainers.raskin]; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 768e0a1d724b..7dbca783b67b 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -34,19 +34,19 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f done ''; meta = with lib; { homepage = "http://www.uberent.com/pa/"; description = "Next-generation RTS that takes the genre to a planetary scale"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; }; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 00b1f68e1371..56f0d5a47f2c 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -1,10 +1,8 @@ -{ mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase +{ lib, mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase , SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite , wrapQtAppsHook , tinyxml2, target ? "client" }: -with stdenv.lib; - let hiDPI = fetchpatch { url = "https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch"; @@ -65,7 +63,7 @@ mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; license = licenses.gpl3; diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index c7817041f7a8..3cd017e8d3b1 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11}: +{lib, stdenv, fetchurl, libX11}: stdenv.mkDerivation { name = "3dpong-0.5"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.newbreedsoftware.com/3dpong/"; description = "One or two player 3d sports game based on Pong from Atari"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index 278aa8a93eaa..4bd59c9e39d1 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, SDL_net +{ lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_net , libGLU ? null , libGL ? null , useOpenGL ? stdenv.hostPlatform == stdenv.buildPlatform @@ -14,21 +14,21 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL SDL_mixer SDL_net ] - ++ stdenv.lib.optionals useOpenGL [ libGL libGLU ]; + ++ lib.optionals useOpenGL [ libGL libGLU ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; configureFlags = [ - (stdenv.lib.enableFeature useOpenGL "gl") - (stdenv.lib.enableFeature doCheck "sdltest") - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + (lib.enableFeature useOpenGL "gl") + (lib.enableFeature doCheck "sdltest") + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-cpu-opt" "--without-x" "ac_cv_type_uid_t=yes" "ac_cv_type_gid_t=yes" ]; - postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' mv $out/games/ $out/bin ''; } diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix index 9ab086f96a21..4850dff99dcd 100644 --- a/pkgs/games/quake2/yquake2/wrapper.nix +++ b/pkgs/games/quake2/yquake2/wrapper.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation { - name = "${name}-${stdenv.lib.getVersion yquake2}"; + name = "${name}-${lib.getVersion yquake2}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 4ab53d677324..3cb64641153a 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -1,6 +1,6 @@ { stdenv, buildEnv, lib, libGL, ioquake3, makeWrapper }: -{ paks, name ? (stdenv.lib.head paks).name, description ? "" }: +{ paks, name ? (lib.head paks).name, description ? "" }: let libPath = lib.makeLibraryPath [ libGL stdenv.cc.cc ]; diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 1e8de1a18f0c..64b7c8f7920d 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: +{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: stdenv.mkDerivation rec { pname = "quakespasm"; majorVersion = "0.93"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { and smoother mouse input - though no CD support. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.m3tti ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.m3tti ]; }; } diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index 1a8cbbea5f9c..524559bc6f73 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fftwSinglePrec, freetype, SDL, SDL_ttf}: +{lib, stdenv, fetchurl, fftwSinglePrec, freetype, SDL, SDL_ttf}: let s = # Generated upstream information rec { @@ -33,8 +33,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''Quantum mechanics-based minigolf-like game''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index edf53482ac3f..b81f1814ac9b 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' - wrapProgram $out/bin/r2mod --prefix PATH : "${stdenv.lib.makeBinPath [ jq p7zip ]}"; + wrapProgram $out/bin/r2mod --prefix PATH : "${lib.makeBinPath [ jq p7zip ]}"; ''; meta = with lib; { diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index a5d9a911afaf..dfbe9bc45e1f 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, allegro, libjpeg, makeWrapper }: +{ fetchurl, lib, stdenv, allegro, libjpeg, makeWrapper }: stdenv.mkDerivation { name = "racer-1.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Car racing game"; homepage = "http://hippo.nipax.cz/download.en.php"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index da003c3190ff..51dd4f908601 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,12 +1,10 @@ -{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib +, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGLU, libGL ? null }: assert openglSupport -> libGL != null && libGLU != null; -with stdenv.lib; - stdenv.mkDerivation rec { version = "0.1.1"; pname = "residualvm"; @@ -17,15 +15,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] - ++ optionals openglSupport [ libGL libGLU ]; + ++ lib.optionals openglSupport [ libGL libGLU ]; configureFlags = [ "--enable-all-engines" ]; - meta = { + meta = with lib; { description = "Interpreter for LucasArts' Lua-based 3D adventure games"; homepage = "http://residualvm.org/"; repositories.git = "https://github.com/residualvm/residualvm.git"; license = licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix index 966f903888be..1272521e55fb 100644 --- a/pkgs/games/rftg/default.nix +++ b/pkgs/games/rftg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, gtk2, pkgconfig }: stdenv.mkDerivation rec { @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://keldon.net/rftg/"; description = "Implementation of the card game Race for the Galaxy, including an AI"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.falsifian ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.falsifian ]; }; } diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index f1e1c50a5966..01dd1f0c04f3 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, +{ fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, pkg-config, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; - meta = with stdenv.lib; { + meta = with lib; { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = "http://rigsofrods.sourceforge.net/"; license = licenses.gpl3; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 0b7fa118f80e..0e3fa9b8cc88 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL_mixer, SDL, autoreconfHook }: +{ lib, stdenv, fetchurl, SDL_mixer, SDL, autoreconfHook }: stdenv.mkDerivation { name = "ri_li-2.0.1"; @@ -17,14 +17,14 @@ stdenv.mkDerivation { meta = { homepage = "http://ri-li.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "A children's train game"; longDescription = '' Ri-li is an arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches to win. ''; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ jcumming ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index 73beba2e34fc..95a168b7d2a0 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, ncurses }: +{ lib, stdenv, fetchurl, pkgconfig, ncurses }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "robotfindskitten"; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index bb33faf7374b..33373e0e7b1d 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Chess database with play and training functionality"; homepage = "http://scidvspc.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.paraseba ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index b3d22d4c0f9e..f0fdef8e62e5 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: +{ lib, stdenv, fetchurl, tcl, tk, libX11, zlib, makeWrapper }: stdenv.mkDerivation { pname = "scid"; @@ -52,6 +52,6 @@ stdenv.mkDerivation { meta = { description = "Chess database with play and training functionality"; homepage = "http://scid.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index a435a240edef..13079e159840 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gcc +{ lib, stdenv, fetchurl, gcc , libGLU, libX11, libXext, libXcursor, libpulseaudio }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; src = fetchurl { @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "ead1fd14988aa07041fedfa7f845c756cd5077a5a402d85bfb749cb669ececec"; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ gcc libGLU libX11 diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index 208a14dc1c57..3128ed5358b2 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchzip, ncurses, libX11, libXaw, libXt, libXext, libXmu, makeWrapper, writeScript, ... }: -let +{ lib, stdenv, fetchzip, ncurses, libX11, libXaw, libXt, libXext, libXmu, makeWrapper, writeScript, ... }: +let setup = writeScript "setup" '' mkdir -p "$ANGBAND_PATH" # Copy all the data files into place @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { prePatch = '' # Allow usage of ANGBAND_PATH - substituteInPlace config.h --replace "#define FIXED_PATHS" "" + substituteInPlace config.h --replace "#define FIXED_PATHS" "" ''; preConfigure = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp sil $out/bin/sil # Wrap the program to set a user-local ANGBAND_PATH, and run the setup script to copy files into place - # We could just use the options for a user-local save and scores dir, but it tried to write to the + # We could just use the options for a user-local save and scores dir, but it tried to write to the # lib directory anyway, so we might as well give everyone a copy wrapProgram $out/bin/sil \ --run "set -u" \ @@ -49,15 +49,15 @@ stdenv.mkDerivation rec { meta = { description = "A rouge-like game set in the first age of Middle-earth"; longDescription = '' - A game of adventure set in the first age of Middle-earth, when the world still + A game of adventure set in the first age of Middle-earth, when the world still rang with elven song and gleamed with dwarven mail. - Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining + Walk the dark halls of Angband. Slay creatures black and fell. Wrest a shining Silmaril from Morgoth’s iron crown. ''; homepage = "http://www.amirrorclear.net/flowers/game/sil/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.michaelpj ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.michaelpj ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index b45a182cc014..97fc0b3104d3 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -6,7 +6,7 @@ let # Choose your "paksets" of objects, images, text, music, etc. paksets = config.simutrans.paksets or "pak64 pak64.japan pak128 pak128.britain pak128.german"; - result = with stdenv.lib; withPaks ( + result = with lib; withPaks ( if paksets == "*" then attrValues pakSpec # taking all else map (name: pakSpec.${name}) (splitString " " paksets) ); @@ -24,7 +24,7 @@ let # As of 2015/03, many packsets still didn't have a release for version 120. - pakSpec = stdenv.lib.mapAttrs + pakSpec = lib.mapAttrs (pakName: attrs: mkPak (attrs // {inherit pakName;})) { pak64 = { diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index 1e678a49f05c..24ff22837910 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ audiofile SDL2 hexdump ]; makeFlags = [ "VERSION=${region}" ] ++ compileFlags - ++ stdenv.lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; + ++ lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; inherit baseRom; diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/soldat-unstable/default.nix index 0278afc5e40c..d48cf3048ee5 100644 --- a/pkgs/games/soldat-unstable/default.nix +++ b/pkgs/games/soldat-unstable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, fpc, zip, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch, fpc, zip, makeWrapper , SDL2, freetype, physfs, openal, gamenetworkingsockets , xorg, autoPatchelfHook }: @@ -27,7 +27,7 @@ let install -Dm644 client/play-regular.ttf -t $out/share/soldat ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Soldat's base game content"; license = licenses.cc-by-40; platforms = platforms.all; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Soldat is a unique 2D (side-view) multiplayer action game"; license = [ licenses.mit base.meta.license ]; inherit (src.meta) homepage; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 473409ffae95..3bf368e807b6 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libGLU, libGL, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, +{ fetchurl, lib, stdenv, libGLU, libGL, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell, curl }: @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game - TORCS fork with more experimental approach"; homepage = "http://speed-dreams.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [raskin]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 9bc204c08d04..fe16a8a0403a 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -44,14 +44,14 @@ stdenv.mkDerivation rec { buildInputs = [ lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 xorg.libX11 xorg.libXcursor libGLU libGL glew curl systemd libunwind which minizip ] - ++ stdenv.lib.optional withAI jdk - ++ stdenv.lib.optional withAI python; + ++ lib.optional withAI jdk + ++ lib.optional withAI python; NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility postInstall = '' wrapProgram "$out/bin/spring" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc systemd ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc systemd ]}" ''; meta = with lib; { diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index f7ef287c1ffa..43c1512c6505 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { postInstall = '' rm $out/bin/steamdeps - ${stdenv.lib.optionalString traceDeps '' + ${lib.optionalString traceDeps '' cat > $out/bin/steamdeps <> ${traceLog} diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 765c50149ace..734e7be3666b 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tcllib, runtimeShell }: +{ lib, stdenv, fetchurl, tcl, tcllib, runtimeShell }: stdenv.mkDerivation { name = "tcl2048-0.4.0"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/dbohdan/2048.tcl"; description = "The game of 2048 implemented in Tcl"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ dbohdan ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ dbohdan ]; }; } diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index a568fd79085a..9df0843c5e47 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, SDL_mixer}: +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: stdenv.mkDerivation { name = "teeter-torture-20051018"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.newbreedsoftware.com/teetertorture/"; description = "Simple shooting game with your cannon is sitting atop a teeter totter"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 9ff50d533bec..09193232d32e 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, cmake, pkgconfig, python3, alsaLib +{ fetchFromGitHub, lib, stdenv, cmake, pkgconfig, python3, alsaLib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests }: @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://teeworlds.com/"; license = "BSD-style, see `license.txt'"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 084a4103bd57..37d4553be6bf 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,4 +1,3 @@ - { lib, stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, zlib, bzip2, curl, darwin }: @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; buildInputs = [ SDL2 lua fftwFloat zlib bzip2 curl ]; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index b8c2c3f3cf43..0892dc2dedd8 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU, libGL }: +{ lib, stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU, libGL }: -with stdenv.lib; stdenv.mkDerivation { name = "tibia-10.90"; @@ -24,7 +23,7 @@ stdenv.mkDerivation { cp -r * $out/res patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 libGLU libGL ]} \ + --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc libX11 libGLU libGL ]} \ "$out/res/Tibia" # We've patchelf'd the files. The main ‘Tibia’ binary is a bit @@ -50,8 +49,8 @@ stdenv.mkDerivation { meta = { description = "Top-down MMORPG set in a fantasy world"; homepage = "http://tibia.com"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = ["i686-linux"]; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index fb706d38e189..763241f2909d 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ncurses, zlib +{ lib, stdenv, fetchurl, ncurses, zlib , openssl ? null , sslSupport ? true }: -with stdenv.lib; +with lib; assert sslSupport -> openssl != null; diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 136578924a0d..d1dafb85ce3f 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, +{ fetchpatch, fetchurl, lib, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, makeWrapper }: @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = "http://torcs.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 3eee4f17af11..4c7d2ba6956e 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU, libGL }: +{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU, libGL }: stdenv.mkDerivation rec { pname = "trackballs"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; platforms = platforms.linux; diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 74a56f1fd406..cb3227f24e3e 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, runtimeShell, SDL2, freealut, SDL2_image, openal, physfs +{ lib, fetchurl, stdenv, runtimeShell, SDL2, freealut, SDL2_image, openal, physfs , zlib, libGLU, libGL, glew, tinyxml-2 }: stdenv.mkDerivation rec { @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { meta = { description = "A fast-paced single-player racing game"; homepage = "http://trigger-rally.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index a5bea42d04e5..9e08b6c1e41e 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, +{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf, imagemagick }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications cp hildon/tuxpaint.xpm $out/share/pixmaps sed -e "s+Exec=tuxpaint+Exec=$out/bin/tuxpaint+" < src/tuxpaint.desktop > $out/share/applications/tuxpaint.desktop - + # Install stamps tar xzf $stamps cd tuxpaint-stamps-2014.08.23 @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Drawing Software for Children"; homepage = "http://www.tuxpaint.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix index 643779cf5fd8..73b1cb38ca38 100644 --- a/pkgs/games/ue4/default.nix +++ b/pkgs/games/ue4/default.nix @@ -11,7 +11,7 @@ let ln -s ${lib.getAttr hash deps} .git/ue4-gitdeps/${prefix}/${hash} '' ) (lib.attrNames deps)); - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXScrnSaver xorg.libXau xorg.libXcursor xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrandr xorg.libXrender xorg.libXxf86vm xorg.libxcb @@ -75,9 +75,9 @@ stdenv.mkDerivation rec { meta = { description = "A suite of integrated tools for game developers to design and build games, simulations, and visualizations"; homepage = "https://www.unrealengine.com/what-is-unreal-engine-4"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.puffnfresh ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.puffnfresh ]; broken = true; }; } diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 24c98f7d774f..a2d114f51139 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, patchelf, xorg, openal }: +{ lib, stdenv, fetchurl, unzip, patchelf, xorg, openal }: let urls = file: @@ -14,9 +14,9 @@ let nativeBuildInputs = [ unzip patchelf ]; - rtdeps = stdenv.lib.makeLibraryPath + rtdeps = lib.makeLibraryPath [ xorg.libXxf86vm xorg.libXext openal ] - + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; + + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; buildCommand = '' @@ -52,7 +52,7 @@ let description = "Unreal Engine 4 Linux demos"; homepage = "https://wiki.unrealengine.com/Linux_Demos"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 94a12774a430..7694821d44f5 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtheora, xvidcore, libGLU, libGL, SDL, SDL_ttf, SDL_mixer +{ lib, stdenv, fetchurl, libtheora, xvidcore, libGLU, libGL, SDL, SDL_ttf, SDL_mixer , curl, libjpeg, libpng, gettext, cunit, enableEditor?false }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = ''tar xvf "${srcData}"''; configureFlags = [ "--enable-release" "--enable-sse" ] - ++ stdenv.lib.optional enableEditor "--enable-uforadiant"; + ++ lib.optional enableEditor "--enable-uforadiant"; buildInputs = [ libtheora xvidcore libGLU libGL SDL SDL_ttf SDL_mixer @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ufoai.org"; description = "A squad-based tactical strategy game in the tradition of X-Com"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index 6eb4725897ff..daaa3110244a 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, libGLU, libGL, SDL_image, freealut, openal, libvorbis, +{lib, stdenv, fetchurl, SDL, libGLU, libGL, SDL_image, freealut, openal, libvorbis, pkgconfig}: stdenv.mkDerivation { @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.ultimatestunts.nl/"; description = "Remake of the popular racing DOS-game Stunts"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 43fd30f1d7de..397946acf582 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { --subst-var-by libpcre_LIBNAME libpcre.so.1 ''; - preBuild = with stdenv.lib; + preBuild = with lib; let items = concatMapStringsSep " " (x: "-rpath ${getLib x}/lib") sharedLibs; in '' export NIX_LDFLAGS="$NIX_LDFLAGS ${items}" diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 8d1bf2b68872..0773b651152e 100644 --- a/pkgs/games/uqm/3dovideo.nix +++ b/pkgs/games/uqm/3dovideo.nix @@ -1,6 +1,6 @@ { stdenv, requireFile, writeText, fetchurl, haskellPackages }: -with stdenv.lib; +with lib; let makeSpin = num: let @@ -30,7 +30,7 @@ let buildDepends = [ base binary bytestring filepath tar ]; description = "Extract video files from a Star Control II 3DO image"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; in stdenv.mkDerivation { diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index bce8fde3acd6..0c6d2d9d952a 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { spin-offs, thereby making zillions more people happy! ''; homepage = "http://sc2.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming aszlig ]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index ea8b3941f8b4..bc499d736f0b 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, sconsPackages, libGLU, libGL, SDL2, SDL2_image +{ lib, stdenv, fetchFromGitHub, fetchsvn, pkgconfig, sconsPackages, libGLU, libGL, SDL2, SDL2_image , libvorbis, bullet, curl, gettext, writeTextFile , data ? fetchsvn { @@ -35,9 +35,9 @@ let meta = { description = "Car racing game"; homepage = "http://vdrift.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.linux; }; }; wrappedName = "vdrift-${version}-with-data-${toString data.rev}"; diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 01e787b8d911..e0b7e13c91ea 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, SDL_mixer}: +{lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer}: stdenv.mkDerivation { name = "vectoroids-1.1.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.newbreedsoftware.com/vectoroids/"; description = "Clone of the classic arcade game Asteroids by Atari"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index fa5aff2b81b4..a60ec15744cb 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { phases = "installPhase"; ld_preload = ./isatty.c; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; + libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; installPhase = '' mkdir -p $out/libexec/strangeloop/vessel/ diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix index eb9108c32c9a..fcfc89667af2 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/games/vms-empire/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, ncurses, xmlto }: +{ lib, stdenv, fetchurl, ncurses, xmlto }: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "vms-empire"; version = "1.15"; @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - meta = { + meta = with lib; { description = "The ancestor of all expand/explore/exploit/exterminate games"; longDescription = '' Empire is a simulation of a full-scale war between two emperors, the diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 2dfb2a72d89b..95c3ec3630fb 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { enableParallelBuilding = true; - postInstall = stdenv.lib.optionalString withVideos + postInstall = lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz"; meta = with lib; { diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index d5eb7495df08..71734b9ff985 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost libvorbis fribidi dbus libpng pcre openssl icu ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation]; + ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 8d06b94271f4..27a270fcf8f3 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { sourceRoot = pname; phases = [ "unpackPhase installPhase" ]; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc SDL2 SDL2_mixer + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc SDL2 SDL2_mixer libogg libvorbis ]; unpackPhase = '' - # The game is distributed as a shell script, with a tar of mojosetup, and a + # The game is distributed as a shell script, with a tar of mojosetup, and a # zip archive attached to the end. Therefore a simple unzip does the job. # However, to avoid unzip errors, we need to strip those out first. tail -c +421887 ${src} > ${src}.zip diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 9f3303578da6..95542491b990 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, xorgproto, libXt, libXaw, libSM, libICE, libXmu +{lib, stdenv, fetchurl, libX11, xorgproto, libXt, libXaw, libSM, libICE, libXmu , libXext, gnuchess, texinfo, libXpm, pkgconfig, librsvg, cairo, pango , gtk2 }: @@ -28,8 +28,8 @@ stdenv.mkDerivation { inherit (s) version; description = ''GUI for chess engines''; homepage = "https://www.gnu.org/software/xboard/"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 6f7ee6962bf8..54ec25c8cf79 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -38,9 +38,9 @@ let aims to become the best possible open-source FPS of its kind. ''; homepage = "https://www.xonotic.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ astsmtl zalakain petabyteboy ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ astsmtl zalakain petabyteboy ]; + platforms = lib.platforms.linux; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 4de27b1f18da..66f329ed0b98 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, SDL, libGLU, libGL, expat, zlib, SDL_ttf, SDL_image }: +{ lib, stdenv, fetchurl, libX11, SDL, libGLU, libGL, expat, zlib, SDL_ttf, SDL_image }: stdenv.mkDerivation rec { version = "1.5.0"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = ''A multiplayer space combat game (client part)''; homepage = "http://bloodspilot.sf.net/"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 5f0f867f1836..c84f5222e68e 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, imake, gccmakedep}: +{lib, stdenv, fetchurl, libX11, imake, gccmakedep}: stdenv.mkDerivation rec { pname = "xskat"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; - meta = with stdenv.lib; { + meta = with lib; { description = ''Famous german card game''; platforms = platforms.unix; license = licenses.free; diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index c64d8bf568fd..de07821c36a6 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXt, libXpm, libXext, imake, gccmakedep }: +{ lib, stdenv, fetchurl, libXt, libXpm, libXext, imake, gccmakedep }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An X-windows application that will let it snow on the root, in between and on windows"; homepage = "http://janswaal.home.xs4all.nl/Xsnow/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.robberer ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.robberer ]; }; } diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index 30579e399b82..ddc43518de64 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, imake, libXt, libXaw, libXpm, libXext +{lib, stdenv, fetchurl, libX11, imake, libXt, libXaw, libXpm, libXext , withNethackLevels ? true }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { makeFlags = ["BINDIR=$(out)/bin"]; - postInstall = stdenv.lib.optionalString withNethackLevels '' + postInstall = lib.optionalString withNethackLevels '' gzip < ${nethackLevels} > "$out/share/games/lib/xsok/Nethack.def.gz" echo Nethack > "$out/share/games/lib/xsok/gametypes" ''; @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A generic Sokoban game for X11"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "https://tracker.debian.org/pkg/xsok"; }; } diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index 257dd3751c8e..4b09cb170c04 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }: let - bits = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; + bits = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ]; in diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index 7f4556c87511..48dd2be9973a 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.sqlite.org/"; description = "A single C code file, named sqlite3.c, that contains all C code for the core SQLite library and the FTS3 and RTREE extensions"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.lassulus ]; }; } diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index 0722e4bbbf95..e8daa9a20251 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }: +{ lib, stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }: stdenv.mkDerivation rec { pname = "zangband"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "Rogue-like game"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; broken = true; # broken in runtime, will not get pass character generation }; } diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index d50218af2416..b07db62aa157 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer +{ lib, fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer , libmysqlclient, makeWrapper }: stdenv.mkDerivation { @@ -40,6 +40,6 @@ stdenv.mkDerivation { meta = { description = "Multiplayer remake of ZED"; homepage = "http://zod.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; /* Says the web */ + license = lib.licenses.gpl3Plus; /* Says the web */ }; } From 175fdc84aa59c48919448af39e4226dc828d8648 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 14 Jan 2021 22:20:35 -0800 Subject: [PATCH 47/81] =?UTF-8?q?openafs:=201.8.6=20=E2=86=92=201.8.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/servers/openafs/1.8/srcs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index 4df5bdfc3888..f1fd7ff4c0fe 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "0i99klrw00v4bwd942n90xqfn16z6337m89xfm9dgv7ih0qrsklb"; + sha256 = "0ygsrf65w9sqji2x3jbx3h31vk6513s6nalzxi7p2ryf3xb3lm2k"; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "1s91kmxfimhdqrz7l6jgjz72j9pyalghrvg4h384fsz0ks6s4kz3"; + sha256 = "0zri99pxmp4klh8ki5ycnjpf1h21lynn4049s6ywmap1vkpq84yn"; })]; } From 495066a47fc259aa4fc5f7548e190fded2c7030e Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 14 Jan 2021 14:13:20 -0500 Subject: [PATCH 48/81] python3Packages.osqp: 0.6.2 -> 0.6.2.post0 --- pkgs/development/python-modules/osqp/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index e2eb0139f123..1db266e116d4 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -8,15 +8,16 @@ , scipy # check inputs , pytestCheckHook +, cvxopt }: buildPythonPackage rec { pname = "osqp"; - version = "0.6.2"; + version = "0.6.2.post0"; src = fetchPypi { inherit pname version; - sha256 = "262162039f6ad6c9ffee658541b18cfae8240b65edbde71d9b9e3af42fbfe4b3"; + sha256 = "5f0695f26a3bef0fae91254bc283fab790dcca0064bfe0f425167f9c9e8b4cbc"; }; nativeBuildInputs = [ cmake ]; @@ -30,18 +31,10 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "osqp" ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook cvxopt ]; disabledTests = [ "mkl_" ]; - pytestFlagsArray = [ - # These cannot collect b/c of circular dependency on cvxpy: https://github.com/oxfordcontrol/osqp-python/issues/50 - "--ignore=module/tests/basic_test.py" - "--ignore=module/tests/feasibility_test.py" - "--ignore=module/tests/polishing_test.py" - "--ignore=module/tests/unconstrained_test.py" - "--ignore=module/tests/update_matrices_test.py" - ]; meta = with lib; { description = "The Operator Splitting QP Solver"; From ac8a17dd5628c5350e5c6f9c1c6df0adf2583d08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Jan 2021 08:10:35 +0100 Subject: [PATCH 49/81] python3Packages.pyipp: switch to pytestCheckHook and exclude tests --- .../python-modules/pyipp/default.nix | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index 98bb6360ce54..ed5a5f4576ab 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -1,11 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, aiohttp, deepmerge, yarl -, aresponses, pytest, pytest-asyncio, pytestcov }: +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, deepmerge +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytestcov +, yarl +}: buildPythonPackage rec { pname = "pyipp"; version = "0.11.0"; - disabled = isPy27; src = fetchFromGitHub { owner = "ctalkington"; @@ -22,14 +29,26 @@ buildPythonPackage rec { checkInputs = [ aresponses - pytest pytest-asyncio pytestcov + pytestCheckHook ]; - checkPhase = '' - pytest -q . - ''; + # Some tests are failing due to encoding issues + # https://github.com/ctalkington/python-ipp/issues/121 + disabledTests = [ + "test_internal_session" + "test_request_port" + "est_http_error426" + "test_unexpected_response" + "test_printer" + "test_raw" + "test_ipp_request" + "test_request_tls" + "test_ipp_error_0x0503" + ]; + + pythonImportsCheck = [ "pyipp" ]; meta = with lib; { description = "Asynchronous Python client for Internet Printing Protocol (IPP)"; From 108bdac3d99b6d94d3740422af5945e510238304 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 12:42:41 +0700 Subject: [PATCH 50/81] pkgs/applications: stdenv.lib -> lib --- .../display-managers/lightdm/default.nix | 4 +- .../display-managers/lightdm/gtk-greeter.nix | 2 +- pkgs/applications/misc/1password/default.nix | 6 +-- pkgs/applications/misc/abook/default.nix | 8 ++-- .../misc/adobe-reader/default.nix | 6 +-- pkgs/applications/misc/almanah/default.nix | 2 +- pkgs/applications/misc/ape/apeclex.nix | 4 +- pkgs/applications/misc/apvlv/default.nix | 2 +- pkgs/applications/misc/audio/sox/default.nix | 2 +- pkgs/applications/misc/audio/soxr/default.nix | 6 +-- .../misc/audio/wavesurfer/default.nix | 6 +-- pkgs/applications/misc/avrdudess/default.nix | 4 +- .../misc/azuredatastudio/default.nix | 8 ++-- pkgs/applications/misc/barrier/default.nix | 10 ++-- pkgs/applications/misc/bemenu/default.nix | 2 +- pkgs/applications/misc/bibletime/default.nix | 8 ++-- .../misc/cli-visualizer/default.nix | 8 ++-- pkgs/applications/misc/clipit/default.nix | 2 +- pkgs/applications/misc/confclerk/default.nix | 8 ++-- pkgs/applications/misc/corectrl/default.nix | 2 +- pkgs/applications/misc/cpu-x/default.nix | 2 +- .../misc/crow-translate/default.nix | 5 +- pkgs/applications/misc/crumbs/default.nix | 4 +- pkgs/applications/misc/dbeaver/default.nix | 2 +- .../misc/dfilemanager/default.nix | 6 +-- pkgs/applications/misc/diffpdf/default.nix | 8 ++-- pkgs/applications/misc/ding/default.nix | 2 +- pkgs/applications/misc/doomseeker/default.nix | 2 +- pkgs/applications/misc/dozenal/default.nix | 6 +-- pkgs/applications/misc/electrum/default.nix | 8 ++-- pkgs/applications/misc/elogind/default.nix | 2 +- pkgs/applications/misc/evtest/default.nix | 2 +- pkgs/applications/misc/expenses/default.nix | 5 +- pkgs/applications/misc/far2l/default.nix | 8 ++-- pkgs/applications/misc/fbreader/default.nix | 2 +- pkgs/applications/misc/fetchmail/default.nix | 8 ++-- pkgs/applications/misc/fff/default.nix | 2 +- .../applications/misc/firestarter/default.nix | 2 +- pkgs/applications/misc/fsv/default.nix | 2 +- pkgs/applications/misc/gammu/default.nix | 4 +- .../misc/garmin-plugin/default.nix | 6 +-- pkgs/applications/misc/gcal/default.nix | 8 ++-- .../applications/misc/get_iplayer/default.nix | 4 +- pkgs/applications/misc/gkrellm/default.nix | 4 +- pkgs/applications/misc/gksu/default.nix | 8 ++-- pkgs/applications/misc/glava/default.nix | 2 +- pkgs/applications/misc/glom/default.nix | 4 +- pkgs/applications/misc/gmtp/default.nix | 6 +-- .../misc/gnome-multi-writer/default.nix | 2 +- .../misc/gnome-recipes/default.nix | 2 +- .../applications/misc/gnome-usage/default.nix | 2 +- pkgs/applications/misc/goldendict/default.nix | 22 ++++----- pkgs/applications/misc/gollum/default.nix | 4 +- pkgs/applications/misc/gollum/gemset.nix | 2 +- .../applications/misc/googleearth/default.nix | 2 +- pkgs/applications/misc/gpg-mdp/default.nix | 4 +- pkgs/applications/misc/gpsbabel/default.nix | 2 +- pkgs/applications/misc/gpsbabel/gui.nix | 2 +- pkgs/applications/misc/gpx/default.nix | 8 ++-- pkgs/applications/misc/gramps/default.nix | 6 +-- pkgs/applications/misc/grip/default.nix | 8 ++-- pkgs/applications/misc/gsimplecal/default.nix | 8 ++-- pkgs/applications/misc/gummi/default.nix | 8 ++-- pkgs/applications/misc/gv/default.nix | 10 ++-- pkgs/applications/misc/gxmessage/default.nix | 8 ++-- pkgs/applications/misc/hdate/default.nix | 6 +-- .../misc/hello-unfree/default.nix | 6 +-- pkgs/applications/misc/houdini/runtime.nix | 10 ++-- pkgs/applications/misc/hstr/default.nix | 8 ++-- pkgs/applications/misc/hubstaff/default.nix | 2 +- pkgs/applications/misc/icesl/default.nix | 2 +- pkgs/applications/misc/ikiwiki/default.nix | 10 ++-- pkgs/applications/misc/imag/default.nix | 2 +- pkgs/applications/misc/ipmicfg/default.nix | 2 +- pkgs/applications/misc/ipmiview/default.nix | 6 +-- .../applications/misc/jbidwatcher/default.nix | 4 +- .../applications/misc/jekyll/basic/gemset.nix | 2 +- pkgs/applications/misc/jgmenu/default.nix | 4 +- pkgs/applications/misc/jigdo/default.nix | 6 +-- pkgs/applications/misc/josm/default.nix | 2 +- pkgs/applications/misc/k2pdfopt/default.nix | 2 +- pkgs/applications/misc/kdbplus/default.nix | 8 ++-- .../misc/keepass-plugins/keeagent/default.nix | 6 +-- .../keepass-plugins/keepasshttp/default.nix | 6 +-- .../keepass-plugins/otpkeyprov/default.nix | 8 ++-- pkgs/applications/misc/keepass/default.nix | 10 ++-- pkgs/applications/misc/keepassx/2.0.nix | 8 ++-- pkgs/applications/misc/keepassx/community.nix | 16 +++---- pkgs/applications/misc/keepassx/default.nix | 8 ++-- .../misc/keystore-explorer/default.nix | 8 ++-- pkgs/applications/misc/khard/default.nix | 6 +-- pkgs/applications/misc/kiwix/default.nix | 4 +- pkgs/applications/misc/koreader/default.nix | 2 +- .../misc/masterpdfeditor4/default.nix | 2 +- pkgs/applications/misc/memo/default.nix | 8 ++-- pkgs/applications/misc/milu/default.nix | 8 ++-- .../misc/minergate-cli/default.nix | 2 +- pkgs/applications/misc/minergate/default.nix | 2 +- pkgs/applications/misc/mkgmap/default.nix | 6 +-- .../misc/mkgmap/splitter/default.nix | 4 +- .../misc/multibootusb/default.nix | 2 +- pkgs/applications/misc/mupdf/1.17.nix | 4 +- pkgs/applications/misc/mupdf/default.nix | 2 +- .../applications/misc/nanoblogger/default.nix | 6 +-- pkgs/applications/misc/navipowm/default.nix | 8 ++-- pkgs/applications/misc/navit/default.nix | 6 +-- pkgs/applications/misc/nnn/default.nix | 4 +- pkgs/applications/misc/noice/default.nix | 4 +- pkgs/applications/misc/nrsc5/default.nix | 2 +- pkgs/applications/misc/obinskit/default.nix | 2 +- pkgs/applications/misc/ocropus/default.nix | 2 +- pkgs/applications/misc/onboard/default.nix | 2 +- .../misc/openbox-menu/default.nix | 8 ++-- pkgs/applications/misc/openbrf/default.nix | 4 +- pkgs/applications/misc/opencpn/default.nix | 6 +-- pkgs/applications/misc/openjump/default.nix | 8 ++-- pkgs/applications/misc/orca/default.nix | 2 +- pkgs/applications/misc/osm2xmap/default.nix | 2 +- .../misc/pass-secret-service/default.nix | 8 ++-- pkgs/applications/misc/pastel/default.nix | 2 +- pkgs/applications/misc/pcmanfm/default.nix | 2 +- pkgs/applications/misc/pdfmod/default.nix | 2 +- pkgs/applications/misc/pdfpc/default.nix | 2 +- pkgs/applications/misc/phwmon/default.nix | 8 ++-- .../applications/misc/playonlinux/default.nix | 4 +- .../misc/polar-bookshelf/default.nix | 6 +-- pkgs/applications/misc/pt/gemset.nix | 2 +- pkgs/applications/misc/qpdfview/default.nix | 8 ++-- .../misc/qt-video-wlr/default.nix | 2 +- .../misc/quicksynergy/default.nix | 8 ++-- pkgs/applications/misc/ranger/default.nix | 4 +- pkgs/applications/misc/reddsaver/default.nix | 6 +-- pkgs/applications/misc/redshift/default.nix | 20 ++++---- pkgs/applications/misc/robo3t/default.nix | 8 ++-- pkgs/applications/misc/robomongo/default.nix | 8 ++-- pkgs/applications/misc/sbagen/default.nix | 4 +- pkgs/applications/misc/sequelpro/default.nix | 6 +-- .../misc/signumone-ks/default.nix | 6 +-- pkgs/applications/misc/simplenote/default.nix | 2 +- pkgs/applications/misc/sleepyhead/default.nix | 2 +- pkgs/applications/misc/slmenu/default.nix | 8 ++-- pkgs/applications/misc/slstatus/default.nix | 4 +- pkgs/applications/misc/snowsql/default.nix | 2 +- pkgs/applications/misc/spacefm/default.nix | 4 +- pkgs/applications/misc/stag/default.nix | 8 ++-- .../applications/misc/sweethome3d/default.nix | 12 ++--- .../applications/misc/sweethome3d/editors.nix | 14 +++--- .../misc/taskjuggler/2.x/default.nix | 2 +- pkgs/applications/misc/taskjuggler/gemset.nix | 2 +- pkgs/applications/misc/taskopen/default.nix | 2 +- .../misc/terminal-typeracer/default.nix | 2 +- pkgs/applications/misc/teseq/default.nix | 8 ++-- pkgs/applications/misc/tomboy/default.nix | 2 +- pkgs/applications/misc/tpmmanager/default.nix | 8 ++-- .../misc/translate-shell/default.nix | 2 +- pkgs/applications/misc/udevil/default.nix | 6 +-- pkgs/applications/misc/ulauncher/default.nix | 2 +- pkgs/applications/misc/upwork/default.nix | 2 +- pkgs/applications/misc/valentina/default.nix | 4 +- pkgs/applications/misc/veracrypt/default.nix | 4 +- pkgs/applications/misc/viking/default.nix | 20 ++++---- pkgs/applications/misc/vue/default.nix | 8 ++-- pkgs/applications/misc/waybar/default.nix | 10 ++-- pkgs/applications/misc/wego/default.nix | 4 +- pkgs/applications/misc/wikicurses/default.nix | 8 ++-- pkgs/applications/misc/with-shell/default.nix | 6 +-- pkgs/applications/misc/wmname/default.nix | 6 +-- pkgs/applications/misc/wordnet/default.nix | 6 +-- pkgs/applications/misc/workrave/default.nix | 2 +- pkgs/applications/misc/xautoclick/default.nix | 6 +-- pkgs/applications/misc/xfe/default.nix | 6 +-- pkgs/applications/misc/xfontsel/default.nix | 8 ++-- pkgs/applications/misc/xpdf/default.nix | 12 ++--- .../misc/xrandr-invert-colors/default.nix | 4 +- pkgs/applications/misc/xrq/default.nix | 10 ++-- pkgs/applications/misc/xxkb/default.nix | 12 ++--- pkgs/applications/misc/xygrib/default.nix | 2 +- .../misc/yubioath-desktop/default.nix | 4 +- .../misc/zathura/core/default.nix | 4 +- pkgs/applications/misc/zk-shell/default.nix | 8 ++-- pkgs/applications/misc/zola/default.nix | 2 +- .../networking/browsers/firefox/wrapper.nix | 2 +- .../browsers/google-chrome/default.nix | 4 +- .../networking/browsers/lynx/default.nix | 6 +-- .../networking/browsers/w3m/default.nix | 8 ++-- .../networking/cawbird/default.nix | 2 +- .../networking/cluster/click/default.nix | 2 +- .../networking/cluster/hadoop/default.nix | 10 ++-- .../networking/cluster/kanif/default.nix | 8 ++-- .../networking/cluster/kubelogin/default.nix | 2 +- .../cluster/node-problem-detector/default.nix | 6 +-- .../networking/cluster/openshift/default.nix | 2 +- .../networking/cluster/pig/default.nix | 2 +- .../cluster/spacegun/node-composition.nix | 2 +- .../cluster/spacegun/node-packages.nix | 2 +- .../networking/cluster/spark/default.nix | 8 ++-- .../networking/cluster/taktuk/default.nix | 8 ++-- .../cluster/terraform-landscape/gemset.nix | 2 +- .../networking/enhanced-ctorrent/default.nix | 8 ++-- .../networking/esniper/default.nix | 2 +- .../feedreaders/canto-curses/default.nix | 8 ++-- .../feedreaders/newsboat/default.nix | 16 +++---- .../feedreaders/rsstail/default.nix | 2 +- .../networking/ids/daq/default.nix | 8 ++-- .../networking/ids/snort/default.nix | 8 ++-- .../networking/ids/zeek/default.nix | 4 +- .../instant-messengers/baresip/default.nix | 12 ++--- .../bitlbee-discord/default.nix | 6 +-- .../bitlbee-facebook/default.nix | 6 +-- .../bitlbee-mastodon/default.nix | 6 +-- .../bitlbee-steam/default.nix | 6 +-- .../instant-messengers/bitlbee/default.nix | 4 +- .../instant-messengers/bitlbee/plugins.nix | 4 +- .../instant-messengers/bluejeans/default.nix | 2 +- .../instant-messengers/centerim/default.nix | 8 ++-- .../instant-messengers/discord/base.nix | 2 +- .../element/element-web.nix | 6 +-- .../instant-messengers/gitter/default.nix | 2 +- .../instant-messengers/gtmess/default.nix | 6 +-- .../instant-messengers/hipchat/default.nix | 2 +- .../jitsi-meet-electron/default.nix | 2 +- .../matrix-recorder/composition.nix | 5 +- .../matrix-recorder/default.nix | 6 +-- .../matrix-recorder/node-env.nix | 46 +++++++++---------- .../instant-messengers/matrixcli/default.nix | 14 +++--- .../mattermost-desktop/default.nix | 2 +- .../instant-messengers/mikutter/gemset.nix | 2 +- .../pidgin-plugins/msn-pecan/default.nix | 4 +- .../pidgin-plugins/pidgin-latex/default.nix | 2 +- .../pidgin-plugins/pidgin-mra/default.nix | 6 +-- .../purple-vk-plugin/default.nix | 6 +-- .../pidgin-plugins/skype4pidgin/default.nix | 6 +-- .../instant-messengers/pond/default.nix | 12 ++--- .../instant-messengers/profanity/default.nix | 4 +- .../instant-messengers/qtox/default.nix | 4 +- .../instant-messengers/ratox/default.nix | 4 +- .../ring-daemon/default.nix | 2 +- .../signal-desktop/default.nix | 2 +- .../silc-client/default.nix | 12 ++--- .../skypeforlinux/default.nix | 4 +- .../instant-messengers/slack/default.nix | 2 +- .../instant-messengers/stride/default.nix | 2 +- .../instant-messengers/teamspeak/client.nix | 2 +- .../telepathy/gabble/default.nix | 2 +- .../telepathy/haze/default.nix | 4 +- .../telepathy/idle/default.nix | 10 ++-- .../telepathy/logger/default.nix | 2 +- .../telepathy/mission-control/default.nix | 2 +- .../instant-messengers/toxic/default.nix | 2 +- .../instant-messengers/turses/default.nix | 2 +- .../instant-messengers/viber/default.nix | 8 ++-- .../instant-messengers/wavebox/default.nix | 2 +- .../xmpp-client/default.nix | 2 +- .../instant-messengers/ytalk/default.nix | 8 ++-- .../instant-messengers/zoom-us/default.nix | 8 ++-- .../networking/iptraf/default.nix | 6 +-- .../networking/irc/bip/default.nix | 6 +-- .../networking/irc/communi/default.nix | 2 +- .../networking/irc/convos/default.nix | 6 +-- .../networking/irc/epic5/default.nix | 2 +- .../networking/irc/ii/default.nix | 6 +-- .../networking/irc/irssi/default.nix | 8 ++-- .../networking/irc/irssi/fish/default.nix | 12 ++--- .../networking/irc/sic/default.nix | 6 +-- .../networking/irc/weechat/default.nix | 14 +++--- .../networking/irc/wraith/default.nix | 2 +- .../networking/maestral-qt/default.nix | 4 +- .../networking/mailreaders/aerc/default.nix | 4 +- .../mailreaders/claws-mail/default.nix | 4 +- .../mailreaders/claws-mail/gtk3.nix | 4 +- .../evolution/evolution-ews/default.nix | 2 +- .../networking/mailreaders/imapfilter.nix | 8 ++-- .../networking/mailreaders/lumail/default.nix | 2 +- .../mailreaders/mailcheck/default.nix | 8 ++-- .../mailreaders/mailpile/default.nix | 2 +- .../mailreaders/msgviewer/default.nix | 2 +- .../networking/mailreaders/mutt/default.nix | 4 +- .../networking/mailreaders/notbit/default.nix | 4 +- .../mailreaders/notmuch/default.nix | 8 ++-- .../mailreaders/notmuch/muchsync.nix | 8 ++-- .../mailreaders/sylpheed/default.nix | 4 +- .../mailreaders/thunderbird-bin/68.nix | 10 ++-- .../networking/n8n/node-composition.nix | 4 +- pkgs/applications/networking/n8n/node-env.nix | 46 +++++++++---------- .../networking/n8n/node-packages.nix | 2 +- .../networking/netperf/default.nix | 8 ++-- .../networking/nntp-proxy/default.nix | 8 ++-- .../networking/offrss/default.nix | 10 ++-- .../networking/openbazaar/client.nix | 2 +- .../networking/openbazaar/default.nix | 2 +- .../applications/networking/pjsip/default.nix | 6 +-- .../networking/resilio-sync/default.nix | 2 +- .../networking/siproxd/default.nix | 8 ++-- .../soulseek/nicotine-plus/default.nix | 4 +- .../networking/super-productivity/default.nix | 2 +- .../networking/tcpkali/default.nix | 8 ++-- .../networking/termius/default.nix | 2 +- pkgs/applications/office/antiword/default.nix | 8 ++-- .../office/beancount/bean-add.nix | 4 +- pkgs/applications/office/bookworm/default.nix | 2 +- pkgs/applications/office/docear/default.nix | 2 +- pkgs/applications/office/fava/default.nix | 6 +-- pkgs/applications/office/gnucash/default.nix | 10 ++-- pkgs/applications/office/gnumeric/default.nix | 4 +- .../office/impressive/default.nix | 4 +- pkgs/applications/office/jabref/default.nix | 4 +- pkgs/applications/office/jameica/default.nix | 8 ++-- pkgs/applications/office/keepnote/default.nix | 4 +- .../office/ledger-autosync/default.nix | 4 +- .../applications/office/ledger-web/gemset.nix | 2 +- .../office/libreoffice/src-fresh/override.nix | 4 +- .../office/libreoffice/src-still/override.nix | 6 +-- pkgs/applications/office/marp/default.nix | 2 +- pkgs/applications/office/mendeley/default.nix | 6 +-- pkgs/applications/office/mmex/default.nix | 8 ++-- .../applications/office/moneyplex/default.nix | 6 +-- pkgs/applications/office/notes-up/default.nix | 4 +- .../applications/office/portfolio/default.nix | 2 +- pkgs/applications/office/qnotero/default.nix | 8 ++-- pkgs/applications/office/scribus/default.nix | 8 ++-- .../applications/office/softmaker/generic.nix | 2 +- pkgs/applications/office/timetrap/gemset.nix | 2 +- .../office/todo.txt-cli/default.nix | 6 +-- pkgs/applications/office/tryton/default.nix | 4 +- pkgs/applications/office/tudu/default.nix | 2 +- .../office/wordgrinder/default.nix | 10 ++-- .../applications/office/wpsoffice/default.nix | 10 ++-- pkgs/applications/office/zotero/default.nix | 6 +-- pkgs/applications/radio/cubicsdr/default.nix | 2 +- pkgs/applications/radio/direwolf/default.nix | 4 +- pkgs/applications/radio/dsd/default.nix | 2 +- pkgs/applications/radio/fldigi/default.nix | 8 ++-- pkgs/applications/radio/fllog/default.nix | 9 ++-- pkgs/applications/radio/flmsg/default.nix | 9 ++-- pkgs/applications/radio/flrig/default.nix | 9 ++-- pkgs/applications/radio/flwrap/default.nix | 9 ++-- pkgs/applications/radio/gnuradio/3.7.nix | 17 +++---- pkgs/applications/radio/gnuradio/ais.nix | 2 +- pkgs/applications/radio/gnuradio/default.nix | 13 +++--- pkgs/applications/radio/gnuradio/gsm.nix | 2 +- pkgs/applications/radio/gnuradio/limesdr.nix | 4 +- pkgs/applications/radio/gnuradio/nacl.nix | 2 +- pkgs/applications/radio/gnuradio/osmosdr.nix | 4 +- pkgs/applications/radio/gnuradio/rds.nix | 2 +- pkgs/applications/radio/gnuradio/shared.nix | 6 +-- pkgs/applications/radio/gnuradio/wrapper.nix | 29 ++++++------ pkgs/applications/radio/gqrx/default.nix | 2 +- pkgs/applications/radio/minimodem/default.nix | 8 ++-- pkgs/applications/radio/qsstv/default.nix | 4 +- pkgs/applications/radio/rtl-sdr/default.nix | 2 +- pkgs/applications/radio/uhd/default.nix | 4 +- pkgs/applications/video/aegisub/default.nix | 7 +-- pkgs/applications/video/avidemux/default.nix | 4 +- pkgs/applications/video/avxsynth/default.nix | 2 +- .../video/ccextractor/default.nix | 6 +-- pkgs/applications/video/cinelerra/default.nix | 6 +-- pkgs/applications/video/clipgrab/default.nix | 2 +- pkgs/applications/video/coriander/default.nix | 10 ++-- .../video/dvd-slideshow/default.nix | 6 +-- pkgs/applications/video/dvdbackup/default.nix | 8 ++-- pkgs/applications/video/dvdstyler/default.nix | 2 +- .../applications/video/epgstation/default.nix | 7 +-- pkgs/applications/video/filebot/default.nix | 2 +- pkgs/applications/video/kino/default.nix | 6 +-- pkgs/applications/video/kodi/plugins.nix | 2 +- pkgs/applications/video/kodi/wrapper.nix | 2 +- .../applications/video/lightworks/default.nix | 8 ++-- pkgs/applications/video/lxdvdrip/default.nix | 8 ++-- pkgs/applications/video/makemkv/default.nix | 4 +- .../applications/video/mkvtoolnix/default.nix | 2 +- pkgs/applications/video/mplayer/default.nix | 16 +++---- pkgs/applications/video/mpv/default.nix | 4 +- pkgs/applications/video/natron/default.nix | 2 +- .../applications/video/obs-studio/default.nix | 4 +- pkgs/applications/video/ogmtools/default.nix | 6 +-- .../video/olive-editor/default.nix | 2 +- pkgs/applications/video/omxplayer/default.nix | 14 +++--- .../video/openshot-qt/default.nix | 4 +- .../video/openshot-qt/libopenshot-audio.nix | 4 +- .../video/openshot-qt/libopenshot.nix | 4 +- pkgs/applications/video/p2pvc/default.nix | 8 ++-- pkgs/applications/video/peek/default.nix | 2 +- pkgs/applications/video/pitivi/default.nix | 2 +- .../video/qstopmotion/default.nix | 4 +- pkgs/applications/video/quvi/library.nix | 6 +-- pkgs/applications/video/quvi/scripts.nix | 6 +-- pkgs/applications/video/quvi/tool.nix | 6 +-- pkgs/applications/video/shotcut/default.nix | 6 +-- pkgs/applications/video/sub-batch/default.nix | 4 +- pkgs/applications/video/subdl/default.nix | 10 ++-- .../video/subtitleeditor/default.nix | 8 ++-- pkgs/applications/video/tartube/default.nix | 2 +- pkgs/applications/video/vcs/default.nix | 4 +- pkgs/applications/video/vdr/plugins.nix | 2 +- pkgs/applications/video/vlc/default.nix | 2 +- pkgs/applications/video/w_scan/default.nix | 8 ++-- .../video/webtorrent_desktop/default.nix | 2 +- pkgs/applications/video/wxcam/default.nix | 2 +- pkgs/applications/video/xawtv/default.nix | 8 ++-- pkgs/applications/video/xscast/default.nix | 2 +- pkgs/applications/video/xvidcap/default.nix | 2 +- .../virtualization/8086tiny/default.nix | 6 +-- .../virtualization/OVMF/default.nix | 2 +- .../virtualization/bochs/default.nix | 4 +- .../virtualization/charliecloud/default.nix | 10 ++-- .../virtualization/conmon/default.nix | 2 +- .../virtualization/cri-o/default.nix | 2 +- .../virtualization/docker-compose/default.nix | 4 +- .../applications/virtualization/docker/gc.nix | 2 +- .../driver/win-pvdrivers/default.nix | 2 +- .../driver/win-virtio/default.nix | 2 +- .../virtualization/gvisor/default.nix | 2 +- .../virtualization/podman/default.nix | 4 +- .../virtualization/qboot/default.nix | 6 +-- .../virtualization/qemu/default.nix | 10 ++-- .../virtualization/qtemu/default.nix | 2 +- .../virtualization/singularity/default.nix | 6 +-- .../virtualization/spice-vdagent/default.nix | 8 ++-- .../virtualization/tinyemu/default.nix | 8 ++-- .../virtualization/virt-manager/default.nix | 2 +- .../virtualization/virt-viewer/default.nix | 4 +- .../virtualization/virtinst/default.nix | 10 ++-- .../virtualization/virtualbox/default.nix | 2 +- .../virtualbox/guest-additions/default.nix | 2 +- .../virtualization/x11docker/default.nix | 10 ++-- pkgs/applications/virtualization/xen/4.10.nix | 4 +- .../virtualization/xen/generic.nix | 8 ++-- 427 files changed, 1160 insertions(+), 1154 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 9858f04d7ddc..ad74cbfb7035 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , nix-update-script , substituteAll @@ -31,7 +31,7 @@ , yelp-tools }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "lightdm"; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index b25e087a211d..6acb05478d8e 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-indicator-services-command" "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically - ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; + ] ++ lib.optional useGTK2 "--with-gtk2"; preConfigure = '' configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 4f4841bb2ed0..3728216da7ad 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; + buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; - unpackPhase = stdenv.lib.optionalString stdenv.isDarwin '' + unpackPhase = lib.optionalString stdenv.isDarwin '' xar -xf $src zcat Payload | cpio -i ''; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.isDarwin; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; doInstallCheck = true; diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 4c03b197b4a0..a6c18e7d3d4f 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { name = "abook-0.6.1"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://abook.sourceforge.net/"; description = "Text-based addressbook program designed to use with mutt mail client"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.edwtjo ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 25f888bbc8b7..8f1b3f5ca88f 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib +{ lib, stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib , gdk-pixbuf, gdk-pixbuf-xlib }: assert stdenv.hostPlatform.system == "i686-linux"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { # We should probably remove those and use the regular Nixpkgs # versions. - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = "http://www.adobe.com/products/reader"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; knownVulnerabilities = [ "Numerous unresolved vulnerabilities" "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index b2b6815f7df1..3a5c3756320a 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "0.12.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24="; }; diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix index 8accc06fac26..b01bfbedb8a6 100644 --- a/pkgs/applications/misc/ape/apeclex.nix +++ b/pkgs/applications/misc/ape/apeclex.nix @@ -1,8 +1,8 @@ -{ stdenv, attemptoClex, callPackage }: +{ lib, stdenv, attemptoClex, callPackage }: callPackage ./. { pname = "ape-clex"; lexiconPath = "${attemptoClex}/clex_lexicon.pl"; description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)"; - license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ]; + license = with lib; [ licenses.lgpl3 licenses.gpl3 ]; } diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index f80dfeb10751..140d6eb7d086 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade '' - + stdenv.lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.isDarwin) '' install -D ../apvlv.desktop $out/share/applications/apvlv.desktop ''; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index ab9242c13227..d77c5486f154 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -14,7 +14,7 @@ , enableLibpulseaudio ? true, libpulseaudio ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "sox-14.4.2"; diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 59c7154fa7de..3f3ed0a0b156 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "soxr-0.1.3"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An audio resampling library"; homepage = "http://soxr.sourceforge.net"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 45746a963b29..6e276d592b0e 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }: +{ lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }: stdenv.mkDerivation { name = "wavesurfer-1.8.5"; @@ -17,12 +17,12 @@ stdenv.mkDerivation { ln -s $out/{nix-support,bin}/wavesurfer.tcl wrapProgram "$out/nix-support/wavesurfer.tcl" \ --set TCLLIBPATH "${snack}/lib" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}" + --prefix PATH : "${lib.makeBinPath [ tcl tk ]}" ''; meta = { description = "Tool for recording, playing, editing, viewing and labeling of audio"; homepage = "http://www.speech.kth.se/wavesurfer/"; - license = stdenv.lib.licenses.bsd0; + license = lib.licenses.bsd0; }; } diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 4e5e253fd07f..696d69c701c9 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation { cat >> "$out/bin/avrdudess" << __EOF__ #!${runtimeShell} - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" + export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. - export PATH="${stdenv.lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" + export PATH="${lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" # avrdudess must have its resource files in its current working directory cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 902bef5f12ec..9472af7a16fe 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} ''; - sqltoolsserviceRpath = stdenv.lib.makeLibraryPath [ + sqltoolsserviceRpath = lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid @@ -62,10 +62,10 @@ stdenv.mkDerivation rec { # this will most likely need to be updated when azuredatastudio's version changes sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/2.0.0-release.56"; - rpath = stdenv.lib.concatStringsSep ":" [ + rpath = lib.concatStringsSep ":" [ atomEnv.libPath ( - stdenv.lib.makeLibraryPath [ + lib.makeLibraryPath [ libuuid at-spi2-core at-spi2-atk @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; meta = { - maintainers = with stdenv.lib.maintainers; [ xavierzwirtz ]; + maintainers = with lib.maintainers; [ xavierzwirtz ]; description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; license = lib.licenses.unfreeRedistributable; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index f08b33f09859..fa5980b115ee 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, +{ lib, stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, openssl, wrapGAppsHook, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: @@ -23,7 +23,7 @@ mkDerivation rec { ''; qtWrapperArgs = [ - ''--prefix PATH : ${stdenv.lib.makeBinPath [ openssl ]}'' + ''--prefix PATH : ${lib.makeBinPath [ openssl ]}'' ]; meta = { @@ -35,8 +35,8 @@ mkDerivation rec { ''; homepage = "https://github.com/debauchee/barrier"; downloadPage = "https://github.com/debauchee/barrier/releases"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.phryneas ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.phryneas ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 43362b0394eb..ca38498edb88 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ++ lib.optional waylandSupport "wayland" ++ lib.optional x11Support "x11"; - buildInputs = with stdenv.lib; [ + buildInputs = with lib; [ cairo fribidi harfbuzz diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index cfac79bef4bd..c004a65ef839 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core +{ lib, mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core , qtbase, qttools, qtsvg, qtwebkit }: @@ -29,8 +29,8 @@ mkDerivation rec { meta = { description = "A Qt4 Bible study tool"; homepage = "http://www.bibletime.info/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.piotr ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.piotr ]; }; } diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 57b3f906cabf..74dd82a3c6e5 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { version = "1.8"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/dpayne/cli-visualizer"; description = "CLI based audio visualizer"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 97ac54731c9f..692622df8ea4 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libayatana-appindicator ]; gappsWrapperArgs = [ - "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ xdotool which ]}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index bb1aacc2069b..fb89d2a7e373 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook }: let version = "0.6.4"; in stdenv.mkDerivation { @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { description = "Offline conference schedule viewer"; homepage = "http://www.toastfreeware.priv.at/confclerk"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ehmry ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 3e129a81b162..f213faa44124 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec{ ]; runtimeDeps = [ mesa-demos vulkan-tools ]; - binPath = stdenv.lib.makeBinPath runtimeDeps; + binPath = lib.makeBinPath runtimeDeps; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 236c2d6d4332..a14aad7a0fcf 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/cpu-x \ - --prefix PATH : ${stdenv.lib.makeBinPath [ stdenv.cc ]} + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} ''; meta = with lib; { diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 120bc768c398..7b9d7faba940 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , mkDerivation , fetchFromGitHub , substituteAll @@ -64,7 +65,7 @@ mkDerivation rec { buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; homepage = "https://crow-translate.github.io/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/crumbs/default.nix b/pkgs/applications/misc/crumbs/default.nix index 889c17e6988d..5bb422058168 100644 --- a/pkgs/applications/misc/crumbs/default.nix +++ b/pkgs/applications/misc/crumbs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "crumbs"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp crumbs-completion.fish $out/share/fish/vendor_completions.d/crumbs.fish ''; - meta = with stdenv.lib; + meta = with lib; { description = "Bookmarks for the command line"; homepage = "https://github.com/fasseg/crumbs"; license = licenses.wtfpl; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e1c73393ec5f..05d282aaf064 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" # Create desktop item. diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index e9a50e88b23c..6af92285c2b0 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: mkDerivation { pname = "dfilemanager"; @@ -19,7 +19,7 @@ mkDerivation { meta = { homepage = "http://dfilemanager.sourceforge.net/"; description = "File manager written in Qt/C++"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index bce224f21b2f..c1a4d5e44405 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: +{ lib, stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: mkDerivation rec { version = "2.1.3"; @@ -51,9 +51,9 @@ mkDerivation rec { meta = { homepage = "http://www.qtrac.eu/diffpdfc.html"; description = "Tool for diffing pdf files visually or textually"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ tstrobel ]; + platforms = with lib.platforms; linux; inherit version; }; } diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 4f06708e47e9..f0a7e2a779fe 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cp -v ding.png $out/share/pixmaps/ cp -v ding.desktop $out/share/applications/ - wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" + wrapProgram $out/bin/ding --prefix PATH : ${lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" ''; meta = with lib; { diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 37f75c4fdd5c..f193ae4c5189 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -16,7 +16,7 @@ mkDerivation { nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.isDarwin "format"; meta = with lib; { homepage = "http://doomseeker.drdteam.org/"; diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix index 05d3ddb7cfba..ae5dd170eb92 100644 --- a/pkgs/applications/misc/dozenal/default.nix +++ b/pkgs/applications/misc/dozenal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }: +{ lib, stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }: stdenv.mkDerivation rec { version = "12010904"; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { Defaults to dozenal Roman numerals. ''; homepage = "https://github.com/dgoodmaniii/dozenal/"; - maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; - license = stdenv.lib.licenses.gpl3; + maintainers = with lib.maintainers; [ CharlesHD ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 215aa3dd5f24..5a3e6265c25c 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/electrum/tests ''; - nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; + nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication { keepkey trezor btchip - ] ++ stdenv.lib.optionals enableQt [ pyqt5 qdarkstyle ]; + ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py @@ -94,7 +94,7 @@ python3.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' # Despite setting usr_share above, these files are installed under # $out/nix ... mv $out/${python3.sitePackages}/nix/store"/"*/share $out @@ -108,7 +108,7 @@ python3.pkgs.buildPythonApplication { ''; - postFixup = stdenv.lib.optionalString enableQt '' + postFixup = lib.optionalString enableQt '' wrapQtApp $out/bin/electrum ''; diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index 78dc54497dd9..8a96cddaff2d 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -25,7 +25,7 @@ , enableSystemd ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "elogind"; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 7ed1afd14f85..3406fc572c79 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple tool for input event debugging"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index 6b118e541221..7f932b5b1e56 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub , sqlite @@ -26,7 +27,7 @@ buildGoModule rec { "-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive command line expense logger"; license = licenses.mit; maintainers = [ maintainers.manojkarthick ]; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 75d0ec3f7965..e56f60624c80 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; buildInputs = [ wxGTK30 glib pcre ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace far2l/bootstrap/trash.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace far2l/CMakeLists.txt \ --replace "-framework System" -lSystem '' + '' @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons/hicolor/$size/apps convert -size $size ../far2l/DE/icons/hicolor/$size/apps/far2l.svg $out/share/icons/hicolor/$size/apps/far2l.png done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' wrapProgram $out/bin/far2l --argv0 $out/bin/far2l ''; diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index fff5bf1680d5..35a50dd10a35 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -6,7 +6,7 @@ , AppKit, Cocoa }: -with stdenv.lib; +with lib; assert elem uiTarget [ "desktop" "macosx" ]; assert elem uiType [ "qt4" "gtk" "cocoa" ]; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index ce6b7c64693c..cae6232a727e 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: let version = "6.4.14"; @@ -28,8 +28,8 @@ stdenv.mkDerivation { IPSEC. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index 5b007ccb37fc..2b21c984f34f 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; }; - pathAdd = stdenv.lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); + pathAdd = lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bashInteractive ]; diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index 3af59d0ddfa5..7215cc564490 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -2,7 +2,7 @@ withCuda ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "firestarter"; version = "1.7.4"; diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index 71e60a11caa2..5ab21ad98b9b 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -7,7 +7,7 @@ let pname = "gtkglarea"; version = "2.1.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 6f1b824925ff..841c629dadff 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl +{ lib, stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl , libiconv, gettext, sqlite , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null , postgresSupport ? false, postgresql ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gammu"; diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index 37cf8fc18af1..7fdb62e5bed1 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: +{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: stdenv.mkDerivation { name = "garmin-plugin-0.3.26"; src = fetchurl { @@ -19,8 +19,8 @@ stdenv.mkDerivation { ''; meta = { homepage = "http://www.andreas-diesner.de/garminplugin"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 24906b11dd59..28de8e0eceae 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, fetchpatch }: +{ lib, stdenv, fetchurl, ncurses, fetchpatch }: stdenv.mkDerivation rec { pname = "gcal"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { also displays holiday lists for many countries around the globe. ''; homepage = "https://www.gnu.org/software/gcal/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 5c31ce55addd..6664974a41ad 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: +{ lib, stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: -with stdenv.lib; +with lib; perlPackages.buildPerlPackage rec { pname = "get_iplayer"; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index bc7c66ee5310..4d2fc15934b8 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which +{ lib, fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which , IOKit ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "gkrellm-2.3.11"; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index bfa504477616..973b0ce288d9 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu, +{ lib, stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { as another user. ''; homepage = "https://www.nongnu.org/gksu/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.romildo ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index daa74c3a4147..a0af30ac84b9 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -3,7 +3,7 @@ , enableGlfw ? false, glfw, runtimeShell }: let - inherit (stdenv.lib) optional makeLibraryPath; + inherit (lib) optional makeLibraryPath; wrapperScript = writeScript "glava" '' #!${runtimeShell} diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 0c2bb9304b14..bda4b1d75f01 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "doc" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wcd4kd3crwqjv0jfp73jkyyf5ws8mvykg37kqxmcb58piz21gsk"; }; @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ - "--with-boost-python=boost_python${stdenv.lib.versions.major python3.version}${stdenv.lib.versions.minor python3.version}" + "--with-boost-python=boost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" ]; makeFlags = [ diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index c568afac31e6..0c9f20b20922 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 +{ lib, stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 , gsettings-desktop-schemas, wrapGAppsHook }: @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems"; homepage = "https://gmtp.sourceforge.io"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 628f93f5bbc6..29078ca773d9 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw"; }; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 3e21e2cadb9f..d67bcdb867d9 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v"; }; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index ad956e9d02a7..e40c68667294 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl"; }; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 0fb4b3f2b974..63b36e2dec4b 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -21,28 +21,28 @@ mkDerivation rec { patches = [ ./0001-dont-check-for-updates.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ ./0001-dont-use-maclibs.patch ]; postPatch = '' substituteInPlace goldendict.pro \ - --replace "hunspell-1.6.1" "hunspell-${stdenv.lib.versions.majorMinor hunspell.version}" + --replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" ''; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo - ] ++ stdenv.lib.optionals stdenv.isLinux [ qtx11extras libXtst ] - ++ stdenv.lib.optionals stdenv.isDarwin [ bzip2 libiconv ] - ++ stdenv.lib.optional withCC opencc - ++ stdenv.lib.optional withEpwing libeb - ++ stdenv.lib.optional withExtraTiff libtiff - ++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg_3 ] - ++ stdenv.lib.optional withZim zstd; + ] ++ lib.optionals stdenv.isLinux [ qtx11extras libXtst ] + ++ lib.optionals stdenv.isDarwin [ bzip2 libiconv ] + ++ lib.optional withCC opencc + ++ lib.optional withEpwing libeb + ++ lib.optional withExtraTiff libtiff + ++ lib.optionals withFFmpeg [ libao ffmpeg_3 ] + ++ lib.optional withZim zstd; - qmakeFlags = with stdenv.lib; [ + qmakeFlags = with lib; [ "goldendict.pro" (optional withCC "CONFIG+=chinese_conversion_support") (optional (!withCC) "CONFIG+=no_chinese_conversion_support") @@ -53,7 +53,7 @@ mkDerivation rec { (optional withZim "CONFIG+=zim_support") ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv GoldenDict.app $out/Applications wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index e1698f06015d..fc80a5ddb8aa 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { in '' mkdir -p $out/bin makeWrapper ${env}/bin/gollum $out/bin/gollum \ - --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} + --prefix PATH ":" ${lib.makeBinPath [ git ]} makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \ - --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} + --prefix PATH ":" ${lib.makeBinPath [ git ]} ''; passthru.updateScript = bundlerUpdateScript "gollum"; diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 75ee9d05ab43..d259167856a1 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -463,4 +463,4 @@ }; version = "0.16.10"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 641e0896f4ee..edf1fc54ba9f 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -12,7 +12,7 @@ let then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2"; version = "7.1.8.3036"; - fullPath = stdenv.lib.makeLibraryPath [ + fullPath = lib.makeLibraryPath [ glibc glib stdenv.cc.cc diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index cf3d6fe9e93e..48c7c7724ebf 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses, gnupg }: +{ fetchurl, lib, stdenv, ncurses, gnupg }: let version = "0.7.4"; in stdenv.mkDerivation { @@ -7,7 +7,7 @@ in stdenv.mkDerivation { inherit version; meta = { homepage = "https://tamentis.com/projects/mdp/"; - license = [stdenv.lib.licenses.isc]; + license = [lib.licenses.isc]; description = "Manage your passwords with GnuPG and a text editor"; }; src = fetchurl { diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 39cd4f40b4bd..f043aa66947f 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-zlib=system" ] # Floating point behavior on i686 causes test failures. Preventing # extended precision fixes this problem. - ++ stdenv.lib.optionals stdenv.isi686 [ + ++ lib.optionals stdenv.isi686 [ "CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store" ]; diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix index b115329cf0d6..3de63203f24c 100644 --- a/pkgs/applications/misc/gpsbabel/gui.nix +++ b/pkgs/applications/misc/gpsbabel/gui.nix @@ -29,7 +29,7 @@ mkDerivation { ''; qtWrapperArgs = [ - "--prefix PATH : ${stdenv.lib.makeBinPath [ gpsbabel ]}" + "--prefix PATH : ${lib.makeBinPath [ gpsbabel ]}" ]; postInstall = '' diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix index c052b1ddb059..04ebd491c28d 100644 --- a/pkgs/applications/misc/gpx/default.nix +++ b/pkgs/applications/misc/gpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "gpx"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "Gcode to x3g conversion postprocessor"; homepage = "https://github.com/markwal/GPX/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.leo60228 ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.leo60228 ]; }; } diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 7b2c5a23f8b0..4fc4586ca4e3 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -15,11 +15,11 @@ in buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook intltool gettext ]; buildInputs = [ gtk3 gobject-introspection pango gexiv2 ] # Map support - ++ stdenv.lib.optional enableOSM osm-gps-map + ++ lib.optional enableOSM osm-gps-map # Graphviz support - ++ stdenv.lib.optional enableGraphviz graphviz + ++ lib.optional enableGraphviz graphviz # Ghostscript support - ++ stdenv.lib.optional enableGhostscript ghostscript + ++ lib.optional enableGhostscript ghostscript ; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 02544812eb12..ef7783f5011d 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte +{ lib, stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "GTK-based audio CD player/ripper"; homepage = "http://nostatic.org/grip"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ marcweber peti ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ marcweber peti ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index 158a7fc8fc62..f692ea54ccf1 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }: +{ lib, stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }: stdenv.mkDerivation rec { pname = "gsimplecal"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { Also, you can configure it to not only show the calendar, but also display multiple clocks for different world time zones. ''; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.romildo ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index af121758c3cd..2ad89a4c160c 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs +{ lib, stdenv, pkgs , glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive , pkgconfig, intltool, autoreconfHook, wrapGAppsHook }: @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gummi.app"; description = "Simple LaTex editor for GTK users"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ flokli ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ flokli ]; + platforms = with lib.platforms; linux; inherit version; }; } diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index accf62c0c469..d599a295bf11 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: +{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: let name = "gv-3.7.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.isDarwin [ "--enable-SIGCHLD-fallback" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ghostscriptX perl pkgconfig - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; @@ -41,8 +41,8 @@ stdenv.mkDerivation { interface for the Ghostscript interpreter. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index ce0a6963ea99..13f7395f6f8a 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }: +{ lib, stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }: stdenv.mkDerivation rec { pname = "gxmessage"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [jfb]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [jfb]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix index c97a67c0bd38..899630b69099 100644 --- a/pkgs/applications/misc/hdate/default.nix +++ b/pkgs/applications/misc/hdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "1.6.02"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Hebrew calendar and solar astronomical times library and utilities"; homepage = "https://sourceforge.net/projects/libhdate/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ CharlesHD ]; }; } diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index a5a9187ab0f2..7c54c3201111 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell }: +{ lib, stdenv, runtimeShell }: stdenv.mkDerivation { pname = "example-unfree-package"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "An example package with unfree license (for testing)"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.oxij ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.oxij ]; }; } diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 51b08af23c5c..9e92a2c6659b 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,9 +1,9 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: +{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" - (stdenv.lib.makeLibraryPath [ + (lib.makeLibraryPath [ libGLU libGL xorg.libXmu @@ -79,9 +79,9 @@ stdenv.mkDerivation rec { meta = { description = "3D animation application software"; homepage = "https://www.sidefx.com"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.canndrew ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.canndrew ]; }; } diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index c58f87d1ab8f..e7155c4da355 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, readline, ncurses +{ lib, stdenv, fetchFromGitHub, readline, ncurses , autoreconfHook, pkgconfig, gettext }: stdenv.mkDerivation rec { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/dvorka/hstr"; description = "Shell history suggest box - easily view, navigate, search and use your command history"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 4cfb5703883f..f291ab898e3d 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -9,7 +9,7 @@ let inherit (data) version url sha256; - rpath = stdenv.lib.makeLibraryPath + rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 curl libXfixes libXScrnSaver ]; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index b3e7e53774d7..9f1431a23409 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }: let - lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ]; + lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ]; in stdenv.mkDerivation rec { pname = "iceSL"; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index c97ea3d4b772..161005d1280a 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight +{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -20,8 +20,6 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; version = "3.20200202.3"; - - lib = stdenv.lib; in stdenv.mkDerivation { name = "${name}-${version}"; @@ -85,8 +83,8 @@ stdenv.mkDerivation { meta = { description = "Wiki compiler, storing pages and history in a RCS"; homepage = "http://ikiwiki.info/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix index 2f5597158389..09f734df9a11 100644 --- a/pkgs/applications/misc/imag/default.nix +++ b/pkgs/applications/misc/imag/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; checkInputs = [ gitMinimal util-linuxMinimal ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index a2cee088e1df..5dd9bc0e644d 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}" \ "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 415762eb6ffb..0c7fc750cfd5 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { else throw "IPMIView is not supported on this platform"; in '' - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so + patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so + patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} ''; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # WORK_DIR: unfortunately the ikvm related binaries are loaded from # and user configuration is written to files in the CWD makeWrapper $out/jre/bin/java $out/bin/IPMIView \ - --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \ + --set LD_LIBRARY_PATH "${lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \ --prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \ --add-flags "-jar $out/IPMIView20.jar" \ --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 2d7dca36d204..0b8bcbfffac1 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, java, runtimeShell }: +{ lib, stdenv, fetchurl, java, runtimeShell }: stdenv.mkDerivation rec { pname = "jbidwatcher"; @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { binary. ''; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 9f33cdc53eb3..cc7be93510c6 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -421,4 +421,4 @@ }; version = "2.4.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 62f15818966f..baa0232a23e5 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { xorg.libXinerama xorg.libXrandr python3Packages.python - ] ++ stdenv.lib.optionals enableXfcePanelApplet [ + ] ++ lib.optionals enableXfcePanelApplet [ gtk3 xfce.libxfce4util xfce.xfce4-panel @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { configureFlags = [ ] - ++ stdenv.lib.optionals enableXfcePanelApplet [ + ++ lib.optionals enableXfcePanelApplet [ "--with-xfce4-panel-applet" ]; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 134354de40b7..b4573a816359 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db, gtk2, bzip2 }: +{ lib, stdenv, fetchurl, db, gtk2, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Download utility that can fetch files from several sources simultaneously"; homepage = "http://atterer.net/jigdo/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 056d73ba76fb..28c7de12c8c8 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { dontUnpack = true; - buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ]; installPhase = if stdenv.isDarwin then '' diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 7c2e2ac07110..e118197f42ac 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -8,7 +8,7 @@ , enableTesseract ? true, leptonica, tesseract4 }: -with stdenv.lib; +with lib; # k2pdfopt is a pain to package. It requires modified versions of mupdf, # leptonica, and tesseract. Instead of shipping patches for these upstream diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index 4c4b461303fb..d27a10af20c6 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -1,9 +1,9 @@ -{ stdenv, requireFile, unzip, rlwrap, bash, zlib }: +{ lib, stdenv, requireFile, unzip, rlwrap, bash, zlib }: assert (stdenv.hostPlatform.system == "i686-linux"); let - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc zlib ]; in stdenv.mkDerivation rec { @@ -68,8 +68,8 @@ stdenv.mkDerivation rec { meta = { description = "Analytics and time-series database"; homepage = "http://www.kx.com/"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index 85749af0a561..7dc75f604265 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchzip, mono }: +{ lib, stdenv, buildEnv, fetchzip, mono }: let version = "0.12.0"; @@ -15,8 +15,8 @@ let meta = { description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication"; homepage = "http://lechnology.com/software/keeagent"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl2; maintainers = [ ]; }; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index 10e6996873a0..be58f0e34cb3 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchFromGitHub, mono }: +{ lib, stdenv, buildEnv, fetchFromGitHub, mono }: let version = "1.8.4.2"; @@ -18,8 +18,8 @@ let meta = { description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP"; homepage = "https://github.com/pfn/keepasshttp"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl3; }; pluginFilename = "KeePassHttp.plgx"; diff --git a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix index e2b26eaee901..780de142c5fd 100644 --- a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix +++ b/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchzip, mono }: +{ lib, stdenv, buildEnv, fetchzip, mono }: let version = "2.6"; @@ -15,9 +15,9 @@ let meta = { description = "OtpKeyProv is a key provider based on one-time passwords"; homepage = "https://keepass.info/plugins.html#otpkeyprov"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.ente ]; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.ente ]; }; pluginFilename = "OtpKeyProv.plgx"; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 6164a60d6a86..c1d9448c6a6d 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -69,7 +69,7 @@ with builtins; buildDotnetPackage rec { desktopName = "Keepass"; genericName = "Password manager"; categories = "Utility;"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "application/x-keepass2" "" ]; @@ -85,7 +85,7 @@ with builtins; buildDotnetPackage rec { # is found and does not pollute output path. binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins)); - dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ]; + dynlibPath = lib.makeLibraryPath [ gtk2 ]; postInstall = let @@ -111,8 +111,8 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; homepage = "http://www.keepass.info/"; - maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; - platforms = with stdenv.lib.platforms; all; - license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ amorsillo obadz jraygauthier ]; + platforms = with lib.platforms; all; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 52feb338a151..86bd7d0849ec 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: +{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: stdenv.mkDerivation rec { pname = "keepassx2"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; homepage = "https://www.keepassx.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ qknight ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 7df1294874f1..044550db7cee 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -36,7 +36,7 @@ , withKeePassFDOSecrets ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "keepassxc"; @@ -49,18 +49,18 @@ stdenv.mkDerivation rec { sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "/usr/local/bin" "../bin" \ --replace "/usr/local/share/man" "../share/man" ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -111,9 +111,9 @@ stdenv.mkDerivation rec { yubikey-personalization zlib ] - ++ stdenv.lib.optional withKeePassKeeShareSecure quazip - ++ stdenv.lib.optional stdenv.isDarwin qtmacextras - ++ stdenv.lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; + ++ lib.optional withKeePassKeeShareSecure quazip + ++ lib.optional stdenv.isDarwin qtmacextras + ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; preFixup = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index d0980001c8f6..0fad28d94d3f 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: +{ lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: stdenv.mkDerivation rec { pname = "keepassx"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; homepage = "https://www.keepassx.org/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ qknight ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index 613b96d1731c..f98e21edf5bc 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, stdenv, jdk8, runtimeShell }: +{ fetchzip, lib, stdenv, jdk8, runtimeShell }: stdenv.mkDerivation rec { version = "5.4.4"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner"; - license = stdenv.lib.licenses.gpl3Only; - maintainers = [ stdenv.lib.maintainers.numinit ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.numinit ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index a3e4c1309ffc..5effc88acb00 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, glibcLocales, python3 }: +{ lib, stdenv, glibcLocales, python3 }: python3.pkgs.buildPythonApplication rec { version = "0.17.0"; @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { meta = { homepage = "https://github.com/scheibler/khard"; description = "Console carddav client"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 068f7833c863..dff50bafaf80 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, makeWrapper, pkg-config +{ lib, stdenv, fetchurl, makeWrapper, pkg-config , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc , libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , xapian, ctpp2, zimlib }: -with stdenv.lib; +with lib; let xulrunner64_tar = fetchurl { diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index c3d7fbac12fd..5bd91f89f917 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { done ln -s "${font-droid}/share/fonts/opentype/NerdFonts/Droid Sans Mono Nerd Font Complete Mono.otf" $out/lib/koreader/fonts/droid/DroidSansMono.ttf wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ - stdenv.lib.makeLibraryPath [ gtk3-x11 SDL2 glib ] + lib.makeLibraryPath [ gtk3-x11 SDL2 glib ] } ''; diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/applications/misc/masterpdfeditor4/default.nix index b0252465bdef..b4b9a4d62446 100644 --- a/pkgs/applications/misc/masterpdfeditor4/default.nix +++ b/pkgs/applications/misc/masterpdfeditor4/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Master PDF Editor - version 4, without watermark"; homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 66fe0d7207c2..885e5466f8b3 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, silver-searcher, tree, man, stdenv, +{ fetchFromGitHub, silver-searcher, tree, man, lib, stdenv, git, pandocSupport ? true, pandoc ? null , ... }: @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://palovandalo.com/memo/"; downloadPage = "https://github.com/mrVanDalo/memo/releases"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.mrVanDalo ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.mrVanDalo ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 84cc0e0bc8dc..95077bdcb332 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: stdenv.mkDerivation { pname = "milu-nightly"; @@ -32,9 +32,9 @@ stdenv.mkDerivation { meta = { description = "Higher Order Mutation Testing Tool for C and C++ programs"; homepage = "https://github.com/yuejia/Milu"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.vrthra ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.vrthra ]; }; } diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index 59de7ba8a9e5..0fe4103f613c 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl stdenv.cc.cc ]} rm $out/usr/bin/minergate-cli mkdir -p $out/bin diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix index 18af19db5100..f6ec20b0df7e 100644 --- a/pkgs/applications/misc/minergate/default.nix +++ b/pkgs/applications/misc/minergate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" rm $out/usr/bin/minergate mkdir -p $out/bin diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 0ef661333d6d..15464c0e6a68 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { cp ${fastutil} lib/compile/${fastutil.name} cp ${osmpbf} lib/compile/${osmpbf.name} cp ${protobuf} lib/compile/${protobuf.name} - '' + stdenv.lib.optionalString doCheck '' + '' + lib.optionalString doCheck '' mkdir -p lib/test cp ${fastutil} lib/test/${fastutil.name} cp ${osmpbf} lib/test/${osmpbf.name} @@ -51,7 +51,7 @@ stdenv.mkDerivation { cp ${hamcrest-core} lib/test/${hamcrest-core.name} mkdir -p test/resources/in/img - ${stdenv.lib.concatMapStringsSep "\n" (res: '' + ${lib.concatMapStringsSep "\n" (res: '' cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} '') testInputs} ''; @@ -70,7 +70,7 @@ stdenv.mkDerivation { cp -r dist/lib/ $out/share/java/mkgmap/ makeWrapper ${jre}/bin/java $out/bin/mkgmap \ --add-flags "-jar $out/share/java/mkgmap/mkgmap.jar" - '' + stdenv.lib.optionalString withExamples '' + '' + lib.optionalString withExamples '' mkdir -p $out/share/mkgmap cp -r dist/examples $out/share/mkgmap/ ''; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 98f6379700eb..6baf4f763070 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation { cp ${osmpbf} lib/compile/${osmpbf.name} cp ${protobuf} lib/compile/${protobuf.name} cp ${xpp3} lib/compile/${xpp3.name} - '' + stdenv.lib.optionalString doCheck '' + '' + lib.optionalString doCheck '' mkdir -p lib/test cp ${junit} lib/test/${junit.name} cp ${hamcrest-core} lib/test/${hamcrest-core.name} mkdir -p test/resources/in/osm - ${stdenv.lib.concatMapStringsSep "\n" (res: '' + ${lib.concatMapStringsSep "\n" (res: '' cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} '') testInputs} ''; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 34671d9374f2..173291183dab 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -98,7 +98,7 @@ python36Packages.buildPythonApplication rec { --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages" # Add some runtime dependencies - --prefix "PATH" ":" "${stdenv.lib.makeBinPath runTimeDeps}" + --prefix "PATH" ":" "${lib.makeBinPath runTimeDeps}" # Finally, move to directory that contains data --run "cd $out/share/${pname}" diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index bf66fc80bab9..722798a43a9d 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -23,8 +23,8 @@ in stdenv.mkDerivation rec { patches = # Use shared libraries to decrease size - stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch - ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch + lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch + ++ lib.optional stdenv.isDarwin ./darwin.patch ; postPatch = '' diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 09ad5fe98423..190696584db0 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { }; patches = - stdenv.lib.optional stdenv.isDarwin ./darwin.patch ++ [ + lib.optional stdenv.isDarwin ./darwin.patch ++ [ (fetchpatch { name = "pdfocr.patch"; url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index a4969a34a86f..e8fa4d4fd379 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bash }: +{ fetchurl, lib, stdenv, bash }: stdenv.mkDerivation rec { version = "3.5-rc1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Small weblog engine written in Bash for the command line"; homepage = "http://nanoblogger.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 80c455f41a0e..0727f8672910 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "navipowm-0.2.4"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://navipowm.sourceforge.net/"; description = "Car navigation system"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index e04669d68964..f1fb59811be6 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 +{ lib, stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 , SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib , librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango , atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc @@ -15,7 +15,7 @@ assert speechdSupport -> speechd != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "navit"; version = "0.5.3"; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; # TODO: fix upstream? - libPath = stdenv.lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs ); + libPath = lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs ); postFixup = '' find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 81f2f648e5f0..1bf16d037f9c 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "nnn"; diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix index 2be5a4ab83b9..73648d896d08 100644 --- a/pkgs/applications/misc/noice/default.nix +++ b/pkgs/applications/misc/noice/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, ncurses, conf ? null }: +{ lib, stdenv, fetchgit, ncurses, conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "noice"; diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index f00fd7894c75..8b8fa16fc213 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/theori-io/nrsc5"; description = "HD-Radio decoder for RTL-SDR"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ markuskowa ]; }; diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index ee31948c62d1..5e37e74902e4 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/opt/obinskit/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" ''; meta = with lib; { diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 27b1b4ab98fa..2b0986eeba66 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { enableParallelBuilding = true; - preConfigure = with stdenv.lib; '' + preConfigure = with lib; '' ${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;") models)} diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 3c7f87ff9672..65f15c1e7ed3 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { udev xorg.libXtst xorg.libxkbfile - ] ++ stdenv.lib.optional atspiSupport at-spi2-core; + ] ++ lib.optional atspiSupport at-spi2-core; propagatedBuildInputs = with python3.pkgs; [ dbus-python diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index e58570103240..5467d4faa3ba 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: +{ lib, stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: stdenv.mkDerivation rec { pname = "openbox-menu"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { dynamic menu listing installed applications. Most of the work is done by the LXDE library menu-cache. ''; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.romildo ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index ec5d3c0a0752..e815fd7a39f9 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -28,7 +28,7 @@ mkDerivation { install -Dm644 reference.brf $out/share/openBrf/reference.brf patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU libGL ]}" \ + --set-rpath "${lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU libGL ]}" \ $out/share/openBrf/openBrf mkdir -p "$out/bin" @@ -40,7 +40,7 @@ mkDerivation { meta = with lib; { description = "A tool to edit resource files (BRF)"; homepage = "https://github.com/cfcohen/openbrf"; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; + maintainers = with lib.maintainers; [ abbradar ]; license = licenses.free; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index a93f4b247408..522c5739a882 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl, gettext, glib, portaudio }: stdenv.mkDerivation rec { @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { description = "A concise ChartPlotter/Navigator"; - maintainers = [ stdenv.lib.maintainers.kragniz ]; + maintainers = [ lib.maintainers.kragniz ]; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://opencpn.org/"; }; } diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 544329ec5e79..28becefa5b12 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper +{ lib, stdenv, fetchurl, unzip, makeWrapper , coreutils, gawk, which, gnugrep, findutils , jdk }: @@ -32,8 +32,8 @@ stdenv.mkDerivation { meta = { description = "Open source Geographic Information System (GIS) written in the Java programming language"; homepage = "http://www.openjump.org/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index be6928a87466..e0c728fc6754 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw="; }; diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 3c06ed19e524..858a8fa1475e 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format"; license = licenses.gpl3; maintainers = [ maintainers.mpickering ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index 678bc06f8004..f2386a5cd83b 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, dbus, gnupg }: +{ lib, stdenv, fetchFromGitHub, python3, dbus, gnupg }: python3.pkgs.buildPythonApplication rec { pname = "pass-secret-service"; @@ -54,8 +54,8 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Libsecret D-Bus API with pass as the backend"; homepage = "https://github.com/mdellweg/pass_secret_service/"; - license = stdenv.lib.licenses.gpl3Only; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ jluttine ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 7fd88348fe9e..39a4c6a6a03c 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ji64h0f8f2sq12cx33kymypzar9swhaj903gclf3jdwgna77326"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A command-line tool to generate, analyze, convert and manipulate colors"; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 15aedb8e709e..e9158d252c66 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -4,7 +4,7 @@ let libfm' = libfm.override { inherit withGtk3; }; gtk = if withGtk3 then gtk3 else gtk2; - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { name = "pcmanfm-1.3.1"; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 76eeaa4da7fa..456acb9bbd15 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.9.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9"; }; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 5714b04c7d1b..1e7f0352c47c 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { json-glib ]; - cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF"; + cmakeFlags = lib.optional stdenv.isDarwin "-DMOVIES=OFF"; meta = with lib; { description = "A presenter console with multi-monitor support for PDF files"; diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 5800bcebef90..717c5c3feb10 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pythonPackages }: +{ lib, stdenv, fetchFromGitLab, pythonPackages }: stdenv.mkDerivation { pname = "phwmon"; @@ -33,8 +33,8 @@ stdenv.mkDerivation { meta = { homepage = "https://gitlab.com/o9000/phwmon"; description = "Hardware monitor (CPU, memory, network and disk I/O) for the system tray"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 73d50209e90f..d805aa0c0aa9 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -27,7 +27,7 @@ let version = "4.4"; - binpath = stdenv.lib.makeBinPath [ + binpath = lib.makeBinPath [ cabextract python gettext @@ -52,7 +52,7 @@ let else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; + libs = pkgs: lib.makeLibraryPath [ xorg.libX11 libGL ]; python = python2.withPackages(ps: with ps; [ wxPython diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index cd309797aa32..faa139a3da4e 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -82,9 +82,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.noneucat ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.noneucat ]; }; } diff --git a/pkgs/applications/misc/pt/gemset.nix b/pkgs/applications/misc/pt/gemset.nix index f1f69c252142..9cd83a90721d 100644 --- a/pkgs/applications/misc/pt/gemset.nix +++ b/pkgs/applications/misc/pt/gemset.nix @@ -270,4 +270,4 @@ }; version = "1.0.5"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 3e55215f4733..8e8ffb2921cc 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups +{lib, stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups , file, ghostscript }: let @@ -40,9 +40,9 @@ mkDerivation { meta = { inherit (s) version; description = "A tabbed document viewer"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://launchpad.net/qpdfview"; updateWalker = true; }; diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix index e10c922e4f16..bdb434085da0 100644 --- a/pkgs/applications/misc/qt-video-wlr/default.nix +++ b/pkgs/applications/misc/qt-video-wlr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, meson, ninja, wayland, pixman, cairo, librsvg, wayland-protocols, wlroots, libxkbcommon, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia }: let - gstreamerPath = with gst_all_1; stdenv.lib.makeSearchPath "lib/gstreamer-1.0" [ + gstreamerPath = with gst_all_1; lib.makeSearchPath "lib/gstreamer-1.0" [ gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index 1956f0ad41d5..ee95d6baeba8 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk2, synergy}: +{lib, stdenv, fetchurl, pkgconfig, gtk2, synergy}: stdenv.mkDerivation rec { pname = "quicksynergy"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { Remember to open port 24800 (used by synergys program) if you want to host mouse and keyboard."; homepage = "https://sourceforge.net/projects/quicksynergy/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.spinus ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.spinus ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 68ddef656972..8394fd4c5343 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, python3Packages, file, less, highlight , imagePreviewSupport ? true, w3m ? null}: -with stdenv.lib; +with lib; assert imagePreviewSupport -> w3m != null; @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { --replace "/bin/echo" "echo" substituteInPlace ranger/__init__.py \ - --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${stdenv.lib.getBin less}/bin/less'" + --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin less}/bin/less'" for i in ranger/config/rc.conf doc/config/rc.conf ; do substituteInPlace $i --replace /usr/share $out/share diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 2a6d613ed577..c90aeeb0afd6 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , openssl @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; # package does not contain tests as of v0.2.2 docCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "CLI tool to download saved images from Reddit"; homepage = "https://github.com/manojkarthick/reddsaver"; license = with licenses; [ mit /* or */ asl20 ]; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6e48a75810e4..3d2c4dd16844 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -19,7 +19,7 @@ let stdenv.mkDerivation rec { inherit pname version src meta; - patches = stdenv.lib.optionals (pname != "gammastep") [ + patches = lib.optionals (pname != "gammastep") [ # https://github.com/jonls/redshift/pull/575 ./575.patch ]; @@ -41,7 +41,7 @@ let "--enable-drm=${if withDrm then "yes" else "no"}" "--enable-quartz=${if withQuartz then "yes" else "no"}" "--enable-corelocation=${if withCoreLocation then "yes" else "no"}" - ] ++ stdenv.lib.optionals (pname == "gammastep") [ + ] ++ lib.optionals (pname == "gammastep") [ "--with-systemduserunitdir=${placeholder "out"}/share/systemd/user/" "--enable-apparmor" ]; @@ -50,12 +50,12 @@ let gobject-introspection gtk3 python - ] ++ stdenv.lib.optional withRandr libxcb - ++ stdenv.lib.optional withGeoclue geoclue - ++ stdenv.lib.optional withDrm libdrm - ++ stdenv.lib.optional withQuartz ApplicationServices - ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] - ++ stdenv.lib.optional withAppIndicator (if (pname != "gammastep") + ] ++ lib.optional withRandr libxcb + ++ lib.optional withGeoclue geoclue + ++ lib.optional withDrm libdrm + ++ lib.optional withQuartz ApplicationServices + ++ lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] + ++ lib.optional withAppIndicator (if (pname != "gammastep") then libappindicator else libayatana-appindicator) ; @@ -144,9 +144,9 @@ rec { meta = redshift.meta // { name = "${pname}-${version}"; longDescription = "Gammastep" - + stdenv.lib.removePrefix "Redshift" redshift.meta.longDescription; + + lib.removePrefix "Redshift" redshift.meta.longDescription; homepage = "https://gitlab.com/chinstrap/gammastep"; - maintainers = [ stdenv.lib.maintainers.primeos ] ++ redshift.meta.maintainers; + maintainers = [ lib.maintainers.primeos ] ++ redshift.meta.maintainers; }; }; } diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index d1e31b4077f4..30fd51fa9905 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, libGL, +{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, libGL, freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [makeWrapper]; - ldLibraryPath = stdenv.lib.makeLibraryPath [ + ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc zlib glib @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://robomongo.org/"; description = "Query GUI for mongodb"; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.eperuffo ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.eperuffo ]; }; } diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index ef0a30472974..e8bba1f7a340 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [makeWrapper]; - ldLibraryPath = stdenv.lib.makeLibraryPath [ + ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc zlib glib @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://robomongo.org/"; description = "Query GUI for mongodb"; - platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.eperuffo ]; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.eperuffo ]; }; } diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index d7d7dd3ab707..215447ed4e9f 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "sbagen-1.4.4"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Binaural sound generator"; homepage = "http://uazu.net/sbagen"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "i686-linux" ]; }; } diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix index 16a11342d812..dd1aca73b7db 100644 --- a/pkgs/applications/misc/sequelpro/default.nix +++ b/pkgs/applications/misc/sequelpro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, undmg }: +{ lib, stdenv, fetchurl, undmg }: stdenv.mkDerivation { pname = "sequel-pro"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "MySQL database management for macOS"; homepage = "http://www.sequelpro.com/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.darwin; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix index cf6fcb201672..144f725e2ef0 100644 --- a/pkgs/applications/misc/signumone-ks/default.nix +++ b/pkgs/applications/misc/signumone-ks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, atk, ffmpeg, gdk-pixbuf, glibc, gtk3, libav_0_8, libXtst }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libav_0_8 gtk3 libXtst ]; - libPath = stdenv.lib.makeLibraryPath buildInputs; + libPath = lib.makeLibraryPath buildInputs; unpackPhase = '' dpkg-deb -x ${src} ./ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${libPath} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Digital signature tool for Costa Rican electronic invoicing"; homepage = "https://signum.one/download.html"; license = licenses.unfree; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index bc5814add89b..840b37351c79 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -88,7 +88,7 @@ let postFixup = '' makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] }" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" \ "''${gappsWrapperArgs[@]}" ''; }; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index 1ea7893108db..bf8a9efb9fd0 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -33,7 +33,7 @@ in mkDerivation { cp sleepyhead/SleepyHead $out/bin ''; - postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' wrapQtApp "$out/Applications/SleepyHead.app/Contents/MacOS/SleepyHead" ''; diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/applications/misc/slmenu/default.nix index 55025621fc7d..122006647cb1 100644 --- a/pkgs/applications/misc/slmenu/default.nix +++ b/pkgs/applications/misc/slmenu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchhg}: +{lib, stdenv, fetchhg}: let s = rec { @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''A console dmenu-like tool''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 6adf24f617c9..e4f864273868 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null, patches ? [] }: +{ lib, stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null, patches ? [] }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "slstatus"; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 692771960017..531bc4893541 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rpmextract makeWrapper ]; - libPath = stdenv.lib.makeLibraryPath [ openssl ]; + libPath = lib.makeLibraryPath [ openssl ]; buildCommand = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 45dc487c8ed1..85ce1e6b1bb4 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils +{ pkgs, fetchFromGitHub, lib, stdenv, gtk3, udev, desktop-file-utils , shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # Introduced because ifuse doesn't build due to CVEs in libplist # Revert when libplist builds again… - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-panel tabbed file manager"; longDescription = '' Multi-panel tabbed file and desktop manager for Linux diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 6b4bf1946306..03c90af23689 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, curses }: +{ lib, stdenv, fetchgit, curses }: stdenv.mkDerivation { name = "stag-1.0"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/seenaburns/stag"; description = "Terminal streaming bar graph passed through stdin"; - license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsdOriginal; + maintainers = [ lib.maintainers.matthiasbeyer ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index bf2db2966508..afbf5b364ed4 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -17,7 +17,7 @@ let stdenv.mkDerivation rec { inherit pname version src description; - exec = stdenv.lib.toLower module; + exec = lib.toLower module; sweethome3dItem = makeDesktopItem { inherit exec desktopName; name = pname; @@ -67,21 +67,21 @@ let homepage = "http://www.sweethome3d.com/index.jsp"; inherit description; inherit license; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.edwtjo ]; + platforms = lib.platforms.linux; }; }; - d2u = stdenv.lib.replaceChars ["."] ["_"]; + d2u = lib.replaceChars ["."] ["_"]; in { application = mkSweetHome3D rec { - pname = stdenv.lib.toLower module + "-application"; + pname = lib.toLower module + "-application"; version = "6.4.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4"; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index d6b44a86e087..08bc5b90fd9c 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant +{ lib, stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant , gtk3, gsettings-desktop-schemas, sweethome3dApp }: let - sweetExec = with stdenv.lib; + sweetExec = with lib; m: "sweethome3d-" + removeSuffix "libraryeditor" (toLower m) + "-editor"; @@ -50,13 +50,13 @@ let homepage = "http://www.sweethome3d.com/index.jsp"; inherit description; inherit license; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.edwtjo ]; + platforms = lib.platforms.linux; }; }; - d2u = stdenv.lib.replaceChars ["."] ["_"]; + d2u = lib.replaceChars ["."] ["_"]; in { @@ -65,7 +65,7 @@ in { module = "TexturesLibraryEditor"; pname = module; description = "Easily create SH3T files and edit the properties of the texture images it contain"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; sha256 = "15wxdns3hc8yq362x0rj53bcxran2iynxznfcb9js85psd94zq7h"; @@ -80,7 +80,7 @@ in { module = "FurnitureLibraryEditor"; pname = module; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; sha256 = "0rr4nqil1mngak3ds5vz7f1whrgcgzpk6fb0qcr5ljms0jx0ylvs"; diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index a1d04a13af85..0235c8af7c53 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.taskjuggler.org"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; description = "Project management tool"; longDescription = '' TaskJuggler is a modern and powerful, Open Source project management diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix index fcf607de8157..c22d49c7dc74 100644 --- a/pkgs/applications/misc/taskjuggler/gemset.nix +++ b/pkgs/applications/misc/taskjuggler/gemset.nix @@ -52,4 +52,4 @@ }; version = "1.20.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 3632a282f7d7..8933faf5fb01 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "Script for taking notes and open urls with taskwarrior"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; - license = stdenv.lib.licenses.free ; + license = lib.licenses.free ; maintainers = [ maintainers.winpat ]; }; } diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index 9b7adac9a2a9..7a19b2923da2 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "VSwku0rtQECirCHx2CXe72gCA+p3DdPC4YYwEYu8WfM="; - buildInputs = [ openssl sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix index 1ba22911c51f..c07cc39f84ef 100644 --- a/pkgs/applications/misc/teseq/default.nix +++ b/pkgs/applications/misc/teseq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "1.1.1"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { meta = { homepage = "https://www.gnu.org/software/teseq/"; description = "Escape sequence illuminator"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.vaibhavsagar ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.vaibhavsagar ]; }; } diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index b87d52fa6286..7c089d830e03 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { homepage = "https://wiki.gnome.org/Apps/Tomboy"; description = "A simple note-taking application with synchronization"; platforms = platforms.linux; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; maintainers = with maintainers; [ stesie ]; }; } diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index 2bbb95d01ae7..37d44d8bf169 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, qt4, qmake4Hook, trousers }: +{ lib, stdenv, fetchgit, qt4, qmake4Hook, trousers }: stdenv.mkDerivation rec { version = "0.8.1"; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://projects.sirrix.com/trac/tpmmanager"; description = "Tool for managing the TPM"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ tstrobel ]; + platforms = with lib.platforms; linux; inherit version; }; } diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 94dc46560270..03ed031be857 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/trans \ - --prefix PATH : ${stdenv.lib.makeBinPath [ + --prefix PATH : ${lib.makeBinPath [ gawk curl ncurses diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 8e01f73f9675..1da61f9dcb01 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }: +{ lib, stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }: stdenv.mkDerivation { name = "udevil-0.4.4"; src = fetchurl { @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes"; homepage = "https://ignorantguru.github.io/udevil/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 117d9dc6aa7b..8c17d2642937 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -100,7 +100,7 @@ python3Packages.buildPythonApplication rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ wmctrl ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ wmctrl ]}") ''; passthru = { diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 136c4c2745a8..36fd4047761c 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libXtst nspr nss libxcb pango systemd libXScrnSaver ]; - libPath = stdenv.lib.makeLibraryPath buildInputs; + libPath = lib.makeLibraryPath buildInputs; unpackPhase = '' dpkg-deb -x ${src} ./ diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index e9e8cfed796a..1818ed9a2153 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -1,10 +1,10 @@ -{ mkDerivation, stdenv, fetchhg +{ mkDerivation, lib, stdenv, fetchhg , qmake, qttools , qtbase, qtsvg, qtxmlpatterns , poppler_utils }: -with stdenv.lib; +with lib; mkDerivation rec { pname = "valentina"; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 07e0a046ac53..d44e49f77cf1 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }: +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "veracrypt"; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 4e002d92ec5e..7fd5b34ee3b6 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -28,19 +28,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 - ] ++ stdenv.lib.optional withMapnik mapnik - ++ stdenv.lib.optional withGeoClue geoclue2 - ++ stdenv.lib.optional withMd5Hash nettle - ++ stdenv.lib.optional withOAuth liboauth - ++ stdenv.lib.optional withMBTiles sqlite; + ] ++ lib.optional withMapnik mapnik + ++ lib.optional withGeoClue geoclue2 + ++ lib.optional withMd5Hash nettle + ++ lib.optional withOAuth liboauth + ++ lib.optional withMBTiles sqlite; configureFlags = [ "--disable-scrollkeeper" - (stdenv.lib.enableFeature withMapnik "mapnik") - (stdenv.lib.enableFeature withGeoClue "geoclue") - (stdenv.lib.enableFeature withMd5Hash "nettle") - (stdenv.lib.enableFeature withOAuth "oauth") - (stdenv.lib.enableFeature withMBTiles "mbtiles") + (lib.enableFeature withMapnik "mapnik") + (lib.enableFeature withGeoClue "geoclue") + (lib.enableFeature withMd5Hash "nettle") + (lib.enableFeature withOAuth "oauth") + (lib.enableFeature withMBTiles "mbtiles") ]; preBuild = '' diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index d6404ca65965..13b09865c6ac 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, runtimeShell }: +{ lib, stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { pname = "vue"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Visual Understanding Environment - mind mapping software"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.free; # Apache License fork, actually + maintainers = with lib.maintainers; [ raskin ]; + platforms = with lib.platforms; linux; + license = lib.licenses.free; # Apache License fork, actually }; } diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 3bb96d7a7576..bbccf7fee221 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -22,16 +22,16 @@ nativeBuildInputs = [ meson ninja pkgconfig scdoc wrapGAppsHook cmake - ] ++ stdenv.lib.optional withMediaPlayer gobject-introspection; + ] ++ lib.optional withMediaPlayer gobject-introspection; - propagatedBuildInputs = stdenv.lib.optionals withMediaPlayer [ + propagatedBuildInputs = lib.optionals withMediaPlayer [ glib playerctl python38Packages.pygobject3 ]; strictDeps = false; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio @@ -40,7 +40,7 @@ ++ optional swaySupport sway ++ optional mpdSupport mpd_clientlib; - mesonFlags = (stdenv.lib.mapAttrsToList + mesonFlags = (lib.mapAttrsToList (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") { dbusmenu-gtk = traySupport; @@ -54,7 +54,7 @@ "-Dsystemd=disabled" ]; - preFixup = stdenv.lib.optional withMediaPlayer '' + preFixup = lib.optional withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py wrapProgram $out/bin/waybar-mediaplayer.py \ diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 0dc13e290f58..74c424a277b1 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "wego"; @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = { - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "https://github.com/schachmat/wego"; description = "Weather app for the terminal"; }; diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index e528dab0c9fd..e234a9007fd5 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.4"; @@ -26,9 +26,9 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A simple curses interface for MediaWiki sites such as Wikipedia"; homepage = "https://github.com/ids1024/wikicurses/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ pSub ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix index d3b5541ac4db..daf697c16614 100644 --- a/pkgs/applications/misc/with-shell/default.nix +++ b/pkgs/applications/misc/with-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "with-2016-08-20"; src = fetchFromGitHub { @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/mchav/With"; description = "Command prefixing for continuous workflow using a single tool"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 8e760b787b49..d501869770e0 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11 }: +{ lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { name = "wmname-0.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; homepage = "https://tools.suckless.org/wmname"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index f681923978bd..32c1f0eaa64a 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }: +{ lib, stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }: stdenv.mkDerivation rec { version = "3.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ tcl tk xlibsWrapper makeWrapper ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { url = "https://wordnet.princeton.edu/license-and-commercial-use"; }; maintainers = [ ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index aa769e7d8ee3..113b674f862f 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p"; - rev = with stdenv.lib; + rev = with lib; "v" + concatStringsSep "_" (splitVersion version); repo = "workrave"; owner = "rcaelers"; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 641d3b4e20cd..3429e80f0540 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevdev xorg.libXtst ] - ++ stdenv.lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] - ++ stdenv.lib.optionals fltkSupport [ fltk ] - ++ stdenv.lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; + ++ lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] + ++ lib.optionals fltkSupport [ fltk ] + ++ lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; meta = with lib; { description = "Autoclicker application, which enables you to automatically click the left mousebutton"; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 29a20e0ece29..c9a2e3b36ae7 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: +{ lib, stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { name = "xfe-1.42"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { Xfe aims to be the filemanager of choice for all the Unix addicts! ''; homepage = "https://sourceforge.net/projects/xfe/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = []; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index c61e64a8a3a7..13bda4f2332b 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,7 +2,7 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: +{lib, stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: stdenv.mkDerivation rec { name = "xfontsel-1.0.6"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index a6fadcf9d2fd..cafbcd4b11c8 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation rec { # Fix "No known features for CXX compiler", see # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html - patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch; + patches = lib.optional stdenv.isDarwin ./cmake_version.patch; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional enableGUI wrapQtAppsHook; + ++ lib.optional enableGUI wrapQtAppsHook; cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON" "-DOPI_SUPPORT=ON"] - ++ stdenv.lib.optional (!enablePrinting) "-DXPDFWIDGET_PRINTING=OFF"; + ++ lib.optional (!enablePrinting) "-DXPDFWIDGET_PRINTING=OFF"; buildInputs = [ zlib libpng ] ++ - stdenv.lib.optional enableGUI qtbase ++ - stdenv.lib.optional enablePrinting cups ++ - stdenv.lib.optional enablePDFtoPPM freetype; + lib.optional enableGUI qtbase ++ + lib.optional enablePrinting cups ++ + lib.optional enablePDFtoPPM freetype; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 0d5fbc336ae4..f1a0f7b5ba1d 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Inverts the colors of your screen"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://github.com/zoltanp/xrandr-invert-colors"; - maintainers = [stdenv.lib.maintainers.magnetophon ]; + maintainers = [lib.maintainers.magnetophon ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix index e3db746ee028..e8e6490cbd64 100644 --- a/pkgs/applications/misc/xrq/default.nix +++ b/pkgs/applications/misc/xrq/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, libX11}: +{ lib, stdenv, fetchFromGitHub, libX11}: stdenv.mkDerivation { name = "xrq-unstable-2016-01-15"; src = fetchFromGitHub { - owner = "arianon"; - repo = "xrq"; + owner = "arianon"; + repo = "xrq"; rev = "d5dc19c63881ebdd1287a02968e3a1447dde14a9"; sha256 = "1bxf6h3fjw3kjraz7028m7p229l423y1ngy88lqvf0xl1g3dhp36"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "X utility for querying xrdb"; homepage = "https://github.com/arianon/xrq"; - license = stdenv.lib.licenses.mit; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.mit; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 64d55322896b..36fd685b7992 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep +{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep , svgSupport ? false, librsvg, glib, gdk-pixbuf, pkgconfig }: @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ libX11 libXt libXext libXpm - ] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkgconfig ]; + ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkgconfig ]; outputs = [ "out" "man" ]; - imakeFlags = stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"; + imakeFlags = lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"; makeFlags = [ "BINDIR=${placeholder "out"}/bin" @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "A keyboard layout indicator and switcher"; homepage = "http://xxkb.sourceforge.net/"; - license = stdenv.lib.licenses.artistic2; - maintainers = with stdenv.lib.maintainers; [ rasendubi ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.artistic2; + maintainers = with lib.maintainers; [ rasendubi ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 24f6b22b4e2b..68adc2abbf9d 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ]; cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; + ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; postInstall = if stdenv.isDarwin then '' mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 22385262a5d4..dbd33db16f9b 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -39,7 +39,7 @@ mkDerivation rec { --prefix PYTHONPATH : "$program_PYTHONPATH" \ --prefix QML2_IMPORT_PATH : "${pyotherside}/${qtbase.qtQmlPrefix}" \ --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" mkdir -p $out/share/applications cp resources/com.yubico.yubioath.desktop \ @@ -63,7 +63,7 @@ mkDerivation rec { downloadPage = "https://developers.yubico.com/yubioath-desktop/Releases/"; changelog = "https://developers.yubico.com/yubioath-desktop/Release_Notes.html"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; maintainers = with maintainers; [ mic92 risson ]; }; } diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 2fc158daf62f..c56f42691f79 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig +{ lib, stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig , appstream-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp @@ -6,7 +6,7 @@ , gtk-mac-integration }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "zathura"; diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix index df6e011e4d58..5e27f9d45b6a 100644 --- a/pkgs/applications/misc/zk-shell/default.nix +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { version = "1.0.0"; @@ -21,8 +21,8 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A powerful & scriptable shell for Apache ZooKeeper"; homepage = "https://github.com/rgs1/zk_shell"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.mahe ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.mahe ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 99699d6e3ccb..3f704e8dd854 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl oniguruma ] - ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + ++ lib.optional stdenv.isDarwin CoreServices; RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 88fb6af4b016..be0b707add46 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -172,7 +172,7 @@ let desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; genericName = "Web Browser"; categories = "Network;WebBrowser;"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "text/html" "text/xml" "application/xhtml+xml" diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 73a095b0827f..6e591dea310f 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, patchelf, makeWrapper +{ lib, stdenv, patchelf, makeWrapper # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr @@ -41,7 +41,7 @@ , gnome3 }: -with stdenv.lib; +with lib; let opusWithCustomModes = libopus.override { diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 9c9ec5624c87..7bda7cdcbf7e 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { "--enable-default-colors" "--enable-widec" "--enable-ipv6" - ] ++ stdenv.lib.optional sslSupport "--with-ssl"; + ] ++ lib.optional sslSupport "--with-ssl"; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ nukeReferences ] - ++ stdenv.lib.optional sslSupport pkgconfig; + ++ lib.optional sslSupport pkgconfig; - buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; + buildInputs = [ ncurses gzip ] ++ lib.optional sslSupport openssl.dev; # cfg_defs.h captures lots of references to build-only dependencies, derived # from config.cache. diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index a15d6844f56d..7ea226411265 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib , sslSupport ? true, openssl ? null , graphicsSupport ? !stdenv.isDarwin, imlib2 ? null @@ -12,7 +12,7 @@ assert graphicsSupport -> imlib2 != null; assert x11Support -> graphicsSupport && libX11 != null; assert mouseSupport -> gpm-ncurses != null; -with stdenv.lib; +with lib; let mktable = buildPackages.stdenv.mkDerivation { @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { homepage = "http://w3m.sourceforge.net/"; description = "A text-mode web browser"; maintainers = [ maintainers.cstrahan ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + platforms = lib.platforms.unix; + license = lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 3394394afd49..e23f94634dea 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://ibboard.co.uk/cawbird/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ]; + maintainers = with lib.maintainers; [ jonafato schmittlauch ]; }; } diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index f1895d074bc4..1b76406f3344 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "1f9yn4pvp58laylngdrfdkwygisnzkhkm7pndf6l33k3aqxhz5mm"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 88d4a88b67e2..af92920645e1 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -13,7 +13,7 @@ let inherit sha256; }; - postUnpack = stdenv.lib.optionalString (tomcat != null) '' + postUnpack = lib.optionalString (tomcat != null) '' install -D ${tomcat.src} $sourceRoot/hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz install -D ${tomcat.src} $sourceRoot/hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz ''; @@ -59,8 +59,8 @@ let # 'maven.repo.local' must be writable mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags} # remove runtime dependency on $jdk/jre/lib/amd64/server/libjvm.so - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhadoop.so.1.0.0 - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhdfs.so.0.0.0 + patchelf --set-rpath ${lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhadoop.so.1.0.0 + patchelf --set-rpath ${lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhdfs.so.0.0.0 ''; installPhase = "mv hadoop-dist/target/hadoop-${version} $out"; }; @@ -86,8 +86,8 @@ let if [ -f "$n" ]; then # only regular files mv $n $out/bin.wrapped/ makeWrapper $out/bin.wrapped/$(basename $n) $n \ - --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \ - --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ opensslPkg snappy zlib bzip2 ]}" \ + --prefix PATH : "${lib.makeBinPath [ which jre bash coreutils ]}" \ + --prefix JAVA_LIBRARY_PATH : "${lib.makeLibraryPath [ opensslPkg snappy zlib bzip2 ]}" \ --set JAVA_HOME "${jre}" \ --set HADOOP_PREFIX "$out" fi diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index ebf98840ee2b..b4bb69dc1f62 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl , taktuk}: +{ lib, stdenv, fetchurl, perl , taktuk}: stdenv.mkDerivation rec { version = "1.2.2"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { remote files or directories locally ('kaget' command). It relies on TakTuk for efficiency and scalability.''; homepage = "http://taktuk.gforge.inria.fr/kanif"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index b1b107a2b032..c72702fdc77a 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { buildFlagsArray = '' -ldflags= -X main.version=${version} - -X main.goVersion=${stdenv.lib.getVersion go} + -X main.goVersion=${lib.getVersion go} ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 370a86db0e6c..6be32ed17a4b 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -20,16 +20,16 @@ buildGoModule rec { # Linux-only feature. See 'ENABLE_JOURNALD' upstream: # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile subPackages = [ "cmd/nodeproblemdetector" ] ++ - stdenv.lib.optionals stdenv.isLinux [ "cmd/logcounter" ]; + lib.optionals stdenv.isLinux [ "cmd/logcounter" ]; preBuild = '' export CGO_ENABLED=${if stdenv.isLinux then "1" else "0"} ''; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd ]; + buildInputs = lib.optionals stdenv.isLinux [ systemd ]; buildFlags = "-mod vendor" + - stdenv.lib.optionalString stdenv.isLinux " -tags journald"; + lib.optionalString stdenv.isLinux " -tags journald"; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index ef9e6c74220a..09bf82e43fed 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -10,7 +10,7 @@ with lib; let version = "4.1.0"; - ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version); + ver = lib.elemAt (lib.splitVersion version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index 2a2c2c437224..ded8a2ea4932 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { for n in $out/{bin,sbin}"/"*; do wrapProgram $n \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jre bash ]}" \ + --prefix PATH : "${lib.makeBinPath [ jre bash ]}" \ --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "${hadoop}" done ''; diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 712f62e8d4fd..89b805fc1538 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/pkgs/applications/networking/cluster/spacegun/node-packages.nix index 981d787c91a0..423e34f10df1 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-packages.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-packages.nix @@ -11474,4 +11474,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 53856ce9e2fe..071636ec4431 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop +{ lib, stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop , RSupport? true, R }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { meta = { description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "http://spark.apache.org"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + platforms = lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline kamilchm ]; repositories.git = "git://git.apache.org/spark.git"; }; diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index a5a2ace2399b..5cb9f8160067 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { version = "3.7.7"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { require any specific software on the nodes thanks to a self-propagation algorithm.''; homepage = "http://taktuk.gforge.inria.fr/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix index aa3f5142aa5e..bf3767486eaf 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix +++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix @@ -58,4 +58,4 @@ }; version = "1.6.10"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix index 76d6d39baf29..ef4baaadc2b8 100644 --- a/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { version = "3.3.2"; @@ -28,8 +28,8 @@ stdenv.mkDerivation { performance enhancements. ''; homepage = "http://www.rahul.net/dholmes/ctorrent/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 4c1b2bbea04f..97b0b1f192bb 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { postInstall = '' sed <"frontends/snipe" >"$out/bin/snipe" \ - -e "2i export PATH=\"$out/bin:${stdenv.lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\"" + -e "2i export PATH=\"$out/bin:${lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\"" chmod 555 "$out/bin/snipe" ''; diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 80106085e1b6..39d9aa905961 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }: +{ lib, stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }: python3Packages.buildPythonApplication rec { version = "0.9.9"; @@ -25,8 +25,8 @@ python3Packages.buildPythonApplication rec { and extensibility using the excellent Python programming language. ''; homepage = "https://codezen.org/canto-ng/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 448590fbf116..bec0a7b1c38f 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace Makefile --replace "|| true" "" '' # TODO: Check if that's still needed - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' # Allow other ncurses versions on Darwin substituteInPlace config.sh \ --replace "ncurses5.4" "ncurses" @@ -29,24 +29,24 @@ rustPlatform.buildRustPackage rec { pkg-config asciidoctor gettext - ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; + ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; + ++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; postBuild = '' make prefix="$out" ''; # TODO: Check if that's still needed - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set # these for all platforms, since upstream's gettext crate behavior might # change in the future. - GETTEXT_LIB_DIR = "${stdenv.lib.getLib gettext}/lib"; - GETTEXT_INCLUDE_DIR = "${stdenv.lib.getDev gettext}/include"; - GETTEXT_BIN_DIR = "${stdenv.lib.getBin gettext}/bin"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; doCheck = true; @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' make prefix="$out" install cp -r contrib $out - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" done diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index f83c91117551..ea1566cd6974 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "flok99"; }; - buildInputs = [ libmrss ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; checkInputs = [ cppcheck ]; postPatch = '' diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 871aba0a669f..26ae9e7a5819 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: +{ lib, stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { name = "daq-2.2.2"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; homepage = "https://www.snort.org"; - maintainers = with stdenv.lib.maintainers; [ aycanirican ]; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ aycanirican ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 7529e233e137..3beb431042a8 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper +{lib, stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper , libtirpc }: @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; homepage = "https://www.snort.org"; - maintainers = with stdenv.lib.maintainers; [ aycanirican ]; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ aycanirican ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index dc8fde4c6ca1..f7b526f29b55 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison file ]; buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ gettext ]; + ++ lib.optionals stdenv.isDarwin [ gettext ]; #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files. inherit preConfigure; - patches = stdenv.lib.optionals stdenv.cc.isClang [ + patches = lib.optionals stdenv.cc.isClang [ # Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604 (fetchpatch { url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch"; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index c3479d1ee698..d947fa76dff2 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 , cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3 , gsm, speex, portaudio, spandsp, libuuid, libvpx }: @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { "USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1=" "USE_ILBC=" "USE_OPUS=" "USE_SILK=" ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" + ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" + ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { homepage = "http://www.creytiv.com/baresip.html"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.bsd3; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [raskin]; + license = lib.licenses.bsd3; inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index c4d780d9ea2c..4af62e05c930 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bitlbee-discord"; version = "0.4.3"; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sm00th/bitlbee-discord"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lassulus jb55 ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 1a8110acacb9..76cf10e7b140 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bitlbee-facebook"; version = "1.2.1"; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bitlbee/bitlbee-facebook"; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index 411cd789275b..ce94ab626593 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,6 +1,6 @@ -{ fetchgit, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; version = "1.4.4"; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://alexschroeder.ch/cgit/bitlbee-mastodon/about"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jpotier ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 8cb7f6c37c43..57ea99ee9212 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "1.4.2"; pname = "bitlbee-steam"; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jgeboski/bitlbee-steam"; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 7b1256b657a7..022fde67365c 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,9 +1,9 @@ -{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python +{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python , enableLibPurple ? false, pidgin ? null , enablePam ? false, pam ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "bitlbee-3.6"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix index 4e05e7cae970..ad68fcb4b79d 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix @@ -1,6 +1,6 @@ -{ stdenv, bitlbee }: +{ lib, stdenv, bitlbee }: -with stdenv.lib; +with lib; plugins: diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index cce3a7edd792..2360b2442f54 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ rpmextract makeWrapper ]; libPath = - stdenv.lib.makeLibraryPath + lib.makeLibraryPath [ libnotify libuuid diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index 52d8178764c5..78178f0021e2 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gnused, openssl, curl, ncurses, libjpeg +{ lib, stdenv, fetchurl, gnused, openssl, curl, ncurses, libjpeg , withGpg ? true, gpgme ? null}: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-std=gnu++98"; buildInputs = [ openssl curl ncurses libjpeg ] - ++ stdenv.lib.optional withGpg gpgme; + ++ lib.optional withGpg gpgme; preConfigure = '' ${gnused}/bin/sed -i '1,1i#include ' libicq2000/libicq2000/sigslot.h @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.centerim.org/"; description = "Fork of CenterICQ, a curses instant messaging program"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 72fb92b9d7cd..e4c588e6c18e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { dontWrapGApps = true; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ libcxx systemd libpulseaudio stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 527af7a4de06..073ac43f5f30 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -32,9 +32,9 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; - maintainers = stdenv.lib.teams.matrix.members; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 42827d43f0db..6fe0e3b13b27 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -6,7 +6,7 @@ , pango, systemd }: let gitterDirectorySuffix = "opt/gitter"; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ alsaLib atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 0661e6d7525e..fec5462c47a7 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, openssl, tcl, tk}: +{lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}: stdenv.mkDerivation { name = "gtmess-0.97"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; homepage = "http://gtmess.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 27e1fc0cad31..323a2521b0fd 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -5,7 +5,7 @@ let version = "4.30.5.1682"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ xdg_utils xorg.libXext xorg.libSM diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index c23d081866ba..7cb614f1d413 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix index 92ddfe342982..2992bf22cb31 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -6,12 +6,11 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; -locpkgs = -import ./node-packages.nix { +locpkgs = import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; globalBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix index 633219626b68..9e3527948818 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs }: +{ lib, stdenv, pkgs }: (import ./composition.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; @@ -21,7 +21,7 @@ meta = { description = "Matrix message recorder"; homepage = "https://gitlab.com/argit/matrix-recorder/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.raskin ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix index ff5ca0d99b19..e6131fe8e771 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "$dontNpmInstall" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -468,8 +468,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -489,7 +489,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -498,13 +498,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -514,7 +514,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell < gpgme != null; assert pythonPluginSupport -> python != null; assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "profanity"; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 37527262b7fe..b91db31f89a1 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -22,10 +22,10 @@ mkDerivation rec { qtbase qtsvg qttranslations ffmpeg_3 filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AVFoundation] ; + ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; nativeBuildInputs = [ cmake pkg-config qttools ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl ]; + ++ lib.optionals stdenv.isDarwin [ perl ]; cmakeFlags = [ "-DGIT_DESCRIBE=v${version}" diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 212ba3a31a4b..1851a60216b9 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, libtoxcore +{ lib, stdenv, fetchgit, libtoxcore , conf ? null }: -with stdenv.lib; +with lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 801e68266803..420ab1a53b3c 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -62,7 +62,7 @@ let ]; }; - pjsip' = stdenv.lib.overrideDerivation pjsip (old: { + pjsip' = lib.overrideDerivation pjsip (old: { patches = [ "${patchdir}/pjproject/gnutls.patch" ./notestsapps.patch # this one had to be modified diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 535a356bbaa2..88cd3dc54c56 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -113,7 +113,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] }" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" ${customLanguageWrapperArgs} ) diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 0c84e1c5c80a..b80d51287483 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, pkgconfig, glib, ncurses +{ lib, stdenv, fetchurl, perl, pkgconfig, glib, ncurses , enablePlugin ? false }: # Enabling the plugin and using it with a recent irssi, segafults on join: @@ -8,7 +8,7 @@ let basename = "silc-client-1.1.11"; in stdenv.mkDerivation { - name = basename + stdenv.lib.optionalString enablePlugin "-irssi-plugin"; + name = basename + lib.optionalString enablePlugin "-irssi-plugin"; src = fetchurl { url = "mirror://sourceforge/silc/silc/client/sources/${basename}.tar.bz2"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; - preConfigure = stdenv.lib.optionalString enablePlugin '' + preConfigure = lib.optionalString enablePlugin '' configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" ''; @@ -33,8 +33,8 @@ stdenv.mkDerivation { meta = { homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 068b939d515c..09452aa90b6c 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -9,7 +9,7 @@ let # source of the latter disappears much faster. version = "8.66.0.74"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib atk at-spi2-atk @@ -118,7 +118,7 @@ in stdenv.mkDerivation { description = "Linux client for skype"; homepage = "https://www.skype.com"; license = licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ panaeon jraygauthier ]; + maintainers = with lib.maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 6c1e99a24dac..4de1d32a64a5 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -78,7 +78,7 @@ let passthru.updateScript = ./update.sh; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 9096a925bbde..0ce5f764128d 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }: let - fullPath = stdenv.lib.makeLibraryPath [ + fullPath = lib.makeLibraryPath [ alsaLib atk cairo diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 33b8c5355f70..988674079163 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip5.so ts3client patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ + --set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \ --force-rpath \ ts3client ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 3cdaa72cfd2c..b4a4e8df0f64 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 6d4ff62f22a8..baa16c98e07e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "A Telepathy connection manager based on libpurple"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # Random choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # Random choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index f3d1e6cfd750..95be1b073755 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: +{ lib, stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib dconf) makeWrapper ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" ''; meta = { description = "IRC connection manager for the Telepathy framework"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index e96b35f21a8e..336bde0bb48c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/libexec/telepathy-logger" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 1df59809146e..8464619f1e73 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$lib/libexec/mission-control-5" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 4aee50453ed4..51c05523160d 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk-pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + ] ++ lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut qrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 4b07289a11ca..4c49f41f623b 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchpatch, python3Packages }: -with stdenv.lib; +with lib; with python3Packages; buildPythonPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 24ce75dc7974..4389ee153c56 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, dpkg, makeWrapper, +{fetchurl, lib, stdenv, dpkg, makeWrapper, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... @@ -17,7 +17,7 @@ stdenv.mkDerivation { dontUnpack = true; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ alsaLib cups curl @@ -98,9 +98,9 @@ stdenv.mkDerivation { meta = { homepage = "http://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + maintainers = with lib.maintainers; [ jagajaga ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index cddff29b5ed5..f90269fc83e3 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -3,7 +3,7 @@ , xorg }: -with stdenv.lib; +with lib; let bits = "x86_64"; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index a4c3f55b2996..fb1f5a0a69c6 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "xmpp-client"; - version = "20160916-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160916-${lib.strings.substring 0 7 rev}"; rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; goPackagePath = "github.com/agl/xmpp-client"; diff --git a/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/pkgs/applications/networking/instant-messengers/ytalk/default.nix index 8cb22aabc69b..1ccc9fbe6f57 100644 --- a/pkgs/applications/networking/instant-messengers/ytalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/ytalk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "ytalk"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ytalk.ourproject.org"; description = "A terminal based talk client"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ taeer ]; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ taeer ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 887e3f458bc4..7fe1f5b0425a 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkDerivation, autoPatchelfHook, bash +{ lib, stdenv, fetchurl, mkDerivation, autoPatchelfHook, bash , fetchFromGitHub # Dynamic libraries , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative @@ -14,7 +14,7 @@ assert pulseaudioSupport -> libpulseaudio != null; let - inherit (stdenv.lib) concatStringsSep makeBinPath optional; + inherit (lib) concatStringsSep makeBinPath optional; version = "5.4.53350.1027"; srcs = { @@ -128,9 +128,9 @@ in mkDerivation { meta = { homepage = "https://zoom.us/"; description = "zoom.us video conferencing application"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with stdenv.lib.maintainers; [ danbst tadfisher doronbehar ]; + maintainers = with lib.maintainers; [ danbst tadfisher doronbehar ]; }; } diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index e57c8bbae0fe..344af6a03120 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses}: +{lib, stdenv, fetchurl, ncurses}: stdenv.mkDerivation { name = "iptraf-3.0.1"; @@ -25,9 +25,9 @@ stdenv.mkDerivation { meta = { homepage = "http://iptraf.seul.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; broken = true; # required isdn headers have been removed from the linux kernel }; } diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index af67c224e7d7..a7b57aa31028 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }: +{ lib, stdenv, fetchurl, fetchpatch, bison, flex, autoconf, automake, openssl }: stdenv.mkDerivation rec { pname = "bip"; @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = { description = "An IRC proxy (bouncer)"; homepage = "http://bip.milkypond.org/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; downloadPage = "https://projects.duckcorp.org/projects/bip/files"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 5380bb5458ed..030737848a96 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes" ]; - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' substituteInPlace "$out/share/applications/communi.desktop" \ --replace "/usr/bin" "$out/bin" ''; diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 551953d43375..5312bf9c1475 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang +{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang , nixosTests }: -with stdenv.lib; +with lib; perlPackages.buildPerlPackage rec { pname = "convos"; @@ -71,7 +71,7 @@ perlPackages.buildPerlPackage rec { meta = { homepage = "https://convos.chat"; description = "Convos is the simplest way to use IRC in your browser"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = with maintainers; [ sgo ]; }; } diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 872c96ac7a01..9b096eb72e9b 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Darwin needs libiconv, tcl; while Linux build don't buildInputs = [ openssl ncurses ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv tcl ]; + ++ lib.optionals stdenv.isDarwin [ libiconv tcl ]; patches = [ (fetchpatch { diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 163dec194b15..22d03af0fafb 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "ii-1.8"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://tools.suckless.org/ii/"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 27b37e78a1a4..9061ac34fe34 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { pname = "irssi"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://irssi.org"; description = "A terminal based IRC client"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ lovek323 ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index f1e0e9158ca6..5c1c97436218 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkgconfig }: +{ lib, stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkgconfig }: stdenv.mkDerivation rec { name = "fish-irssi-20130413-e98156bebd"; - + src = fetchurl { url = "https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd"; name = "${name}.tar.gz"; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/irssi/modules cp src/.libs/libfish.so $out/lib/irssi/modules ''; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gmp automake autoconf libtool openssl glib ]; - + meta = { homepage = "https://github.com/falsovsky/FiSH-irssi"; - license = stdenv.lib.licenses.unfree; # I can't find any mention of license - maintainers = with stdenv.lib.maintainers; [viric]; + license = lib.licenses.unfree; # I can't find any mention of license + maintainers = with lib.maintainers; [viric]; }; } diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 69605af2f660..129b72d847d4 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sic"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple IRC client"; homepage = "https://tools.suckless.org/sic/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 7343b7e1a554..148665d6b6d4 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -37,7 +37,7 @@ let outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; - cmakeFlags = with stdenv.lib; [ + cmakeFlags = with lib; [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 @@ -48,7 +48,7 @@ let ; nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ]; - buildInputs = with stdenv.lib; [ + buildInputs = with lib; [ ncurses openssl aspell gnutls gettext zlib curl libgcrypt ] ++ optionals stdenv.isDarwin [ libobjc libresolv ] @@ -57,9 +57,9 @@ let NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error - + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); + + (lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); - postInstall = with stdenv.lib; '' + postInstall = with lib; '' for p in ${concatMapStringsSep " " (p: p.name) enabledPlugins}; do from=$out/lib/weechat/plugins/$p.so to=''${!p}/lib/weechat/plugins/$p.so @@ -76,8 +76,8 @@ let (eg. adding python modules for scripts that would require them, etc.) on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 lheckemann ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ lovek323 lheckemann ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index 02bccb67bfe1..a4802c31ed2c 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: with stdenv; -with stdenv.lib; +with lib; mkDerivation rec { pname = "wraith"; diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 41341532637b..dbcae7a0ec37 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { maestral packaging pyqt5 - ] ++ stdenv.lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" # Add the installed directories to the python path so the daemon can find them - "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}" + "--prefix" "PYTHONPATH" ":" "${lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}" "--prefix" "PYTHONPATH" ":" "${python3.pkgs.maestral}/lib/${python3.libPrefix}/site-packages" ]; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 1bd8cbeceeb8..b01ec9ef2cd4 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -48,9 +48,9 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/aerc --prefix PATH ":" \ - "$out/share/aerc/filters:${stdenv.lib.makeBinPath [ ncurses ]}" + "$out/share/aerc/filters:${lib.makeBinPath [ ncurses ]}" wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ w3m dante ]} + ${lib.makeBinPath [ w3m dante ]} ''; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index a2a26010e4df..975ace086f5d 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,4 +1,4 @@ -{ config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook +{ lib, config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, gumbo , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap, perl, pkgconfig, poppler, python, shared-mime-info @@ -27,7 +27,7 @@ , enableSpellcheck ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "claws-mail"; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix index 2d93ff85b898..3a828b631a32 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix @@ -1,4 +1,4 @@ -{ config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex +{ lib, config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex , curl, dbus, dbus-glib, enchant, gtk3, gnutls, gnupg, gpgme , libarchive, libcanberra-gtk3, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk @@ -27,7 +27,7 @@ , enableSpellcheck ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "claws-mail-gtk3"; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 65cb888ad6f7..fbd6d1d924cd 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "3.36.5"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0h1wz4hxsasihdvvsaxnmzka4afjw7603gn0qcw8rxpw114ib1bl"; }; diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 8423beec4687..bed71202c4fe 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, lua, pcre2 }: +{ lib, stdenv, fetchFromGitHub, openssl, lua, pcre2 }: stdenv.mkDerivation rec { pname = "imapfilter"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/lefcha/imapfilter"; description = "Mail filtering utility"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ doronbehar ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 0929919dcd06..0f1f2e52d85d 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy ''; - buildFlags = stdenv.lib.optional debugBuild "lumail2-debug"; + buildFlags = lib.optional debugBuild "lumail2-debug"; installPhase = '' mkdir -p $out/bin || true diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index 96ce99580fcb..d66dcbf47c16 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mailcheck"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = { description = "Simple command line tool to check for new messages"; homepage = "http://mailcheck.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ kovirobi ]; + platforms = lib.platforms.linux; inherit version; longDescription = '' diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 3cd02e7467c5..2cb1fd56ecca 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ gnupg1orig openssl ]}" \ --set-default MAILPILE_SHARED "$out/share/mailpile" ''; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index d3bb47a911bd..646fa4e2050a 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { rmdir $dir/${uname} cat <<_EOF > $out/bin/msgviewer #!${runtimeShell} -eu - exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" + exec ${lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" _EOF chmod 755 $out/bin/msgviewer ''; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index f7b1b990acb8..5120f9291c9a 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ncurses, which, perl +{ lib, stdenv, fetchurl, fetchpatch, ncurses, which, perl , gdbm ? null , openssl ? null , cyrus_sasl ? null @@ -23,7 +23,7 @@ assert smimeSupport -> openssl != null; assert gpgSupport -> gnupg != null; assert gpgmeSupport -> gpgme != null && openssl != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "mutt"; diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index 868037c33c1a..1f7bbf5c7122 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext, openssl }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "notbit"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index cc24e13810ed..59c7b6bf9d44 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, stdenv +{ fetchurl, fetchgit, lib, stdenv , pkgconfig, gnupg , xapian, gmime, talloc, zlib , doxygen, perl, texinfo @@ -9,7 +9,7 @@ , withEmacs ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "0.31"; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { makeFlags = [ "V=1" ]; - outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional withEmacs "emacs"; + outputs = [ "out" "man" "info" ] ++ lib.optional withEmacs "emacs"; preCheck = let test-database = fetchurl { @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-man" "install-info" ]; - postInstall = stdenv.lib.optionalString withEmacs '' + postInstall = lib.optionalString withEmacs '' moveToOutput bin/notmuch-emacs-mua $emacs ''; diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index 953cfed3c665..de248faace71 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , notmuch, openssl, pkgconfig, sqlite, xapian, zlib }: stdenv.mkDerivation rec { @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "Synchronize maildirs and notmuch databases"; homepage = "http://www.muchsync.org/"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; []; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; []; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 8f268e67c304..1b6cc50ffdf6 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, openssl ? null, gpgme ? null +{ lib, stdenv, fetchurl, pkgconfig, gtk2, openssl ? null, gpgme ? null , gpgSupport ? true, sslSupport ? true }: assert gpgSupport -> gpgme != null; assert sslSupport -> openssl != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "sylpheed"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index fafd2c72c889..5e2c74fb3f1a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -60,9 +60,9 @@ let systemLocale = config.i18n.defaultLocale or "en-US"; - defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; - source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; name = "thunderbird-bin-${version}"; in @@ -77,7 +77,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib at-spi2-atk @@ -112,7 +112,7 @@ stdenv.mkDerivation { nspr nss pango - ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; @@ -177,7 +177,7 @@ stdenv.mkDerivation { free = false; url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; platforms = platforms.linux; knownVulnerabilities = [ "Support ended around Semptember 2020." ]; }; diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix index c970861a86f0..f6cfb2cd2e45 100644 --- a/pkgs/applications/networking/n8n/node-composition.nix +++ b/pkgs/applications/networking/n8n/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix index e1abf5304935..759fa71c5aab 100644 --- a/pkgs/applications/networking/n8n/node-env.nix +++ b/pkgs/applications/networking/n8n/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -470,8 +470,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) utillinux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +491,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,13 +500,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -516,7 +516,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell < - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; ''; @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://cowlark.com/wordgrinder"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 9ab7446fe3c0..e0f156f06c95 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchurl , autoPatchelfHook @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { unpackCmd = "dpkg -x $src ."; sourceRoot = "."; - postUnpack = stdenv.lib.optionalString (version == "11.1.0.9505") '' + postUnpack = lib.optionalString (version == "11.1.0.9505") '' # distribution is missing libjsapiservice.so, so we should not let # autoPatchelfHook fail on the following dead libraries rm opt/kingsoft/wps-office/office6/{libjsetapi.so,libjswppapi.so,libjswpsapi.so} @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { homepage = "http://wps-community.org/"; platforms = [ "x86_64-linux" ]; hydraPlatforms = []; - license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = with stdenv.lib.maintainers; [ mlatus th0rgal ]; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ mlatus th0rgal ]; }; buildInputs = with xorg; [ @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { done ''; - runtimeLibPath = stdenv.lib.makeLibraryPath [ + runtimeLibPath = lib.makeLibraryPath [ cups.lib ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 4b41655b9aea..739b003bbef6 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc atk cairo @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { nspr nss pango - ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils ]} + --prefix PATH : ${lib.makeBinPath [ coreutils ]} ) ''; diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index d3b5b12836fd..8ba372e46fb8 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] - ++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; + ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; meta = with lib; { homepage = "https://cubicsdr.com"; diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index 321b103c7f7a..e7da78034cc2 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd +{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd , hamlib, perl, python, udev }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "direwolf"; diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index 4b9fbcd6af25..35a3e9f44bb2 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ mbelib libsndfile itpp - ] ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; + ] ++ lib.optionals portaudioSupport [ portaudio ]; doCheck = true; preCheck = '' diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 07e9647f2c3f..349999b1eef4 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, +{ lib, stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ relrod ftrvxmtrx ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix index 649caae09021..270494110d77 100644 --- a/pkgs/applications/radio/fllog/default.nix +++ b/pkgs/applications/radio/fllog/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , fltk13 , libjpeg @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem log program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ dysinger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dysinger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index fa3f175fcc56..bbde85555474 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , fltk13 , libjpeg @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem message program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ dysinger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dysinger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 322f2eb9a3b9..36b0b216598f 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , fltk13 , libjpeg @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem rig control program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ dysinger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dysinger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix index 889c212de4e9..f0f16f1e8c9a 100644 --- a/pkgs/applications/radio/flwrap/default.nix +++ b/pkgs/applications/radio/flwrap/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , fltk13 , libjpeg @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem file transfer program"; homepage = "https://sourceforge.net/projects/fldigi/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ dysinger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dysinger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix index 54fb0d7d66cd..76cfa5f414bb 100644 --- a/pkgs/applications/radio/gnuradio/3.7.nix +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -138,8 +138,8 @@ let }; gr-audio = { runtime = [] - ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib libjack2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; @@ -198,6 +198,7 @@ let }; shared = (import ./shared.nix { inherit + lib stdenv python removeReferencesTo @@ -229,7 +230,7 @@ let # From some reason, if these are not set, libcodec2 and gsm are # not detected properly (slightly different then what's in # ./default.nix). - ++ stdenv.lib.optionals (hasFeature "gr-vocoder" features) [ + ++ lib.optionals (hasFeature "gr-vocoder" features) [ "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_INCLUDE_DIR=${codec2}/include" "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" @@ -238,16 +239,16 @@ let ; stripDebugList = shared.stripDebugList # gr-fcd feature was dropped in 3.8 - ++ stdenv.lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ] + ++ lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ] ; preConfigure = '' '' # wxgui and pygtk are not looked up properly, so we force them to be # detected as found, if they are requested by the `features` attrset. - + stdenv.lib.optionalString (hasFeature "gr-wxgui" features) '' + + lib.optionalString (hasFeature "gr-wxgui" features) '' sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt '' - + stdenv.lib.optionalString (hasFeature "gnuradio-companion" features) '' + + lib.optionalString (hasFeature "gnuradio-companion" features) '' sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt '' # If python-support is disabled, don't install volk's (git submodule) @@ -256,7 +257,7 @@ let # NOTE: The same is done for 3.8, but we don't put this string in # ./shared.nix since on the next release of 3.8 it won't be needed there, # but it will be needed for 3.7, probably for ever. - + stdenv.lib.optionalString (!hasFeature "python-support" features) '' + + lib.optionalString (!hasFeature "python-support" features) '' sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt '' ; diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 9c993de65d01..94556561439d 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ] - ++ stdenv.lib.optionals pythonSupport [ python swig ]; + ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 811eb37f4f31..0bc8675690f7 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -143,8 +143,8 @@ let }; gr-audio = { runtime = [] - ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib libjack2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; @@ -193,6 +193,7 @@ let shared = (import ./shared.nix { inherit stdenv + lib python removeReferencesTo featuresInfo @@ -223,7 +224,7 @@ let # From some reason, if these are not set, libcodec2 and gsm are not # detected properly. NOTE: qradiolink needs libcodec2 to be detected in # order to build, see https://github.com/qradiolink/qradiolink/issues/67 - ++ stdenv.lib.optionals (hasFeature "gr-vocoder" features) [ + ++ lib.optionals (hasFeature "gr-vocoder" features) [ "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" "-DLIBCODEC2_HAS_FREEDV_API=ON" @@ -235,7 +236,7 @@ let postInstall = shared.postInstall # This is the only python reference worth removing, if needed (3.7 doesn't # set that reference). - + stdenv.lib.optionalString (!hasFeature "python-support" features) '' + + lib.optionalString (!hasFeature "python-support" features) '' ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; @@ -249,7 +250,7 @@ let # we'll need to package volk while able to tell it to install or not # install python referencing files. When we'll be there, this will help: # https://github.com/gnuradio/volk/pull/404 - + stdenv.lib.optionalString (!hasFeature "python-support" features) '' + + lib.optionalString (!hasFeature "python-support" features) '' sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt '' ; diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 39834540ff81..28c5045081b0 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + ] ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index 1033b25cb3db..a01fab4975ac 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -21,11 +21,11 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig - ] ++ stdenv.lib.optionals pythonSupport [ swig ]; + ] ++ lib.optionals pythonSupport [ swig ]; buildInputs = [ boost gnuradio limesuite log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python ]; + ] ++ lib.optionals pythonSupport [ python ]; meta = with lib; { diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index e87d2a71b1c9..f6c21e794542 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gnuradio uhd makeWrapper libsodium cppunit log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + ] ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 90adcf5ffaef..436c4309a5b4 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ boost log4cpp airspy gnuradio hackrf libbladeRF rtl-sdr uhd - ] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] - ++ stdenv.lib.optionals pythonSupport [ python swig python.pkgs.cheetah ]; + ] ++ lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] + ++ lib.optionals pythonSupport [ python swig python.pkgs.cheetah ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 3c90a8ad9855..4f15f2a961e4 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gnuradio makeWrapper log4cpp - ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + ] ++ lib.optionals pythonSupport [ python swig ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index 66ce0a5f5132..e30831f87ee7 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python , qt , gtk @@ -14,9 +14,7 @@ , fetchSubmodules }: -let - lib = stdenv.lib; -in rec { +rec { version = builtins.concatStringsSep "." ( lib.attrVals [ "major" "minor" "patch" ] versionAttr ); diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 6b854918f571..aaf74abc2c50 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , unwrapped , makeWrapper # For lndir @@ -28,7 +29,7 @@ let pythonPkgs = extraPythonPackages # Add the extraPackages as python modules as well ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) - ++ stdenv.lib.flatten (stdenv.lib.mapAttrsToList ( + ++ lib.flatten (lib.mapAttrsToList ( feat: info: ( if unwrapped.hasFeature feat unwrapped.features then (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) @@ -36,18 +37,18 @@ let [] ) ) unwrapped.featuresInfo) - ++ stdenv.lib.optionals (unwrapped.hasFeature "python-support" unwrapped.features) [ + ++ lib.optionals (unwrapped.hasFeature "python-support" unwrapped.features) [ # Add unwrapped itself as a python module (unwrapped.python.pkgs.toPythonModule unwrapped) ] ; python3Env = unwrapped.python.withPackages(ps: pythonPkgs); - name = (stdenv.lib.appendToName "wrapped" unwrapped).name; + name = (lib.appendToName "wrapped" unwrapped).name; makeWrapperArgs = builtins.concatStringsSep " " ([ ] # Emulating wrapGAppsHook & wrapQtAppsHook working together - ++ stdenv.lib.optionals ( + ++ lib.optionals ( (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) || (unwrapped.hasFeature "gr-qtgui" unwrapped.features) ) [ @@ -57,14 +58,14 @@ let "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" # Needs to run `gsettings` on startup, see: # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1764890.html - "--prefix" "PATH" ":" "${stdenv.lib.getBin glib}/bin" + "--prefix" "PATH" ":" "${lib.getBin glib}/bin" ] - ++ stdenv.lib.optionals (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) [ + ++ lib.optionals (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) [ "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache" - "--prefix" "GIO_EXTRA_MODULES" ":" "${stdenv.lib.getLib dconf}/lib/gio/modules" + "--prefix" "GIO_EXTRA_MODULES" ":" "${lib.getLib dconf}/lib/gio/modules" "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share" "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share/gsettings-schemas/${unwrapped.gtk.name}" - "--prefix" "GI_TYPELIB_PATH" ":" "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ + "--prefix" "GI_TYPELIB_PATH" ":" "${lib.makeSearchPath "lib/girepository-1.0" [ unwrapped.gtk gsettings-desktop-schemas atk @@ -79,17 +80,17 @@ let at-spi2-core ]}" ] - ++ stdenv.lib.optionals (extraPackages != []) [ - "--prefix" "GRC_BLOCKS_PATH" ":" "${stdenv.lib.makeSearchPath "share/gnuradio/grc/blocks" extraPackages}" + ++ lib.optionals (extraPackages != []) [ + "--prefix" "GRC_BLOCKS_PATH" ":" "${lib.makeSearchPath "share/gnuradio/grc/blocks" extraPackages}" ] - ++ stdenv.lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features) + ++ lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features) # 3.7 builds with qt4 (if unwrapped.versionAttr.major == "3.8" then [ "--prefix" "QT_PLUGIN_PATH" ":" - "${stdenv.lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtPluginPrefix}" + "${lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtPluginPrefix}" "--prefix" "QML2_IMPORT_PATH" ":" - "${stdenv.lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtQmlPrefix}" + "${lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtQmlPrefix}" ] else # TODO: Add here qt4 related environment for 3.7? diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index a4a1dfa61e40..863c2010868c 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -21,7 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf - ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; + ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; postInstall = '' install -vD $src/gqrx.desktop -t "$out/share/applications/" diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index e94561e46dc8..0b0f8f2f0ccb 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool , fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }: @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { Caller-ID. ''; homepage = "http://www.whence.com/minimodem/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ relrod ]; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ relrod ]; }; } diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index ddf1d6c6febd..2e333e462c61 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -29,8 +29,8 @@ mkDerivation rec { description = "Qt-based slow-scan TV and fax"; homepage = "http://users.telenet.be/on4qz/"; platforms = platforms.linux; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ hax404 ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ hax404 ]; }; } diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 3f69f40424e3..0b5381fb6013 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # /etc/udev/rules.d/, and there is no option to install elsewhere. So install # rules manually. # * Propagate libusb-1.0 dependency in pkg-config file. - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d/" cp ../rtl-sdr.rules "$out/etc/udev/rules.d/99-rtl-sdr.rules" diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 033c2c4e2a67..4645ae881a82 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -33,7 +33,7 @@ let onOffBool = b: if b then "ON" else "OFF"; - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 - ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] + ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; # Python + Mako are always required for the build itself but not necessary for runtime. diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 54dac5c2aa1c..d39b5e179a6d 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,4 +1,5 @@ -{ config +{ lib +, config , stdenv , fetchurl , fetchpatch @@ -45,7 +46,7 @@ assert alsaSupport -> (alsaLib != null); assert pulseaudioSupport -> (libpulseaudio != null); assert portaudioSupport -> (portaudio != null); -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "aegisub"; @@ -81,7 +82,7 @@ stdenv.mkDerivation intltool ]; - buildInputs = with stdenv.lib; [ + buildInputs = with lib; [ libX11 wxGTK fontconfig diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 69e33f986a8d..8c8a0c1c3f61 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ++ lib.optional withVPX libvpx; buildCommand = let - qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}"; + qtVersion = "5.${lib.versions.minor qtbase.version}"; wrapWith = makeWrapper: filename: "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib"; wrapQtApp = wrapWith "wrapQtApp"; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ${wrapProgram "$out/bin/avidemux3_cli"} - ${stdenv.lib.optionalString withQT '' + ${lib.optionalString withQT '' ${wrapQtApp "$out/bin/avidemux3_qt5"} ${wrapQtApp "$out/bin/avidemux3_jobs_qt5"} ''} diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index aed1bcef381d..f326965ce44b 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -4,7 +4,7 @@ }: let - inherit (stdenv.lib) enableFeature optional; + inherit (lib) enableFeature optional; in stdenv.mkDerivation { diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 91c47516521e..bc2ac4e4ef2e 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake , glew, glfw3, leptonica, libiconv, tesseract3, zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "ccextractor"; version = "0.88"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ glew glfw3 leptonica tesseract3 zlib ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ glew glfw3 leptonica tesseract3 zlib ] ++ lib.optional (!stdenv.isLinux) libiconv; meta = { homepage = "https://www.ccextractor.org"; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 22533b182a0f..8d6ff8e5a005 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { description = "Video Editor"; homepage = "http://www.cinelerra.org"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - license = stdenv.lib.licenses.gpl2; + maintainers = [ lib.maintainers.marcweber ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 7fcd3fce64d4..c1701dd51748 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; nativeBuildInputs = [ qmake qttools ]; - postPatch = stdenv.lib.optionalString (ffmpeg_3 != null) '' + postPatch = lib.optionalString (ffmpeg_3 != null) '' substituteInPlace converter_ffmpeg.cpp \ --replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \ --replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg ' diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index a094bfd904ab..5afcab12a08b 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 +{ lib, stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 , SDL, automake, GConf }: stdenv.mkDerivation { @@ -15,12 +15,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; - + meta = { homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index e35d95d54d6f..95f3169718d9 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -65,8 +65,8 @@ in stdenv.mkDerivation rec { meta = { description = "Suite of command line programs that creates a slideshow-style video from groups of pictures"; homepage = "http://dvd-slideshow.sourceforge.net/wiki/Main_Page"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.robbinch ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.robbinch ]; }; } diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index 633eea3d282a..89995ab8cba7 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libdvdread, libdvdcss, dvdauthor }: +{ lib, stdenv, fetchurl, fetchpatch, libdvdread, libdvdcss, dvdauthor }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A tool to rip video DVDs from the command line"; homepage = "http://dvdbackup.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bradediger ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.bradediger ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index e3f7f8a0702b..8ca3be19e5ad 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -10,7 +10,7 @@ , dbusSupport ? true, dbus ? null , makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "dvdstyler"; diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 62aa54ca7844..53a3535fde4e 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub , common-updater-scripts , genericUpdater @@ -82,7 +83,7 @@ let makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ --run "cd $out/lib/node_modules/EPGStation" \ - --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps} + --prefix PATH : ${lib.makeBinPath runtimeDeps} popd ''; @@ -113,7 +114,7 @@ in pkg // { name = "${pname}-${version}"; - meta = with stdenv.lib; pkg.meta // { + meta = with lib; pkg.meta // { maintainers = with maintainers; [ midchildan ]; # NOTE: updateScript relies on this being correct diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index ba0627fc0fa1..0e7cce4fee7f 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' wrapProgram $out/opt/filebot.sh \ - --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]} + --prefix PATH : ${lib.makeBinPath [ openjdk11 ]} # Expose the binary in bin to make runnable. ln -s $out/opt/filebot.sh $out/bin/filebot ''; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 3f41e73dfa75..13beb768d7bb 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -50,7 +50,7 @@ #AMR-WB float support no #AMR-WB IF2 support no -{ stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv +{ lib, stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv , pkgconfig, perlPackages, libavc1394, libiec61883, libXv, gettext , libX11, glib, cairo, intltool, ffmpeg, libv4l }: @@ -89,7 +89,7 @@ stdenv.mkDerivation { meta = { description = "Non-linear DV editor for GNU/Linux"; homepage = "http://www.kinodv.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index a0ef8b7e8feb..7d9fdcc3d000 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -4,7 +4,7 @@ , python2Packages, expat, glib, nspr, nss, openssl , libssh, libarchive, lzma, bzip2, lz4, lzo }: -with stdenv.lib; +with lib; let self = rec { diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index d0a7ed5e23cb..6bec8f9c8912 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -18,7 +18,7 @@ in buildEnv { --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \ --prefix KODI_HOME : $out/share/kodi \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - (stdenv.lib.concatMap + (lib.concatMap (plugin: plugin.extraRuntimeDependencies or []) plugins)}" done ''; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 97e5e67aaec1..1776aab00336 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv +{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv , gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let - fullPath = stdenv.lib.makeLibraryPath [ + fullPath = lib.makeLibraryPath [ stdenv.cc.cc gtk3 gdk-pixbuf @@ -80,8 +80,8 @@ in buildFHSUserEnv { meta = { description = "Professional Non-Linear Video Editor"; homepage = "https://www.lwks.com/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.antonxy ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.antonxy ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 16ade40f0b5a..6a10aca398cb 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libdvdread }: +{ lib, stdenv, fetchurl, libdvdread }: stdenv.mkDerivation rec { name = "lxdvdrip-1.76"; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread ]; - meta = { + meta = { description = "Command line tool to make a copy from a video DVD for private use"; homepage = "https://sourceforge.net/projects/lxdvdrip"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 35b0d41907b8..a2aa45a6e060 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -43,8 +43,8 @@ in mkDerivation { qtWrapperArgs = let - binPath = stdenv.lib.makeBinPath [ jre_headless ]; - in stdenv.lib.optionals withJava [ + binPath = lib.makeBinPath [ jre_headless ]; + in lib.optionals withJava [ ''--prefix PATH : ${binPath}'' ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9ad64e72fd3a..3fed91bd961e 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -9,7 +9,7 @@ assert withGUI -> qtbase != null && qtmultimedia != null && wrapQtAppsHook != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 86047239cc56..757aa42682a5 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg_3 +{ config, lib, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg_3 , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -84,7 +84,7 @@ let cp -prv * $out ''; - meta.license = stdenv.lib.licenses.unfree; + meta.license = lib.licenses.unfree; } else null; crossBuild = stdenv.hostPlatform != stdenv.buildPlatform; @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig yasm ]; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ freetype ffmpeg_3 ] ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { ; configurePlatforms = [ ]; - configureFlags = with stdenv.lib; [ + configureFlags = with lib; [ "--enable-freetype" (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig") (if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl") @@ -199,19 +199,19 @@ stdenv.mkDerivation rec { echo CONFIG_MPEGAUDIODSP=yes >> config.mak ''; - NIX_LDFLAGS = with stdenv.lib; toString ( + NIX_LDFLAGS = with lib; toString ( optional fontconfigSupport "-lfontconfig" ++ optional fribidiSupport "-lfribidi" ++ optionals x11Support [ "-lX11" "-lXext" ] ++ [ "-lfreetype" ] ); - installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui"; + installTargets = [ "install" ] ++ lib.optional x11Support "install-gui"; enableParallelBuilding = true; # Provide a reasonable standard font when not using fontconfig. Maybe we should symlink here. - postInstall = stdenv.lib.optionalString (!fontconfigSupport) + postInstall = lib.optionalString (!fontconfigSupport) '' mkdir -p $out/share/mplayer cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf @@ -224,7 +224,7 @@ stdenv.mkDerivation rec { description = "A movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = [ lib.maintainers.eelco ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 8d487fecfdec..05025cb304fe 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -56,7 +56,7 @@ , zimgSupport ? true, zimg ? null }: -with stdenv.lib; +with lib; let available = x: x != null; @@ -149,7 +149,7 @@ in stdenv.mkDerivation rec { (enableFeature waylandSupport "wayland") (enableFeature stdenv.isLinux "dvbin") ] # Disable whilst Swift isn't supported - ++ stdenv.lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; + ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ addOpenGLRunpath docutils perl pkgconfig python3 wafHook which diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 75d271c4878a..c9486edd2502 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation { functionalities to Adobe After Effects and Nuke by The Foundry. ''; homepage = "https://natron.fr/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; broken = true; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 1f8357324ea3..af4e11ef0dd5 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -36,7 +36,7 @@ }: let - inherit (stdenv.lib) optional optionals; + inherit (lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; @@ -105,7 +105,7 @@ in mkDerivation rec { --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib" ''; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so addOpenGLRunpath $out/lib/obs-plugins/*.so ''; diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index c9c5190dc539..aa0f2404ab80 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, libvorbis, libdvdread }: +{ lib, stdenv, fetchurl, libogg, libvorbis, libdvdread }: stdenv.mkDerivation rec { name = "ogmtools-1.5"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { tool for extracting chapter information from DVD. ''; homepage = "https://www.bunkus.org/videotools/ogmtools/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 9356e4676a2a..65f032c078c8 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { frei0r opencolorio qtmultimedia - ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.isDarwin CoreFoundation; meta = with lib; { description = "Professional open-source NLE video editor"; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 28df8ead0c80..3fe3dcf454a1 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , raspberrypifw, pcre, boost, freetype, zlib }: let ffmpeg = stdenv.mkDerivation rec { name = "ffmpeg-1.1.3"; - + src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; }; - + configurePlatforms = []; configureFlags = [ "--arch=${stdenv.hostPlatform.parsed.cpu.name}" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch32 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # TODO be better with condition "--cpu=arm1176jzf-s" ] ++ [ @@ -47,7 +47,7 @@ let "--disable-debug" "--arch=${stdenv.hostPlatform.parsed.cpu.name}" "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/huceke/omxplayer"; description = "Commandline OMX player for the Raspberry Pi"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.arm; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.arm; }; } diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index f3c0187d9cb3..5951f4665e40 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -32,8 +32,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec { wrapProgram $out/bin/openshot-qt \ '' # Fix toolbar icons on Darwin - + stdenv.lib.optionalString stdenv.isDarwin '' - --suffix QT_PLUGIN_PATH : "${stdenv.lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ + + lib.optionalString stdenv.isDarwin '' + --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \ '' + '' "''${gappsWrapperArgs[@]}" \ diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index b6bb87e66512..d769eaa59554 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen , alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor , zlib, AGL, Cocoa, Foundation }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libopenshot-audio"; version = "0.2.0"; diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 1ab7a5266a23..e66c519f78b3 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , pkgconfig, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 @@ -7,7 +7,7 @@ , llvmPackages }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "libopenshot"; version = "0.2.5"; diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 91468ea1ee60..64f7b7181eef 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }: +{ lib, stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { name = "p2pvc"; @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { description = "A point to point color terminal video chat"; homepage = "https://github.com/mofarrell/p2pvc"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ trino ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ trino ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 17f9d20695ea..d81c32de20cb 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg_3 gifski ]}) + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg_3 gifski ]}) ''; passthru = { diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index c56878dea351..1b2af7614ab0 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/pitivi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0"; }; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 008e73cd6ed7..b37d65d8ffc2 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -74,9 +74,9 @@ mkDerivation rec { animation to different video formats such as mpeg or avi. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; broken = stdenv.isAarch64; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index c4926bedd727..37486dfa1144 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: +{ lib, stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: stdenv.mkDerivation rec { pname = "libquvi"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; homepage = "http://quvi.sf.net"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index 462c2df9962c..d91ac4526d1a 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig}: +{lib, stdenv, fetchurl, pkgconfig}: stdenv.mkDerivation rec { pname = "quvi-scripts"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; homepage = "http://quvi.sf.net"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index b2746ef82333..e7a5153f710b 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: +{lib, stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: stdenv.mkDerivation rec { pname = "quvi"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; homepage = "http://quvi.sf.net"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index bae6a0ac7f37..160a99574561 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -21,7 +21,7 @@ , common-updater-scripts }: -assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; +assert lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; @@ -52,7 +52,7 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt"; qmakeFlags = [ - "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "QMAKE_LRELEASE=${lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" "DEFINES+=SHOTCUT_NOUPGRADE" ]; @@ -68,7 +68,7 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" - "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ jack1 SDL2 ]}" "--prefix PATH : ${mlt}/bin" ]; diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 244e826f0a24..070bcc90685f 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform }: @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-l+BTF9PGb8bG8QHhNCoBsrsVX8nlRjPlaea1ESFfMW0="; - meta = with stdenv.lib; { + meta = with lib; { description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files"; homepage = "https://github.com/kl/sub-batch"; license = licenses.mit; diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix index b2b020a20d23..e115fbcdd04d 100644 --- a/pkgs/applications/video/subdl/default.nix +++ b/pkgs/applications/video/subdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation { name = "subdl-0.0pre.2017.11.06"; @@ -13,14 +13,14 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/alexanderwink/subdl"; description = "A command-line tool to download subtitles from opensubtitles.org"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.exfalso ]; + platforms = lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.exfalso ]; }; buildInputs = [ python3 ]; installPhase = '' install -vD subdl $out/bin/subdl - ''; + ''; } diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index eea6353d66cd..67918ee9806e 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -60,8 +60,8 @@ stdenv.mkDerivation { makes it easier to synchronise subtitles to voices. ''; homepage = "http://kitone.github.io/subtitleeditor/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.plcplc ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.plcplc ]; }; } diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 36375d9ecc06..3bd48019d0dd 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -63,7 +63,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; makeWrapperArgs = [ - "--prefix PATH : ${stdenv.lib.makeBinPath [ youtube-dl ]}" + "--prefix PATH : ${lib.makeBinPath [ youtube-dl ]}" ]; meta = with lib; { diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix index 0280cfb3f1f4..83b49c075784 100644 --- a/pkgs/applications/video/vcs/default.nix +++ b/pkgs/applications/video/vcs/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, util-linux , dejavu_fonts }: -with stdenv.lib; +with lib; let version = "1.13.4"; runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer util-linux ]; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 55ac94d8c6c7..395de891eb93 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -18,7 +18,7 @@ in { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; }); - inherit (stdenv.lib.genAttrs [ + inherit (lib.genAttrs [ "epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo" ] mkPlugin); diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 559398677a41..9c49f8ba6df4 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -19,7 +19,7 @@ # If your firewall is enabled, make sure to have something like: # networking.firewall.allowedTCPPorts = [ 8010 ]; -with stdenv.lib; +with lib; assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null); diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix index 7710c7d67a31..7cbc2b0f8159 100644 --- a/pkgs/applications/video/w_scan/default.nix +++ b/pkgs/applications/video/w_scan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "w_scan"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { description = "Small CLI utility to scan DVB and ATSC transmissions"; homepage = "http://wirbel.htpc-forum.de/w_scan/index_en.html"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ] ; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nico202 ] ; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 6b97fa63e0be..ac3dd320d3a3 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -6,7 +6,7 @@ }: let - rpath = stdenv.lib.makeLibraryPath ([ + rpath = lib.makeLibraryPath ([ alsaLib atk at-spi2-core diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 9294c4d2cde1..747af7a3b024 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859"; }; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg"; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index ee2f811cb4a1..e891d4ab5acf 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , ncurses , libjpeg @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { meta = { description = "TV application for Linux with apps and tools such as a teletext browser"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://www.kraxel.org/blog/linux/xawtv/"; - maintainers = with stdenv.lib.maintainers; [ domenkozar ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ domenkozar ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index 050b5b32b198..49f5b43bb734 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { patchShebangs $out/bin wrapProgram "$out/bin/xscast" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg_3 dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} + --prefix PATH : ${lib.makeBinPath [ ffmpeg_3 dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} runHook postInstall ''; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 0f7f9390daca..06a433f40211 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Screencast video catpuring tool"; homepage = "http://xvidcap.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index addab70c3b3d..c58d488f5839 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w"; }; - buildInputs = with stdenv.lib; + buildInputs = with lib; optionals localBios [ nasm ] ++ optionals sdlSupport [ SDL ]; - + bios = localBios; - + builder = ./builder.sh; meta = with lib; { diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 6301182771fb..14d8d0c13fe6 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -59,7 +59,7 @@ edk2.mkDerivation projectDscPath { meta = { description = "Sample UEFI firmware for QEMU and KVM"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index e9982d61391d..58d7a3ad7048 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkgconfig, libtool , gtk2, libGLU, libGL, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl @@ -15,7 +15,7 @@ assert wxSupport -> (gtk2 != null && wxGTK != null); assert wgetSupport -> (wget != null); assert curlSupport -> (curl != null); -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bochs"; diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index 79e32007144f..9e866d7cf4dc 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }: +{ lib, stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Here we wrap those deps so they are resolved inside nixpkgs. postInstall = '' for file in $out/bin/* ; do \ - wrapProgram $file --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]} + wrapProgram $file --prefix PATH : ${lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]} done ''; @@ -54,9 +54,9 @@ stdenv.mkDerivation rec { on offer. ''; homepage = "https://hpc.github.io/charliecloud"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index ac0313a4e336..6afcfcff8c17 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib systemd ] - ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; # manpage requires building the vendored go-md2man makeFlags = [ "bin/conmon" ]; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 7914fd243270..946e109c99e0 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { libseccomp libselinux lvm2 - ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + ] ++ lib.optionals (glibc != null) [ glibc glibc.static ]; BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index e9e6092e1f9b..464771b2c14f 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -25,8 +25,8 @@ buildPythonApplication rec { ipaddress jsonschema requests six texttable websocket_client docopt cached-property paramiko distro python-dotenv ] ++ - stdenv.lib.optional (pythonOlder "3.4") enum34 ++ - stdenv.lib.optional (pythonOlder "3.2") functools32; + lib.optional (pythonOlder "3.4") enum34 ++ + lib.optional (pythonOlder "3.2") functools32; postPatch = '' # Remove upper bound on requires, see also diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index 08cfba59918f..f7bd5a4b0696 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp docker-gc $out/bin chmod +x $out/bin/docker-gc wrapProgram $out/bin/docker-gc \ - --prefix PATH : "${stdenv.lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}" ''; meta = { diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index e772a540b183..cf6395c8a53b 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildPhase = let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/."; - in stdenv.lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]); + in lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]); installPhase = '' mkdir -p $out diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 565fc4cf533b..1f9e21845ce6 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { {input="viorng"; output="viorng";} ]; in - stdenv.lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio)); + lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio)); meta = with lib; { description = "Windows VirtIO Drivers"; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 54cf8094d646..2d423911c99b 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -87,7 +87,7 @@ in buildBazelPackage rec { # Needed for the 'runsc do' subcomand wrapProgram $out/bin/runsc \ - --prefix PATH : ${stdenv.lib.makeBinPath [ iproute iptables procps ]} + --prefix PATH : ${lib.makeBinPath [ iproute iptables procps ]} ''; }; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 39097c8e5b3b..5c03951e17eb 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme libapparmor @@ -51,7 +51,7 @@ buildGoModule rec { make docs ''; - installPhase = stdenv.lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.isDarwin '' mv bin/{podman-remote,podman} '' + '' install -Dm555 bin/podman $out/bin/podman diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 8d1f9dac2e51..8ac00d1f8e15 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub, nixosTests }: +{ lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }: stdenv.mkDerivation { name = "qboot-20200423"; @@ -24,8 +24,8 @@ stdenv.mkDerivation { meta = { description = "A simple x86 firmware for booting Linux"; homepage = "https://github.com/bonzini/qboot"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ tstrobel ]; platforms = ["x86_64-linux" "i686-linux"]; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 44dff9ad42a1..ce2797d35d0e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -29,7 +29,7 @@ , nixosTestRunner ? false }: -with stdenv.lib; +with lib; let audio = optionalString alsaSupport "alsa," + optionalString pulseSupport "pa," @@ -40,9 +40,9 @@ in stdenv.mkDerivation rec { version = "5.1.0"; pname = "qemu" - + stdenv.lib.optionalString xenSupport "-xen" - + stdenv.lib.optionalString hostCpuOnly "-host-cpu-only" - + stdenv.lib.optionalString nixosTestRunner "-for-vm-tests"; + + lib.optionalString xenSupport "-xen" + + lib.optionalString hostCpuOnly "-host-cpu-only" + + lib.optionalString nixosTestRunner "-for-vm-tests"; src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { ++ optional smartcardSupport "--enable-smartcard" ++ optional spiceSupport "--enable-spice" ++ optional usbredirSupport "--enable-usb-redir" - ++ optional (hostCpuTargets != null) "--target-list=${stdenv.lib.concatStringsSep "," hostCpuTargets}" + ++ optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}" ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isDarwin "--enable-hvf" ++ optional stdenv.isLinux "--enable-linux-aio" diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 4c0f441d7819..547b177b3a6c 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { install -D -t $out/bin qtemu # make sure that the qemu-* executables are found - wrapProgram $out/bin/qtemu --prefix PATH : ${stdenv.lib.makeBinPath [ qemu ]} + wrapProgram $out/bin/qtemu --prefix PATH : ${lib.makeBinPath [ qemu ]} runHook postInstall ''; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 13f84736d9ec..6961dcf7b893 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -39,7 +39,7 @@ buildGoPackage rec { cd go/src/github.com/sylabs/singularity patchShebangs . - sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go + sed -i 's|defaultPath := "[^"]*"|defaultPath := "${lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go ./mconfig -V ${version} -p $out --localstatedir=/var @@ -59,8 +59,8 @@ buildGoPackage rec { chmod 755 $out/libexec/singularity/bin/starter-suid # Explicitly configure paths in the config file - sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${stdenv.lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf - sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${stdenv.lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf + sed -i 's|^# mksquashfs path =.*$|mksquashfs path = ${lib.makeBinPath [squashfsTools]}/mksquashfs|' $out/etc/singularity/singularity.conf + sed -i 's|^# cryptsetup path =.*$|cryptsetup path = ${lib.makeBinPath [cryptsetup]}/cryptsetup|' $out/etc/singularity/singularity.conf runHook postInstall ''; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index f577ded70bae..998a127b2fcb 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, +{lib, stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { * Multiple displays ''; homepage = "https://www.spice-space.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.aboseley ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.aboseley ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix index 2c9098993d8f..17cee52a64e0 100644 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ b/pkgs/applications/virtualization/tinyemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, curl, SDL }: +{ lib, stdenv, fetchurl, openssl, curl, SDL }: stdenv.mkDerivation rec { pname = "tinyemu"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { homepage = "https://bellard.org/tinyemu/"; description = "A system emulator for the RISC-V and x86 architectures"; longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; - license = with stdenv.lib.licenses; [ mit bsd2 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + license = with lib.licenses; [ mit bsd2 ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jhhuh ]; }; } diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 4a6b539b4fbd..8fe9caf0e570 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -7,7 +7,7 @@ , cpio, e2fsprogs, findutils, gzip }: -with stdenv.lib; +with lib; python3Packages.buildPythonApplication rec { pname = "virt-manager"; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 41e6c425a81a..c31552db3018 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook +{ lib, stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook , glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null @@ -7,7 +7,7 @@ assert spiceSupport -> spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 4d8987d6ed78..37f03d8772f5 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python2Packages, intltool, libxml2Python }: +{ lib, stdenv, fetchurl, python2Packages, intltool, libxml2Python }: -with stdenv.lib; +with lib; let version = "0.600.4"; in @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://virt-manager.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [qknight]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [qknight]; description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index e80edf72677a..eb7d067b6d53 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -16,7 +16,7 @@ , enable32bitGuests ? true }: -with stdenv.lib; +with lib; let python = python3; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 180970d51dac..8e5adc835776 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -3,7 +3,7 @@ let version = virtualbox.version; - xserverVListFunc = builtins.elemAt (stdenv.lib.splitVersion xorg.xorgserver.version); + xserverVListFunc = builtins.elemAt (lib.splitVersion xorg.xorgserver.version); # Forced to 1.18 in # as it even fails to build otherwise. Still, override this even here, diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index cbaa0a579926..b671c1f6fa4d 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: stdenv.mkDerivation rec { pname = "x11docker"; version = "6.6.2"; @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { installPhase = '' install -D x11docker "$out/bin/x11docker"; wrapProgram "$out/bin/x11docker" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" + --prefix PATH : "${lib.makeBinPath [ getopt gnugrep gawk ps mount iproute nx-libs xorg.xdpyinfo xorg.xhost xorg.xinit ]}" ''; meta = { description = "Run graphical applications with Docker"; homepage = "https://github.com/mviereck/x11docker"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jD91mZM2 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index 7e3c73fb11d5..2f9882dee9b3 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit +{ lib, stdenv, callPackage, fetchurl, fetchpatch, fetchgit , ocaml-ng , withInternalQemu ? true , withInternalTraditionalQemu ? true @@ -16,7 +16,7 @@ assert withInternalSeabios -> !withSeabios; assert withInternalOVMF -> !withOVMF; -with stdenv.lib; +with lib; # Patching XEN? Check the XSAs at # https://xenbits.xen.org/xsa/ diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 4b03bb5da46d..3fdda8107897 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,5 +1,5 @@ config: -{ stdenv, cmake, pkg-config, which +{ lib, stdenv, cmake, pkg-config, which # Xen , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib @@ -24,7 +24,7 @@ config: , ...} @ args: -with stdenv.lib; +with lib; let #TODO: fix paths instead @@ -252,7 +252,7 @@ stdenv.mkDerivation (rec { + "\nIncludes:\n" + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.''); platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ]; - license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ eelco tstrobel oxij ]; + license = lib.licenses.gpl2; } // (config.meta or {}); } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) From f35b06e86db3574743efd24ead9ba6b68e1b9a99 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 13:19:41 +0700 Subject: [PATCH 51/81] top-level/ruby-packages: add newline to end of file --- pkgs/top-level/ruby-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index ef82be30b620..3ab534dd91ad 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2643,4 +2643,4 @@ }; version = "1.4.11"; }; -} \ No newline at end of file +} From e245ae3c3ac34d24ec6ceb7b86aa74be4fb8e707 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 13:28:56 +0700 Subject: [PATCH 52/81] pkgs/shells: stdenv.lib -> lib --- pkgs/shells/bash/4.4.nix | 2 +- pkgs/shells/bash/5.1.nix | 2 +- pkgs/shells/bash/bash-completion/default.nix | 4 ++-- pkgs/shells/dash/default.nix | 4 ++-- pkgs/shells/ion/default.nix | 2 +- pkgs/shells/oh/default.nix | 4 ++-- pkgs/shells/powershell/default.nix | 2 +- pkgs/shells/rc/default.nix | 6 +++--- pkgs/shells/rush/default.nix | 8 ++++---- pkgs/shells/tcsh/default.nix | 2 +- pkgs/shells/zsh/antigen/default.nix | 4 ++-- pkgs/shells/zsh/default.nix | 10 +++++----- pkgs/shells/zsh/oh-my-zsh/default.nix | 2 +- pkgs/shells/zsh/pure-prompt/default.nix | 4 ++-- pkgs/shells/zsh/zsh-bd/default.nix | 8 ++++---- pkgs/shells/zsh/zsh-completions/default.nix | 8 ++++---- pkgs/shells/zsh/zsh-git-prompt/default.nix | 2 +- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 8 ++++---- pkgs/shells/zsh/zsh-powerlevel9k/default.nix | 8 ++++---- 19 files changed, 45 insertions(+), 45 deletions(-) diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index afdfb816c955..bde942aff0c5 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -6,7 +6,7 @@ , withDocs ? false, texinfo ? null }: -with stdenv.lib; +with lib; assert interactive -> readline70 != null; assert withDocs -> texinfo != null; diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index fd8c0c32cd61..5dd060db7efb 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -12,7 +12,7 @@ , texinfo ? null }: -with stdenv.lib; +with lib; assert interactive -> readline80 != null; assert withDocs -> texinfo != null; diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 22a7ead545dd..0ebcaa9e8645 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # - ignore test_screen because it assumes vt terminals exist checkPhase = '' pytest . \ - ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ + ${lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ --ignore=test/t/test_chsh.py \ --ignore=test/t/test_ether_wake.py \ --ignore=test/t/test_ifdown.py \ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { --ignore=test/t/test_screen.py ''; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* ''; diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 2c6e9cc0e681..24d5af7e74ee 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5"; }) - ] ++ stdenv.lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; + ] ++ lib.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; meta = with lib; { homepage = "http://gondor.apana.org.au/~herbert/dash/"; diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index d1b499a9160c..77691e99b255 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ dywedir ]; }; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 3ae8a7c600aa..3ea41d7f4728 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "oh"; - version = "20160522-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160522-${lib.strings.substring 0 7 rev}"; rev = "0daaf4081475fb9d6b3801c85019bdd57b2ee9b4"; goPackagePath = "github.com/michaelmacinnis/oh"; @@ -18,6 +18,6 @@ buildGoPackage rec { meta = with lib;{ homepage = "https://github.com/michaelmacinnis/oh"; description = "A Unix shell"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index d776e64fa49d..3f9d7130811a 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper $pslibs/pwsh $out/bin/pwsh \ - --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ + --prefix ${platformLdLibraryPath} : "${lib.makeLibraryPath libraries}" \ --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 ''; diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index a71d5ba28971..af43c42dd4bd 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optionals (readline != null) [ readline ]; + ++ lib.optionals (readline != null) [ readline ]; configureFlags = [ "--enable-def-interp=${stdenv.shell}" #183 - ] ++ stdenv.lib.optionals historySupport [ "--with-history" ] - ++ stdenv.lib.optionals (readline != null) [ "--with-edit=readline" ]; + ] ++ lib.optionals historySupport [ "--with-history" ] + ++ lib.optionals (readline != null) [ "--with-edit=readline" ]; prePatch = '' substituteInPlace configure.ac \ diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index f9e15d4a0b47..bdb8f7ce0952 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "rush"; @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/rush/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.bjg ]; + platforms = lib.platforms.all; }; passthru = { diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 468d17b60b7e..8f4a1664467b 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "sysmalloc.patch"; url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index 5603e5edf598..c80471677f09 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "2.2.3"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "The plugin manager for zsh"; homepage = "http://antigen.sharats.me"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index eab6d88a0b7d..71f526525e4f 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre, buildPackages }: +{ lib, stdenv, fetchurl, ncurses, pcre, buildPackages }: let version = "5.8"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { # the zsh/zpty module is not available on hydra # so skip groups Y Z - checkFlags = map (T: "TESTNUM=${T}") (stdenv.lib.stringToCharacters "ABCDEVW"); + checkFlags = map (T: "TESTNUM=${T}") (lib.stringToCharacters "ABCDEVW"); # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' @@ -65,7 +65,7 @@ EOF ${if stdenv.hostPlatform == stdenv.buildPlatform then '' $out/bin/zsh -c "zcompile $out/etc/zprofile" '' else '' - ${stdenv.lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" + ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" ''} mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used ''; @@ -83,8 +83,8 @@ EOF ''; license = "MIT-like"; homepage = "https://www.zsh.org/"; - maintainers = with stdenv.lib.maintainers; [ pSub ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ pSub ]; + platforms = lib.platforms.unix; }; passthru = { diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 1b3a4c21cf32..36ef1843162e 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - stdenv.lib.makeBinPath [ + lib.makeBinPath [ common-updater-scripts curl cacert diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index ac7035045bb1..dfc9593a5326 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/shells/zsh/zsh-bd/default.nix index b5b66af6ca38..f2c2dc90fb4e 100644 --- a/pkgs/shells/zsh/zsh-bd/default.nix +++ b/pkgs/shells/zsh/zsh-bd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub}: +{ lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "zsh-bd"; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = { description = "Jump back to a specific directory, without doing `cd ../../..` "; homepage = "https://github.com/Tarrasch/zsh-bd"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.olejorgenb ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.olejorgenb ]; }; } diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 89a91ad0508e..07e538610ba3 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub}: +{ lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "zsh-completions"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { description = "Additional completion definitions for zsh"; homepage = "https://github.com/zsh-users/zsh-completions"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.olejorgenb ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.olejorgenb ]; }; } diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index 6aadf3163d34..c0c56570b46d 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -65,6 +65,6 @@ haskellPackages.callPackage testHaskellDepends = [HUnit] ++ libraryHaskellDepends; homepage = "https://github.com/olivierverdier/zsh-git-prompt#readme"; description = "Informative git prompt for zsh"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; maintainers = [lib.maintainers.league]; }) {} diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 0bba4bffdeff..0bc46849df27 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, pkgs }: +{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = { description = "A fast reimplementation of Powerlevel9k ZSH theme"; homepage = "https://github.com/romkatv/powerlevel10k"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.hexa ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.hexa ]; }; } diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index 676f9458675b..b681dc2d3a3a 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: # To make use of this derivation, use # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";` @@ -21,9 +21,9 @@ stdenv.mkDerivation { meta = { description = "A beautiful theme for zsh"; homepage = "https://github.com/bhilburn/powerlevel9k"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.pierrechevalier83 ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.pierrechevalier83 ]; }; } From 872973d7d1a71570dee1e9c1114e13a072bf3ffc Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 14:07:56 +0700 Subject: [PATCH 53/81] pkgs/servers: stdenv.lib -> lib --- pkgs/servers/amqp/qpid-cpp/default.nix | 2 +- pkgs/servers/amqp/rabbitmq-server/default.nix | 14 ++++----- pkgs/servers/apcupsd/default.nix | 4 +-- pkgs/servers/asterisk/sccp/default.nix | 2 +- pkgs/servers/atlassian/crowd.nix | 2 +- pkgs/servers/blockbook/default.nix | 2 +- pkgs/servers/brickd/default.nix | 8 ++--- pkgs/servers/cayley/default.nix | 8 ++--- pkgs/servers/code-server/default.nix | 6 ++-- pkgs/servers/computing/slurm/default.nix | 6 ++-- pkgs/servers/corosync/default.nix | 4 +-- pkgs/servers/dict/dictd-db.nix | 4 +-- pkgs/servers/dict/dictd-wiktionary.nix | 4 +-- pkgs/servers/dict/dictd-wordnet.nix | 4 +-- pkgs/servers/dns/knot-dns/default.nix | 2 +- pkgs/servers/dns/knot-resolver/default.nix | 2 +- pkgs/servers/dns/pdns-recursor/default.nix | 4 +-- pkgs/servers/elasticmq/default.nix | 10 +++---- pkgs/servers/exhibitor/default.nix | 2 +- pkgs/servers/firebird/default.nix | 10 +++---- pkgs/servers/freeradius/default.nix | 4 +-- pkgs/servers/gerbera/default.nix | 2 +- pkgs/servers/h2/default.nix | 2 +- pkgs/servers/hbase/default.nix | 2 +- pkgs/servers/headphones/default.nix | 2 +- pkgs/servers/holochain-go/default.nix | 6 ++-- pkgs/servers/http/apache-httpd/2.4.nix | 24 +++++++-------- .../apache-modules/mod_evasive/default.nix | 2 +- .../apache-modules/mod_fastcgi/default.nix | 6 ++-- .../apache-modules/mod_python/default.nix | 4 +-- .../http/apache-modules/mod_wsgi/default.nix | 6 ++-- pkgs/servers/http/gatling/default.nix | 2 +- pkgs/servers/http/hiawatha/default.nix | 2 +- .../servers/http/jboss/jdbc/mysql/default.nix | 4 +-- pkgs/servers/http/jetty/default.nix | 6 ++-- pkgs/servers/http/lighttpd/default.nix | 24 +++++++-------- pkgs/servers/http/mini-httpd/default.nix | 8 ++--- pkgs/servers/http/nginx/generic.nix | 4 +-- .../servers/http/nix-binary-cache/default.nix | 12 ++++---- pkgs/servers/http/pshs/default.nix | 6 ++-- pkgs/servers/http/redstore/default.nix | 8 ++--- pkgs/servers/http/tengine/default.nix | 4 +-- pkgs/servers/http/thttpd/default.nix | 6 ++-- pkgs/servers/http/tomcat/axis2/default.nix | 6 ++-- .../http/tomcat/jdbc/mysql/default.nix | 4 +-- pkgs/servers/http/unit/default.nix | 4 +-- pkgs/servers/icecast/default.nix | 8 ++--- pkgs/servers/irc/ircd-hybrid/default.nix | 4 +-- pkgs/servers/irc/ngircd/default.nix | 6 ++-- pkgs/servers/irc/solanum/default.nix | 2 +- pkgs/servers/jackett/default.nix | 2 +- pkgs/servers/jellyfin/10.5.x.nix | 4 +-- pkgs/servers/jellyfin/default.nix | 4 +-- pkgs/servers/jetbrains/youtrack.nix | 2 +- pkgs/servers/ldap/389/default.nix | 4 +-- pkgs/servers/lidarr/default.nix | 4 +-- pkgs/servers/mail/dovecot/default.nix | 4 +-- pkgs/servers/mail/exim/default.nix | 24 +++++++-------- pkgs/servers/mail/mailman/default.nix | 6 ++-- pkgs/servers/mail/mailman/hyperkitty.nix | 8 ++--- pkgs/servers/mail/mailman/postorius.nix | 6 ++-- pkgs/servers/mail/nullmailer/default.nix | 4 +-- pkgs/servers/mail/opensmtpd/extras.nix | 18 +++++------ pkgs/servers/mail/petidomo/default.nix | 8 ++--- pkgs/servers/mail/popa3d/default.nix | 4 +-- pkgs/servers/mail/postfix/default.nix | 2 +- pkgs/servers/mail/postfix/pfixtools.nix | 2 +- pkgs/servers/mail/postfix/pflogsumm.nix | 6 ++-- pkgs/servers/mail/spamassassin/default.nix | 8 ++--- pkgs/servers/memcached/default.nix | 2 +- pkgs/servers/microserver/default.nix | 2 +- pkgs/servers/misc/airsonic/default.nix | 2 +- .../misc/client-ip-echo/client-ip-echo.nix | 4 +-- pkgs/servers/misc/navidrome/default.nix | 4 +-- pkgs/servers/misc/taskserver/default.nix | 10 +++---- .../monitoring/fusion-inventory/default.nix | 2 +- .../monitoring/grafana-reporter/default.nix | 4 +-- pkgs/servers/monitoring/lcdproc/default.nix | 2 +- pkgs/servers/monitoring/loki/default.nix | 4 +-- pkgs/servers/monitoring/nagios/default.nix | 8 ++--- .../nagios/plugins/check_ssl_cert.nix | 2 +- pkgs/servers/monitoring/net-snmp/default.nix | 2 +- pkgs/servers/monitoring/plugins/default.nix | 4 +-- pkgs/servers/monitoring/plugins/esxi.nix | 2 +- .../monitoring/plugins/labs_consol_de.nix | 2 +- .../monitoring/prometheus/alertmanager.nix | 2 +- .../monitoring/prometheus/bind-exporter.nix | 2 +- .../prometheus/postfix-exporter.nix | 2 +- .../monitoring/prometheus/pushgateway.nix | 2 +- pkgs/servers/monitoring/zabbix/agent.nix | 2 +- pkgs/servers/monitoring/zabbix/proxy.nix | 4 +-- pkgs/servers/monitoring/zabbix/server.nix | 4 +-- pkgs/servers/monitoring/zabbix/web.nix | 4 +-- pkgs/servers/mpd/clientlib.nix | 2 +- pkgs/servers/mpd/default.nix | 1 - pkgs/servers/news/leafnode/default.nix | 6 ++-- pkgs/servers/nextcloud/news-updater.nix | 6 ++-- pkgs/servers/nosql/apache-jena/binary.nix | 8 ++--- .../nosql/apache-jena/fuseki-binary.nix | 8 ++--- pkgs/servers/nosql/cassandra/generic.nix | 4 +-- pkgs/servers/nosql/eventstore/default.nix | 6 ++-- pkgs/servers/nosql/mongodb/mongodb.nix | 16 +++++----- pkgs/servers/nosql/mongodb/v3_4.nix | 2 +- pkgs/servers/nosql/mongodb/v3_6.nix | 2 +- pkgs/servers/nosql/mongodb/v4_0.nix | 2 +- pkgs/servers/nosql/mongodb/v4_2.nix | 2 +- pkgs/servers/nosql/neo4j/default.nix | 6 ++-- pkgs/servers/nosql/redis/default.nix | 12 ++++---- pkgs/servers/nosql/rethinkdb/default.nix | 16 +++++----- pkgs/servers/openafs/1.8/default.nix | 2 +- pkgs/servers/openafs/1.9/default.nix | 2 +- pkgs/servers/openxpki/default.nix | 14 ++++----- pkgs/servers/osrm-backend/default.nix | 8 ++--- pkgs/servers/pies/default.nix | 6 ++-- pkgs/servers/plex/raw.nix | 4 +-- pkgs/servers/prayer/default.nix | 8 ++--- pkgs/servers/ps3netsrv/default.nix | 8 ++--- pkgs/servers/quagga/default.nix | 2 +- pkgs/servers/radarr/default.nix | 2 +- pkgs/servers/radicale/1.x.nix | 2 +- pkgs/servers/rainloop/default.nix | 4 +-- pkgs/servers/roundcube/default.nix | 8 ++--- pkgs/servers/rpcbind/default.nix | 2 +- pkgs/servers/rt/default.nix | 4 +-- pkgs/servers/sabnzbd/default.nix | 4 +-- pkgs/servers/samba/4.x.nix | 2 +- pkgs/servers/scylladb/default.nix | 4 +-- pkgs/servers/search/elasticsearch/6.x.nix | 4 +-- pkgs/servers/search/elasticsearch/7.x.nix | 4 +-- pkgs/servers/search/groonga/default.nix | 4 +-- pkgs/servers/search/meilisearch/default.nix | 2 +- pkgs/servers/search/sphinxsearch/default.nix | 16 +++++----- pkgs/servers/shairplay/default.nix | 4 +-- pkgs/servers/shishi/default.nix | 8 ++--- pkgs/servers/sickbeard/default.nix | 2 +- pkgs/servers/sickbeard/sickgear.nix | 2 +- pkgs/servers/silc-server/default.nix | 8 ++--- pkgs/servers/sip/freeswitch/default.nix | 6 ++-- pkgs/servers/sip/sipwitch/default.nix | 8 ++--- pkgs/servers/skydns/default.nix | 4 +-- pkgs/servers/slimserver/default.nix | 2 +- pkgs/servers/sonarr/default.nix | 10 +++---- pkgs/servers/sozu/default.nix | 2 +- pkgs/servers/sql/cockroachdb/default.nix | 2 +- .../sql/mariadb/connector-c/default.nix | 4 +-- pkgs/servers/sql/mariadb/default.nix | 4 +-- pkgs/servers/sql/mssql/jdbc/default.nix | 4 +-- pkgs/servers/sql/mysql/5.7.x.nix | 6 ++-- pkgs/servers/sql/mysql/jdbc/default.nix | 4 +-- pkgs/servers/sql/pgpool/default.nix | 4 +-- .../sql/postgresql/ext/pg_similarity.nix | 2 +- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 +-- pkgs/servers/squid/default.nix | 4 +-- pkgs/servers/teleport/default.nix | 8 ++--- pkgs/servers/ttyd/default.nix | 8 ++--- pkgs/servers/tvheadend/default.nix | 2 +- pkgs/servers/udpt/default.nix | 8 ++--- pkgs/servers/uftp/default.nix | 8 ++--- pkgs/servers/uhub/default.nix | 2 +- pkgs/servers/ums/default.nix | 14 ++++----- pkgs/servers/unfs3/default.nix | 6 ++-- pkgs/servers/urserver/default.nix | 2 +- pkgs/servers/varnish/default.nix | 4 +-- pkgs/servers/web-apps/matomo/default.nix | 4 +-- pkgs/servers/web-apps/mediawiki/default.nix | 2 +- pkgs/servers/x11/xorg/overrides.nix | 30 +++++++++---------- pkgs/servers/x11/xorg/xwayland.nix | 4 +-- pkgs/servers/x11/xquartz/default.nix | 4 +-- pkgs/servers/xinetd/default.nix | 6 ++-- pkgs/servers/xmpp/ejabberd/default.nix | 2 +- pkgs/servers/xmpp/openfire/default.nix | 6 ++-- pkgs/servers/xmpp/prosody/default.nix | 2 +- 172 files changed, 454 insertions(+), 455 deletions(-) diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index d65ad1301139..04e63d9173fb 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -41,7 +41,7 @@ let "-Wno-error=unused-function" "-Wno-error=ignored-qualifiers" "-Wno-error=catch-value" - ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + ] ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" ]); }; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 2d55e0da85c3..6100498f9bf8 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto +{ lib, stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat , procps, coreutils, gnused, systemd, glibcLocales , AppKit, Carbon, Cocoa @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync glibcLocales ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { export LANG=C.UTF-8 # fix elixir locale warning ''; - runtimePath = stdenv.lib.makeBinPath ([ + runtimePath = lib.makeBinPath ([ erlang getconf # for getting memory limits socat procps gnused coreutils # used by helper scripts - ] ++ stdenv.lib.optionals stdenv.isLinux [ systemd ]); # for systemd unit activation check + ] ++ lib.optionals stdenv.isLinux [ systemd ]); # for systemd unit activation check postInstall = '' # rabbitmq-env calls to sed/coreutils, so provide everything early sed -i $out/sbin/rabbitmq-env -e '2s|^|PATH=${runtimePath}\''${PATH:+:}\$PATH/\n|' @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rabbitmq.com/"; description = "An implementation of the AMQP messaging protocol"; - license = stdenv.lib.licenses.mpl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; + license = lib.licenses.mpl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ Profpatsch ]; }; passthru.tests = { diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 07bfcfd26736..3759a3d2f069 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ util-linux man ] ++ stdenv.lib.optional enableCgiScripts gd; + buildInputs = [ util-linux man ] ++ lib.optional enableCgiScripts gd; prePatch = '' sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --with-lock-dir=/run/lock \ --with-pid-dir=/run \ --enable-usb \ - ${stdenv.lib.optionalString enableCgiScripts "--enable-cgi --with-cgi-bin=$out/libexec/cgi-bin"} + ${lib.optionalString enableCgiScripts "--enable-cgi --with-cgi-bin=$out/libexec/cgi-bin"} " ''; diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/servers/asterisk/sccp/default.nix index a830c5bdbd4a..10b238f8877a 100644 --- a/pkgs/servers/asterisk/sccp/default.nix +++ b/pkgs/servers/asterisk/sccp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postFixup = '' p="$out/lib/asterisk/modules/chan_sccp.so" - patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ binutils-unwrapped ]}" "$p" + patchelf --set-rpath "$p:${lib.makeLibraryPath [ binutils-unwrapped ]}" "$p" ''; meta = with lib; { diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 6fec1b5960e0..f4c257314a84 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "http://localhost:${toString port}/" sed -r -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ -e 's,application.password\s+password,application.password ${openidPassword},' - '' + stdenv.lib.optionalString (proxyUrl != null) '' + '' + lib.optionalString (proxyUrl != null) '' sed -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ -e 's,http://localhost:${toString port}/openidserver,${proxyUrl}/openidserver,' ''; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index ceff2139414d..2394ef258a91 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -39,7 +39,7 @@ buildGoModule rec { -X github.com/trezor/blockbook/common.buildDate=unknown ''; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' export CGO_LDFLAGS="-L${stdenv.cc.cc.lib}/lib -lrocksdb -lz -lbz2 -lsnappy -llz4 -lm -lstdc++" diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index 4b18e73284f9..b1997cf76f07 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} : +{ lib, stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} : let @@ -55,8 +55,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.tinkerforge.com/"; description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages"; - maintainers = [ stdenv.lib.maintainers.qknight ]; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.qknight ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index 0d89d2f11653..8ab171a2f437 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "cayley"; @@ -23,8 +23,8 @@ buildGoPackage rec { meta = { homepage = "https://cayley.io/"; description = "A graph database inspired by Freebase and Knowledge Graph"; - maintainers = with stdenv.lib.maintainers; [ sigma ]; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ sigma ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 60b4d57c6477..433f08525dc1 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { configurePhase = '' # set default yarn opts - ${stdenv.lib.concatMapStrings (option: '' + ${lib.concatMapStrings (option: '' yarn --offline config set ${option} '') defaultYarnOpts} @@ -206,8 +206,8 @@ in stdenv.mkDerivation rec { ''; passthru = { - prefetchYarnCache = stdenv.lib.overrideDerivation yarnCache (d: { - outputHash = stdenv.lib.fakeSha256; + prefetchYarnCache = lib.overrideDerivation yarnCache (d: { + outputHash = lib.fakeSha256; }); }; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index d5a2c030c115..2b4c250a966c 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace src/common/env.c \ --replace "/bin/echo" "${coreutils}/bin/echo" - '' + (stdenv.lib.optionalString enableX11 '' + '' + (lib.optionalString enableX11 '' substituteInPlace src/common/x11_util.c \ --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"' ''); @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { libmysqlclient ncurses gtk2 lz4 rdma-core lua hwloc numactl readline freeipmi shadow.su pmix - ] ++ stdenv.lib.optionals enableX11 [ xorg.xauth ]; + ] ++ lib.optionals enableX11 [ xorg.xauth ]; - configureFlags = with stdenv.lib; + configureFlags = with lib; [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" "--with-lz4=${lz4.dev}" diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 693ab0042f3d..08ded357488e 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb +{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb , dbus, rdma-core, libstatgrab, net-snmp , enableDbus ? false , enableInfiniBandRdma ? false @@ -6,7 +6,7 @@ , enableSnmp ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "corosync"; diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 3ff36d4c62e4..584c35bf7f83 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage }: +{ lib, stdenv, fetchurl, callPackage }: let # Probably a bug in some FreeDict release files, but easier to trivially @@ -24,7 +24,7 @@ let meta = { description = "dictd-db dictionary for dictd"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; }; in rec { diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix index 2207f2c36dfb..f591064a3c13 100644 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, dict, glibcLocales, writeScript}: +{lib, stdenv, fetchurl, python, dict, glibcLocales, writeScript}: stdenv.mkDerivation rec { version = "20161001"; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "DICT version of English Wiktionary"; homepage = "http://en.wiktionary.org/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 0afdf442d233..3f76d60233cc 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -1,4 +1,4 @@ -{stdenv, python, wordnet, writeScript}: +{lib, stdenv, python, wordnet, writeScript}: stdenv.mkDerivation rec { version = "542"; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://wordnet.princeton.edu/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index e1bd2bb2fff3..9c4b04cc6e6e 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -3,7 +3,7 @@ , autoreconfHook }: -let inherit (stdenv.lib) optional optionals; in +let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1f495622f28b..3277d694a4bc 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,7 +12,7 @@ let # un-indented, over the whole file result = if extraFeatures then wrapped-full else unwrapped; -inherit (stdenv.lib) optional optionals optionalString; +inherit (lib) optional optionals optionalString; lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index f23aa6b02c17..d91a77ac372b 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, boost, nixosTests +{ lib, stdenv, fetchurl, pkgconfig, boost, nixosTests , openssl, systemd, lua, luajit, protobuf , enableProtoBuf ? false }: assert enableProtoBuf -> protobuf != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix index 1ea669f573f0..b27a8decb5e9 100644 --- a/pkgs/servers/elasticmq/default.nix +++ b/pkgs/servers/elasticmq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, which }: +{ lib, stdenv, fetchurl, jre, makeWrapper, which }: stdenv.mkDerivation rec { name = "elasticmq-0.5"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { '' mkdir -p $out/bin cp -prd lib conf $out/ - + cp bin/run.sh $out/bin/elasticmq substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}' - wrapProgram $out/bin/elasticmq --prefix PATH : "${stdenv.lib.makeBinPath [ which jre ]}" + wrapProgram $out/bin/elasticmq --prefix PATH : "${lib.makeBinPath [ which jre ]}" ''; meta = { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the Default.scala included in the distribution as a template. ''; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index b4869b162db9..0b92aca74c75 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/share/java mv target/$name.jar $out/share/java/ - makeWrapper ${jdk}/bin/java $out/bin/startExhibitor.sh --add-flags "-jar $out/share/java/$name.jar" --suffix PATH : ${stdenv.lib.makeBinPath [ jdk ]} + makeWrapper ${jdk}/bin/java $out/bin/startExhibitor.sh --add-flags "-jar $out/share/java/$name.jar" --suffix PATH : ${lib.makeBinPath [ jdk ]} ''; } diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 063eaec7dede..eb45cb3bfc5d 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libedit, automake, autoconf, libtool +{lib, stdenv, fetchurl, libedit, automake, autoconf, libtool , # icu = null: use icu which comes with firebird @@ -56,8 +56,8 @@ stdenv.mkDerivation rec { "--with-fbconf=/etc/firebird" "--with-fbsecure-db=/var/db/firebird/system" ] - ++ (stdenv.lib.optional (icu != null) "--with-system-icu") - ++ (stdenv.lib.optional superServer "--enable-superserver"); + ++ (lib.optional (icu != null) "--with-system-icu") + ++ (lib.optional superServer "--enable-superserver"); src = fetchurl { url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2"; @@ -83,8 +83,8 @@ stdenv.mkDerivation rec { description = "SQL relational database management system"; homepage = "https://www.firebirdnews.org"; license = ["IDPL" "Interbase-1.0"]; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; broken = true; }; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 6f932208f3c9..06ce536b18d1 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -40,7 +40,7 @@ assert withRest -> curl != null && withJson; ## TODO: include oracle optionally ## TODO: include ykclient optionally -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "freeradius"; version = "3.0.21"; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ] ++ optional (!linkOpenssl) "--with-openssl=no"; - patches = stdenv.lib.optional withRest (fetchpatch { + patches = lib.optional withRest (fetchpatch { # Fix HTTP/2 in rest url = "https://github.com/FreeRADIUS/freeradius-server/commit/6286520698a3cc4053b4d49eb0a61d9ba77632aa.patch"; sha256 = "1ycvr3ql1mfkvzydnn4aiygnidicv2hgllppv37nb1p2pk02159g"; diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index 965e1d1b0820..f81cc6600f15 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -16,7 +16,7 @@ , enableInotifyTools ? true }: -with stdenv.lib; +with lib; let optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index cdcd802916b5..51060a3ab9d9 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "The Java SQL database"; homepage = "http://www.h2database.com/html/main.html"; license = licenses.mpl20; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = with maintainers; [ mahe ]; }; } diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 5e1d8c85a3ff..09600082633d 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "A distributed, scalable, big data store"; homepage = "https://hbase.apache.org"; license = licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index 0ae4bbcb1fd6..75d15d4f3786 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -28,6 +28,6 @@ python2.pkgs.buildPythonApplication rec { description = "Automatic music downloader for SABnzbd"; license = licenses.gpl3; homepage = "https://github.com/rembo10/headphones"; - maintainers = with stdenv.lib.maintainers; [ rembo10 ]; + maintainers = with lib.maintainers; [ rembo10 ]; }; } diff --git a/pkgs/servers/holochain-go/default.nix b/pkgs/servers/holochain-go/default.nix index 95ec267dba24..e6e35c35900e 100644 --- a/pkgs/servers/holochain-go/default.nix +++ b/pkgs/servers/holochain-go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "holochain-go${version}"; @@ -22,8 +22,8 @@ buildGoPackage rec { longDescription = "Holographic storage for distributed applications -- a validating monotonic DHT backed by authoritative hashchains for data provenance"; homepage = "https://holochain.org/"; downloadPage = "https://developer.holochain.org/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ gavin ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ gavin ]; }; } diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index e0c906fe9f11..bd326390bbd0 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -8,7 +8,7 @@ , luaSupport ? false, lua5 }: -let inherit (stdenv.lib) optional; +let inherit (lib) optional; in assert sslSupport -> aprutil.sslSupport && openssl != null; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; # Required for ‘pthread_cancel’. - NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; configureFlags = [ "--with-apr=${apr.dev}" @@ -57,19 +57,19 @@ stdenv.mkDerivation rec { "--enable-imagemap" "--enable-cgi" "--includedir=${placeholder "dev"}/include" - (stdenv.lib.enableFeature proxySupport "proxy") - (stdenv.lib.enableFeature sslSupport "ssl") - (stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") + (lib.enableFeature proxySupport "proxy") + (lib.enableFeature sslSupport "ssl") + (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") "--docdir=$(doc)/share/doc" - (stdenv.lib.enableFeature brotliSupport "brotli") - (stdenv.lib.withFeatureAs brotliSupport "brotli" brotli) + (lib.enableFeature brotliSupport "brotli") + (lib.withFeatureAs brotliSupport "brotli" brotli) - (stdenv.lib.enableFeature http2Support "http2") - (stdenv.lib.withFeature http2Support "nghttp2") + (lib.enableFeature http2Support "http2") + (lib.withFeature http2Support "nghttp2") - (stdenv.lib.enableFeature luaSupport "lua") - (stdenv.lib.withFeatureAs luaSupport "lua" lua5) + (lib.enableFeature luaSupport "lua") + (lib.withFeatureAs luaSupport "lua" lua5) ]; enableParallelBuilding = true; @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { description = "Apache HTTPD, the world's most popular web server"; homepage = "http://httpd.apache.org/"; license = licenses.asl20; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with maintainers; [ lovek323 peti ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix index 9abd08baa091..daac48398538 100644 --- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.zdziarski.com/blog/?page_id=442"; description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 4922076266bb..0e5a5fed31c1 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd }: +{ lib, stdenv, fetchurl, apacheHttpd }: let version = "2.4.7.1"; @@ -42,7 +42,7 @@ stdenv.mkDerivation { more scalable. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 39c568d1d499..3d9d4b21c409 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, python2 }: +{ lib, stdenv, fetchurl, apacheHttpd, python2 }: stdenv.mkDerivation rec { name = "mod_python-3.5.0"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://modpython.org/"; description = "An Apache module that embeds the Python interpreter within the server"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index c8f95e685ab7..7f28abe8840a 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheHttpd, python, ncurses }: +{ lib, stdenv, fetchurl, apacheHttpd, python, ncurses }: stdenv.mkDerivation rec { pname = "mod_wsgi"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/GrahamDumpleton/mod_wsgi"; description = "Host Python applications in Apache through the WSGI interface"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 145a045014b8..e1180121a65a 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high performance web server"; homepage = "http://www.fefe.de/gatling/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 3a4f44ebf8ca..950faf89bedb 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ mbedtls ] ++ stdenv.lib.optionals enableXslt [ libxslt libxml2 ]; + buildInputs = [ mbedtls ] ++ lib.optionals enableXslt [ libxslt libxml2 ]; prePatch = '' substituteInPlace CMakeLists.txt --replace SETUID "" diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index fd2dec44c7f3..e05bf4bfce8c 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mysql_jdbc }: +{ lib, stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "jboss-mysql-jdbc"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { inherit mysql_jdbc; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 72e6c00278a4..7767d864de3c 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "jetty"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A Web server and javax.servlet container"; homepage = "https://www.eclipse.org/jetty/"; - platforms = stdenv.lib.platforms.all; - license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ]; + platforms = lib.platforms.all; + license = [ lib.licenses.asl20 stdenv.lib.licenses.epl10 ]; }; } diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index a3f0b045aa11..34da8750befe 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -32,19 +32,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] - ++ stdenv.lib.optional enableMagnet lua5_1 - ++ stdenv.lib.optional enableMysql libmysqlclient - ++ stdenv.lib.optional enableLdap openldap - ++ stdenv.lib.optional enableWebDAV sqlite - ++ stdenv.lib.optional enableWebDAV libuuid; + ++ lib.optional enableMagnet lua5_1 + ++ lib.optional enableMysql libmysqlclient + ++ lib.optional enableLdap openldap + ++ lib.optional enableWebDAV sqlite + ++ lib.optional enableWebDAV libuuid; configureFlags = [ "--with-openssl" ] - ++ stdenv.lib.optional enableMagnet "--with-lua" - ++ stdenv.lib.optional enableMysql "--with-mysql" - ++ stdenv.lib.optional enableLdap "--with-ldap" - ++ stdenv.lib.optional enableWebDAV "--with-webdav-props" - ++ stdenv.lib.optional enableWebDAV "--with-webdav-locks" - ++ stdenv.lib.optional enableExtendedAttrs "--with-attr"; + ++ lib.optional enableMagnet "--with-lua" + ++ lib.optional enableMysql "--with-mysql" + ++ lib.optional enableLdap "--with-ldap" + ++ lib.optional enableWebDAV "--with-webdav-props" + ++ lib.optional enableWebDAV "--with-webdav-locks" + ++ lib.optional enableExtendedAttrs "--with-attr"; preConfigure = '' export PATH=$PATH:${pcre.dev}/bin @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight high-performance web server"; homepage = "http://www.lighttpd.net/"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 98bb27221c37..113ccf10b8a3 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost }: +{ lib, stdenv, fetchurl, boost }: stdenv.mkDerivation rec { name = "mini-httpd-1.7"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mini-httpd.nongnu.org/"; description = "minimalistic high-performance web server"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 2b2af8966e99..251f099f7d96 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt +{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , nixosTests , substituteAll, gd, geoip, perl , withDebug ? false @@ -22,7 +22,7 @@ , meta ? null }: -with stdenv.lib; +with lib; let diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index bef7f43ea71f..1403516876f8 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -1,4 +1,4 @@ -{stdenv +{lib, stdenv , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl , lighttpd, iproute }: stdenv.mkDerivation rec { @@ -47,15 +47,15 @@ stdenv.mkDerivation rec { meta = { description = ''A set of scripts to serve the Nix store as a binary cache''; longDescription = '' - This package installs a CGI script that serves Nix store path in the - binary cache format. It also installs a launcher called + This package installs a CGI script that serves Nix store path in the + binary cache format. It also installs a launcher called nix-binary-cache-start that can be run without any setup to launch a binary cache and get the example arguments for its usage. ''; - maintainers = [stdenv.lib.maintainers.raskin]; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = [lib.maintainers.raskin]; + license = lib.licenses.gpl2Plus; inherit version; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index e8ecb16c0c52..456c58e45a2f 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }: stdenv.mkDerivation rec { pname = "pshs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Pretty small HTTP server - a command-line tool to share files"; homepage = "https://github.com/mgorny/pshs"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index 80f2434e5297..5f24c66ce64a 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2 +{ lib, stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2 , librdf_rasqal }: stdenv.mkDerivation rec { @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "An HTTP interface to Redland RDF store"; homepage = "https://www.aelius.com/njh/redstore/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; + maintainers = [ lib.maintainers.raskin ]; + platforms = with lib.platforms; linux ++ freebsd ++ gnu; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index cc6363e75d15..d7bd2eca926b 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt +{ lib, stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt , substituteAll, gd, geoip, gperftools, jemalloc , withDebug ? false , withMail ? false @@ -7,7 +7,7 @@ , ... }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.3.2"; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 6ff1026ba0c6..64e7309bc9bf 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "thttpd"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny/turbo/throttling HTTP server"; homepage = "http://www.acme.com/software/thttpd/"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 59a4ab6e5b49..e383d8f0d1b0 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheAnt, jdk, unzip }: +{ lib, stdenv, fetchurl, apacheAnt, jdk, unzip }: stdenv.mkDerivation rec { pname = "axis2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.asl20; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; }; } diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index d070a9f17404..3796d5458b2b 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mysql_jdbc }: +{ lib, stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "tomcat-mysql-jdbc"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { inherit mysql_jdbc; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index f4379aa6fa2c..a5d5e37487aa 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nixosTests, which +{ lib, stdenv, fetchFromGitHub, nixosTests, which , pcre2 , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses @@ -15,7 +15,7 @@ , withDebug ? false }: -with stdenv.lib; +with lib; let phpConfig = { diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 52f30c7c658c..15e5e81d0585 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{lib, stdenv, fetchurl , libxml2, libxslt, curl , libvorbis, libtheora, speex, libkate, libopus }: @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.icecast.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ jcumming ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 582bf94b0de9..353e836dc66e 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib }: +{ lib, stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { name = "ircd-hybrid-8.2.35"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An IPv6-capable IRC server"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; homepage = "https://www.ircd-hybrid.org/"; }; } diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index ff754a5390c1..b89837e5942d 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, openssl, pam, libiconv }: +{ lib, stdenv, fetchurl, zlib, openssl, pam, libiconv }: stdenv.mkDerivation rec { pname = "ngircd"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Next Generation IRC Daemon"; homepage = "https://ngircd.barton.de"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index d5ee98a18043..0ae030ba59d1 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var/lib/solanum" "--with-rundir=/run/solanum" "--with-logdir=/var/log/solanum" - ] ++ stdenv.lib.optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.isLinux) [ "--enable-sctp=${lksctp-tools.out}/lib" ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 9fda62a68afa..11e213f01364 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ curl icu60 openssl zlib ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl icu60 openssl zlib ]} ''; meta = with lib; { diff --git a/pkgs/servers/jellyfin/10.5.x.nix b/pkgs/servers/jellyfin/10.5.x.nix index 17903871c8d7..da4d2c4c1d58 100644 --- a/pkgs/servers/jellyfin/10.5.x.nix +++ b/pkgs/servers/jellyfin/10.5.x.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { install -dm 755 "$out/opt/jellyfin" cp -r * "$out/opt/jellyfin" makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sqlite fontconfig freetype stdenv.cc.cc.lib ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { smoke-test = nixosTests.jellyfin; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The Free Software Media System"; homepage = "https://jellyfin.org/"; license = licenses.gpl2; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index afa5375c9fdc..caca89bfd0db 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { install -dm 755 "$out/opt/jellyfin" cp -r * "$out/opt/jellyfin" makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sqlite fontconfig freetype stdenv.cc.cc.lib ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { smoke-test = nixosTests.jellyfin; }; - meta = with stdenv.lib; { + meta = with lib; { description = "The Free Software Media System"; homepage = "https://jellyfin.org/"; license = licenses.gpl2; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index a965a2dbfeec..5aab96d1bc04 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { runHook preInstall makeWrapper ${jre}/bin/java $out/bin/youtrack \ --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ gawk ]}" \ + --prefix PATH : "${lib.makeBinPath [ gawk ]}" \ --set JRE_HOME ${jre} runHook postInstall ''; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 9b518bf80a3e..dd513d8a4477 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { "--with-db-lib=${db.out}/lib" "--with-sasl=${cyrus_sasl.dev}" "--with-netsnmp=yes" - "--with-netsnmp-inc=${stdenv.lib.getDev net-snmp}/include" - "--with-netsnmp-lib=${stdenv.lib.getLib net-snmp}/lib" + "--with-netsnmp-inc=${lib.getDev net-snmp}/include" + "--with-netsnmp-lib=${lib.getLib net-snmp}/lib" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 46c88b95c378..60c2027e552f 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \ --add-flags "$out/bin/Lidarr.exe" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ chromaprint ]} \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix PATH : ${lib.makeBinPath [ chromaprint ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 8d39c01478f9..046176fea2ea 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [ peti fpletz globin ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ peti fpletz globin ]; + platforms = lib.platforms.unix; }; passthru.tests = { opensmtpd-interaction = nixosTests.opensmtpd; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 25e1bb02dbed..de3daf8e4c0e 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ coreutils db openssl perl pcre ] - ++ stdenv.lib.optional enableLDAP openldap - ++ stdenv.lib.optionals enableMySQL [ libmysqlclient zlib ] - ++ stdenv.lib.optional enableAuthDovecot dovecot - ++ stdenv.lib.optional enablePAM pam - ++ stdenv.lib.optional enableSPF libspf2 - ++ stdenv.lib.optional enableDMARC opendmarc; + ++ lib.optional enableLDAP openldap + ++ lib.optionals enableMySQL [ libmysqlclient zlib ] + ++ lib.optional enableAuthDovecot dovecot + ++ lib.optional enablePAM pam + ++ lib.optional enableSPF libspf2 + ++ lib.optional enableDMARC opendmarc; preBuild = '' sed ' @@ -49,32 +49,32 @@ stdenv.mkDerivation rec { s:^# \(TOUCH_COMMAND\)=.*:\1=${coreutils}/bin/touch: s:^# \(PERL_COMMAND\)=.*:\1=${perl}/bin/perl: s:^# \(LOOKUP_DSEARCH=yes\)$:\1: - ${stdenv.lib.optionalString enableLDAP '' + ${lib.optionalString enableLDAP '' s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1: s:^# \(LOOKUP_LDAP=yes\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lldap -llber: s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap -llber: ''} - ${stdenv.lib.optionalString enableMySQL '' + ${lib.optionalString enableMySQL '' s:^# \(LOOKUP_MYSQL=yes\)$:\1: s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/: ''} - ${stdenv.lib.optionalString enableAuthDovecot '' + ${lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: ''} - ${stdenv.lib.optionalString enablePAM '' + ${lib.optionalString enablePAM '' s:^# \(SUPPORT_PAM\)=.*:\1=yes: s:^\(EXTRALIBS_EXIM\)=\(.*\):\1=\2 -lpam: s:^# \(EXTRALIBS_EXIM\)=.*:\1=-lpam: ''} - ${stdenv.lib.optionalString enableSPF '' + ${lib.optionalString enableSPF '' s:^# \(SUPPORT_SPF\)=.*:\1=yes: s:^# \(LDFLAGS += -lspf2\):\1: ''} - ${stdenv.lib.optionalString enableDMARC '' + ${lib.optionalString enableDMARC '' s:^# \(SUPPORT_DMARC\)=.*:\1=yes: s:^# \(LDFLAGS += -lopendmarc\):\1: ''} diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 8f3a382b13e2..57ceee948b50 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ peti ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ peti ]; }; } diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 5ed5b74d309a..58ef52e9c26d 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 , django-haystack, flufl_lock, networkx, dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Archiver for GNU Mailman v3"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ peti globin ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ peti globin ]; }; } diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index ae797fa6cbc7..ab8ad4440ab6 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock +{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock , django-mailman3, mailmanclient, readme_renderer }: @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Web-based user interface for managing GNU Mailman"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ globin peti ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ globin peti ]; }; } diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index 6744d1ffac12..95263e435f02 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0md8cf90fl2yf3zh9njjy42a673v4j4ygyq95xg7fzkygdigm1lq"; }; - buildInputs = stdenv.lib.optional tls gnutls; + buildInputs = lib.optional tls gnutls; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] ++ stdenv.lib.optional tls "--enable-tls"; + ] ++ lib.optional tls "--enable-tls"; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index d3084ff258d6..39a3a645ce68 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -48,37 +48,37 @@ stdenv.mkDerivation rec { "--with-scheduler-ram" "--with-scheduler-stub" - ] ++ stdenv.lib.optionals enablePython [ + ] ++ lib.optionals enablePython [ "--with-python=${python2}" "--with-filter-python" "--with-queue-python" "--with-table-python" "--with-scheduler-python" - ] ++ stdenv.lib.optionals enableLua [ + ] ++ lib.optionals enableLua [ "--with-lua=${pkgconfig}" "--with-filter-lua" - ] ++ stdenv.lib.optionals enablePerl [ + ] ++ lib.optionals enablePerl [ "--with-perl=${perl}" "--with-filter-perl" - ] ++ stdenv.lib.optionals enableMysql [ + ] ++ lib.optionals enableMysql [ "--with-table-mysql" - ] ++ stdenv.lib.optionals enablePostgres [ + ] ++ lib.optionals enablePostgres [ "--with-table-postgres" - ] ++ stdenv.lib.optionals enableSqlite [ + ] ++ lib.optionals enableSqlite [ "--with-table-sqlite" - ] ++ stdenv.lib.optionals enableRedis [ + ] ++ lib.optionals enableRedis [ "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString enableRedis + NIX_CFLAGS_COMPILE = lib.optionalString enableRedis "-I${hiredis}/include/hiredis -lhiredis" - + stdenv.lib.optionalString enableMysql + + lib.optionalString enableMysql " -L${libmysqlclient}/lib/mysql"; meta = with lib; { diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index 146160b79c32..169712375c1f 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }: +{ lib, stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }: stdenv.mkDerivation rec { name = "petidomo-4.3"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://petidomo.sourceforge.net/"; description = "A simple and easy to administer mailing list server"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index 998dce882866..d086eb09e804 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.openwall.com/popa3d/"; description = "Tiny POP3 daemon with security as the primary goal"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 0b6ed49737d2..deea480b2f71 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ./relative-symlinks.patch ]; - postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -e 's!bin/postconf!${buildPackages.postfix}/bin/postconf!' -i postfix-install '' + '' sed -e '/^PATH=/d' -i postfix-install diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 40a2d7fe092d..d1bee8cc049a 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { description = "A collection of postfix-related tools"; license = with lib.licenses; [ bsd3 ]; homepage = "https://github.com/Fruneau/pfixtools"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jerith666 ]; }; } diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index e6451cddec6d..1c92a4a76764 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages }: +{ lib, stdenv, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "pflogsumm"; @@ -27,8 +27,8 @@ perlPackages.buildPerlPackage rec { meta = { homepage = "http://jimsun.linxnet.com/postfix_contrib.html"; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + maintainers = with lib.maintainers; [ schneefux ]; description = "Postfix activity overview"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index afdd2ea860d3..c5980bc8889e 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: +{ lib, stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; @@ -35,8 +35,8 @@ perlPackages.buildPerlPackage rec { meta = { homepage = "http://spamassassin.apache.org/"; description = "Open-Source Spam Filter"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ peti qknight qyliss ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ peti qknight qyliss ]; }; } diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 9ea845338211..f684883b8f55 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ] - ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error"; + ++ lib.optional stdenv.isDarwin "-Wno-error"; meta = with lib; { description = "A distributed memory object caching system"; diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix index 4090aebc8f00..30557460077b 100644 --- a/pkgs/servers/microserver/default.nix +++ b/pkgs/servers/microserver/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0cyxa200iz7knkma4zi3mzky3g0kibbxd5303psk2rl2rppir0f7"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); meta = with lib; { homepage = "https://github.com/robertohuertasm/microserver"; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index f20fed3e2df8..bd8310bc74f7 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Personal media streamer"; homepage = "https://airsonic.github.io"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index 39adc6b78ee3..a696bc413515 100644 --- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, base, bytestring, network, stdenv }: +{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib, stdenv }: mkDerivation { pname = "client-ip-echo"; version = "0.1.0.5"; @@ -12,5 +12,5 @@ mkDerivation { isExecutable = true; executableHaskellDepends = [ base bytestring network ]; description = "accepts TCP connections and echoes the client's IP address back to it"; - license = stdenv.lib.licenses.lgpl3; + license = lib.licenses.lgpl3; } diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 9df7ad827f0a..9b276afa4bc1 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper }: +{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "navidrome"; diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 4cd2e13e4a52..bbd2a4a70da4 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }: +{ lib, stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }: stdenv.mkDerivation rec { pname = "taskserver"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { echo wrapping $i makeWrapper $pkipath/$i $out/bin/taskd-pki-$i \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gnutls ]} + --prefix PATH : ${lib.makeBinPath [ gnutls ]} done ''; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Server for synchronising Taskwarrior clients"; homepage = "https://taskwarrior.org"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ matthiasbeyer makefu ]; }; } diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index a94928730789..5d825dbe7f26 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -76,7 +76,7 @@ perlPackages.buildPerlPackage rec { meta = with lib; { homepage = "http://www.fusioninventory.org"; description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.phile314 ]; }; } diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index d6f3c28d82b6..43346e9353f3 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: -with stdenv.lib; +with lib; buildGoPackage rec { pname = "reporter"; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 41247362799c..80f3d2c14ab1 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postFixup = '' for f in $out/bin/*.pl ; do substituteInPlace $f \ - --replace /usr/bin/perl ${stdenv.lib.getBin perl}/bin/perl + --replace /usr/bin/perl ${lib.getBin perl}/bin/perl done # NixOS will not use this file anyway but at least we can now execute LCDd diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 5e630623dabb..99f83e1bfbd3 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -17,9 +17,9 @@ buildGoModule rec { subPackages = [ "..." ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; + buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ]; - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/promtail \ --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 12957f6d1bb5..09af13951c9d 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip, nixosTests }: +{ lib, stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip, nixosTests }: stdenv.mkDerivation rec { pname = "nagios"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "A host, service and network monitoring program"; homepage = "https://www.nagios.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ immae thoughtpolice relrod ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ immae thoughtpolice relrod ]; }; } diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 90ff605b733c..eba2347333ab 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/check_ssl_cert \ - --prefix PATH : "${stdenv.lib.makeBinPath [ openssl file which curl ]}" + --prefix PATH : "${lib.makeBinPath [ openssl file which curl ]}" ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index d2f31e4c3727..524bba527394 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--with-openssl=${openssl.dev}" "--disable-embedded-perl" "--without-perl-modules" - ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; + ] ++ lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; postPatch = '' substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 8edac875a3aa..15da6bc3f110 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, runCommand +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, runCommand , coreutils, gnugrep, gnused, lm_sensors, net-snmp, openssh, openssl, perl , dnsutils, libdbi, libmysqlclient, zlib, openldap, procps , runtimeShell }: -with stdenv.lib; +with lib; let majorVersion = "2.2"; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 6b609d8160da..11183dcc2f29 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -4,7 +4,7 @@ let bName = "check_esxi_hardware"; in python3Packages.buildPythonApplication rec { - pname = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName; + pname = lib.replaceStrings [ "_" ] [ "-" ] bName; version = "20200710"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index ee66cde0c506..c293a4daa215 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -22,7 +22,7 @@ let nativeBuildInputs = [ autoreconfHook makeWrapper ]; - prePatch = with stdenv.lib; '' + prePatch = with lib; '' rm -rf GLPlugin ln -s ${glplugin} GLPlugin substituteInPlace plugins-scripts/Makefile.am \ diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index a11fcf18c253..19b98124e8e2 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -21,7 +21,7 @@ buildGoPackage rec { -X ${t}.Branch=unknown -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${stdenv.lib.getVersion go} + -X ${t}.GoVersion=${lib.getVersion go} ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index d6f0f864dec7..1a86a0e38d9c 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "bind_exporter"; - version = "20161221-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20161221-${lib.strings.substring 0 7 rev}"; rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba"; goPackagePath = "github.com/digitalocean/bind_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index c66373e92982..e3f8b2d44d4e 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests , systemd, withSystemdSupport ? true }: -with stdenv.lib; +with lib; buildGoPackage rec { pname = "postfix_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 29897267b6e1..0d47211005f2 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -24,7 +24,7 @@ buildGoPackage rec { -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev} -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser} -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate} - -X main.goVersion=${stdenv.lib.getVersion go} + -X main.goVersion=${lib.getVersion go} ''; doInstallCheck = true; diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index aadbd879f5e6..ef4a3cb4d387 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 190bfbcb81bf..18c1ac52fc15 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -13,7 +13,7 @@ assert postgresqlSupport -> !mysqlSupport && !sqliteSupport; assert sqliteSupport -> !mysqlSupport && !postgresqlSupport; let - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in import ./versions.nix ({ version, sha256 }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index b82c3ce9ee83..2e6275921a45 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -13,7 +13,7 @@ assert mysqlSupport -> !postgresqlSupport; assert postgresqlSupport -> !mysqlSupport; let - inherit (stdenv.lib) optional optionalString; + inherit (lib) optional optionalString; in import ./versions.nix ({ version, sha256 }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index 16e5be4045aa..e19646e71000 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; inherit sha256; }; @@ -18,7 +18,7 @@ import ./versions.nix ({ version, sha256 }: installPhase = '' mkdir -p $out/share/zabbix/ - cp -a ${if stdenv.lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/ + cp -a ${if lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/ cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php ''; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index b180e62ce18a..e0df9458f878 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; meta = with lib; { description = "Client library for MPD (music player daemon)"; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 8c50c0b10ae2..54878eda1ac6 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -28,7 +28,6 @@ }: let - lib = stdenv.lib; concatAttrVals = nameList: set: lib.concatMap (x: set.${x} or []) nameList; featureDependencies = { diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 4095b95ad96e..eb6ce851c6ee 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre }: +{ lib, stdenv, fetchurl, pcre }: stdenv.mkDerivation { name = "leafnode-2.0.0.alpha20121101a.12"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { homepage = "http://leafnode.sourceforge.net/"; description = "Implementation of a store & forward NNTP proxy"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index dd7e8e4879c5..f4dc2d33d1b0 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, php }: +{ lib, stdenv, fetchurl, python3Packages, php }: python3Packages.buildPythonApplication rec { name = "nextcloud-news-updater-${version}"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Fast parallel feed updater for the Nextcloud news app"; homepage = "https://github.com/nextcloud/news-updater"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ schneefux ]; }; } diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index bd7f9a36c9c6..4bf6693d3f95 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, java, makeWrapper}: +{lib, stdenv, fetchurl, java, makeWrapper}: let s = # Generated upstream information rec { @@ -27,9 +27,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''RDF database''; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://jena.apache.org"; downloadPage = "http://archive.apache.org/dist/jena/binaries/"; updateWalker = true; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 135fd31ea3d2..17cf175b896e 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, java, makeWrapper}: +{lib, stdenv, fetchurl, java, makeWrapper}: let s = # Generated upstream information rec { @@ -31,9 +31,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''SPARQL server''; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://jena.apache.org"; downloadPage = "http://archive.apache.org/dist/jena/binaries/"; downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$"; diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 696334e85616..4d9f09637e9f 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -7,8 +7,8 @@ }: let - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; - binPath = with stdenv.lib; makeBinPath ([ + libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; + binPath = with lib; makeBinPath ([ bash getopt gawk diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 239c6875c342..abec3c5f79f9 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl , makeWrapper @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://geteventstore.com/"; description = "Event sourcing database with processing logic in JavaScript"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ puffnfresh ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index f57ff7461989..8a66528d81cd 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp +{ lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp , sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }: # Note: # The command line tools are written in Go as part of a different package (mongodb-tools) -with stdenv.lib; +with lib; { version, sha256, patches ? [] -, license ? stdenv.lib.licenses.sspl +, license ? lib.licenses.sspl }@args: let @@ -34,7 +34,7 @@ let #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source. #"wiredtiger" ] ++ optionals stdenv.isLinux [ "tcmalloc" ]; - inherit (stdenv.lib) systems subtractLists; + inherit (lib) systems subtractLists; in stdenv.mkDerivation rec { inherit version; @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { sasl snappy zlib - ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ]; + ] ++ lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ]; # MongoDB keeps track of its build parameters, which tricks nix into # keeping dependencies to build inputs in the final output. @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { # fix environment variable reading substituteInPlace SConstruct \ --replace "env = Environment(" "env = Environment(ENV = os.environ," - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0 substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder @@ -77,14 +77,14 @@ in stdenv.mkDerivation rec { substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder substituteInPlace src/third_party/s2/s2latlng.cc --replace drem remainder substituteInPlace src/third_party/s2/s2latlngrect.cc --replace drem remainder - '' + stdenv.lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.isi686 '' # don't fail by default on i686 substituteInPlace src/mongo/db/storage/storage_options.h \ --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; sconsFlags = [ diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix index e1c71bc13f7a..2a33b9744a2a 100644 --- a/pkgs/servers/nosql/mongodb/v3_4.nix +++ b/pkgs/servers/nosql/mongodb/v3_4.nix @@ -12,5 +12,5 @@ in buildMongoDB { version = "3.4.24"; sha256 = "0j6mvgv0jnsnvgkl8505bl88kbxkba66qijlpi1la0dd5pd1imfr"; patches = [ ./forget-build-dependencies-3-4.patch ]; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3; } diff --git a/pkgs/servers/nosql/mongodb/v3_6.nix b/pkgs/servers/nosql/mongodb/v3_6.nix index 68f83631c801..b55bccab7795 100644 --- a/pkgs/servers/nosql/mongodb/v3_6.nix +++ b/pkgs/servers/nosql/mongodb/v3_6.nix @@ -12,5 +12,5 @@ in buildMongoDB { version = "3.6.13"; sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4"; patches = [ ./forget-build-dependencies.patch ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; + ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; } diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix index 51ce1e25062d..7d61ece8cd52 100644 --- a/pkgs/servers/nosql/mongodb/v4_0.nix +++ b/pkgs/servers/nosql/mongodb/v4_0.nix @@ -13,5 +13,5 @@ in buildMongoDB { sha256 = "1j8dqa4jr623y87jrdanyib9r7x18srrvdx952q4azcc8zrdwci1"; patches = [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; + ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; } diff --git a/pkgs/servers/nosql/mongodb/v4_2.nix b/pkgs/servers/nosql/mongodb/v4_2.nix index 3ebe69daca1b..43dc41acc38d 100644 --- a/pkgs/servers/nosql/mongodb/v4_2.nix +++ b/pkgs/servers/nosql/mongodb/v4_2.nix @@ -13,5 +13,5 @@ in buildMongoDB { sha256 = "13yvhi1258skdni00bh6ph609whqsmhiimhyqy1gs2liwdvh5278"; patches = [ ./forget-build-dependencies-4-2.patch ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; + ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; } diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 74e7cd463b78..684cdbe287c5 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, jre8, which, gawk }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "neo4j"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { do makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \ "$out/bin/$NEO4J_SCRIPT" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jre8 which gawk ]}" \ + --prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}" \ --set JAVA_HOME "$jre8" done ''; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.offline ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 45dd26fb8f0e..3118a0128df3 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Cross-compiling fixes configurePhase = '' - ${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' # This fixes hiredis, which has the AR awkwardly coded. # Probably a good candidate for a patch upstream. makeFlagsArray+=('STLIB_MAKE_CMD=${stdenv.cc.targetPrefix}ar rcs $(STLIBNAME)') @@ -23,16 +23,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lua ] - ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd - ++ stdenv.lib.optionals tlsSupport [ openssl ]; + ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd + ++ lib.optionals tlsSupport [ openssl ]; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] - ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"] - ++ stdenv.lib.optionals tlsSupport [ "BUILD_TLS=yes" ]; + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] + ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"] + ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 40ffddd4f105..558fdad9841f 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, m4 +{ lib, stdenv, fetchurl, which, m4 , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool , python2Packages, makeWrapper }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "5f1786c94797a0f8973597796e22545849dc214805cf1962ef76969e0b7d495b"; }; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py # very meta @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [ + configureFlags = lib.optionals (!stdenv.isDarwin) [ "--with-jemalloc" "--lib-path=${jemalloc}/lib" ]; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { makeFlags = [ "rethinkdb" ]; buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ] - ++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc - ++ stdenv.lib.optional stdenv.isDarwin libtool; + ++ lib.optional (!stdenv.isDarwin) jemalloc + ++ lib.optional stdenv.isDarwin libtool; nativeBuildInputs = [ which m4 python2Packages.python ]; @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { joins and group by, and is easy to setup and learn. ''; homepage = "http://www.rethinkdb.com"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thoughtpolice bluescreen303 ]; }; } diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index de780e9fb964..f7944e6a1752 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -8,7 +8,7 @@ with (import ./srcs.nix { inherit fetchurl; }); let - inherit (stdenv.lib) optional optionalString optionals; + inherit (lib) optional optionalString optionals; in stdenv.mkDerivation { pname = "openafs"; diff --git a/pkgs/servers/openafs/1.9/default.nix b/pkgs/servers/openafs/1.9/default.nix index de780e9fb964..f7944e6a1752 100644 --- a/pkgs/servers/openafs/1.9/default.nix +++ b/pkgs/servers/openafs/1.9/default.nix @@ -8,7 +8,7 @@ with (import ./srcs.nix { inherit fetchurl; }); let - inherit (stdenv.lib) optional optionalString optionals; + inherit (lib) optional optionalString optionals; in stdenv.mkDerivation { pname = "openafs"; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 9b952938e893..511ea217328d 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl, openssl, perlPackages, gettext, python3Packages +{ lib, stdenv, fetchgit, perl, openssl, perlPackages, gettext, python3Packages # TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere. , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: @@ -23,18 +23,18 @@ perlPackages.buildPerlPackage { ProcProcessTable ProcSafeExec RegexpCommon SOAPLite Switch SysSigAction TemplateToolkit TestPod TestPodCoverage TextCSV_XS Workflow XMLFilterXInclude XMLParser XMLSAX XMLSAXWriter XMLSimple XMLValidatorSchema ] - ++ stdenv.lib.optionals extraDependencies1 + ++ lib.optionals extraDependencies1 [ # dependencies from parsing through core/server ClassAccessor PathTools DataDumper DateTime DateTimeFormatStrptime DBI Encode ExceptionClass FilePath FileTemp Filter GetoptLong HTMLParser ScalarListUtils MathBigInt Memoize libnet RTClientREST Storable ] - ++ stdenv.lib.optionals extraDependencies2 + ++ lib.optionals extraDependencies2 [ # dependencies taken from Debian MooseXTypesPathClass DataStreamBulk MooseXStrictConstructor GitPurePerl ConfigGitLike DevelStackTrace TreeDAGNode ClassObservable ClassFactory TimeDate ConfigAny CGIFast ClassISA YAML YAMLLibYAML AuthenSASL TextCSV FileFindRulePerl IODigest ] - ++ stdenv.lib.optionals extraDependencies3 + ++ lib.optionals extraDependencies3 [ # dependencies taken from https://metacpan.org/pod/release/ALECH/Bundle-OpenXPKI-0.06/lib/Bundle/OpenXPKI.pm AttributeParamsValidate BC CGI CPAN CacheCache ClassClassgenclassgen ClassContainer ClassDataInheritable ClassSingleton ConvertASN1 DBDSQLite DBIxHTMLViewLATEST @@ -75,9 +75,9 @@ perlPackages.buildPerlPackage { meta = { homepage = "http://www.openxpki.org"; description = "Enterprise-grade PKI/Trustcenter software"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tstrobel ]; + platforms = with lib.platforms; linux; broken = true; # broken with openssl 1.1 (v2.x might fix this) }; } diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 54c0da642b7e..49b998ecbf04 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: +{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, libxml2, libzip, boost, lua, luabind, tbb, expat}: stdenv.mkDerivation rec { pname = "osrm-backend"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Project-OSRM/osrm-backend/wiki"; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers;[ erictapen ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers;[ erictapen ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 201ff3296fa5..b513d5914935 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, lib, stdenv }: stdenv.mkDerivation rec { name = "pies-1.3"; @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { native utilities). Finally, it can replace the inetd utility! ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/pies/"; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 89158838527e..77ce52db91f3 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -59,12 +59,12 @@ stdenv.mkDerivation rec { passthru.updateScript = writeScript "${pname}-updater" '' #!${stdenv.shell} set -eu -o pipefail - PATH=${stdenv.lib.makeBinPath [curl jq common-updater-scripts]}:$PATH + PATH=${lib.makeBinPath [curl jq common-updater-scripts]}:$PATH plexApiJson=$(curl -sS https://plex.tv/api/downloads/5.json) latestVersion="$(echo $plexApiJson | jq .computer.Linux.version | tr -d '"\n')" - for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + for platform in ${lib.concatStringsSep " " meta.platforms}; do arch=$(echo $platform | cut -d '-' -f1) dlUrl="$(echo $plexApiJson | jq --arg arch "$arch" -c '.computer.Linux.releases[] | select(.distro == "debian") | select(.build | contains($arch)) .url' | tr -d '"\n')" diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 8bc40cb73cc9..fe3cabcf9d7b 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}: +{ lib, stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}: let - ssl = stdenv.lib.optionals uwimap.withSSL + ssl = lib.optionals uwimap.withSSL "-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'"; in stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/"; description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 2288942ebf30..6ee0e3ea366b 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "ps3netsrv"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { description = "C++ implementation of the ps3netsrv server"; homepage = "https://github.com/dirkvdb/ps3netsrv--"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index b74950d627ca..1d44561806a4 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline net-snmp c-ares ] - ++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ]; + ++ lib.optionals stdenv.isLinux [ libcap libnl ]; nativeBuildInputs = [ pkgconfig perl texinfo ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 231b390f326b..ae0195156276 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/Radarr \ --add-flags "$out/share/${pname}-${version}/Radarr.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 6ca821214856..3bfab658af6d 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0"; }; - propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ + propagatedBuildInputs = lib.optionals (!pythonPackages.isPy3k) [ pythonPackages.flup pythonPackages.ldap pythonPackages.sqlalchemy diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index 0c149149e159..681a9dd38ca3 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let common = { edition, sha256 }: stdenv.mkDerivation (rec { - pname = "rainloop${stdenv.lib.optionalString (edition != "") "-${edition}"}"; + pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}"; version = "1.14.0"; buildInputs = [ unzip ]; @@ -12,7 +12,7 @@ ''; src = fetchurl { - url = "https://github.com/RainLoop/rainloop-webmail/releases/download/v${version}/rainloop-${edition}${stdenv.lib.optionalString (edition != "") "-"}${version}.zip"; + url = "https://github.com/RainLoop/rainloop-webmail/releases/download/v${version}/rainloop-${edition}${lib.optionalString (edition != "") "-"}${version}.zip"; sha256 = sha256; }; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 05604e936c7f..ce62b7d1fdcc 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, buildEnv, roundcube, roundcubePlugins }: +{ fetchurl, lib, stdenv, buildEnv, roundcube, roundcubePlugins }: stdenv.mkDerivation rec { pname = "roundcube"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Webmail Software"; - maintainers = with stdenv.lib.maintainers; [ vskilet globin ma27 ]; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + maintainers = with lib.maintainers; [ vskilet globin ma27 ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index ad18c42858b4..9755d42ce01f 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ]; buildInputs = [ libnsl libtirpc ] - ++ stdenv.lib.optional useSystemd systemd; + ++ lib.optional useSystemd systemd; configureFlags = [ "--with-systemdsystemunitdir=${if useSystemd then "${placeholder "out"}/etc/systemd/system" else "no"}" diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index 94fd1661c3f5..cc192a18a618 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }: +{ lib, stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }: # This package isn't extremely useful as it is, but is getting close. # After running: @@ -97,6 +97,6 @@ stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index d72caf54fc4c..5f1f8e6230ed 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -18,7 +18,7 @@ let feedparser sabyenc3 ]); - path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; + path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { version = "3.1.1"; pname = "sabnzbd"; @@ -46,6 +46,6 @@ in stdenv.mkDerivation rec { homepage = "https://sabnzbd.org"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index a665de00cced..0df084230b65 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -40,7 +40,7 @@ , enablePam ? (!stdenv.isDarwin), pam }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "samba"; diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index 522d40e070ac..d48df47f0c56 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -95,8 +95,8 @@ gcc8Stdenv.mkDerivation { description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra"; homepage = "https://scylladb.com"; license = licenses.agpl3; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; hydraPlatforms = []; # It's huge ATM, about 18 GB. - maintainers = [ stdenv.lib.maintainers.farlion ]; + maintainers = [ lib.maintainers.farlion ]; }; } diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 673167030dc1..86230e11cb98 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -1,6 +1,6 @@ { elk6Version , enableUnfree ? true -, stdenv +, lib, stdenv , fetchurl , makeWrapper , jre_headless @@ -9,7 +9,7 @@ , zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation (rec { version = elk6Version; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index c3d50f8fbddd..6a51e5ea62f8 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -1,6 +1,6 @@ { elk7Version , enableUnfree ? true -, stdenv +, lib, stdenv , fetchurl , makeWrapper , jre_headless @@ -9,7 +9,7 @@ , zlib }: -with stdenv.lib; +with lib; let info = splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 8f7e63665b86..d05c2e527e2d 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { sha256 = "191saqanv8k6ijl96mw4jdhh9pkpdn651f1bg4kfb34p7vy8ld9k"; }; - buildInputs = with stdenv.lib; + buildInputs = with lib; [ pkgconfig mecab kytea libedit ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; - configureFlags = with stdenv.lib; + configureFlags = with lib; optional zlibSupport "--with-zlib" ++ optional lz4Support "--with-lz4"; diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 569da6b5b971..6ee90aba2991 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0axjygk8a7cykpa5skk4a6mkm8rndkr76l10h3z3gjdc88b17qcz"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit Security ]; meta = with lib; { description = "Ultra relevant and instant full-text search API"; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 47547f07fb49..a44f96db7026 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, expat, libmysqlclient, +{ lib, stdenv, fetchurl, pkg-config, expat, libmysqlclient, enableXmlpipe2 ? false, enableMysql ? true }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--program-prefix=sphinxsearch-" "--enable-id64" - ] ++ stdenv.lib.optionals (!enableMysql) [ + ] ++ lib.optionals (!enableMysql) [ "--without-mysql" ]; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = stdenv.lib.optionals enableMysql [ + buildInputs = lib.optionals enableMysql [ libmysqlclient - ] ++ stdenv.lib.optionals enableXmlpipe2 [ + ] ++ lib.optionals enableXmlpipe2 [ expat ]; - CXXFLAGS = with stdenv.lib; concatStringsSep " " (optionals stdenv.isDarwin [ + CXXFLAGS = with lib; concatStringsSep " " (optionals stdenv.isDarwin [ # see upstream bug: http://sphinxsearch.com/bugs/view.php?id=2578 # workaround for "error: invalid suffix on literal "-Wno-reserved-user-defined-literal" @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = { description = "An open source full text search server"; homepage = "http://sphinxsearch.com"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ ederoyd46 valodim ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ederoyd46 valodim ]; }; } diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix index 655e60060cba..3eea64e6ab2d 100644 --- a/pkgs/servers/shairplay/default.nix +++ b/pkgs/servers/shairplay/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # the build will fail without complaining about a reference to /tmp - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.isLinux '' patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$out/lib" \ + --set-rpath "${lib.makeLibraryPath buildInputs}:$out/lib" \ $out/bin/shairplay ''; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 41543c325a63..60798b22580f 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libgcrypt, libgpgerror, libtasn1 # Optional Dependencies @@ -9,18 +9,18 @@ let mkFlag = trueStr: falseStr: cond: name: val: "--" + (if cond then trueStr else falseStr) + name - + stdenv.lib.optionalString (val != null && cond != false) "=${val}"; + + lib.optionalString (val != null && cond != false) "=${val}"; mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; optGnutls = shouldUsePkg gnutls; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "shishi-1.0.2"; diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix index 10a5018d7814..46562a11fac4 100644 --- a/pkgs/servers/sickbeard/default.nix +++ b/pkgs/servers/sickbeard/default.nix @@ -30,6 +30,6 @@ in stdenv.mkDerivation { description = "PVR & episode guide that downloads and manages all your TV shows"; license = licenses.gpl3; homepage = "https://github.com/midgetspy/Sick-Beard"; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 48efe7147614..afae82b4d391 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -30,6 +30,6 @@ in stdenv.mkDerivation rec { description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation"; license = licenses.gpl3; homepage = "https://github.com/SickGear/SickGear"; - maintainers = with stdenv.lib.maintainers; [ rembo10 ]; + maintainers = with lib.maintainers; [ rembo10 ]; }; } diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index 084d60ba6a5b..48bc4395d073 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "silc-server-1.1.18"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 975ea9596b3f..e89a599ebec5 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -150,8 +150,8 @@ stdenv.mkDerivation rec { meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = "https://freeswitch.org/"; - license = stdenv.lib.licenses.mpl11; - maintainers = with stdenv.lib.maintainers; [ misuzu ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.mpl11; + maintainers = with lib.maintainers; [ misuzu ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 33c888ba35ed..f8995063a0c1 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: +{ fetchurl, lib, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { name = "sipwitch-1.9.15"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; homepage = "https://www.gnu.org/software/sipwitch/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 176b41a1fe29..587c5d4bda2c 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "skydns"; @@ -17,6 +17,6 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = { - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index a2a9c210a35f..5e1e8544818a 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -89,7 +89,7 @@ perlPackages.buildPerlPackage rec { installPhase = '' cp -r . $out wrapProgram $out/slimserver.pl \ - --prefix PATH : "${stdenv.lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" + --prefix PATH : "${lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" ''; outputs = [ "out" ]; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index a1c854b77235..a1803abe6a8c 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }: stdenv.mkDerivation rec { pname = "sonarr"; @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \ --add-flags "$out/bin/NzbDrone.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo ]} ''; meta = { description = "Smart PVR for newsgroup and bittorrent users"; homepage = "https://sonarr.tv/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ fadenb purcell ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ fadenb purcell ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index c3c839fcc29e..8d3e4e1388b2 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "5WOigCiQZQ5DaTd15vV8pUh8Xl3UIe9yLG1ptUtY+iA="; buildInputs = - stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { description = diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 05d41afa28bd..63cbbf16b302 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { sha256 = "0mm3hfr778c7djza8gr1clwa8wca4d3ldh9hlg80avw4x664y5zi"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; inherit nativeBuildInputs buildInputs; diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 6454aa4897e8..37c697f3676e 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, cmake +{ lib, stdenv, fetchurl, cmake , curl, openssl, zlib , libiconv , version, sha256, ... }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "mariadb-connector-c"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 562b059015fe..90fdbd09b6e8 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -8,7 +8,7 @@ , withStorageRocks ? true }: -with stdenv.lib; +with lib; let # in mariadb # spans the whole file diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index f6edfe388aca..881f014f1342 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "mssql-jdbc"; @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { }; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index bfdacf3444ea..cc9852d57e3c 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -16,7 +16,7 @@ self = stdenv.mkDerivation rec { sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"; }; - preConfigure = stdenv.lib.optional stdenv.isDarwin '' + preConfigure = lib.optional stdenv.isDarwin '' ln -s /bin/ps $TMPDIR/ps export PATH=$PATH:$TMPDIR ''; @@ -24,7 +24,7 @@ self = stdenv.mkDerivation rec { nativeBuildInputs = [ cmake bison pkgconfig rpcsvc-proto ]; buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; + ++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; outputs = [ "out" "static" ]; @@ -58,7 +58,7 @@ self = stdenv.mkDerivation rec { ]; CXXFLAGS = "-fpermissive -std=c++11"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 66e62b823d9a..5aab3000f374 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ant, unzip}: +{lib, stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation rec { name = "mysql-connector-java-5.1.46"; @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ant ]; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index ad32904ce8a5..101f8163659e 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--with-openssl" - ] ++ stdenv.lib.optional (pam != null) "--with-pam" - ++ stdenv.lib.optional (libmemcached != null) "--with-memcached=${libmemcached}"; + ] ++ lib.optional (pam != null) "--with-pam" + ++ lib.optional (libmemcached != null) "--with-memcached=${libmemcached}"; installFlags = [ "sysconfdir=\${out}/etc" diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 70cbb656e0af..e424120a390f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function). ''; platforms = postgresql.meta.platforms; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ danbst ]; }; } diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index e9c9a24ae367..4cc7423ab2c1 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ perl pkgconfig ]; dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 09507aaef2a0..238a298f85f4 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl - ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap pam ]; + ] ++ lib.optionals stdenv.isLinux [ libcap pam ]; configureFlags = [ "--enable-ipv6" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--enable-removal-policies=lru,heap" "--enable-delay-pools" "--enable-x-accelerator-vary" - ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; + ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; meta = with lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index b307f7861fa4..f89c8f96fcf2 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ stdenv, buildGoPackage, zip, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, zip, fetchFromGitHub }: buildGoPackage rec { pname = "teleport"; @@ -37,8 +37,8 @@ buildGoPackage rec { meta = { description = "A SSH CA management suite"; homepage = "https://gravitational.com/teleport/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ sigma tomberek ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sigma tomberek ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index d5e4d607f72e..bd055e656874 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkgconfig, cmake, xxd , openssl, libwebsockets, json_c, libuv, zlib }: @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Share your terminal over the web"; homepage = "https://github.com/tsl0922/ttyd"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.thoughtpolice ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 0276f5aca0a6..716e8e1c1aad 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/tvheadend \ - --prefix PATH : ${stdenv.lib.makeBinPath [ bzip2 ]} + --prefix PATH : ${lib.makeBinPath [ bzip2 ]} ''; meta = with lib; { diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index acf885ed0121..acdfb95272a7 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "udpt"; @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage rec { meta = { description = "A lightweight UDP torrent tracker"; homepage = "https://naim94a.github.io/udpt"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 02607155d486..2a80f5ca28de 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { pname = "uftp"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted UDP based FTP with multicast"; homepage = "http://uftp-multicast.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.fadenb ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 34e2b1bae7d5..4569ee675d92 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ sqlite systemd ] ++ stdenv.lib.optional tlsSupport openssl; + buildInputs = [ sqlite systemd ] ++ lib.optional tlsSupport openssl; outputs = [ "out" "mod_example" diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 3e58edba42fb..61bb815892ad 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , libzen, libmediainfo , jre8 }: @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { src = { i686-linux = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86.tgz"; + url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86.tgz"; sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j"; }; x86_64-linux = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; + url = "mirror://sourceforge/project/unimediaserver/${version}/" + lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { rm -rf $out/jre makeWrapper "$out/UMS.sh" "$out/bin/ums" \ - --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \ + --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath [ libzen libmediainfo] }" \ --set JAVA_HOME "${jre8}" ''; meta = { description = "Universal Media Server: a DLNA-compliant UPnP Media Server"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thall snicket2100 ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thall snicket2100 ]; }; } diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index c2a0fbbd1c20..257bb21b42bc 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex, bison }: +{ fetchurl, lib, stdenv, flex, bison }: stdenv.mkDerivation rec { name = "unfs3-0.9.22"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { homepage = "http://unfs3.sourceforge.net/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/servers/urserver/default.nix b/pkgs/servers/urserver/default.nix index 2d2e83fe01b2..eee10d05826f 100644 --- a/pkgs/servers/urserver/default.nix +++ b/pkgs/servers/urserver/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m755 -D urserver $out/bin/urserver - wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath buildInputs}" + wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" cp -r remotes $out/bin/remotes cp -r manager $out/bin/manager ''; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 0326c8988f49..433cc44415c3 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -22,11 +22,11 @@ let buildFlags = [ "localstatedir=/var/spool" ]; postInstall = '' - wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}" + wrapProgram "$out/sbin/varnishd" --prefix PATH : "${lib.makeBinPath [ stdenv.cc ]}" ''; # https://github.com/varnishcache/varnish-cache/issues/1875 - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index ffa4f55fa77a..d29893947206 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -17,7 +17,7 @@ let }; common = pname: { version, sha256, beta ? null }: let - fullVersion = version + stdenv.lib.optionalString (beta != null) "-${toString beta}"; + fullVersion = version + lib.optionalString (beta != null) "-${toString beta}"; name = "${pname}-${fullVersion}"; in @@ -106,4 +106,4 @@ let }; }; in -stdenv.lib.mapAttrs common versions +lib.mapAttrs common versions diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index ddd2ecf81327..7d246365a338 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "mediawiki"; version = "1.35.0"; - src = with stdenv.lib; fetchurl { + src = with lib; fetchurl { url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; sha256 = "1m1f7yaabmfpp3ma394j9nqhx9xv47vpbc48qrbknlq3xhfvqzrs"; }; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index e31d1ab707c8..0c5156ebdfe9 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -12,7 +12,7 @@ let inherit (stdenv) lib isDarwin; inherit (lib) overrideDerivation; - malloc0ReturnsNullCrossFlag = stdenv.lib.optional + malloc0ReturnsNullCrossFlag = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; in @@ -75,7 +75,7 @@ self: super: libxcb = super.libxcb.overrideAttrs (attrs: { configureFlags = [ "--enable-xkb" "--enable-xinput" ] - ++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; + ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; outputs = [ "out" "dev" "man" "doc" ]; }); @@ -85,7 +85,7 @@ self: super: ++ malloc0ReturnsNullCrossFlag; depsBuildBuild = [ buildPackages.stdenv.cc - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isStatic [ + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ (self.buildPackages.stdenv.cc.libc.static or null) ]; preConfigure = '' @@ -95,7 +95,7 @@ self: super: # Remove useless DocBook XML files. rm -rf $out/share/doc ''; - CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; + CPP = lib.optionalString stdenv.isDarwin "clang -E -"; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xorgproto ]; }); @@ -144,7 +144,7 @@ self: super: ++ malloc0ReturnsNullCrossFlag; preConfigure = attrs.preConfigure or "" # missing transitive dependencies - + stdenv.lib.optionalString stdenv.hostPlatform.isStatic '' + + lib.optionalString stdenv.hostPlatform.isStatic '' export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp" ''; }); @@ -232,9 +232,9 @@ self: super: libXi = super.libXi.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.libXfixes ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "xorg_cv_malloc0_returns_null=no" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; + ] ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared"; }); libXinerama = super.libXinerama.overrideAttrs (attrs: { @@ -320,7 +320,7 @@ self: super: }); libpciaccess = super.libpciaccess.overrideAttrs (attrs: { - meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; }; + meta = attrs.meta // { platforms = lib.platforms.linux; }; }); setxkbmap = super.setxkbmap.overrideAttrs (attrs: { @@ -346,7 +346,7 @@ self: super: xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - meta = attrs.meta // { maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; + meta = attrs.meta // { maintainers = [ lib.maintainers.lovek323 ]; }; }); xcbutilimage = super.xcbutilimage.overrideAttrs (attrs: { @@ -596,7 +596,7 @@ self: super: }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; - meta.platforms = stdenv.lib.platforms.unix; + meta.platforms = lib.platforms.unix; } else if (abiCompat == "1.18") then { name = "xorg-server-1.18.4"; builder = ./builder.sh; @@ -606,8 +606,8 @@ self: super: }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; - postPatch = stdenv.lib.optionalString stdenv.isLinux "sed '1i#include ' -i include/os.h"; - meta.platforms = stdenv.lib.platforms.unix; + postPatch = lib.optionalString stdenv.isLinux "sed '1i#include ' -i include/os.h"; + meta.platforms = lib.platforms.unix; } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; in attrs // @@ -646,7 +646,7 @@ self: super: propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; - prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + prePatch = lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; configureFlags = [ @@ -757,7 +757,7 @@ self: super: doCheck = false; # fails preConfigure = attrs.preConfigure or "" # missing transitive dependencies - + stdenv.lib.optionalString stdenv.hostPlatform.isStatic '' + + lib.optionalString stdenv.hostPlatform.isStatic '' export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" ''; }); @@ -821,7 +821,7 @@ self: super: }); xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: { - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" ''; }); diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index e10ba1069f05..7fe0e5a9f97f 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,8 +1,8 @@ -{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config +{ lib, stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config , epoxy, libxslt, libunwind, makeWrapper, egl-wayland , defaultFontPath ? "" }: -with stdenv.lib; +with lib; xorgserver.overrideAttrs (oldAttrs: { diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 96269b1a4f37..8f3bbf61baa9 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -95,7 +95,7 @@ let ]; }; in stdenv.mkDerivation { - name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}"; + name = "xquartz-${lib.getVersion xorg.xorgserver}"; nativeBuildInputs = [ ruby makeWrapper ]; @@ -135,7 +135,7 @@ in stdenv.mkDerivation { defaultStartX="$out/bin/startx -- $out/bin/Xquartz" ruby ${./patch_plist.rb} \ - ${stdenv.lib.escapeShellArg (builtins.toXML { + ${lib.escapeShellArg (builtins.toXML { XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm"; XQUARTZ_DEFAULT_SHELL = shell; XQUARTZ_DEFAULT_STARTX = "@STARTX@"; diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 0ecd65ce6faf..3d130c93b784 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, libtirpc }: +{ fetchurl, fetchpatch, lib, stdenv, libtirpc }: stdenv.mkDerivation rec { name = "xinetd-2.3.15"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Secure replacement for inetd"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; homepage = "http://xinetd.org"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; } diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1efadd5915eb..2fa1c913e277 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *JOT=\).*,\1,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl - wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpng libjpeg libwebp ]}" + wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" ''; meta = with lib; { diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index ab377e3d53b1..a655f1c348f6 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { pname = "openfire"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { mv $out/conf $out/conf.inst ln -s /var/log/openfire $out/logs ln -s /etc/openfire $out/conf - ''; + ''; meta = { description = "XMPP server in Java"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; # Some security advisories seem to apply, and each next version wants to # write into larger parts of installation directory; installation is just # unpacking, though diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 9b7ed2ac41d0..cfa6e2269557 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -11,7 +11,7 @@ assert withLibevent -> luaevent != null; assert withDBI -> luadbi != null; -with stdenv.lib; +with lib; stdenv.mkDerivation rec { From 0e49ba1b645fcf7b1840b688e130f988cad6d7a3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 14:11:03 +0700 Subject: [PATCH 54/81] make-bootstrap-tools: stdenv.lib -> lib --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 9824d57dff86..1d5abdc8b4a6 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -152,7 +152,7 @@ in rec { allowedReferences = []; meta = { - maintainers = [ stdenv.lib.maintainers.copumpkin ]; + maintainers = [ lib.maintainers.copumpkin ]; }; }; From 4eb185bd6af35b31c9bc8ab9fca170f9440c696a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 14:29:18 +0700 Subject: [PATCH 55/81] pkgs/data: stdenv.lib -> lib --- pkgs/data/documentation/gnome-user-docs/default.nix | 2 +- pkgs/data/documentation/man-pages-posix/default.nix | 4 ++-- pkgs/data/fonts/cantarell-fonts/default.nix | 10 +++++----- pkgs/data/fonts/dejavu-fonts/default.nix | 8 ++++---- pkgs/data/fonts/fixedsys-excelsior/default.nix | 8 ++++---- pkgs/data/fonts/go-font/default.nix | 2 +- pkgs/data/fonts/kochi-substitute/default.nix | 6 +++--- pkgs/data/fonts/league-of-moveable-type/default.nix | 8 ++++---- pkgs/data/fonts/meslo-lg/default.nix | 8 ++++---- pkgs/data/fonts/nafees/default.nix | 6 +++--- pkgs/data/fonts/navilu/default.nix | 4 ++-- pkgs/data/fonts/poly/default.nix | 6 +++--- pkgs/data/fonts/tempora-lgc/default.nix | 6 +++--- pkgs/data/fonts/tex-gyre-math/default.nix | 2 +- pkgs/data/fonts/tex-gyre/default.nix | 2 +- pkgs/data/fonts/ttf-bitstream-vera/default.nix | 4 ++-- pkgs/data/fonts/twitter-color-emoji/default.nix | 2 +- pkgs/data/fonts/uni-vga/default.nix | 4 ++-- pkgs/data/fonts/unscii/default.nix | 4 ++-- pkgs/data/fonts/vista-fonts/default.nix | 4 ++-- pkgs/data/icons/gnome-icon-theme/default.nix | 2 +- pkgs/data/icons/tango-icon-theme/default.nix | 4 ++-- pkgs/data/misc/cacert/default.nix | 4 ++-- pkgs/data/misc/ddccontrol-db/default.nix | 2 +- pkgs/data/misc/prjxray-db/default.nix | 4 ++-- pkgs/data/misc/scowl/default.nix | 12 ++++++------ pkgs/data/misc/symbiflow-arch-defs/default.nix | 4 ++-- pkgs/data/misc/xorg-rgb/default.nix | 8 ++++---- pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix | 4 ++-- pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix | 4 ++-- .../schemas/xml-dtd/docbook-ebnf/default.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix | 4 ++-- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix | 4 ++-- .../sgml+xml/schemas/xml-dtd/docbook/generic.nix | 4 ++-- .../data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix | 4 ++-- pkgs/data/themes/adapta-kde/default.nix | 8 ++++---- pkgs/data/themes/albatross/default.nix | 6 +++--- pkgs/data/themes/arc-kde/default.nix | 8 ++++---- pkgs/data/themes/blackbird/default.nix | 8 ++++---- pkgs/data/themes/e17gtk/default.nix | 8 ++++---- pkgs/data/themes/equilux-theme/default.nix | 2 +- pkgs/data/themes/gnome-breeze/default.nix | 8 ++++---- pkgs/data/themes/lounge/default.nix | 2 +- pkgs/data/themes/materia-theme/default.nix | 2 +- pkgs/data/themes/numix-sx/default.nix | 8 ++++---- pkgs/data/themes/numix/default.nix | 8 ++++---- pkgs/data/themes/openzone/default.nix | 4 ++-- pkgs/data/themes/orion/default.nix | 6 +++--- pkgs/data/themes/plata/default.nix | 6 +++--- 52 files changed, 132 insertions(+), 132 deletions(-) diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 30f8d736d32e..ebd171c65455 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m"; }; diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index 8a76bcb2c448..a65b176f88fc 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "man-pages-posix-2013-a"; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "POSIX man-pages (0p, 1p, 3p)"; homepage = "https://www.kernel.org/doc/man-pages/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 4c3459d0f114..5129cf271886 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: let pname = "cantarell-fonts"; @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5"; }; @@ -31,8 +31,8 @@ in stdenv.mkDerivation rec { meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.ofl; - maintainers = with stdenv.lib.maintainers; [ ]; + platforms = lib.platforms.all; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 839cb80a6b99..aed90b103b4e 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, fontforge, perl, perlPackages }: +{ fetchFromGitHub, lib, stdenv, fontforge, perl, perlPackages }: let version = "2.37"; @@ -18,9 +18,9 @@ let # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. # DejaVu changes are in public domain # See http://dejavu-fonts.org/wiki/License for details - license = stdenv.lib.licenses.free; + license = lib.licenses.free; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; full-ttf = stdenv.mkDerivation { @@ -31,7 +31,7 @@ let src = fetchFromGitHub { owner = "dejavu-fonts"; repo = "dejavu-fonts"; - rev = "version_${stdenv.lib.replaceStrings ["."] ["_"] version}"; + rev = "version_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk"; }; diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index 4222b802d55c..e55ae0bcf11b 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ lib, stdenv, fetchurl } : let major = "3"; @@ -23,8 +23,8 @@ in fetchurl rec { meta = { description = "Pan-unicode version of Fixedsys, a classic DOS font"; homepage = "http://www.fixedsysexcelsior.com/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.publicDomain; - maintainers = [ stdenv.lib.maintainers.ninjatrappeur ]; + platforms = lib.platforms.all; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.ninjatrappeur ]; }; } diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index b2225f5b49bf..056cd621394f 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -22,7 +22,7 @@ in (fetchgit { description = "The Go font family"; license = licenses.bsd3; maintainers = with maintainers; [ sternenseemann ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index cf89a8fcb8f1..071db9b13dfb 100644 --- a/pkgs/data/fonts/kochi-substitute/default.nix +++ b/pkgs/data/fonts/kochi-substitute/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg }: +{ lib, stdenv, fetchurl, dpkg }: let version = "20030809"; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { from the naga10 font. ''; homepage = "https://osdn.net/projects/efont/"; - license = stdenv.lib.licenses.wadalab; - maintainers = [ stdenv.lib.maintainers.auntie ]; + license = lib.licenses.wadalab; + maintainers = [ lib.maintainers.auntie ]; }; } diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index 9a80b9a43df8..f6855dc99d66 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, raleway}: +{lib, stdenv, fetchurl, unzip, raleway}: let @@ -43,9 +43,9 @@ stdenv.mkDerivation rec { homepage = "https://www.theleagueofmoveabletype.com/"; - license = stdenv.lib.licenses.ofl; + license = lib.licenses.ofl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey Profpatsch ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bergey Profpatsch ]; }; } diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index 2837e488389b..7083b9e00313 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { version = "1.2.1"; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { description = "A customized version of Apple’s Menlo-Regular font"; homepage = "https://github.com/andreberg/Meslo-Font/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ balajisivaraman ]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ balajisivaraman ]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index 11e1ccb56451..e23528aefe80 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { name = "nafees"; @@ -56,7 +56,7 @@ stdenv.mkDerivation { # more like a modified BSD, but still contains the GPLv2 embedded # font exception, and some not-for-resale language. license = "unknown"; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bergey ]; }; } diff --git a/pkgs/data/fonts/navilu/default.nix b/pkgs/data/fonts/navilu/default.nix index 0433ad22de53..afd9f85741c3 100644 --- a/pkgs/data/fonts/navilu/default.nix +++ b/pkgs/data/fonts/navilu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge }: +{ lib, stdenv, fetchFromGitHub, fontforge }: stdenv.mkDerivation rec { pname = "navilu-font"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Navilu.ttf"; - meta = with stdenv.lib; src.meta // { + meta = with lib; src.meta // { description = "A Kannada handwriting font"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 05b411a5ba30..50dfb5020354 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "poly"; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { and languages that use the Latin script and its variants. ''; homepage = "http://www.fontsquirrel.com/fonts/poly"; - license = stdenv.lib.licenses.ofl; - maintainers = with stdenv.lib.maintainers; [ relrod ]; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ relrod ]; }; } diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index d20acad663c1..c7be70f800de 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let srcs = [ (fetchurl { @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = ''Tempora font''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; + license = lib.licenses.gpl2 ; + maintainers = [lib.maintainers.raskin]; }; } diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index 92898be0f3ff..95038d3f9cfe 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -64,4 +64,4 @@ let }; }; in - stdenv.lib.mapAttrs mkVariant variants + lib.mapAttrs mkVariant variants diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 333da24e95f3..6ce5bd207862 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -32,7 +32,7 @@ let platforms = platforms.all; }; }; -in stdenv.lib.mapAttrs mkVariant { +in lib.mapAttrs mkVariant { adventor = { version = "2_501"; sha256 = "0qjg3x0adfppyx3x33cm07ww9i9sl88xaq07m7wfip8rmyp567fn"; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index f485f43b60c6..bcf6cefb8d67 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let pname = "ttf-bitstream-vera"; version = "1.10"; @@ -6,7 +6,7 @@ in fetchzip rec { name = "${pname}-${version}"; - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.bz2"; postFetch = '' tar -xjf $downloadedFile --strip-components=1 diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index de70a0b6c6a0..f86c47994929 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; postPatch = let - templateSubstitutions = stdenv.lib.concatStringsSep "; " [ + templateSubstitutions = lib.concatStringsSep "; " [ ''s#Noto Color Emoji#Twitter Color Emoji#'' ''s#NotoColorEmoji#TwitterColorEmoji#'' ''s#Copyright .* Google Inc\.#Twitter, Inc and other contributors.#'' diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 65db46ca2ca7..56ba36b1eb41 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, perl, kbd, bdftopcf +{ lib, stdenv, fetchurl, perl, kbd, bdftopcf , libfaketime, fonttosfnt, mkfontscale }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "uni-vga"; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 724d015a7c31..5aaa68f9796f 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, bdftopcf +{ lib, stdenv, fetchurl, perl, bdftopcf , fontforge, SDL, SDL_image, mkfontscale }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. license = "http://unifoundry.com/LICENSE.txt"; - maintainers = [ stdenv.lib.maintainers.raskin ]; + maintainers = [ lib.maintainers.raskin ]; homepage = "http://pelulamu.net/unscii/"; }; } diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 3a5ee616a0ef..b71ef7c99ec8 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, cabextract }: +{ lib, stdenv, fetchzip, cabextract }: fetchzip { name = "vista-fonts-1"; @@ -26,7 +26,7 @@ fetchzip { meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = "http://www.microsoft.com/typography/ClearTypeFonts.mspx"; - license = stdenv.lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so... + license = lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so... # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 9879f8da342d..b9a4fd48fb67 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im"; }; diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index f1b59c2f5386..b69bf4d46f53 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg +{ lib, stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg , gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme }: @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "A basic set of icons"; homepage = "http://tango.freedesktop.org/Tango_Icon_Library"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index ad8c39831736..e50aa81656a9 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nss, python3 +{ lib, stdenv, fetchurl, nss, python3 , blacklist ? [] # Used for tests only @@ -7,7 +7,7 @@ , openssl }: -with stdenv.lib; +with lib; let diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 6cb0c46e5f55..38f72b5a2efe 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { homepage = "https://github.com/ddccontrol/ddccontrol-db"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ stdenv.lib.maintainers.pakhfn ]; + maintainers = [ lib.maintainers.pakhfn ]; }; } diff --git a/pkgs/data/misc/prjxray-db/default.nix b/pkgs/data/misc/prjxray-db/default.nix index d498fdb1cc8b..edc3c86438f6 100644 --- a/pkgs/data/misc/prjxray-db/default.nix +++ b/pkgs/data/misc/prjxray-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; homepage = "https://github.com/SymbiFlow/prjxray-db"; license = licenses.cc0; diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 686582b48ce1..a4d91eeb037a 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix +{ lib, stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix , singleWordlist ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ unzip zip perl aspell dos2unix ]; - buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = lib.optional (!stdenv.isLinux) libiconv; NIX_CFLAGS_COMPILE = "-Wno-narrowing"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$PWD/varcon" ''; - postBuild = stdenv.lib.optionalString (singleWordlist == null) '' + postBuild = lib.optionalString (singleWordlist == null) '' ( cd scowl/speller make aspell @@ -104,9 +104,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Spell checker oriented word lists"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; homepage = "http://wordlist.aspell.net/"; }; } diff --git a/pkgs/data/misc/symbiflow-arch-defs/default.nix b/pkgs/data/misc/symbiflow-arch-defs/default.nix index 89549da85dcb..3f6e39d85f90 100644 --- a/pkgs/data/misc/symbiflow-arch-defs/default.nix +++ b/pkgs/data/misc/symbiflow-arch-defs/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , autoPatchelfHook , python3Packages @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation"; homepage = "https://github.com/SymbiFlow/symbiflow-arch-defs"; hydraPlatforms = []; diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index e976fe1358d2..c74c4b826ed0 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xorgproto}: +{lib, stdenv, fetchurl, pkgconfig, xorgproto}: stdenv.mkDerivation rec { pname = "rgb"; version = "1.0.6"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "X11 colorname to RGB mapping database"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://xorg.freedesktop.org/"; }; } diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix index 0faad5b594f6..b1db3638682b 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix index 4b0ced9daaea..85d7ab167964 100644 --- a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: let @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index a3b7067b2a42..1c6e57b3e7a7 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; @@ -20,6 +20,6 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index de126da9f909..8a10defa0fb5 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: let @@ -12,7 +12,7 @@ let in import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { url = "http://www.docbook.org/xml/4.1.2/docbkx412.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index f894db24827e..9a9abc0588bd 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { url = "http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index dc2ec36ccef7..4d821ce2ffb8 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { url = "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index 93b03d854572..ca847d3e436e 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { url = "http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 5bdb63e69da2..7be810fe3071 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip, findXMLCatalogs}: +{lib, stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv unzip findXMLCatalogs; + inherit lib stdenv unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { url = "http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 41c4b73d3f62..3d6edd300ec3 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: +{ lib, stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: stdenv.mkDerivation { inherit src name postInstall; @@ -18,6 +18,6 @@ stdenv.mkDerivation { ''; meta = meta // { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index 383a8750f1f8..a000c4249067 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2 }: +{ lib, stdenv, fetchurl, libxml2 }: stdenv.mkDerivation { name = "xhtml1-20020801"; @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.w3.org/TR/xhtml1/"; description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix index fed16da929c2..4feeeaa6c002 100644 --- a/pkgs/data/themes/adapta-kde/default.nix +++ b/pkgs/data/themes/adapta-kde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "adapta-kde-theme"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A port of the Adapta theme for Plasma"; homepage = "https://git.io/adapta-kde"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.tadfisher ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.tadfisher ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/data/themes/albatross/default.nix b/pkgs/data/themes/albatross/default.nix index 1baa977d101c..b53dd553ca2d 100644 --- a/pkgs/data/themes/albatross/default.nix +++ b/pkgs/data/themes/albatross/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "Albatross"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A desktop Suite for Xfce"; homepage = "https://github.com/shimmerproject/Albatross"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index c0db85105d56..ecf798364ff3 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "arc-kde-theme"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A port of the arc theme for Plasma"; homepage = "https://git.io/arc-kde"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.nixy ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nixy ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/data/themes/blackbird/default.nix b/pkgs/data/themes/blackbird/default.nix index f4a2fbb7bbe6..a3f481b6d4ee 100644 --- a/pkgs/data/themes/blackbird/default.nix +++ b/pkgs/data/themes/blackbird/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "Blackbird"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; homepage = "https://github.com/shimmerproject/Blackbird"; - license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = with lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/themes/e17gtk/default.nix b/pkgs/data/themes/e17gtk/default.nix index c666cc5d0aa1..b6cc44aa0d54 100644 --- a/pkgs/data/themes/e17gtk/default.nix +++ b/pkgs/data/themes/e17gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "e17gtk"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "An Enlightenment-like GTK theme with sharp corners"; homepage = "https://github.com/tsujan/E17gtk"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index ddc57c552a12..162b87885089 100644 --- a/pkgs/data/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs install.sh sed -i install.sh \ -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|" + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome3.gnome-shell.version}|" mkdir -p $out/share/themes ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING diff --git a/pkgs/data/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix index 25d6d60d6526..09f9ecd197a8 100644 --- a/pkgs/data/themes/gnome-breeze/default.nix +++ b/pkgs/data/themes/gnome-breeze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { name = "gnome-breeze-20160526"; @@ -17,9 +17,9 @@ stdenv.mkDerivation { meta = { description = "A GTK theme built to match KDE's breeze theme"; homepage = "https://github.com/dirruk1/gnome-breeze"; - license = stdenv.lib.licenses.lgpl2; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ bennofs ]; + platforms = lib.platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix index af355c168e42..0c51b78333dc 100644 --- a/pkgs/data/themes/lounge/default.nix +++ b/pkgs/data/themes/lounge/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; mesonFlags = [ - "-D gnome_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + "-D gnome_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" ]; postFixup = '' diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index a7351a30ba82..d34ece5c94f7 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dontBuild = true; mesonFlags = [ - "-Dgnome_shell_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + "-Dgnome_shell_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" ]; postInstall = '' diff --git a/pkgs/data/themes/numix-sx/default.nix b/pkgs/data/themes/numix-sx/default.nix index 7c8cf77dfc40..ee887cbadee1 100644 --- a/pkgs/data/themes/numix-sx/default.nix +++ b/pkgs/data/themes/numix-sx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation { version = "2017-04-24"; @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { description = "Gray variation of Numix theme"; homepage = "https://www.gnome-look.org/p/1117412/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.sauyon ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.sauyon ]; }; } diff --git a/pkgs/data/themes/numix/default.nix b/pkgs/data/themes/numix/default.nix index 879a13561533..23f491d4a9ad 100644 --- a/pkgs/data/themes/numix/default.nix +++ b/pkgs/data/themes/numix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf +{ lib, stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf , gtk-engine-murrine }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)"; homepage = "https://numixproject.github.io"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/data/themes/openzone/default.nix b/pkgs/data/themes/openzone/default.nix index cce23bd76ea0..e7748612fef3 100644 --- a/pkgs/data/themes/openzone/default.nix +++ b/pkgs/data/themes/openzone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, icon-slicer, xcursorgen }: +{ lib, stdenv, fetchFromGitHub, icon-slicer, xcursorgen }: stdenv.mkDerivation rec { pname = "openzone-cursors"; version = "1.2.9"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Clean and sharp X11/Wayland cursor theme"; homepage = "https://www.gnome-look.org/p/999999/"; license = licenses.mit; diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix index 740b34889227..93ea3633fb5a 100644 --- a/pkgs/data/themes/orion/default.nix +++ b/pkgs/data/themes/orion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "orion"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/shimmerproject/Orion"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 6153c3607c92..5c7de90b295e 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { libxml2 glib.dev ] - ++ stdenv.lib.optionals mateSupport [ gtk3 marco ] - ++ stdenv.lib.optional telegramSupport zip; + ++ lib.optionals mateSupport [ gtk3 marco ] + ++ lib.optional telegramSupport zip; buildInputs = [ gdk-pixbuf @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { configureFlags = let - inherit (stdenv.lib) enableFeature optional; + inherit (lib) enableFeature optional; withOptional = value: feat: optional (value != null) "--with-${feat}=${value}"; in [ "--enable-parallel" From cc2462d430748283225392b0f9cfa766b8ae11c5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 15 Jan 2021 16:43:14 +1000 Subject: [PATCH 56/81] buildah: 1.19.0 -> 1.19.1 https://github.com/containers/buildah/releases/tag/v1.19.1 --- pkgs/development/tools/buildah/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index a680dd097fe6..5efd6e791b9f 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildGoModule , fetchFromGitHub , go-md2man @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "15ps4z41r8inyg0g1k8s9s3hkbnrl942w0n3957bv8g8gjihww0f"; + sha256 = "1wzj8ll9z4pnzr5bz1rjq7fc98kw596zcwaamv8lh2pzwcfgi9ki"; }; outputs = [ "out" "man" ]; @@ -52,7 +52,7 @@ buildGoModule rec { make -C docs install PREFIX="$man" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool which facilitates building OCI images"; homepage = "https://buildah.io/"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; From 4f80e068460b7a9fbe8b4b0c8c701f83ca85abe6 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Mon, 4 Jan 2021 21:52:33 +0100 Subject: [PATCH 57/81] freecad: add scipy and pyyaml to dependencies Closes #108424 --- pkgs/applications/graphics/freecad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index cb37a81d9e1a..ebf8b9ee6061 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -33,6 +33,7 @@ in mkDerivation rec { ] ++ (with pythonPackages; [ matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost GitPython # for addon manager + scipy pyyaml # (at least for) PyrateWorkbench ]); cmakeFlags = [ From d959f1483e79335b34fa47e1edb4f90574629ebd Mon Sep 17 00:00:00 2001 From: ppenguin Date: Tue, 5 Jan 2021 11:23:58 +0100 Subject: [PATCH 58/81] vtk_8: add patch to fix build with gcc10 Closes #108424 --- pkgs/development/libraries/vtk/8.x.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vtk/8.x.nix b/pkgs/development/libraries/vtk/8.x.nix index 1563991f47f3..f86d0915daf7 100644 --- a/pkgs/development/libraries/vtk/8.x.nix +++ b/pkgs/development/libraries/vtk/8.x.nix @@ -5,5 +5,11 @@ import ./generic.nix { patchesToFetch = [{ url = "https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab.diff"; sha256 = "0qdahp4f4gcaznr28j06d5fyxiis774ys0p335aazf7h51zb8rzy"; - }]; + } + { + meta.description = "Fix compiling with gcc-10+"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; + sha256 = "0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; + } + ]; } From d55425d2a074834ddb8e9ec50605b7fdccc56a69 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Sun, 10 Jan 2021 12:41:36 +0100 Subject: [PATCH 59/81] vtk_7: add patches to fix build with gcc10/qt5.15 Closes #108424 --- pkgs/development/libraries/vtk/7.x.nix | 7 ++++++- pkgs/development/libraries/vtk/8.x.nix | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vtk/7.x.nix b/pkgs/development/libraries/vtk/7.x.nix index 55f950e0ac90..860f17639454 100644 --- a/pkgs/development/libraries/vtk/7.x.nix +++ b/pkgs/development/libraries/vtk/7.x.nix @@ -5,5 +5,10 @@ import ./generic.nix { patchesToFetch = [{ url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; - }]; + } + { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; + sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; + } + ]; } diff --git a/pkgs/development/libraries/vtk/8.x.nix b/pkgs/development/libraries/vtk/8.x.nix index f86d0915daf7..ad84ec163cfa 100644 --- a/pkgs/development/libraries/vtk/8.x.nix +++ b/pkgs/development/libraries/vtk/8.x.nix @@ -7,9 +7,12 @@ import ./generic.nix { sha256 = "0qdahp4f4gcaznr28j06d5fyxiis774ys0p335aazf7h51zb8rzy"; } { - meta.description = "Fix compiling with gcc-10+"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f"; - sha256 = "0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; + sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5"; + } + { + url = "https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6943.diff"; + sha256 = "sha256:1nzdw3f6bsri04y528zj2klqkb9p8s4lnl9g5zvm119m1cmyhn04"; } ]; } From 8c5d37129fc5097d9fb52e95fb07de75392d1c3c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Jan 2021 16:19:50 +0700 Subject: [PATCH 60/81] pkgs/tools: stdenv.lib -> lib --- pkgs/tools/X11/arandr/default.nix | 6 ++-- pkgs/tools/X11/autocutsel/default.nix | 10 +++---- pkgs/tools/X11/ckbcomp/default.nix | 2 +- pkgs/tools/X11/go-sct/default.nix | 2 +- pkgs/tools/X11/icon-slicer/default.nix | 4 +-- pkgs/tools/X11/nitrogen/default.nix | 8 ++--- pkgs/tools/X11/nx-libs/default.nix | 8 ++--- pkgs/tools/X11/obconf/default.nix | 8 ++--- pkgs/tools/X11/ratmen/default.nix | 8 ++--- pkgs/tools/X11/run-scaled/default.nix | 2 +- pkgs/tools/X11/runningx/default.nix | 10 +++---- pkgs/tools/X11/screen-message/default.nix | 8 ++--- pkgs/tools/X11/setroot/default.nix | 2 +- pkgs/tools/X11/skippy-xd/default.nix | 8 ++--- pkgs/tools/X11/sselp/default.nix | 12 ++++---- pkgs/tools/X11/virtualgl/default.nix | 2 +- pkgs/tools/X11/wayv/default.nix | 8 ++--- pkgs/tools/X11/wmctrl/default.nix | 8 ++--- pkgs/tools/X11/xannotate/default.nix | 10 +++---- pkgs/tools/X11/xautomation/default.nix | 8 ++--- pkgs/tools/X11/xbanish/default.nix | 8 ++--- pkgs/tools/X11/xbindkeys-config/default.nix | 8 ++--- pkgs/tools/X11/xbindkeys/default.nix | 8 ++--- pkgs/tools/X11/xbrightness/default.nix | 6 ++-- pkgs/tools/X11/xchainkeys/default.nix | 6 ++-- pkgs/tools/X11/xdg-utils/default.nix | 2 +- pkgs/tools/X11/xdotool/default.nix | 8 ++--- pkgs/tools/X11/xinput_calibrator/default.nix | 8 ++--- pkgs/tools/X11/xloadimage/default.nix | 14 ++++----- pkgs/tools/X11/xmacro/default.nix | 6 ++-- pkgs/tools/X11/xmousepasteblock/default.nix | 2 +- pkgs/tools/X11/xnee/default.nix | 8 ++--- pkgs/tools/X11/xpointerbarrier/default.nix | 8 ++--- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/X11/xprintidle-ng/default.nix | 8 ++--- pkgs/tools/X11/xrestop/default.nix | 6 ++-- pkgs/tools/X11/xwinmosaic/default.nix | 8 ++--- pkgs/tools/X11/xzoom/default.nix | 8 ++--- pkgs/tools/admin/daemontools/default.nix | 8 ++--- pkgs/tools/admin/dehydrated/default.nix | 2 +- .../docker-credential-helpers/default.nix | 4 +-- pkgs/tools/admin/exoscale-cli/default.nix | 6 ++-- pkgs/tools/admin/fbvnc/default.nix | 8 ++--- pkgs/tools/admin/gtk-vnc/default.nix | 2 +- pkgs/tools/admin/lxd/default.nix | 2 +- pkgs/tools/admin/procs/default.nix | 2 +- pkgs/tools/admin/sec/default.nix | 8 ++--- pkgs/tools/admin/ssl-cert-check/default.nix | 2 +- pkgs/tools/admin/tigervnc/default.nix | 12 ++++---- pkgs/tools/admin/tightvnc/default.nix | 6 ++-- pkgs/tools/archivers/afio/default.nix | 6 ++-- pkgs/tools/archivers/atool/default.nix | 6 ++-- pkgs/tools/archivers/gnutar/default.nix | 16 +++++----- pkgs/tools/archivers/innoextract/default.nix | 4 +-- pkgs/tools/archivers/ndstool/default.nix | 6 ++-- pkgs/tools/archivers/p7zip/default.nix | 10 +++---- pkgs/tools/archivers/pxattr/default.nix | 8 ++--- pkgs/tools/archivers/runzip/default.nix | 8 ++--- pkgs/tools/archivers/s-tar/default.nix | 6 ++-- pkgs/tools/archivers/unzip/default.nix | 12 ++++---- pkgs/tools/archivers/wimlib/default.nix | 2 +- pkgs/tools/archivers/xarchive/default.nix | 8 ++--- pkgs/tools/archivers/xarchiver/default.nix | 10 +++---- pkgs/tools/archivers/zip/default.nix | 4 +-- pkgs/tools/archivers/zpaq/zpaqd.nix | 6 ++-- .../audio/acoustid-fingerprinter/default.nix | 4 +-- .../audio/beets/plugins/alternatives.nix | 4 +-- .../audio/beets/plugins/copyartifacts.nix | 2 +- pkgs/tools/audio/beets/plugins/extrafiles.nix | 2 +- pkgs/tools/audio/bpm-tools/default.nix | 2 +- pkgs/tools/audio/darkice/default.nix | 6 ++-- pkgs/tools/audio/gvolicon/default.nix | 8 ++--- pkgs/tools/audio/mididings/default.nix | 2 +- pkgs/tools/audio/picotts/default.nix | 8 ++--- pkgs/tools/backup/automysqlbackup/default.nix | 2 +- pkgs/tools/backup/bacula/default.nix | 6 ++-- pkgs/tools/backup/bareos/default.nix | 2 +- pkgs/tools/backup/borg/default.nix | 2 +- pkgs/tools/backup/btar/default.nix | 8 ++--- pkgs/tools/backup/btrbk/default.nix | 2 +- pkgs/tools/backup/bup/default.nix | 6 ++-- pkgs/tools/backup/bupstash/default.nix | 4 +-- pkgs/tools/backup/burp/default.nix | 2 +- pkgs/tools/backup/chunksync/default.nix | 6 ++-- pkgs/tools/backup/dar/default.nix | 4 +-- pkgs/tools/backup/dirvish/default.nix | 2 +- pkgs/tools/backup/duplicati/default.nix | 4 +-- pkgs/tools/backup/duplicity/default.nix | 14 ++++----- pkgs/tools/backup/duply/default.nix | 4 +-- pkgs/tools/backup/httrack/default.nix | 2 +- pkgs/tools/backup/luckybackup/default.nix | 12 ++++---- pkgs/tools/backup/monolith/default.nix | 6 ++-- pkgs/tools/backup/mt-st/default.nix | 8 ++--- pkgs/tools/backup/mtx/default.nix | 8 ++--- pkgs/tools/backup/mydumper/default.nix | 2 +- pkgs/tools/backup/partclone/default.nix | 12 ++++---- pkgs/tools/backup/partimage/default.nix | 8 ++--- pkgs/tools/backup/rdedup/default.nix | 2 +- pkgs/tools/backup/rdiff-backup/default.nix | 6 ++-- pkgs/tools/backup/rdup/default.nix | 8 ++--- pkgs/tools/backup/rsnapshot/default.nix | 2 +- pkgs/tools/backup/stenc/default.nix | 8 ++--- pkgs/tools/backup/store-backup/default.nix | 10 +++---- pkgs/tools/backup/tarsnap/default.nix | 10 +++---- pkgs/tools/backup/wal-e/default.nix | 6 ++-- pkgs/tools/backup/zbackup/default.nix | 6 ++-- pkgs/tools/bluetooth/bluez-alsa/default.nix | 4 +-- pkgs/tools/cd-dvd/bchunk/default.nix | 2 +- pkgs/tools/cd-dvd/cdrkit/default.nix | 6 ++-- pkgs/tools/cd-dvd/cue2pops/default.nix | 4 +-- pkgs/tools/cd-dvd/dvdisaster/default.nix | 4 +-- pkgs/tools/cd-dvd/uif2iso/default.nix | 6 ++-- pkgs/tools/cd-dvd/unetbootin/default.nix | 2 +- pkgs/tools/cd-dvd/vobcopy/default.nix | 8 ++--- pkgs/tools/cd-dvd/vobsub2srt/default.nix | 8 ++--- pkgs/tools/cd-dvd/xorriso/default.nix | 2 +- pkgs/tools/compression/brotli/default.nix | 4 +-- pkgs/tools/compression/bsc/default.nix | 2 +- pkgs/tools/compression/bsdiff/default.nix | 8 ++--- pkgs/tools/compression/bzip2/default.nix | 2 +- pkgs/tools/compression/gzip/default.nix | 6 ++-- pkgs/tools/compression/gzrt/default.nix | 6 ++-- pkgs/tools/compression/hactool/default.nix | 2 +- pkgs/tools/compression/kzipmix/default.nix | 8 ++--- pkgs/tools/compression/lhasa/default.nix | 8 ++--- pkgs/tools/compression/lrzip/default.nix | 6 ++-- pkgs/tools/compression/lz4/default.nix | 6 ++-- pkgs/tools/compression/lzip/default.nix | 8 ++--- pkgs/tools/compression/mozlz4a/default.nix | 8 ++--- pkgs/tools/compression/ncompress/default.nix | 6 ++-- pkgs/tools/compression/pbzip2/default.nix | 2 +- pkgs/tools/compression/pigz/default.nix | 2 +- pkgs/tools/compression/pixz/default.nix | 8 ++--- pkgs/tools/compression/pxz/default.nix | 8 ++--- pkgs/tools/compression/rzip/default.nix | 6 ++-- pkgs/tools/compression/xar/default.nix | 8 ++--- pkgs/tools/compression/xdelta/default.nix | 2 +- pkgs/tools/compression/xdelta/unstable.nix | 2 +- pkgs/tools/compression/xz/default.nix | 2 +- pkgs/tools/compression/zstd/default.nix | 12 ++++---- pkgs/tools/compression/zsync/default.nix | 8 ++--- .../filesystems/archivemount/default.nix | 6 ++-- pkgs/tools/filesystems/avfs/default.nix | 6 ++-- .../filesystems/bcachefs-tools/default.nix | 4 +-- pkgs/tools/filesystems/bindfs/default.nix | 8 ++--- pkgs/tools/filesystems/bonnie/default.nix | 6 ++-- .../tools/filesystems/btrfs-progs/default.nix | 2 +- pkgs/tools/filesystems/ceph/default.nix | 2 +- pkgs/tools/filesystems/chunkfs/default.nix | 6 ++-- pkgs/tools/filesystems/ciopfs/default.nix | 6 ++-- pkgs/tools/filesystems/davfs2/default.nix | 6 ++-- pkgs/tools/filesystems/djmount/default.nix | 8 ++--- pkgs/tools/filesystems/dosfstools/default.nix | 8 ++--- pkgs/tools/filesystems/e2tools/default.nix | 8 ++--- pkgs/tools/filesystems/fsfs/default.nix | 4 +-- pkgs/tools/filesystems/fuse-7z-ng/default.nix | 2 +- pkgs/tools/filesystems/gitfs/default.nix | 8 ++--- pkgs/tools/filesystems/glusterfs/default.nix | 2 +- pkgs/tools/filesystems/hfsprogs/default.nix | 6 ++-- pkgs/tools/filesystems/httpfs/default.nix | 6 ++-- pkgs/tools/filesystems/irods/common.nix | 6 ++-- pkgs/tools/filesystems/mergerfs/default.nix | 8 ++--- pkgs/tools/filesystems/mergerfs/tools.nix | 2 +- pkgs/tools/filesystems/mhddfs/default.nix | 6 ++-- pkgs/tools/filesystems/mtdutils/default.nix | 14 ++++----- pkgs/tools/filesystems/mtools/default.nix | 4 +-- pkgs/tools/filesystems/netatalk/default.nix | 8 ++--- .../tools/filesystems/nilfs-utils/default.nix | 2 +- pkgs/tools/filesystems/nixpart/default.nix | 8 ++--- pkgs/tools/filesystems/ntfs-3g/default.nix | 4 +-- pkgs/tools/filesystems/orangefs/default.nix | 2 +- pkgs/tools/filesystems/rdfind/default.nix | 2 +- .../filesystems/reiserfsprogs/default.nix | 6 ++-- pkgs/tools/filesystems/rmount/default.nix | 2 +- pkgs/tools/filesystems/s3fs/default.nix | 4 +-- pkgs/tools/filesystems/sasquatch/default.nix | 4 +-- pkgs/tools/filesystems/snapraid/default.nix | 8 ++--- pkgs/tools/filesystems/squashfs/default.nix | 14 ++++----- pkgs/tools/filesystems/squashfuse/default.nix | 4 +-- pkgs/tools/filesystems/sshfs-fuse/default.nix | 2 +- pkgs/tools/filesystems/svnfs/default.nix | 8 ++--- .../tools/filesystems/yandex-disk/default.nix | 6 ++-- pkgs/tools/filesystems/zerofree/default.nix | 8 ++--- pkgs/tools/graphics/asymptote/default.nix | 6 ++-- pkgs/tools/graphics/briss/default.nix | 6 ++-- pkgs/tools/graphics/convchain/default.nix | 8 ++--- pkgs/tools/graphics/dcraw/default.nix | 8 ++--- .../graphics/diagrams-builder/default.nix | 4 +-- pkgs/tools/graphics/dmtx-utils/default.nix | 8 ++--- pkgs/tools/graphics/exiftags/default.nix | 8 ++--- pkgs/tools/graphics/fgallery/default.nix | 2 +- pkgs/tools/graphics/flam3/default.nix | 2 +- pkgs/tools/graphics/gifsicle/default.nix | 8 ++--- pkgs/tools/graphics/glee/default.nix | 2 +- pkgs/tools/graphics/graphviz/base.nix | 10 +++---- pkgs/tools/graphics/guff/default.nix | 4 +-- pkgs/tools/graphics/icoutils/default.nix | 6 ++-- .../graphics/imgur-screenshot/default.nix | 2 +- pkgs/tools/graphics/imgurbash2/default.nix | 2 +- pkgs/tools/graphics/jbig2enc/default.nix | 6 ++-- .../graphics/ldgallery/compiler/default.nix | 6 ++-- pkgs/tools/graphics/leela/default.nix | 8 ++--- pkgs/tools/graphics/lepton/default.nix | 2 +- pkgs/tools/graphics/lprof/default.nix | 6 ++-- pkgs/tools/graphics/luxcorerender/default.nix | 8 ++--- pkgs/tools/graphics/maim/default.nix | 4 +-- pkgs/tools/graphics/mscgen/default.nix | 8 ++--- pkgs/tools/graphics/netpbm/default.nix | 10 +++---- pkgs/tools/graphics/nifskope/default.nix | 2 +- pkgs/tools/graphics/optar/default.nix | 2 +- pkgs/tools/graphics/optipng/default.nix | 4 +-- pkgs/tools/graphics/pdfread/default.nix | 2 +- pkgs/tools/graphics/pfstools/default.nix | 6 ++-- pkgs/tools/graphics/pgf/default.nix | 8 ++--- pkgs/tools/graphics/piglit/default.nix | 2 +- pkgs/tools/graphics/plotutils/default.nix | 8 ++--- pkgs/tools/graphics/pngcheck/default.nix | 6 ++-- pkgs/tools/graphics/pngcrush/default.nix | 6 ++-- pkgs/tools/graphics/pngout/default.nix | 8 ++--- pkgs/tools/graphics/pngtoico/default.nix | 6 ++-- pkgs/tools/graphics/quirc/default.nix | 8 ++--- pkgs/tools/graphics/s2png/default.nix | 8 ++--- pkgs/tools/graphics/syntex/default.nix | 8 ++--- pkgs/tools/graphics/transfig/default.nix | 4 +-- pkgs/tools/graphics/vips/default.nix | 2 +- .../waifu2x-converter-cpp/default.nix | 10 +++---- .../graphics/wavefunctioncollapse/default.nix | 8 ++--- pkgs/tools/graphics/welkin/default.nix | 8 ++--- pkgs/tools/graphics/xcftools/default.nix | 6 ++-- pkgs/tools/graphics/yafaray-core/default.nix | 2 +- pkgs/tools/graphics/yaxg/default.nix | 2 +- pkgs/tools/graphics/zxing/default.nix | 8 ++--- pkgs/tools/inputmethods/evscript/default.nix | 4 +-- pkgs/tools/inputmethods/fcitx/unwrapped.nix | 2 +- pkgs/tools/inputmethods/fcitx5/default.nix | 4 +-- .../fcitx5/fcitx5-chinese-addons.nix | 6 ++-- .../inputmethods/fcitx5/fcitx5-configtool.nix | 6 ++-- pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 8 ++--- pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 4 +-- pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 +-- .../tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 +-- .../fcitx5/fcitx5-table-extra.nix | 4 +-- .../fcitx5/fcitx5-table-other.nix | 4 +-- .../ibus-engines/ibus-mozc/default.nix | 2 +- pkgs/tools/inputmethods/ibus/default.nix | 4 +-- pkgs/tools/inputmethods/ibus/wrapper.nix | 8 ++--- .../interception-tools/default.nix | 8 ++--- pkgs/tools/inputmethods/m17n-db/default.nix | 10 +++---- pkgs/tools/inputmethods/m17n-lib/default.nix | 8 ++--- pkgs/tools/inputmethods/m17n-lib/otf.nix | 8 ++--- .../inputmethods/skk/skk-dicts/default.nix | 10 +++---- .../inputmethods/skk/skktools/default.nix | 10 +++---- pkgs/tools/inputmethods/touchegg/default.nix | 6 ++-- pkgs/tools/inputmethods/uim/default.nix | 2 +- pkgs/tools/misc/0x0/default.nix | 2 +- pkgs/tools/misc/abduco/default.nix | 6 ++-- pkgs/tools/misc/aescrypt/default.nix | 4 +-- pkgs/tools/misc/aptly/default.nix | 2 +- pkgs/tools/misc/aws-mturk-clt/default.nix | 4 +-- pkgs/tools/misc/azure-vhd-utils/default.nix | 2 +- pkgs/tools/misc/bat-extras/default.nix | 6 ++-- pkgs/tools/misc/bat/default.nix | 4 +-- pkgs/tools/misc/bc/default.nix | 6 ++-- pkgs/tools/misc/bfr/default.nix | 2 +- pkgs/tools/misc/blink1-tool/default.nix | 8 ++--- pkgs/tools/misc/bogofilter/default.nix | 6 ++-- pkgs/tools/misc/brltty/default.nix | 12 ++++---- pkgs/tools/misc/broot/default.nix | 2 +- pkgs/tools/misc/capture/default.nix | 2 +- pkgs/tools/misc/catimg/default.nix | 4 +-- pkgs/tools/misc/chafa/default.nix | 2 +- pkgs/tools/misc/cht.sh/default.nix | 2 +- pkgs/tools/misc/cloc/default.nix | 8 ++--- pkgs/tools/misc/cloud-utils/default.nix | 4 +-- pkgs/tools/misc/contacts/default.nix | 4 +-- pkgs/tools/misc/coreboot-utils/default.nix | 8 ++--- pkgs/tools/misc/coreutils/default.nix | 2 +- pkgs/tools/misc/cpuminer-multi/default.nix | 2 +- pkgs/tools/misc/cunit/default.nix | 6 ++-- pkgs/tools/misc/dasht/default.nix | 6 ++-- pkgs/tools/misc/dbacl/default.nix | 6 ++-- pkgs/tools/misc/ddate/default.nix | 4 +-- pkgs/tools/misc/ddccontrol/default.nix | 2 +- pkgs/tools/misc/debootstrap/default.nix | 2 +- .../tools/misc/desktop-file-utils/default.nix | 4 +-- pkgs/tools/misc/ding-libs/default.nix | 8 ++--- pkgs/tools/misc/direnv/default.nix | 2 +- pkgs/tools/misc/diskus/default.nix | 2 +- pkgs/tools/misc/disper/default.nix | 8 ++--- pkgs/tools/misc/dmg2img/default.nix | 6 ++-- pkgs/tools/misc/dtach/default.nix | 6 ++-- pkgs/tools/misc/duc/default.nix | 4 +-- pkgs/tools/misc/dvtm/dvtm.nix | 4 +-- pkgs/tools/misc/edid-decode/default.nix | 8 ++--- pkgs/tools/misc/edid-generator/default.nix | 10 +++---- pkgs/tools/misc/emv/default.nix | 6 ++-- pkgs/tools/misc/ent/default.nix | 2 +- pkgs/tools/misc/envchain/default.nix | 2 +- pkgs/tools/misc/envdir-go/default.nix | 6 ++-- pkgs/tools/misc/eot-utilities/default.nix | 8 ++--- pkgs/tools/misc/etcher/default.nix | 2 +- pkgs/tools/misc/exa/default.nix | 2 +- pkgs/tools/misc/expect/default.nix | 2 +- pkgs/tools/misc/fasd/default.nix | 6 ++-- pkgs/tools/misc/ffsend/default.nix | 2 +- pkgs/tools/misc/figlet/default.nix | 6 ++-- pkgs/tools/misc/file/default.nix | 6 ++-- pkgs/tools/misc/fileschanged/default.nix | 6 ++-- pkgs/tools/misc/findutils/default.nix | 8 ++--- pkgs/tools/misc/fondu/default.nix | 6 ++-- pkgs/tools/misc/fontforge/default.nix | 6 ++-- pkgs/tools/misc/fpp/default.nix | 6 ++-- pkgs/tools/misc/fx_cast/default.nix | 2 +- pkgs/tools/misc/gams/default.nix | 6 ++-- pkgs/tools/misc/gawp/default.nix | 6 ++-- pkgs/tools/misc/gbdfed/default.nix | 12 ++++---- pkgs/tools/misc/geekbench/default.nix | 2 +- pkgs/tools/misc/getopt/default.nix | 4 +-- pkgs/tools/misc/gibo/default.nix | 6 ++-- pkgs/tools/misc/gnokii/default.nix | 6 ++-- pkgs/tools/misc/goaccess/default.nix | 8 ++--- pkgs/tools/misc/gosu/default.nix | 6 ++-- pkgs/tools/misc/gparted/default.nix | 2 +- pkgs/tools/misc/graylog/plugins.nix | 4 +-- pkgs/tools/misc/grex/default.nix | 2 +- pkgs/tools/misc/gringo/default.nix | 2 +- pkgs/tools/misc/grub/2.0x.nix | 2 +- pkgs/tools/misc/grub/default.nix | 2 +- pkgs/tools/misc/grub/pvgrub_image/default.nix | 2 +- pkgs/tools/misc/grub/trusted.nix | 2 +- pkgs/tools/misc/gsmartcontrol/default.nix | 10 +++---- pkgs/tools/misc/hdf4/default.nix | 16 +++++----- pkgs/tools/misc/hdf5/default.nix | 8 ++--- pkgs/tools/misc/hdfjava/default.nix | 6 ++-- pkgs/tools/misc/hdfview/default.nix | 6 ++-- pkgs/tools/misc/heimdall/default.nix | 4 +-- pkgs/tools/misc/hexd/default.nix | 4 +-- pkgs/tools/misc/hhpc/default.nix | 2 +- pkgs/tools/misc/hyperfine/default.nix | 2 +- pkgs/tools/misc/i3cat/default.nix | 4 +-- pkgs/tools/misc/i3minator/default.nix | 4 +-- pkgs/tools/misc/idevicerestore/default.nix | 2 +- pkgs/tools/misc/idutils/default.nix | 8 ++--- pkgs/tools/misc/intermodal/default.nix | 2 +- pkgs/tools/misc/ipxe/default.nix | 2 +- pkgs/tools/misc/ised/default.nix | 8 ++--- pkgs/tools/misc/ix/default.nix | 2 +- pkgs/tools/misc/jdupes/default.nix | 4 +-- pkgs/tools/misc/keychain/default.nix | 26 ++++++++-------- pkgs/tools/misc/kisslicer/default.nix | 2 +- pkgs/tools/misc/kodi-cli/default.nix | 8 ++--- pkgs/tools/misc/lbdb/default.nix | 4 +-- pkgs/tools/misc/ldapvi/default.nix | 2 +- pkgs/tools/misc/less/default.nix | 2 +- pkgs/tools/misc/lockfile-progs/default.nix | 8 ++--- pkgs/tools/misc/logstash/6.x.nix | 2 +- pkgs/tools/misc/logstash/7.x.nix | 2 +- pkgs/tools/misc/logstash/contrib.nix | 4 +-- pkgs/tools/misc/lorri/default.nix | 2 +- pkgs/tools/misc/man-db/default.nix | 6 ++-- pkgs/tools/misc/mbuffer/default.nix | 12 ++++---- pkgs/tools/misc/mc/default.nix | 2 +- pkgs/tools/misc/mcrypt/default.nix | 8 ++--- pkgs/tools/misc/megacli/default.nix | 6 ++-- pkgs/tools/misc/memtest86+/default.nix | 4 +-- pkgs/tools/misc/minicom/default.nix | 4 +-- pkgs/tools/misc/miniserve/default.nix | 2 +- pkgs/tools/misc/mktorrent/default.nix | 10 +++---- pkgs/tools/misc/mlocate/default.nix | 2 +- pkgs/tools/misc/mmv/default.nix | 6 ++-- pkgs/tools/misc/mongodb-compass/default.nix | 2 +- pkgs/tools/misc/mongodb-tools/default.nix | 2 +- pkgs/tools/misc/moreutils/default.nix | 4 +-- pkgs/tools/misc/mrtg/default.nix | 8 ++--- pkgs/tools/misc/multitail/default.nix | 10 +++---- pkgs/tools/misc/multitime/default.nix | 6 ++-- pkgs/tools/misc/mysql2pgsql/default.nix | 6 ++-- pkgs/tools/misc/nbench/default.nix | 2 +- pkgs/tools/misc/ocz-ssd-guru/default.nix | 10 +++---- pkgs/tools/misc/opencorsairlink/default.nix | 2 +- pkgs/tools/misc/opentsdb/default.nix | 2 +- pkgs/tools/misc/os-prober/default.nix | 2 +- pkgs/tools/misc/osm2pgsql/default.nix | 6 ++-- pkgs/tools/misc/ostree/default.nix | 2 +- pkgs/tools/misc/otfcc/default.nix | 2 +- pkgs/tools/misc/pal/default.nix | 8 ++--- pkgs/tools/misc/parallel/default.nix | 2 +- pkgs/tools/misc/parted/default.nix | 16 +++++----- pkgs/tools/misc/pazi/default.nix | 2 +- pkgs/tools/misc/pb_cli/default.nix | 8 ++--- .../misc/phoronix-test-suite/default.nix | 2 +- pkgs/tools/misc/picocom/default.nix | 2 +- pkgs/tools/misc/pipelight/default.nix | 6 ++-- pkgs/tools/misc/pixd/default.nix | 4 +-- pkgs/tools/misc/pk2cmd/default.nix | 4 +-- pkgs/tools/misc/plowshare/default.nix | 10 +++---- pkgs/tools/misc/ponysay/default.nix | 8 ++--- pkgs/tools/misc/profile-cleaner/default.nix | 10 +++---- pkgs/tools/misc/proxytunnel/default.nix | 6 ++-- pkgs/tools/misc/pv/default.nix | 8 ++--- pkgs/tools/misc/qjoypad/default.nix | 8 ++--- pkgs/tools/misc/recoverjpeg/default.nix | 2 +- pkgs/tools/misc/recutils/default.nix | 6 ++-- pkgs/tools/misc/remind/default.nix | 14 ++++----- pkgs/tools/misc/renameutils/default.nix | 6 ++-- pkgs/tools/misc/rig/default.nix | 10 +++---- pkgs/tools/misc/rlwrap/default.nix | 8 ++--- pkgs/tools/misc/rmlint/default.nix | 14 ++++----- pkgs/tools/misc/rockbox-utility/default.nix | 6 ++-- pkgs/tools/misc/routino/default.nix | 4 +-- pkgs/tools/misc/rrdtool/default.nix | 2 +- pkgs/tools/misc/sam-ba/default.nix | 2 +- pkgs/tools/misc/screen/default.nix | 8 ++--- pkgs/tools/misc/sdate/default.nix | 8 ++--- pkgs/tools/misc/shadowenv/default.nix | 2 +- pkgs/tools/misc/shallot/default.nix | 6 ++-- pkgs/tools/misc/sixpair/default.nix | 8 ++--- pkgs/tools/misc/slop/default.nix | 6 ++-- pkgs/tools/misc/slsnif/default.nix | 8 ++--- pkgs/tools/misc/slurp/default.nix | 4 +-- pkgs/tools/misc/somafm-cli/default.nix | 2 +- pkgs/tools/misc/spigot/default.nix | 4 +-- pkgs/tools/misc/starship/default.nix | 6 ++-- pkgs/tools/misc/stow/default.nix | 6 ++-- pkgs/tools/misc/sutils/default.nix | 6 ++-- pkgs/tools/misc/svtplay-dl/default.nix | 2 +- .../misc/system-config-printer/default.nix | 6 ++-- pkgs/tools/misc/tab-rs/default.nix | 2 +- pkgs/tools/misc/tensorman/default.nix | 2 +- pkgs/tools/misc/tewisay/default.nix | 6 ++-- pkgs/tools/misc/time/default.nix | 6 ++-- pkgs/tools/misc/tmux-cssh/default.nix | 8 ++--- pkgs/tools/misc/tmux/default.nix | 8 ++--- pkgs/tools/misc/ttf2pt1/default.nix | 8 ++--- pkgs/tools/misc/ttmkfdir/default.nix | 8 ++--- pkgs/tools/misc/ttwatch/default.nix | 2 +- pkgs/tools/misc/ttygif/default.nix | 2 +- pkgs/tools/misc/txr/default.nix | 2 +- pkgs/tools/misc/txt2man/default.nix | 8 ++--- pkgs/tools/misc/unclutter-xfixes/default.nix | 2 +- pkgs/tools/misc/unclutter/default.nix | 2 +- pkgs/tools/misc/upower-notify/default.nix | 4 +-- pkgs/tools/misc/urjtag/default.nix | 16 +++++----- pkgs/tools/misc/urn-timer/default.nix | 4 +-- pkgs/tools/misc/uucp/default.nix | 6 ++-- pkgs/tools/misc/uudeview/default.nix | 8 ++--- pkgs/tools/misc/vector/default.nix | 2 +- pkgs/tools/misc/venus/default.nix | 6 ++-- pkgs/tools/misc/vmtouch/default.nix | 8 ++--- pkgs/tools/misc/watchexec/default.nix | 2 +- pkgs/tools/misc/websocat/default.nix | 4 +-- pkgs/tools/misc/wob/default.nix | 4 +-- pkgs/tools/misc/woeusb/default.nix | 2 +- pkgs/tools/misc/woof/default.nix | 4 +-- pkgs/tools/misc/wv/default.nix | 6 ++-- pkgs/tools/misc/wv2/default.nix | 4 +-- pkgs/tools/misc/xburst-tools/default.nix | 12 ++++---- pkgs/tools/misc/xclip/default.nix | 6 ++-- pkgs/tools/misc/xflux/default.nix | 10 +++---- pkgs/tools/misc/xflux/gui.nix | 8 ++--- pkgs/tools/misc/xprite-editor/default.nix | 6 ++-- pkgs/tools/misc/xtitle/default.nix | 6 ++-- pkgs/tools/misc/xvfb-run/default.nix | 2 +- .../tools/misc/yubikey-manager-qt/default.nix | 2 +- pkgs/tools/misc/zsh-autoenv/default.nix | 2 +- pkgs/tools/networking/acme-client/default.nix | 4 +-- pkgs/tools/networking/ahcpd/default.nix | 6 ++-- pkgs/tools/networking/aircrack-ng/default.nix | 2 +- pkgs/tools/networking/argus/default.nix | 4 +-- pkgs/tools/networking/aria2/default.nix | 2 +- pkgs/tools/networking/babeld/default.nix | 8 ++--- pkgs/tools/networking/badvpn/default.nix | 10 +++---- pkgs/tools/networking/bandwhich/default.nix | 2 +- pkgs/tools/networking/bgpdump/default.nix | 8 ++--- pkgs/tools/networking/boringtun/default.nix | 2 +- pkgs/tools/networking/burpsuite/default.nix | 6 ++-- pkgs/tools/networking/bwm-ng/default.nix | 2 +- pkgs/tools/networking/chrony/default.nix | 4 +-- pkgs/tools/networking/cjdns/default.nix | 4 +-- pkgs/tools/networking/cntlm/default.nix | 2 +- pkgs/tools/networking/connect/default.nix | 10 +++---- pkgs/tools/networking/connman/connman.nix | 6 ++-- .../connman/connman_dmenu/default.nix | 8 ++--- pkgs/tools/networking/corkscrew/default.nix | 2 +- pkgs/tools/networking/curl/default.nix | 16 +++++----- pkgs/tools/networking/davix/default.nix | 2 +- pkgs/tools/networking/dd-agent/5.nix | 8 ++--- .../networking/dd-agent/datadog-agent.nix | 2 +- pkgs/tools/networking/dhcp/default.nix | 2 +- pkgs/tools/networking/dhcpcd/default.nix | 2 +- pkgs/tools/networking/dibbler/default.nix | 2 +- pkgs/tools/networking/dirb/default.nix | 8 ++--- pkgs/tools/networking/dnsmasq/default.nix | 6 ++-- pkgs/tools/networking/dnstop/default.nix | 8 ++--- pkgs/tools/networking/dnstracer/default.nix | 4 +-- pkgs/tools/networking/dogdns/default.nix | 6 ++-- pkgs/tools/networking/drill/default.nix | 6 ++-- pkgs/tools/networking/email/default.nix | 2 +- pkgs/tools/networking/ferm/default.nix | 12 ++++---- pkgs/tools/networking/flvstreamer/default.nix | 10 +++---- pkgs/tools/networking/getmail/default.nix | 8 ++--- pkgs/tools/networking/gftp/default.nix | 6 ++-- pkgs/tools/networking/goreplay/default.nix | 8 ++--- pkgs/tools/networking/gupnp-tools/default.nix | 2 +- pkgs/tools/networking/haproxy/default.nix | 2 +- pkgs/tools/networking/hping/default.nix | 4 +-- pkgs/tools/networking/httpie/default.nix | 6 ++-- pkgs/tools/networking/httpstat/default.nix | 6 ++-- pkgs/tools/networking/hyenae/default.nix | 8 ++--- pkgs/tools/networking/i2pd/default.nix | 2 +- pkgs/tools/networking/iftop/default.nix | 2 +- pkgs/tools/networking/imapproxy/default.nix | 6 ++-- pkgs/tools/networking/iodine/default.nix | 6 ++-- pkgs/tools/networking/ip2unix/default.nix | 8 ++--- pkgs/tools/networking/ipcalc/default.nix | 6 ++-- pkgs/tools/networking/iperf/3.nix | 2 +- pkgs/tools/networking/ipv6calc/default.nix | 6 ++-- pkgs/tools/networking/jnettop/default.nix | 6 ++-- pkgs/tools/networking/junkie/default.nix | 8 ++--- pkgs/tools/networking/jwhois/default.nix | 6 ++-- pkgs/tools/networking/lftp/default.nix | 2 +- pkgs/tools/networking/libreswan/default.nix | 6 ++-- .../networking/logmein-hamachi/default.nix | 4 +-- pkgs/tools/networking/lsh/default.nix | 4 +-- pkgs/tools/networking/mailsend/default.nix | 8 ++--- pkgs/tools/networking/mcrcon/default.nix | 6 ++-- pkgs/tools/networking/megatools/default.nix | 2 +- .../networking/memtier-benchmark/default.nix | 8 ++--- pkgs/tools/networking/miniupnpc/default.nix | 4 +-- pkgs/tools/networking/mosh/default.nix | 8 ++--- pkgs/tools/networking/mozwire/default.nix | 2 +- pkgs/tools/networking/mtr/default.nix | 6 ++-- pkgs/tools/networking/mu/default.nix | 8 ++--- pkgs/tools/networking/nbd/default.nix | 12 ++++---- pkgs/tools/networking/ndjbdns/default.nix | 4 +-- pkgs/tools/networking/netboot/default.nix | 2 +- pkgs/tools/networking/netifd/default.nix | 2 +- pkgs/tools/networking/netkit/tftp/default.nix | 8 ++--- pkgs/tools/networking/netrw/default.nix | 10 +++---- pkgs/tools/networking/nettee/default.nix | 2 +- .../network-manager/applet/default.nix | 2 +- .../networking/network-manager/default.nix | 2 +- .../network-manager/dmenu/default.nix | 6 ++-- .../network-manager/fortisslvpn/default.nix | 4 +-- .../network-manager/iodine/default.nix | 2 +- .../network-manager/l2tp/default.nix | 2 +- .../network-manager/libnma/default.nix | 4 +-- .../network-manager/openconnect/default.nix | 4 +-- .../network-manager/openvpn/default.nix | 4 +-- .../network-manager/sstp/default.nix | 2 +- .../network-manager/vpnc/default.nix | 4 +-- pkgs/tools/networking/ngrok-2/default.nix | 4 +-- pkgs/tools/networking/noip/default.nix | 4 +-- pkgs/tools/networking/nss-mdns/default.nix | 8 ++--- pkgs/tools/networking/ntopng/default.nix | 4 +-- pkgs/tools/networking/ntp/default.nix | 4 +-- pkgs/tools/networking/ocserv/default.nix | 2 +- pkgs/tools/networking/offlineimap/default.nix | 6 ++-- pkgs/tools/networking/olsrd/default.nix | 8 ++--- pkgs/tools/networking/openconnect/default.nix | 6 ++-- pkgs/tools/networking/openresolv/default.nix | 8 ++--- pkgs/tools/networking/openssh/default.nix | 6 ++-- pkgs/tools/networking/openvpn/default.nix | 2 +- .../openvpn/openvpn_learnaddress.nix | 8 ++--- pkgs/tools/networking/p2p/azureus/default.nix | 4 +-- .../networking/p2p/gtk-gnutella/default.nix | 4 +-- .../tools/networking/p2p/rtorrent/default.nix | 2 +- pkgs/tools/networking/packetdrill/default.nix | 8 ++--- pkgs/tools/networking/pdsh/default.nix | 10 +++---- pkgs/tools/networking/pixiecore/default.nix | 8 ++--- pkgs/tools/networking/pixiewps/default.nix | 10 +++---- pkgs/tools/networking/pmacct/default.nix | 2 +- pkgs/tools/networking/proxychains/default.nix | 6 ++-- pkgs/tools/networking/pwnat/default.nix | 2 +- pkgs/tools/networking/pykms/default.nix | 2 +- pkgs/tools/networking/redir/default.nix | 8 ++--- pkgs/tools/networking/redsocks/default.nix | 8 ++--- pkgs/tools/networking/s3gof3r/default.nix | 4 +-- pkgs/tools/networking/samplicator/default.nix | 6 ++-- .../networking/shadowsocks-rust/default.nix | 2 +- pkgs/tools/networking/shorewall/default.nix | 8 ++--- pkgs/tools/networking/siege/default.nix | 2 +- pkgs/tools/networking/sipsak/default.nix | 2 +- pkgs/tools/networking/smokeping/default.nix | 8 ++--- pkgs/tools/networking/snabb/default.nix | 4 +-- pkgs/tools/networking/socat/2.x.nix | 2 +- pkgs/tools/networking/spiped/default.nix | 8 ++--- pkgs/tools/networking/spoofer/default.nix | 4 +-- pkgs/tools/networking/srelay/default.nix | 6 ++-- pkgs/tools/networking/ssh-ident/default.nix | 6 ++-- pkgs/tools/networking/ssldump/default.nix | 6 ++-- pkgs/tools/networking/ssmtp/default.nix | 6 ++-- pkgs/tools/networking/sstp/default.nix | 8 ++--- pkgs/tools/networking/strongswan/default.nix | 4 +-- pkgs/tools/networking/stubby/default.nix | 2 +- pkgs/tools/networking/stunnel/default.nix | 8 ++--- pkgs/tools/networking/surfraw/default.nix | 6 ++-- pkgs/tools/networking/swec/default.nix | 6 ++-- pkgs/tools/networking/tcpdump/default.nix | 8 ++--- pkgs/tools/networking/tcpreplay/default.nix | 2 +- .../networking/tcptraceroute/default.nix | 4 +-- pkgs/tools/networking/termshark/default.nix | 2 +- pkgs/tools/networking/tinc/default.nix | 6 ++-- pkgs/tools/networking/tinyproxy/default.nix | 4 +-- pkgs/tools/networking/toss/default.nix | 4 +-- pkgs/tools/networking/toxvpn/default.nix | 2 +- pkgs/tools/networking/tracebox/default.nix | 2 +- pkgs/tools/networking/traceroute/default.nix | 2 +- pkgs/tools/networking/trickle/default.nix | 6 ++-- pkgs/tools/networking/tunnelto/default.nix | 6 ++-- pkgs/tools/networking/twa/default.nix | 2 +- pkgs/tools/networking/ua/default.nix | 8 ++--- pkgs/tools/networking/udptunnel/default.nix | 8 ++--- pkgs/tools/networking/uget/default.nix | 6 ++-- pkgs/tools/networking/unbound/default.nix | 2 +- pkgs/tools/networking/unbound/python.nix | 2 +- pkgs/tools/networking/uwimap/default.nix | 16 +++++----- pkgs/tools/networking/vde2/default.nix | 6 ++-- pkgs/tools/networking/vpnc/default.nix | 6 ++-- pkgs/tools/networking/waitron/default.nix | 8 ++--- pkgs/tools/networking/wakelan/default.nix | 8 ++--- pkgs/tools/networking/wavemon/default.nix | 2 +- pkgs/tools/networking/wbox/default.nix | 6 ++-- pkgs/tools/networking/weighttp/default.nix | 4 +-- pkgs/tools/networking/wget/default.nix | 12 ++++---- pkgs/tools/networking/wicd/default.nix | 8 ++--- pkgs/tools/networking/wifish/default.nix | 6 ++-- .../networking/wireguard-tools/default.nix | 4 +-- pkgs/tools/networking/wrk2/default.nix | 8 ++--- pkgs/tools/networking/xnbd/default.nix | 8 ++--- pkgs/tools/networking/zssh/default.nix | 6 ++-- pkgs/tools/nix/manix/default.nix | 2 +- pkgs/tools/nix/nix-output-monitor/default.nix | 6 ++-- pkgs/tools/nix/nixdoc/default.nix | 2 +- .../appimagekit/default.nix | 2 +- .../cargo-outdated/default.nix | 2 +- .../cargo-release/default.nix | 2 +- .../cargo-update/default.nix | 2 +- .../checkinstall/default.nix | 10 +++---- .../disnix/DisnixWebService/default.nix | 10 +++---- .../package-management/disnix/default.nix | 8 ++--- .../disnix/disnixos/default.nix | 8 ++--- .../disnix/dydisnix/default.nix | 8 ++--- .../disnix/dysnomia/default.nix | 30 +++++++++---------- .../tools/package-management/dpkg/default.nix | 4 +-- .../package-management/libdnf/default.nix | 2 +- .../package-management/librepo/default.nix | 2 +- .../package-management/microdnf/default.nix | 2 +- .../tools/package-management/niff/default.nix | 6 ++-- .../package-management/nix-du/default.nix | 2 +- .../package-management/nix-index/default.nix | 4 +-- .../nix-prefetch-scripts/default.nix | 6 ++-- .../nix-prefetch/default.nix | 2 +- .../package-management/nix-serve/default.nix | 4 +-- .../package-management/nix-top/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 6 ++-- .../package-management/nixui/default.nix | 8 ++--- pkgs/tools/package-management/rpm/default.nix | 2 +- pkgs/tools/security/1password-gui/default.nix | 2 +- pkgs/tools/security/acsccid/default.nix | 2 +- pkgs/tools/security/aespipe/default.nix | 2 +- pkgs/tools/security/afl/default.nix | 6 ++-- pkgs/tools/security/afl/libdislocator.nix | 4 +-- pkgs/tools/security/afl/qemu.nix | 2 +- pkgs/tools/security/aflplusplus/default.nix | 10 +++---- .../security/aflplusplus/libdislocator.nix | 4 +-- .../security/aflplusplus/libtokencap.nix | 4 +-- pkgs/tools/security/aflplusplus/qemu.nix | 2 +- pkgs/tools/security/apg/default.nix | 12 ++++---- .../asc-key-to-qr-code-gif/default.nix | 4 +-- pkgs/tools/security/b2sum/default.nix | 4 +-- .../security/bash-supergenpass/default.nix | 2 +- pkgs/tools/security/bettercap/default.nix | 2 +- pkgs/tools/security/bitwarden/default.nix | 2 +- pkgs/tools/security/bitwarden_rs/default.nix | 2 +- pkgs/tools/security/brutespray/default.nix | 2 +- pkgs/tools/security/ccrypt/default.nix | 8 ++--- pkgs/tools/security/chntpw/default.nix | 6 ++-- pkgs/tools/security/clamav/default.nix | 6 ++-- pkgs/tools/security/cowpatty/default.nix | 4 +-- pkgs/tools/security/crlfuzz/default.nix | 4 +-- pkgs/tools/security/dirmngr/default.nix | 6 ++-- pkgs/tools/security/duo-unix/default.nix | 8 ++--- pkgs/tools/security/ecryptfs/default.nix | 6 ++-- pkgs/tools/security/enchive/default.nix | 8 ++--- pkgs/tools/security/encryptr/default.nix | 2 +- pkgs/tools/security/enum4linux/default.nix | 2 +- pkgs/tools/security/fail2ban/default.nix | 2 +- pkgs/tools/security/fpm2/default.nix | 4 +-- pkgs/tools/security/fprintd/default.nix | 2 +- pkgs/tools/security/fwknop/default.nix | 12 ++++---- pkgs/tools/security/gen-oath-safe/default.nix | 2 +- pkgs/tools/security/genpass/default.nix | 2 +- pkgs/tools/security/gnu-pw-mgr/default.nix | 2 +- pkgs/tools/security/gnupg/22.nix | 6 ++-- pkgs/tools/security/gopass/default.nix | 6 ++-- pkgs/tools/security/gorilla-bin/default.nix | 8 ++--- pkgs/tools/security/gpgstats/default.nix | 2 +- pkgs/tools/security/haka/default.nix | 6 ++-- pkgs/tools/security/hash-slinger/default.nix | 6 ++-- pkgs/tools/security/hashdeep/default.nix | 2 +- pkgs/tools/security/haveged/default.nix | 8 ++--- pkgs/tools/security/honggfuzz/default.nix | 6 ++-- pkgs/tools/security/ipscan/default.nix | 2 +- pkgs/tools/security/john/default.nix | 4 +-- pkgs/tools/security/jwt-cli/default.nix | 2 +- pkgs/tools/security/kbs2/default.nix | 8 ++--- pkgs/tools/security/keybase/default.nix | 2 +- pkgs/tools/security/kpcli/default.nix | 4 +-- pkgs/tools/security/lynis/default.nix | 2 +- pkgs/tools/security/mbox/default.nix | 6 ++-- pkgs/tools/security/meo/default.nix | 10 +++---- pkgs/tools/security/mkrand/default.nix | 6 ++-- pkgs/tools/security/modsecurity/default.nix | 4 +-- pkgs/tools/security/monkeysphere/default.nix | 10 +++---- pkgs/tools/security/monsoon/default.nix | 4 +-- .../security/nitrokey-app/udev-rules.nix | 4 +-- pkgs/tools/security/nmap/default.nix | 4 +-- pkgs/tools/security/open-ecard/default.nix | 2 +- pkgs/tools/security/opensc/default.nix | 8 ++--- pkgs/tools/security/ossec/default.nix | 6 ++-- pkgs/tools/security/p0f/default.nix | 8 ++--- pkgs/tools/security/pass/default.nix | 12 ++++---- pkgs/tools/security/pass/rofi-pass.nix | 8 ++--- pkgs/tools/security/pbis/default.nix | 2 +- .../security/pcsc-scm-scl011/default.nix | 2 +- pkgs/tools/security/pcsclite/default.nix | 8 ++--- pkgs/tools/security/pgpdump/default.nix | 2 +- pkgs/tools/security/pinentry/default.nix | 2 +- pkgs/tools/security/pinentry/mac.nix | 6 ++-- pkgs/tools/security/pius/default.nix | 8 ++--- pkgs/tools/security/polkit-gnome/default.nix | 8 ++--- pkgs/tools/security/pwgen/default.nix | 4 +-- pkgs/tools/security/radamsa/default.nix | 8 ++--- pkgs/tools/security/rage/default.nix | 2 +- pkgs/tools/security/rarcrack/default.nix | 2 +- pkgs/tools/security/ripasso/cursive.nix | 2 +- pkgs/tools/security/rng-tools/default.nix | 4 +-- pkgs/tools/security/rustscan/default.nix | 2 +- pkgs/tools/security/saml2aws/default.nix | 4 +-- pkgs/tools/security/scallion/default.nix | 2 +- pkgs/tools/security/seccure/default.nix | 10 +++---- pkgs/tools/security/secp256k1/default.nix | 2 +- pkgs/tools/security/shc/default.nix | 2 +- pkgs/tools/security/signing-party/default.nix | 28 ++++++++--------- pkgs/tools/security/softhsm/default.nix | 2 +- .../spectre-meltdown-checker/default.nix | 2 +- pkgs/tools/security/ssdeep/default.nix | 8 ++--- pkgs/tools/security/sshuttle/default.nix | 4 +-- pkgs/tools/security/ssss/default.nix | 6 ++-- pkgs/tools/security/stoken/default.nix | 2 +- pkgs/tools/security/stricat/default.nix | 8 ++--- pkgs/tools/security/sudo/default.nix | 10 +++---- pkgs/tools/security/sudolikeaboss/default.nix | 2 +- pkgs/tools/security/super/default.nix | 4 +-- pkgs/tools/security/tcpcrypt/default.nix | 4 +-- pkgs/tools/security/tor/default.nix | 8 ++--- pkgs/tools/security/tor/tor-arm.nix | 8 ++--- pkgs/tools/security/tor/torsocks.nix | 12 ++++---- .../security/tpm-quote-tools/default.nix | 8 ++--- pkgs/tools/security/volatility/default.nix | 2 +- pkgs/tools/security/yara/default.nix | 12 ++++---- pkgs/tools/system/amtterm/default.nix | 4 +-- pkgs/tools/system/at/default.nix | 6 ++-- pkgs/tools/system/bar/default.nix | 8 ++--- pkgs/tools/system/bfs/default.nix | 4 +-- pkgs/tools/system/bottom/default.nix | 2 +- pkgs/tools/system/chase/default.nix | 4 +-- pkgs/tools/system/collectd/default.nix | 2 +- pkgs/tools/system/collectd/plugins.nix | 30 +++++++++---------- pkgs/tools/system/dfc/default.nix | 8 ++--- pkgs/tools/system/facter/default.nix | 4 +-- pkgs/tools/system/fakeroot/default.nix | 14 ++++----- pkgs/tools/system/fcron/default.nix | 2 +- pkgs/tools/system/fdisk/default.nix | 6 ++-- pkgs/tools/system/fio/default.nix | 6 ++-- pkgs/tools/system/freeipmi/default.nix | 8 ++--- pkgs/tools/system/gptfdisk/default.nix | 4 +-- pkgs/tools/system/gt5/default.nix | 10 +++---- pkgs/tools/system/idle3tools/default.nix | 8 ++--- pkgs/tools/system/illum/default.nix | 8 ++--- pkgs/tools/system/inxi/default.nix | 2 +- pkgs/tools/system/ipmitool/default.nix | 6 ++-- pkgs/tools/system/ledmon/default.nix | 2 +- pkgs/tools/system/logrotate/default.nix | 10 +++---- pkgs/tools/system/mcron/default.nix | 6 ++-- pkgs/tools/system/monit/default.nix | 16 +++++----- pkgs/tools/system/netdata/default.nix | 4 +-- pkgs/tools/system/pciutils/default.nix | 2 +- pkgs/tools/system/plan9port/default.nix | 6 ++-- pkgs/tools/system/proot/default.nix | 4 +-- pkgs/tools/system/rofi-systemd/default.nix | 10 +++---- pkgs/tools/system/rowhammer-test/default.nix | 2 +- pkgs/tools/system/rsyslog/default.nix | 8 ++--- pkgs/tools/system/runit/default.nix | 8 ++--- pkgs/tools/system/s6-rc/default.nix | 4 +-- pkgs/tools/system/safecopy/default.nix | 8 ++--- pkgs/tools/system/setserial/default.nix | 6 ++-- pkgs/tools/system/sleuthkit/default.nix | 8 ++--- pkgs/tools/system/smartmontools/default.nix | 4 +-- pkgs/tools/system/socklog/default.nix | 4 +-- pkgs/tools/system/stress-ng/default.nix | 4 +-- pkgs/tools/system/supervise/default.nix | 2 +- pkgs/tools/system/testdisk/default.nix | 10 +++---- pkgs/tools/system/thinkfan/default.nix | 4 +-- pkgs/tools/system/tree/default.nix | 8 ++--- pkgs/tools/system/tuptime/default.nix | 2 +- pkgs/tools/system/undaemonize/default.nix | 8 ++--- pkgs/tools/system/zenith/default.nix | 2 +- pkgs/tools/text/agrep/default.nix | 2 +- pkgs/tools/text/amber/default.nix | 2 +- pkgs/tools/text/boxes/default.nix | 2 +- pkgs/tools/text/chars/default.nix | 2 +- pkgs/tools/text/codesearch/default.nix | 10 +++---- pkgs/tools/text/coloursum/default.nix | 2 +- pkgs/tools/text/convertlit/default.nix | 6 ++-- pkgs/tools/text/diction/default.nix | 6 ++-- pkgs/tools/text/diffr/default.nix | 2 +- pkgs/tools/text/diffutils/default.nix | 4 +-- pkgs/tools/text/ebook-tools/default.nix | 4 +-- pkgs/tools/text/enscript/default.nix | 6 ++-- pkgs/tools/text/fastmod/default.nix | 2 +- pkgs/tools/text/gawk/default.nix | 2 +- pkgs/tools/text/gawk/gawkextlib.nix | 4 +-- pkgs/tools/text/glogg/default.nix | 4 +-- pkgs/tools/text/gnupatch/default.nix | 8 ++--- pkgs/tools/text/gnused/422.nix | 8 ++--- pkgs/tools/text/gnused/default.nix | 6 ++-- pkgs/tools/text/grin/default.nix | 6 ++-- pkgs/tools/text/groff/default.nix | 24 +++++++-------- pkgs/tools/text/gtranslator/default.nix | 2 +- pkgs/tools/text/highlight/default.nix | 4 +-- pkgs/tools/text/html2text/default.nix | 8 ++--- pkgs/tools/text/invoice2data/default.nix | 2 +- pkgs/tools/text/ispell/default.nix | 2 +- pkgs/tools/text/jsawk/default.nix | 8 ++--- pkgs/tools/text/kakasi/default.nix | 2 +- pkgs/tools/text/kytea/default.nix | 2 +- pkgs/tools/text/ledger2beancount/default.nix | 4 +-- pkgs/tools/text/mairix/default.nix | 8 ++--- pkgs/tools/text/mdbook/default.nix | 2 +- pkgs/tools/text/mdcat/default.nix | 2 +- pkgs/tools/text/mpage/default.nix | 4 +-- pkgs/tools/text/multitran/data/default.nix | 6 ++-- .../tools/text/multitran/libbtree/default.nix | 6 ++-- .../tools/text/multitran/libfacet/default.nix | 8 ++--- .../text/multitran/libmtquery/default.nix | 6 ++-- .../text/multitran/libmtsupport/default.nix | 6 ++-- pkgs/tools/text/multitran/mtutils/default.nix | 8 ++--- pkgs/tools/text/namazu/default.nix | 6 ++-- pkgs/tools/text/nawk/default.nix | 8 ++--- pkgs/tools/text/nkf/default.nix | 8 ++--- pkgs/tools/text/ocrmypdf/default.nix | 4 +-- pkgs/tools/text/odt2txt/default.nix | 6 ++-- pkgs/tools/text/opencc/default.nix | 4 +-- pkgs/tools/text/poedit/default.nix | 2 +- pkgs/tools/text/popfile/default.nix | 6 ++-- pkgs/tools/text/qgrep/default.nix | 8 ++--- pkgs/tools/text/qprint/default.nix | 8 ++--- pkgs/tools/text/qshowdiff/default.nix | 4 +-- pkgs/tools/text/recode/default.nix | 8 ++--- pkgs/tools/text/replace/default.nix | 4 +-- pkgs/tools/text/ripgrep/default.nix | 6 ++-- pkgs/tools/text/ruplacer/default.nix | 2 +- pkgs/tools/text/sd/default.nix | 2 +- pkgs/tools/text/sgml/jade/default.nix | 6 ++-- pkgs/tools/text/sgml/openjade/default.nix | 6 ++-- pkgs/tools/text/sgml/opensp/default.nix | 10 +++---- pkgs/tools/text/silver-searcher/default.nix | 2 +- pkgs/tools/text/source-highlight/default.nix | 6 ++-- pkgs/tools/text/txt2tags/default.nix | 8 ++--- pkgs/tools/text/uni2ascii/default.nix | 10 +++---- pkgs/tools/text/wdiff/default.nix | 8 ++--- pkgs/tools/text/wgetpaste/default.nix | 8 ++--- pkgs/tools/text/xml/rxp/default.nix | 6 ++-- pkgs/tools/text/xml/xmlformat/default.nix | 6 ++-- pkgs/tools/text/xml/xmlstarlet/default.nix | 8 ++--- pkgs/tools/text/xml/xpf/default.nix | 8 ++--- pkgs/tools/text/xsv/default.nix | 2 +- pkgs/tools/text/zimreader/default.nix | 6 ++-- pkgs/tools/text/zimwriterfs/default.nix | 8 ++--- pkgs/tools/typesetting/asciidoc/default.nix | 6 ++-- pkgs/tools/typesetting/biber/default.nix | 6 ++-- pkgs/tools/typesetting/djvu2pdf/default.nix | 8 ++--- .../tools/typesetting/docbook2odf/default.nix | 2 +- pkgs/tools/typesetting/kindlegen/default.nix | 2 +- pkgs/tools/typesetting/lout/default.nix | 6 ++-- pkgs/tools/typesetting/mmark/default.nix | 8 ++--- .../typesetting/multimarkdown/default.nix | 4 +-- pkgs/tools/typesetting/pdfgrep/default.nix | 8 ++--- .../tools/typesetting/pdfsandwich/default.nix | 2 +- pkgs/tools/typesetting/pdftk/legacy.nix | 8 ++--- pkgs/tools/typesetting/sile/default.nix | 8 ++--- pkgs/tools/typesetting/skribilo/default.nix | 6 ++-- pkgs/tools/typesetting/sshlatex/default.nix | 6 ++-- pkgs/tools/typesetting/tectonic/default.nix | 4 +-- pkgs/tools/typesetting/ted/default.nix | 2 +- pkgs/tools/typesetting/tex/auctex/default.nix | 8 ++--- .../tools/typesetting/tex/dblatex/default.nix | 10 +++---- pkgs/tools/typesetting/tex/tetex/default.nix | 4 +-- pkgs/tools/typesetting/tex/texlive/bin.nix | 20 ++++++------- pkgs/tools/typesetting/xmlto/default.nix | 8 ++--- pkgs/tools/video/atomicparsley/default.nix | 2 +- pkgs/tools/video/gopro/default.nix | 2 +- pkgs/tools/video/rtmpdump/default.nix | 4 +-- pkgs/tools/video/swfmill/default.nix | 6 ++-- pkgs/tools/video/swftools/default.nix | 6 ++-- pkgs/tools/video/vnc2flv/default.nix | 4 +-- pkgs/tools/video/vncrec/default.nix | 6 ++-- pkgs/tools/virtualization/aws/default.nix | 6 ++-- .../virtualization/distrobuilder/default.nix | 2 +- .../virtualization/ec2-ami-tools/default.nix | 6 ++-- .../virtualization/ec2-api-tools/default.nix | 4 +-- .../virtualization/euca2ools/default.nix | 6 ++-- .../virtualization/nixos-shell/default.nix | 2 +- .../xe-guest-utilities/default.nix | 8 ++--- 916 files changed, 2510 insertions(+), 2510 deletions(-) diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 94e3ac36d078..00296bc54af7 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages +{ lib, stdenv, fetchurl, python3Packages , gobject-introspection, gsettings-desktop-schemas, gtk3 , wrapGAppsHook, xrandr }: @@ -34,7 +34,7 @@ in buildPythonApplication rec { meta = { homepage = "http://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.domenkozar ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.domenkozar ]; }; } diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index ece42502d81c..ef03130a2df0 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libX11, libXaw}: +{lib, stdenv, fetchurl, libX11, libXaw}: stdenv.mkDerivation rec { version = "0.10.0"; pname = "autocutsel"; - + src = fetchurl { url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2"; }; - + buildInputs = [ libX11 libXaw ]; installPhase = '' mkdir -p $out/bin @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { inherit version; homepage = "https://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; all; updateWalker = true; }; } diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 8bb2cddc0801..471dc80979ab 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys"; homepage = "https://salsa.debian.org/installer-team/console-setup"; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ dezgeg ]; + maintainers = with lib.maintainers; [ dezgeg ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index b52183e2dd28..2d6965567b7a 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-sct"; - version = "20180605-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20180605-${lib.strings.substring 0 7 rev}"; rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4"; goPackagePath = "github.com/d4l3k/go-sct"; diff --git a/pkgs/tools/X11/icon-slicer/default.nix b/pkgs/tools/X11/icon-slicer/default.nix index 18d6d468af8c..37b309c54b76 100644 --- a/pkgs/tools/X11/icon-slicer/default.nix +++ b/pkgs/tools/X11/icon-slicer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }: +{ lib, stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }: stdenv.mkDerivation rec { pname = "icon-slicer"; version = "0.3"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ popt pkg-config ]; buildInputs = [ gdk-pixbuf ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utility for generating icon themes and libXcursor cursor themes"; homepage = "https://www.freedesktop.org/wiki/Software/icon-slicer/"; license = licenses.mit; diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 057288fbaa37..8521c1dbc29a 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: +{ lib, stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: let version = "1.6.1"; in @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { and settings are stored in a human-readable config file. ''; homepage = "https://github.com/l3ib/nitrogen"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.auntie ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.auntie ]; }; } diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 3fbb0930cab6..b685ba8cf42c 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo +{ lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo , libpng, libtool, libxml2, pkgconfig, which, xorg , libtirpc }: @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { meta = { description = "NX X server based on Xnest"; homepage = "https://github.com/ArcticaProject/nx-libs"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ jD91mZM2 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 809e3614f0b1..0ca2eb3de790 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox, +{ lib, stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox, imlib2, libstartup_notification, makeWrapper, libSM }: stdenv.mkDerivation rec { @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "GUI configuration tool for openbox"; homepage = "http://openbox.org/wiki/ObConf"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.lhvwb ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.lhvwb ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix index f60426226747..eabe14649e1c 100644 --- a/pkgs/tools/X11/ratmen/default.nix +++ b/pkgs/tools/X11/ratmen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, xorgproto, libX11}: +{lib, stdenv, fetchurl, perl, xorgproto, libX11}: let s = # Generated upstream information rec { @@ -25,9 +25,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''A minimalistic X11 menu creator''; - license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free ; # 9menu derivative with 9menu license + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "http://www.update.uu.se/~zrajm/programs/"; downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/"; updateWalker = true; diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix index 6b2f400c2951..bae91bbc4649 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cp run_scaled $out/bin wrapProgram $out/bin/run_scaled --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ bc xorgserver xpra xrandr ]} + ${lib.makeBinPath [ bc xorgserver xpra xrandr ]} ''; meta = with lib; { diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix index 55f99c63365d..4052bbc8a556 100644 --- a/pkgs/tools/X11/runningx/default.nix +++ b/pkgs/tools/X11/runningx/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, libX11 }: +{ lib, stdenv, fetchurl, pkgconfig, libX11 }: stdenv.mkDerivation { pname = "runningx"; version = "1.0"; - + src = fetchurl { url = "http://www.fiction.net/blong/programs/mutt/autoview/RunningX.c"; sha256 = "1mikkhrx6jsx716041qdy3nwjac08pxxvxyq2yablm8zg9hrip0d"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { homepage = "http://www.fiction.net/blong/programs/mutt/"; description = "A program for testing if X is running"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = lib.licenses.free; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix index c57c4f824310..cb24859c1e2b 100644 --- a/pkgs/tools/X11/screen-message/default.nix +++ b/pkgs/tools/X11/screen-message/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }: +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }: stdenv.mkDerivation rec { pname = "screen-message"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.joachim-breitner.de/en/projects#screen-message"; description = "Displays a short text fullscreen in an X11 window"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.fpletz ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.fpletz ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index a59e2a0d0dbb..e5a461b0e0e6 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libX11 imlib2 ] - ++ stdenv.lib.optional enableXinerama libXinerama; + ++ lib.optional enableXinerama libXinerama; buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index 4fd9678733dd..a52b7fa8c0d7 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage +{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage , libXext, libXinerama, libjpeg, giflib, pkgconfig }: let @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''Expose-style compositing-based standalone window switcher''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 81893fd2be83..d22884270dd4 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libX11 }: +{ lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { version = "0.2"; pname = "sselp"; - + src = fetchurl { url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd"; }; - + buildInputs = [ libX11 ]; patchPhase = '' @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://tools.suckless.org/sselp"; description = "Prints the X selection to stdout, useful in scripts"; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [lib.maintainers.magnetophon ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index aa839e6d684d..fe5ac9410a67 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; inherit (virtualglLib.meta) license; }; } diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index 55f6eede0fa3..4ee2c8acc254 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, libX11}: +{lib, stdenv, fetchFromGitHub, libX11}: stdenv.mkDerivation rec { pname = "wayv"; version = "0.3"; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A gesture control for X11"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/mikemb/wayV"; }; } diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 64f8627a2eff..9247d0fe2e02 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , libX11 , glib @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://sites.google.com/site/tstyblo/wmctrl"; description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; - maintainers = [ stdenv.lib.maintainers.Anton-Latukha ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; all; + maintainers = [ lib.maintainers.Anton-Latukha ]; }; } diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix index b1e070673c6d..9c88a038e3ee 100644 --- a/pkgs/tools/X11/xannotate/default.nix +++ b/pkgs/tools/X11/xannotate/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchFromBitbucket, libX11}: +{lib, stdenv, fetchFromBitbucket, libX11}: stdenv.mkDerivation rec { pname = "xannotate"; version = "20150301"; - + src = fetchFromBitbucket { owner = "blais"; repo = pname; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A tool to scribble over X windows"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://bitbucket.org/blais/xannotate"; }; } diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix index 0a31d5fb8653..ef0d04410bb0 100644 --- a/pkgs/tools/X11/xautomation/default.nix +++ b/pkgs/tools/X11/xautomation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }: +{ lib, stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }: let version = "1.09"; in stdenv.mkDerivation { @@ -15,8 +15,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.hoopajoo.net/projects/xautomation.html"; description = "Control X from the command line for scripts, and do \"visual scraping\" to find things on the screen"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ vaibhavsagar ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ vaibhavsagar ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/tools/X11/xbanish/default.nix index 6267cd1a34c8..169f87a50f60 100644 --- a/pkgs/tools/X11/xbanish/default.nix +++ b/pkgs/tools/X11/xbanish/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}: +{lib, stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}: stdenv.mkDerivation rec { version = "1.7"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { The name comes from ratpoison's "banish" command that sends the cursor to the corner of the screen. ''; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.choochootrain]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.choochootrain]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index 35961aff178d..1f3537d5b5ac 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }: +{ lib, stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }: stdenv.mkDerivation rec { pname = "xbindkeys-config"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://packages.debian.org/source/xbindkeys-config"; description = "Graphical interface for configuring xbindkeys"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [benley]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [benley]; + platforms = with lib.platforms; linux; }; patches = [ ./xbindkeys-config-patch1.patch ]; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 71316bdb36c8..8c65845f8bd0 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, guile }: +{ lib, stdenv, fetchurl, pkgconfig, libX11, guile }: let version = "1.8.7"; in stdenv.mkDerivation { @@ -15,8 +15,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html"; description = "Launch shell commands with your keyboard or your mouse under X Window"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index cbf4d2c94003..1bb95699f644 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, imake, gccmakedep +{ lib, stdenv, fetchurl, imake, gccmakedep , libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm }: stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "X11 brigthness and gamma software control"; homepage = "http://shallowsky.com/software"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 238b8c7b2b2d..06428393b2a2 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11 }: +{ lib, stdenv, fetchurl, libX11 }: stdenv.mkDerivation rec { name = "xchainkeys-0.11"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://henning-bekel.de/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 5f0e0ef19d6c..a321ead36665 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # just needed when built from git buildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ]; - postInstall = stdenv.lib.optionalString mimiSupport '' + postInstall = lib.optionalString mimiSupport '' cp ${mimisrc}/xdg-open $out/bin/xdg-open '' + '' sed '2s#.#\ diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 6785d10258f3..924557f62217 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: +{ lib, stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }: stdenv.mkDerivation rec { pname = "xdotool"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.semicomplete.com/projects/xdotool/"; description = "Fake keyboard/mouse input, window management, and more"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 9e11c948f40b..1e4cfc6e0c92 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: +{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { pname = "xinput_calibrator"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/tias/xinput_calibrator"; description = "A generic touchscreen calibration program for X.Org"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.flosse ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.flosse ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/tools/X11/xloadimage/default.nix index 3bd9f5256835..e228c8223f4f 100644 --- a/pkgs/tools/X11/xloadimage/default.nix +++ b/pkgs/tools/X11/xloadimage/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , libX11 , libXt @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXt - ] ++ stdenv.lib.optionals withJpegSupport [ + ] ++ lib.optionals withJpegSupport [ libjpeg - ] ++ stdenv.lib.optionals withPngSupport [ + ] ++ lib.optionals withPngSupport [ libpng - ] ++ stdenv.lib.optionals withTiffSupport [ + ] ++ lib.optionals withTiffSupport [ libtiff ]; @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { zoom, brightening/darkening and merging. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ andrew-d ]; - platforms = stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ andrew-d ]; + platforms = lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index 13a18efccba6..cf0ef6d8bf8c 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }: +{ lib, stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }: stdenv.mkDerivation rec { pname = "xmacro"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXtst xorgproto libXi ]; meta = { - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index 7402f19c2c8a..2c63e5fd4fc8 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Middle mouse button primary X selection/clipboard paste disabler"; homepage = "https://github.com/milaq/XMousePasteBlock"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.petercommand ]; }; } diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index ae057c769845..0cdab1d77926 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libX11, xorgproto, libXext, libXtst +{ fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst , gtk2, libXi, pkgconfig, texinfo }: stdenv.mkDerivation rec { @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { "macros", retype a file. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/xnee/"; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 6f6d38932df3..8cb36cb9141d 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, xorg, fetchgit }: +{ lib, stdenv, xorg, fetchgit }: stdenv.mkDerivation rec { pname = "xpointerbarrier"; version = "18.06"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://uninformativ.de/git/xpointerbarrier"; description = "Create X11 pointer barriers around your working area"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.xzfc ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.xzfc ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 3f1bf557ae8e..3f63db9be64a 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -97,7 +97,7 @@ in buildPythonApplication rec { --set XPRA_INSTALL_PREFIX "$out" --set XPRA_COMMAND "$out/bin/xpra" --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]} + --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]} ) ''; diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index c7bb2bc348b1..dadbfd01cb9b 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib +{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib , autoconf, automake, libtool, gettext, pkgconfig , git, perl, texinfo, help2man }: @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { inherit version; description = ''A command-line tool to print idle time from libXss''; homepage = "http://taktoa.me/xprintidle-ng/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index a28fc50c1e74..945f21c8cb10 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, pkgconfig, ncurses }: +{ lib, stdenv, fetchurl, xorg, pkgconfig, ncurses }: stdenv.mkDerivation { pname = "xrestop"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ]; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 7bd0c3e6dcd4..553a4c2b7ede 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }: +{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''X window switcher drawing a colourful grid''; - license = stdenv.lib.licenses.bsd2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index ed7828f37e2a..ba62704bdd3b 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}: +{ lib, stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "An X11 screen zoom tool"; - license = stdenv.lib.licenses.free ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.free ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 2bfdb9b69de6..6fafc1c253a9 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, bash, glibc, stdenv }: +{ fetchurl, bash, glibc, lib, stdenv }: stdenv.mkDerivation rec { name = "daemontools-0.76"; @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { ''; meta = { - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; homepage = "https://cr.yp.to/daemontools.html"; description = "A collection of tools for managing UNIX services"; - maintainers = with stdenv.lib.maintainers; [ kevincox ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ kevincox ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index 5ec710dde434..eda7b7ace5fb 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -a dehydrated $out/bin - wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}" + wrapProgram "$out/bin/dehydrated" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}" ''; meta = with lib; { diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index ef8df0d47265..0d46eff98b51 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -13,9 +13,9 @@ buildGoPackage rec { sha256 = "0xgmwjva3j1s0cqkbajbamj13bgzh5jkf2ir54m9a7w8gjnsh6dx"; }; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsecret ]; + buildInputs = lib.optionals stdenv.isLinux [ libsecret ]; buildPhase = if stdenv.isDarwin diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index c2e6a4479aea..96520f10ffaf 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "exoscale-cli"; @@ -27,7 +27,7 @@ buildGoPackage rec { meta = { description = "Command-line tool for everything at Exoscale: compute, storage, dns"; homepage = "https://github.com/exoscale/cli"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ dramaturg ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dramaturg ]; }; } diff --git a/pkgs/tools/admin/fbvnc/default.nix b/pkgs/tools/admin/fbvnc/default.nix index ec32b5f0a268..2bd46f27ab0f 100644 --- a/pkgs/tools/admin/fbvnc/default.nix +++ b/pkgs/tools/admin/fbvnc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub}: +{lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "fbvnc"; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "Framebuffer VNC client"; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/zohead/fbvnc/"; }; } diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 152025d41c90..f5ffd33cc70e 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8"; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 5c97d110f9ae..4c5a5f3d6f06 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -46,7 +46,7 @@ buildGoPackage rec { # test binaries, code generation rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath ( + wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( networkPkgs ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ] ++ [ (writeShellScriptBin "apparmor_parser" '' diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index f331c137107c..269e0e1df1fa 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "13wfz0ig9dsl0h085rzlrx0dg9la957c50xyzjfxq1ybw2qr266b"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A modern replacement for ps written in Rust"; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index b082f61f875d..fe3517c6196c 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, perl, stdenv }: +{ fetchFromGitHub, perl, lib, stdenv }: stdenv.mkDerivation rec { name = "sec-${meta.version}"; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://simple-evcorr.github.io"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; description = "Simple Event Correlator"; - maintainers = [ stdenv.lib.maintainers.tv ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.tv ]; + platforms = lib.platforms.all; version = "2.8.3"; }; } diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index f29ced9ebfd8..aafe91dccd24 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp $pname $out/bin/$pname wrapProgram $out/bin/$pname \ - --set PATH "${stdenv.lib.makeBinPath buildInputs}" + --set PATH "${lib.makeBinPath buildInputs}" ''; meta = with lib; { diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 8412ffa9cad1..20d17b77741b 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , xorg, xkeyboard_config, zlib , libjpeg_turbo, pixman, fltk , fontDirectories @@ -9,7 +9,7 @@ , makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "1.11.0"; @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { rm -f $out/lib/xorg/protocol.txt wrapProgram $out/bin/vncserver \ - --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) } + --prefix PATH : ${lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) } ''; buildInputs = with xorg; [ @@ -100,10 +100,10 @@ stdenv.mkDerivation rec { meta = { homepage = "https://tigervnc.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Fork of tightVNC, made in cooperation with VirtualGL"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; # Prevent a store collision. priority = 4; }; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 7dc416c8efda..1bfb3be113da 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu +{ lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }: stdenv.mkDerivation { @@ -68,7 +68,7 @@ stdenv.mkDerivation { ''; meta = { - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://vnc-tight.sourceforge.net/"; description = "Improved version of VNC"; @@ -80,6 +80,6 @@ stdenv.mkDerivation { ''; maintainers = []; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 3b4eb6a5ea56..7ef374b5bfe6 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub } : +{ lib, stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { version = "2.5.2"; @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/kholtman/afio"; description = "Fault tolerant cpio archiver targeting backups"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; /* * Licensing is complicated due to the age of the code base, but * generally free. See the file ``afio_license_issues_v5.txt`` for * a comprehensive discussion. */ - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; } diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 0d24ead456a7..419a7d04ee33 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, bash}: +{lib, stdenv, fetchurl, perl, bash}: stdenv.mkDerivation { name = "atool-0.39.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.nongnu.org/atool"; description = "Archive command line helper"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 672c99d80c00..844bd8de29c4 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, acl }: +{ lib, stdenv, fetchurl, autoreconfHook, acl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; # avoid retaining reference to CF during stdenv bootstrap - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.isDarwin [ "gt_cv_func_CFPreferencesCopyAppValue=no" "gt_cv_func_CFLocaleCopyCurrent=no" "gt_cv_func_CFLocaleCopyPreferredLanguages=no" @@ -24,19 +24,19 @@ stdenv.mkDerivation rec { # gnutar tries to call into gettext between `fork` and `exec`, # which is not safe on darwin. # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882 - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/system.c --replace '_(' 'N_(' ''; outputs = [ "out" "info" ]; buildInputs = [ ] - ++ stdenv.lib.optional stdenv.isLinux acl - ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook; + ++ lib.optional stdenv.isLinux acl + ++ lib.optional stdenv.isDarwin autoreconfHook; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now. - FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1"; + FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1"; preConfigure = if stdenv.isCygwin then '' sed -i gnu/fpending.h -e 's,include ,,' @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { archives). ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; priority = 10; }; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index d5d35a38251f..701c7429d636 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; # we need unar to for multi-archive extraction - postFixup = stdenv.lib.optionalString withGog '' + postFixup = lib.optionalString withGog '' wrapProgram $out/bin/innoextract \ - --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]} + --prefix PATH : ${lib.makeBinPath [ unar ]} ''; meta = with lib; { diff --git a/pkgs/tools/archivers/ndstool/default.nix b/pkgs/tools/archivers/ndstool/default.nix index 9a6350a8df16..de7f02ce846a 100644 --- a/pkgs/tools/archivers/ndstool/default.nix +++ b/pkgs/tools/archivers/ndstool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake }: stdenv.mkDerivation rec { pname = "ndstool"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/devkitPro/ndstool"; description = "A tool to unpack and repack nds rom"; - maintainers = [ stdenv.lib.maintainers.marius851000 ]; - license = stdenv.lib.licenses.gpl3; + maintainers = [ lib.maintainers.marius851000 ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 90602cd42d84..ed2340ca628d 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # I think this is a typo and should be CXX? Either way let's kill it sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits - '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace makefile.machine \ --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { preConfigure = '' buildFlags=all3 - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' cp makefile.macosx_llvm_64bits makefile.machine ''; @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { homepage = "https://github.com/szcnick/p7zip"; description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.raskin ]; # RAR code is under non-free UnRAR license, but we remove it license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index 74ad0669d693..79a40e6ca6be 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gcc }: +{ lib, stdenv, fetchurl, gcc }: stdenv.mkDerivation { name = "pxattr-2.1.0"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.lesbonscomptes.com/pxattr/index.html"; description = "Provides a single interface to extended file attributes"; - maintainers = [ stdenv.lib.maintainers.vrthra ]; - license = [ stdenv.lib.licenses.mit ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.vrthra ]; + license = [ lib.licenses.mit ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix index b9eaf3dba65e..c251cfe0dc30 100644 --- a/pkgs/tools/archivers/runzip/default.nix +++ b/pkgs/tools/archivers/runzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libzip, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, libzip, autoreconfHook }: stdenv.mkDerivation rec { version = "1.4"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "A tool to convert filename encoding inside a ZIP archive"; - license = stdenv.lib.licenses.bsd2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix index 30ff2bc36a25..dd3fb8462889 100644 --- a/pkgs/tools/archivers/s-tar/default.nix +++ b/pkgs/tools/archivers/s-tar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "s-tar"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { Note that unpacking tar archives may be a security risk because star may overwrite existing files. ''; homepage = "http://cdrtools.sourceforge.net/private/star.html"; - license = stdenv.lib.licenses.cddl; - maintainers = [ stdenv.lib.maintainers.wucke13 ]; + license = lib.licenses.cddl; + maintainers = [ lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index b3b150637d60..cfd764aa11ef 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , bzip2 , enableNLS ? false, libnatspec }: @@ -41,7 +41,7 @@ stdenv.mkDerivation { name = "CVE-2019-13232-3.patch"; sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf"; }) - ] ++ stdenv.lib.optional enableNLS + ] ++ lib.optional enableNLS (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; name = "unzip-6.0-natspec.patch"; @@ -49,11 +49,11 @@ stdenv.mkDerivation { }); nativeBuildInputs = [ bzip2 ]; - buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec; + buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec; makefile = "unix/Makefile"; - NIX_LDFLAGS = "-lbz2" + stdenv.lib.optionalString enableNLS " -lnatspec"; + NIX_LDFLAGS = "-lbz2" + lib.optionalString enableNLS " -lnatspec"; buildFlags = [ "generic" @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.info-zip.org"; description = "An extraction utility for archives compressed in .zip format"; - license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; # http://www.info-zip.org/license.html + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 16e93470e892..8272b2fe598a 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; postInstall = let - path = stdenv.lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ]; + path = lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ]; in '' for prog in $out/bin/*; do wrapProgram $prog --prefix PATH : ${path} diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index 53da140b7fda..12490d96cb48 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, pkgconfig }: +{ lib, stdenv, fetchurl, gtk2, pkgconfig }: stdenv.mkDerivation rec { version = "0.2.8-6"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "A GTK front-end for command line archiving tools"; - maintainers = [ stdenv.lib.maintainers.domenkozar ]; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.domenkozar ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 022c05a4c6fe..e7c3392731ae 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper, +{ lib, stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper, coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/xarchiver \ - --prefix PATH : ${stdenv.lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]} + --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]} ''; meta = { description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = "https://github.com/ib/xarchiver"; - maintainers = [ stdenv.lib.maintainers.domenkozar ]; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.domenkozar ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 74f1982a425e..f8131046df17 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation { patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; - buildInputs = stdenv.lib.optional enableNLS libnatspec - ++ stdenv.lib.optional stdenv.isCygwin libiconv; + buildInputs = lib.optional enableNLS libnatspec + ++ lib.optional stdenv.isCygwin libiconv; meta = with lib; { description = "Compressor/archiver for creating and modifying zipfiles"; diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index 6abad5a17be4..1ff204babc12 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -11,9 +11,9 @@ let sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk"; }; - compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread" - ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT"); + compileFlags = lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ] + ++ lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread" + ++ lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT"); in stdenv.mkDerivation { inherit (s) name version; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 3c8f43772b55..5703ca77bd01 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qt4 taglib chromaprint ffmpeg ]; - cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${stdenv.lib.getVersion taglib}" ]; + cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ]; patches = [ (fetchpatch { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://acoustid.org/fingerprinter"; description = "Audio fingerprinting tool using chromaprint"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index fdad7dd89844..a64cc5ebcada 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Beets plugin to manage external files"; homepage = "https://github.com/geigerzaehler/beets-alternatives"; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - license = stdenv.lib.licenses.mit; + maintainers = [ lib.maintainers.aszlig ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index 9432cb9bd0b9..b339bc34ad20 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -28,6 +28,6 @@ pythonPackages.buildPythonApplication { meta = { description = "Beets plugin to move non-music files during the import process"; homepage = "https://github.com/sbarakat/beets-copyartifacts"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/beets/plugins/extrafiles.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix index 7d0e446ce605..584c7da7925e 100644 --- a/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -25,6 +25,6 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = "https://github.com/Holzhaus/beets-extrafiles"; description = "A plugin for beets that copies additional files and directories during the import process"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/tools/audio/bpm-tools/default.nix index afd5785f3cff..7967577dda5a 100644 --- a/pkgs/tools/audio/bpm-tools/default.nix +++ b/pkgs/tools/audio/bpm-tools/default.nix @@ -10,7 +10,7 @@ }: let - path = stdenv.lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ]; + path = lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ]; in stdenv.mkDerivation rec { pname = "bpm-tools"; diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index 89b93b02865f..774a018fe036 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkgconfig , libjack2, alsaLib, libpulseaudio , faac, lame, libogg, libopus, libvorbis, libsamplerate }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://darkice.org/"; description = "Live audio streamer"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ikervagyok fpletz ]; }; } diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 5190699be087..7c868e5383f8 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }: +{ lib, stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { description = "A simple and lightweight volume icon that sits in your system tray"; homepage = "https://github.com/Unia/gvolicon"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bennofs ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.bennofs ]; }; } diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index ccaa01412312..eedfd2f3dbbe 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication { # so mididings knows where to look for config files ++ [ pyxdg ]; - preBuild = with stdenv.lib.versions; '' + preBuild = with lib.versions; '' substituteInPlace setup.py \ --replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}" ''; diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index 5b7ab80d8602..03f446dc215b 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: stdenv.mkDerivation { name = "picotts-unstable-2018-10-19"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { meta = { description = "Text to speech voice sinthesizer from SVox"; homepage = "https://github.com/naggety/picotts"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.canndrew ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.canndrew ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/tools/backup/automysqlbackup/default.nix index b3b6e40997cc..169ef7309fe0 100644 --- a/pkgs/tools/backup/automysqlbackup/default.nix +++ b/pkgs/tools/backup/automysqlbackup/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp automysqlbackup $out/bin/ cp automysqlbackup.conf $out/etc/ - wrapProgram $out/bin/automysqlbackup --prefix PATH : ${stdenv.lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]} + wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]} ''; meta = with lib; { diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 23036596c977..3d9772de404d 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation IOKit ] # acl relies on attr, which I can't get to build on darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) acl; + ++ lib.optional (!stdenv.isDarwin) acl; configureFlags = [ "--with-sqlite3=${sqlite.dev}" @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" - ] ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"; + ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"; installFlags = [ "logdir=\${out}/logdir" diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 90fb2f4c4a49..f4cf9502c0d1 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -6,7 +6,7 @@ assert sqlite != null || postgresql != null || libmysqlclient != null; -with stdenv.lib; +with lib; let withGlusterfs = "\${with_glusterfs_directory}"; in diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 121900f76f51..4b8908448f68 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ libb2 lz4 zstd openssl python3.pkgs.setuptools_scm - ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; + ] ++ lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3.pkgs; [ cython llfuse ]; diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 3727a4b7f427..af253ccd7e6a 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, librsync }: +{ lib, stdenv, fetchurl, librsync }: stdenv.mkDerivation rec { name = "btar-1.1.1"; @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { meta = { description = "Tar-compatible block-based archiver"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "http://viric.name/cgi-bin/btar"; - platforms = with stdenv.lib.platforms; all; - maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with lib.platforms; all; + maintainers = with lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index db6946e88057..cd91d51d9606 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/sbin/btrbk \ --set PERL5LIB $PERL5LIB \ - --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}" + --prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}" ''; meta = with lib; { diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 0765d8a08cd9..3cd68e6ef459 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper , perl, pandoc, python3Packages, git , par2cmdline ? null, par2Support ? true }: @@ -7,7 +7,7 @@ assert par2Support -> par2cmdline != null; let version = "0.31"; in -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "bup"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { git (python3Packages.python.withPackages (p: with p; [ setuptools tornado ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ])) + ++ lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ])) ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 9801d8ded9c4..76a3d674ecbf 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; version = "0.6.4"; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installManPage doc/man/*.[1-9] ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Easy and efficient encrypted backups"; homepage = "https://bupstash.io"; license = licenses.mit; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 0da366b58eb1..8d946ad2ba8d 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ librsync ncurses openssl zlib uthash ] - ++ stdenv.lib.optional (!stdenv.isDarwin) acl; + ++ lib.optional (!stdenv.isDarwin) acl; configureFlags = [ "--localstatedir=/var" ]; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 6885f3f8265a..2bab8d5ea22e 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, perl }: +{ lib, stdenv, fetchurl, openssl, perl }: stdenv.mkDerivation rec { version = "0.4"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; homepage = "http://chunksync.florz.de/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 593e9b34da9f..709084d5108b 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , attr, e2fsprogs , curl, librsync, libthreadar , gpgme, libgcrypt, openssl , bzip2, lzo, xz, zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "2.6.13"; diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix index 701ac2333de9..a26bdb0d9a3f 100644 --- a/pkgs/tools/backup/dirvish/default.nix +++ b/pkgs/tools/backup/dirvish/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast, disk based, rotating network backup system"; homepage = "http://dirvish.org/"; - license = stdenv.lib.licenses.osl2; + license = lib.licenses.osl2; platforms = platforms.linux; maintainers = [ maintainers.winpat ]; }; diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index 502c8c713536..5330ca60a4dc 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { cp -r * $out/share/${pname}-${version} makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \ --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ sqlite ]} makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \ --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ sqlite ]} ''; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 284cf50132f3..5b213db6385a 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -14,8 +14,8 @@ , gettext }: let - inherit (stdenv.lib.versions) majorMinor splitVersion; - majorMinorPatch = v: builtins.concatStringsSep "." (stdenv.lib.take 3 (splitVersion v)); + inherit (lib.versions) majorMinor splitVersion; + majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v)); in pythonPackages.buildPythonApplication rec { pname = "duplicity"; @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { # Our Python infrastructure runs test in installCheckPhase so we need # to make the testing code stop assuming it is run from the source directory. ./use-installed-scripts-in-test.patch - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ ./linux-disable-timezone-test.patch ]; @@ -63,7 +63,7 @@ pythonPackages.buildPythonApplication rec { pycrypto pydrive future - ] ++ stdenv.lib.optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ enum ]; @@ -72,7 +72,7 @@ pythonPackages.buildPythonApplication rec { gnutar # Add 'tar' to PATH. librsync # Add 'rdiff' to PATH. par2cmdline # Add 'par2' to PATH. - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ util-linux # Add 'setsid' to PATH. ] ++ (with pythonPackages; [ lockfile @@ -84,7 +84,7 @@ pythonPackages.buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/duplicity \ - --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}" + --prefix PATH : "${lib.makeBinPath [ gnupg ncftp rsync ]}" ''; preCheck = '' @@ -100,7 +100,7 @@ pythonPackages.buildPythonApplication rec { # Don't run developer-only checks (pep8, etc.). export RUN_CODE_TESTS=0 - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # Work around the following error when running tests: # > Max open files of 256 is too low, should be >= 1024. # > Use 'ulimit -n 1024' or higher to correct. diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 61e97b66e183..d23198f6f0c0 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" wrapProgram "$out/bin/duply" --set PATH \ - ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]} + ${lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://duply.net/"; license = licenses.gpl2; maintainers = [ maintainers.bjornfor ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index f611a953f3a8..a01565c43a0a 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; }; - buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = [ zlib openssl ] ++ lib.optional stdenv.isDarwin libiconv; enableParallelBuilding = true; diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index 7203ba480e60..32e66db19ba9 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -1,9 +1,9 @@ -{ mkDerivation, stdenv, fetchurl +{ mkDerivation, lib, stdenv, fetchurl , pkgconfig, libtool, qmake , rsync, ssh }: -with stdenv.lib; +with lib; mkDerivation rec { pname = "luckybackup"; version = "0.5.0"; @@ -16,7 +16,7 @@ mkDerivation rec { buildInputs = [ rsync ssh ]; nativeBuildInputs = [ pkgconfig libtool qmake ]; - + prePatch = '' for File in luckybackup.pro menu/luckybackup-pkexec \ menu/luckybackup-su.desktop menu/luckybackup.desktop \ @@ -29,12 +29,12 @@ mkDerivation rec { meta = { description = "A powerful, fast and reliable backup & sync tool"; longDescription = '' - luckyBackup is an application for data back-up and synchronization + luckyBackup is an application for data back-up and synchronization powered by the rsync tool. - + It is simple to use, fast (transfers over only changes made and not all data), safe (keeps your data safe by checking all declared directories - before proceeding in any data manipulation), reliable and fully + before proceeding in any data manipulation), reliable and fully customizable. ''; homepage = "http://luckybackup.sourceforge.net/"; diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index f88ee31711f6..0f9a171e979d 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0s5mv8mymycz4ga4zh9kbrhwmhgl4j01pw1sdzxy49l9waryk9p3"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; checkFlagsArray = [ "--skip=tests::cli" ]; diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/tools/backup/mt-st/default.nix index 57201d69dbac..804c50830ce6 100644 --- a/pkgs/tools/backup/mt-st/default.nix +++ b/pkgs/tools/backup/mt-st/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mt-st-1.3"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { Fork of the standard "mt" tool with additional Linux-specific IOCTLs. ''; homepage = "https://github.com/iustin/mt-st"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.redvers ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.redvers ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index 2a2dd80c566b..aa72b02afbbd 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mtx-1.3.12"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { specification. ''; homepage = "https://sourceforge.net/projects/mtx/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.redvers ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.redvers ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 7549ac73292d..7df696bcc56c 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkgconfig , glib, zlib, pcre, libmysqlclient, libressl }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in stdenv.mkDerivation rec { version = "0.9.5"; diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 2a325046123e..7cbddb688b6f 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , pkgconfig, libuuid, e2fsprogs, nilfs-utils, ntfs3g }: @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g - (stdenv.lib.getOutput "static" stdenv.cc.libc) + e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g + (lib.getOutput "static" stdenv.cc.libc) ]; configureFlags = [ @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { ext2 partition. ''; homepage = "https://partclone.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index cec19c399335..179e08e29264 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -1,4 +1,4 @@ -{stdenv +{lib, stdenv , fetchurl , fetchpatch , bzip2 @@ -40,8 +40,8 @@ stdenv.mkDerivation { meta = { description = "Opensource disk backup software"; homepage = "http://www.partimage.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 05b35e004a29..7077f8e34702 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang ]; buildInputs = [ openssl libsodium lzma ] - ++ (stdenv.lib.optional stdenv.isDarwin Security); + ++ (lib.optional stdenv.isDarwin Security); configurePhase = '' export LIBCLANG_PATH="${llvmPackages.libclang}/lib" diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 707ba8a9885b..f55f163dafb0 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python2Packages, librsync, gnused }: +{lib, stdenv, fetchurl, python2Packages, librsync, gnused }: python2Packages.buildPythonApplication { name = "rdiff-backup-1.3.3"; @@ -17,7 +17,7 @@ python2Packages.buildPythonApplication { meta = { description = "Backup system trying to combine best a mirror and an incremental backup system"; homepage = "http://rdiff-backup.nongnu.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix index 0df4ecda89ef..70cf1a78d8c2 100644 --- a/pkgs/tools/backup/rdup/default.nix +++ b/pkgs/tools/backup/rdup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }: stdenv.mkDerivation { pname = "rdup"; @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "The only backup program that doesn't make backups"; homepage = "https://github.com/miekg/rdup"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 1f65bd6ae5a4..9322e62a3dc6 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A filesystem snapshot utility for making backups of local and remote systems"; homepage = "https://rsnapshot.org/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix index af5a33c2a6ee..e2f0cc7fe1f0 100644 --- a/pkgs/tools/backup/stenc/default.nix +++ b/pkgs/tools/backup/stenc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.0.7"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "SCSI Tape Encryption Manager"; homepage = "https://github.com/scsitape/stenc"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index bd1c0d802aa0..d0ca5324cabd 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -1,4 +1,4 @@ -{stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}: +{lib, stdenv, which, coreutils, perl, fetchurl, perlPackages, makeWrapper, diffutils , writeScriptBin, bzip2}: # quick usage: # storeBackup.pl --sourceDir /home/user --backupDir /tmp/my_backup_destination @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for p in $out/bin/* do wrapProgram "$p" \ --prefix PERL5LIB ":" "${perlPackages.DBFile}/${perlPackages.perl.libPrefix}" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ which bzip2 ]}" + --prefix PATH ":" "${lib.makeBinPath [ which bzip2 ]}" done patchShebangs $out @@ -104,8 +104,8 @@ stdenv.mkDerivation rec { meta = { description = "A backup suite that stores files on other disks"; homepage = "https://savannah.nongnu.org/projects/storebackup"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 34955a979a41..1b151ece3d95 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, e2fsprogs }: +{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs }: let zshCompletion = fetchurl { @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; - buildInputs = [ openssl zlib ] ++ stdenv.lib.optional stdenv.isLinux e2fsprogs ; + buildInputs = [ openssl zlib ] ++ lib.optional stdenv.isLinux e2fsprogs ; meta = { description = "Online backups for the truly paranoid"; homepage = "http://www.tarsnap.com/"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice roconnor ]; + license = lib.licenses.unfree; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice roconnor ]; }; } diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index b3e9bfd56c0f..0ed2bf1bf8bf 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, lzop, postgresql, pv }: +{ lib, stdenv, fetchurl, python3Packages, lzop, postgresql, pv }: python3Packages.buildPythonApplication rec { pname = "wal-e"; @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; homepage = "https://github.com/wal-e/wal-e"; maintainers = []; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix index 5de58c56f002..12913ed62225 100644 --- a/pkgs/tools/backup/zbackup/default.nix +++ b/pkgs/tools/backup/zbackup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : +{ lib, stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : stdenv.mkDerivation { pname = "zbackup"; version = "1.4.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "A versatile deduplicating backup tool"; homepage = "http://zbackup.org/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index 588049cb976b..61d88edd670b 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , alsaLib, bluez, glib, sbc, dbus # optional, but useful utils @@ -9,7 +9,7 @@ # TODO: aptxSupport }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "bluez-alsa"; diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index d5c3a30e7aea..6affd3ec6620 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7"; }; - makeFlags = stdenv.lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ]; + makeFlags = lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ]; installPhase = '' install -Dt $out/bin bchunk diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index e5d7a842e6c7..28ed61ebd55e 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}: +{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}: stdenv.mkDerivation rec { name = "cdrkit-1.1.11"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://cdrkit.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 87e633c504a8..e5d95e96fbca 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "cue2pops"; version = "git-2018-01-04"; diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 1087bb94b432..686c1f0ad72d 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext pkgconfig which ]; buildInputs = [ glib gtk2 ]; - patches = stdenv.lib.optional enableSoftening [ + patches = lib.optional enableSoftening [ ./encryption.patch ./dvdrom.patch ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "--docdir=share/doc" "--with-nls=yes" "--with-embedded-src-path=no" - ] ++ stdenv.lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes"; + ] ++ lib.optional (stdenv.hostPlatform.isx86_64) "--with-sse2=yes"; # fatal error: inlined-icons.h: No such file or directory enableParallelBuilding = false; diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix index 4e3a2daafe81..d37cc649d386 100644 --- a/pkgs/tools/cd-dvd/uif2iso/default.nix +++ b/pkgs/tools/cd-dvd/uif2iso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, zlib }: +{ lib, stdenv, fetchurl, unzip, zlib }: stdenv.mkDerivation rec { nameNoVer = "uif2iso"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool for converting single/multi part UIF image files to ISO"; homepage = "http://aluigi.org/mytoolz.htm#uif2iso"; - license = stdenv.lib.licenses.gpl1Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl1Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 5ccb4b49d7e8..71a0a763285a 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/applications unetbootin.desktop wrapProgram $out/bin/unetbootin \ - --prefix PATH : ${stdenv.lib.makeBinPath [ mtools p7zip which ]} \ + --prefix PATH : ${lib.makeBinPath [ mtools p7zip which ]} \ --set QT_X11_NO_MITSHM 1 runHook postInstall diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index 2b918c4ffebc..a31354670a04 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libdvdread, libdvdcss }: +{ lib, stdenv, fetchurl, libdvdread, libdvdcss }: stdenv.mkDerivation rec { name = "vobcopy-1.2.0"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; homepage = "http://vobcopy.org/projects/c/c.shtml"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index e187d49b783a..5262fe06963b 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: +{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }: let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; shortRev = builtins.substring 0 7 rev; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ruediger/VobSub2SRT"; description = "Converts VobSub subtitles into SRT subtitles"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index b40808a5a8cc..34fdb8d03af5 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; buildInputs = [ libcdio zlib bzip2 readline libiconv ] - ++ stdenv.lib.optionals stdenv.isLinux [ acl attr ]; + ++ lib.optionals stdenv.isLinux [ acl attr ]; meta = with lib; { description = "ISO 9660 Rock Ridge file system manipulator"; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 1c80c70b7c1d..af0cbc4fe22e 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - patches = stdenv.lib.optional staticOnly (fetchpatch { + patches = lib.optional staticOnly (fetchpatch { # context from https://github.com/google/brotli/pull/655 # updated patch from https://github.com/google/brotli/pull/655 url = "https://github.com/google/brotli/commit/47a554804ceabb899ae924aaee54df806053d0d1.patch"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }); cmakeFlags = [] - ++ stdenv.lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; + ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index 1f15b3d2f87b..ac0c0544f017 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = stdenv.lib.optional stdenv.isDarwin openmp; + buildInputs = lib.optional stdenv.isDarwin openmp; prePatch = '' substituteInPlace makefile \ diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index a5b527d70b7f..8b5dfe919c7d 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2 }: +{ lib, stdenv, fetchurl, bzip2 }: stdenv.mkDerivation rec { pname = "bsdiff"; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "An efficient binary diff/patch tool"; homepage = "http://www.daemonology.net/bsdiff"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 7b97c66b3b90..ad680a69f850 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; configureFlags = - stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; + lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 9628e100c1cc..6bcd5ae0c427 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , xz , writeText @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { is just a bonus. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 4367f4b6d61f..18efc1b64c28 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { name = "gzrt-0.8"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index 2cce7bb8b929..85b95a6f7694 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mv config.mk.template config.mk ''; - makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' install -D hactool $out/bin/hactool diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index f68b0cdc751a..73931f6bcaea 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "kzipmix-20091108"; @@ -11,15 +11,15 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cp kzip zipmix $out/bin - + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix ''; meta = { description = "A tool that aggressively optimizes the sizes of Zip archives"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ stdenv.lib.maintainers.sander ]; + maintainers = [ lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index edf42266acdb..77df84879b8d 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "lhasa-0.3.1"; @@ -13,9 +13,9 @@ stdenv.mkDerivation { decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for the tool is a library, so that it can be reused for other purposes. ''; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "http://fragglet.github.io/lhasa"; - maintainers = with stdenv.lib; [ maintainers.sander ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with lib; [ maintainers.sander ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index aaddb6299c4b..596ea0531664 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: +{lib, stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: stdenv.mkDerivation rec { version = "0.631"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; inherit version; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 080504551843..e2bb98a4b805 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; - buildInputs = stdenv.lib.optional doCheck valgrind; + buildInputs = lib.optional doCheck valgrind; enableParallelBuilding = true; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "WINDRES:=${stdenv.cc.bintools.targetPrefix}windres" ] # TODO make full dictionary - ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW "TARGET_OS=MINGW" + ++ lib.optional stdenv.hostPlatform.isMinGW "TARGET_OS=MINGW" ; doCheck = false; # tests take a very long time @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Make resusable setup hook for this issue on Windows. postInstall = - stdenv.lib.optionalString stdenv.hostPlatform.isWindows '' + lib.optionalString stdenv.hostPlatform.isWindows '' mv $out/bin/*.dll $out/lib ln -s $out/lib/*.dll '' diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index e55af8b94ed2..9826347cfbb1 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl, texinfo }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "CPPFLAGS=-DNDEBUG" "CFLAGS=-O3" "CXXFLAGS=-O3" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "CXX=${stdenv.cc.targetPrefix}c++"; setupHook = ./lzip-setup-hook.sh; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/lzip/lzip.html"; description = "A lossless data compressor based on the LZMA algorithm"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 04323f8c49ec..dabde674d2eb 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, runtimeShell }: +{ lib, stdenv, fetchurl, python3, runtimeShell }: stdenv.mkDerivation rec { pname = "mozlz4a"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A script to handle Mozilla's mozlz4 files"; - license = stdenv.lib.licenses.bsd2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5"; }; } diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index b60a23e660ca..0f79811f9669 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "ncompress-4.2.4.5"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ncompress.sourceforge.net/"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 599c096adefa..6d27b84e8c4c 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with lib; { homepage = "http://compression.ca/pbzip2/"; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 9178e3ad5875..7517e599e733 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux util-linux; + buildInputs = [zlib] ++ lib.optional stdenv.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index c7b4b46328d7..9cf1e441df87 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig + lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl , libarchive, lzma }: @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A parallel compressor/decompressor for xz format''; - license = stdenv.lib.licenses.bsd2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd2; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index e731d91f6d6e..e337ccdd4ae3 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, xz, lzma }: +{ lib, stdenv, fetchgit, xz, lzma }: let name = "pxz"; version = "4.999.9beta+git"; @@ -32,13 +32,13 @@ stdenv.mkDerivation { meta = { homepage = "https://jnovy.fedorapeople.org/pxz/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [pashev]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [pashev]; description = ''Parallel XZ is a compression utility that takes advantage of running LZMA compression of different parts of an input file on multiple cores and processors simultaneously. Its primary goal is to utilize all resources to speed up compression time with minimal possible influence on compression ratio''; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index fe4ac14ad021..60364afa9f30 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, bzip2}: +{lib, stdenv, fetchurl, fetchpatch, bzip2}: stdenv.mkDerivation { name = "rzip-2.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "https://rzip.samba.org/"; description = "Compression program"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index b877f78b8c35..5d7c2b092204 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }: +{ lib, stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { of content's rich meta-data. ''; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ copumpkin ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ copumpkin ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index b599ee2920f1..ee52f35c9790 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [] - ++ stdenv.lib.optionals lzmaSupport [ xz ]; + ++ lib.optionals lzmaSupport [ xz ]; postPatch = '' cd xdelta3 diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index 25cd3ed311ad..03366e5b1ce3 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [] - ++ stdenv.lib.optionals lzmaSupport [ xz ]; + ++ lib.optionals lzmaSupport [ xz ]; postPatch = '' cd xdelta3 diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index fa4a01243339..cc021a1ef051 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; - configureFlags = stdenv.lib.optional enableStatic "--disable-shared"; + configureFlags = lib.optional enableStatic "--disable-shared"; doCheck = true; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index eb4144443aec..e1437e3843db 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -17,22 +17,22 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix bash; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = lib.optional stdenv.hostPlatform.isUnix bash; patches = [ ./playtests-darwin.patch ] # This I didn't upstream because if you use posix threads with MinGW it will # work fine, and I'm not sure how to write the condition. - ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; + ++ lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; - postPatch = stdenv.lib.optionalString (!static) '' + postPatch = lib.optionalString (!static) '' substituteInPlace build/cmake/CMakeLists.txt \ --replace 'message(SEND_ERROR "You need to build static library to build tests")' "" substituteInPlace build/cmake/tests/CMakeLists.txt \ --replace 'libzstd_static' 'libzstd_shared' sed -i \ - "1aexport ${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \ + "1aexport ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/build_/lib" \ tests/playTests.sh ''; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; outputs = [ "bin" "dev" ] - ++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man" + ++ lib.optional stdenv.hostPlatform.isUnix "man" ++ [ "out" ]; meta = with lib; { diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 7984e2bd5893..94921397e303 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "zsync-0.6.2"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index d1d4ba6adf17..69beb9e7e6fa 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, libarchive }: +{ lib, stdenv, fetchurl, pkgconfig, fuse, libarchive }: let name = "archivemount-0.9.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index edfcaa0d8f81..341d772e82d0 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, xz }: +{ lib, stdenv, fetchurl, pkgconfig, fuse, xz }: stdenv.mkDerivation rec { pname = "avfs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://avf.sourceforge.net/"; description = "Virtual filesystem that allows browsing of compressed files"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 869d2782855c..949acef695e8 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation { buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 python3Packages.pytest udev valgrind - ] ++ stdenv.lib.optional fuseSupport fuse3; + ] ++ lib.optional fuseSupport fuse3; doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; checkInputs = [ valgrind ]; - preCheck = stdenv.lib.optionalString fuseSupport '' + preCheck = lib.optionalString fuseSupport '' rm tests/test_fuse.py ''; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index e69f76e16304..e8972b36f33e 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fuse, pkgconfig }: +{ lib, stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { version = "1.14.8"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; homepage = "https://bindfs.org"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ lovek323 ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index ab49ce02225f..f2ef9a0f52a8 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "bonnie++-1.98"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.coker.com.au/bonnie++/"; description = "Hard drive and file system benchmark suite"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 469a499b5549..3bc8dc5875fe 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs ''; - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; + configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; meta = with lib; { description = "Utilities for the btrfs filesystem"; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 845d146f0c1d..c19f095c649e 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -36,7 +36,7 @@ # We must have one crypto library assert cryptopp != null || (nss != null && nspr != null); -with stdenv; with stdenv.lib; +with stdenv; with lib; let shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index c18bbe5a4559..e4a20e3da5a0 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, fuse }: +{ lib, stdenv, fetchurl, perl, fuse }: stdenv.mkDerivation rec { version = "0.7"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; homepage = "http://chunkfs.florz.de/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 8b633ecbe0f5..345b942411c0 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, glib, attr }: +{ lib, stdenv, fetchurl, pkgconfig, fuse, glib, attr }: stdenv.mkDerivation rec { name = "ciopfs-0.4"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.brain-dump.org/projects/ciopfs/"; description = "A case-insensitive filesystem layered on top of any other filesystem"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 02536a13d15b..7652cc978785 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , neon @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://savannah.nongnu.org/projects/davfs2"; description = "Mount WebDAV shares like a typical filesystem"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' Web Distributed Authoring and Versioning (WebDAV), an extension to @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { with no built-in support for WebDAV. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index 15086d28c988..824788fe24f6 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse }: +{ lib, stdenv, fetchurl, pkgconfig, fuse }: stdenv.mkDerivation rec { pname = "djmount"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://djmount.sourceforge.net/"; description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.jagajaga ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 5af1580d0a51..a4688ffd4ac5 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }: stdenv.mkDerivation rec { pname = "dosfstools"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin libiconv; configureFlags = [ "--enable-compat-symlinks" ]; meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; homepage = "https://github.com/dosfstools/dosfstools"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix index 9c86ced90f7f..1f4fdc323187 100644 --- a/pkgs/tools/filesystems/e2tools/default.nix +++ b/pkgs/tools/filesystems/e2tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, e2fsprogs }: +{ lib, stdenv, fetchurl, pkgconfig, e2fsprogs }: stdenv.mkDerivation rec { pname = "e2tools"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://home.earthlink.net/~k_sheff/sw/e2tools/"; description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.leenaars ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.leenaars ]; }; } diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 3e76653dd3e0..114c83e84f4a 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, fuse}: +{lib, stdenv, fetchurl, openssl, fuse}: throw "It still does not build" @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = "http://fsfs.sourceforge.net/"; description = "Secure distributed file system in user space"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index b9edd4799bc8..61170f469e80 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - libs = stdenv.lib.makeLibraryPath [ p7zip ]; # 'cause 7z.so is loaded manually + libs = lib.makeLibraryPath [ p7zip ]; # 'cause 7z.so is loaded manually postInstall = '' wrapProgram $out/bin/${pname} --suffix LD_LIBRARY_PATH : "${libs}/p7zip" diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 0f66955360f7..1d1863ede968 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "gitfs"; @@ -30,8 +30,8 @@ python3Packages.buildPythonApplication rec { automatically committed to the remote. ''; homepage = "https://github.com/PressLabs/gitfs"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.robbinch ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.robbinch ]; }; } diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index d23faf16886f..a3f50a7f9784 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -111,7 +111,7 @@ in stdenv.mkDerivation rec { # It also invokes executable Python scripts in `$out/libexec/glusterfs`, which is why we set up PYTHONPATH accordingly. # We set up the paths for the main entry point executables. - GLUSTER_PATH="${stdenv.lib.makeBinPath runtimePATHdeps}:$out/bin" + GLUSTER_PATH="${lib.makeBinPath runtimePATHdeps}:$out/bin" GLUSTER_PYTHONPATH="$(toPythonPath $out):$out/libexec/glusterfs" GLUSTER_LD_LIBRARY_PATH="$out/lib" diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix index e08835fc35d6..8a2a8572b5ca 100644 --- a/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/pkgs/tools/filesystems/hfsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libbsd }: +{ lib, stdenv, fetchurl, openssl, libbsd }: let version = "332.25"; package_name = "hfsprogs"; in @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { description = "HFS/HFS+ user space utils"; - license = stdenv.lib.licenses.apsl20; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.apsl20; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 23edb8175799..2cb1dba28b61 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, fuse, openssl, asciidoc +{ fetchurl, lib, stdenv, pkgconfig, fuse, openssl, asciidoc , docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }: stdenv.mkDerivation rec { @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { homepage = "http://httpfs.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 2062a8442e6d..24697aaf8218 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -48,8 +48,8 @@ with stdenv; testing on supported platforms; plug-in support for microservices, storage resources, drivers, and databases; and extensive documentation, training and support services.''; homepage = "https://irods.org"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.bzizou ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 60670708f4bc..07c74c58c816 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: +{ lib, stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { pname = "mergerfs"; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE based union filesystem"; homepage = "https://github.com/trapexit/mergerfs"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ]; + license = lib.licenses.isc; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jfrankenau makefu ]; }; } diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix index 2b3f6a8b3cbf..e559fd9d4cd0 100644 --- a/pkgs/tools/filesystems/mergerfs/tools.nix +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - postInstall = with stdenv.lib; '' + postInstall = with lib; '' wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${makeBinPath [ rsync ]} wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${makeBinPath [ rsync ]} wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ pythonPackages.xattr ]} diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 94aa07b10437..894e9e7a66c2 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fuse, pkgconfig, attr, uthash }: +{ lib, stdenv, fetchurl, fuse, pkgconfig, attr, uthash }: stdenv.mkDerivation rec { pname = "mhddfs"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mhddfs.uvw.ru/"; description = "Combines a several mount points into the single one"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.makefu ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.makefu ]; }; } diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 3b355c92226b..1db4b473e9db 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmocka, acl, libuuid, lzo, zlib, zstd }: +{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, cmocka, acl, libuuid, lzo, zlib, zstd }: stdenv.mkDerivation rec { pname = "mtd-utils"; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ stdenv.lib.optional doCheck cmocka; + nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ lib.optional doCheck cmocka; buildInputs = [ acl libuuid lzo zlib zstd ]; configureFlags = [ - (stdenv.lib.enableFeature doCheck "unit-tests") - (stdenv.lib.enableFeature doCheck "tests") + (lib.enableFeature doCheck "unit-tests") + (lib.enableFeature doCheck "tests") ]; enableParallelBuilding = true; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = { description = "Tools for MTD filesystems"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "http://www.linux-mtd.infradead.org/"; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ viric ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index b2cac0f75906..4316e0ee4268 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "06pabnjc4r2vv3dzfm6q97g6jbp2k5bhmcdwv2cf25ka8y5ir7sk"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; + patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; # fails to find X on darwin - configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x"; + configureFlags = lib.optional stdenv.isDarwin "--without-x"; doCheck = true; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 6abad445517b..b08c4b9c71d0 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python +{ fetchurl, lib, stdenv, autoreconfHook, pkgconfig, perl, python , db, libgcrypt, avahi, libiconv, pam, openssl, acl , ed, libtirpc, libevent }: @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { meta = { description = "Apple Filing Protocol Server"; homepage = "http://netatalk.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 72d07ed19220..0639c6a6f21b 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-libmount" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # AC_FUNC_MALLOC is broken on cross builds. "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 809c5256873e..3a63ad9747fe 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication, blivet }: +{ lib, stdenv, fetchurl, buildPythonApplication, blivet }: buildPythonApplication rec { pname = "nixpart"; @@ -13,8 +13,8 @@ buildPythonApplication rec { meta = { description = "NixOS storage manager/partitioner"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.aszlig ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 30c7aa7ba364..6c67dfc5e1b3 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; - buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ]; - nativeBuildInputs = stdenv.lib.optional crypto pkgconfig; + buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ]; + nativeBuildInputs = lib.optional crypto pkgconfig; src = fetchurl { url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; diff --git a/pkgs/tools/filesystems/orangefs/default.nix b/pkgs/tools/filesystems/orangefs/default.nix index 1b10941f1392..f6a35437fb92 100644 --- a/pkgs/tools/filesystems/orangefs/default.nix +++ b/pkgs/tools/filesystems/orangefs/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc/orangefs" "--enable-shared" "--enable-fast" - "--with-ssl=${stdenv.lib.getDev openssl}" + "--with-ssl=${lib.getDev openssl}" ]; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 62d602f06808..08562aed3635 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rdfind.pauldreik.se/"; description = "Removes or hardlinks duplicate files very swiftly"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.wmertens ]; platforms = platforms.all; }; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index daafdbf231fd..dc97cdb652e2 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libuuid, autoreconfHook }: +{ lib, stdenv, fetchurl, libuuid, autoreconfHook }: let version = "3.6.24"; in stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "http://www.namesys.com/"; description = "ReiserFS utilities"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index fb1e1a5539a2..96d950e74ff1 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -D ${src}/rmount.bash $out/bin/rmount install -D ${src}/config.json $out/share/config.json - wrapProgram $out/bin/rmount --prefix PATH : ${stdenv.lib.makeBinPath [ nmap jq cifs-utils sshfs ]} + wrapProgram $out/bin/rmount --prefix PATH : ${lib.makeBinPath [ nmap jq cifs-utils sshfs ]} ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 487ecf63c938..3635119bc9f4 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ curl openssl libxml2 ] - ++ stdenv.lib.optionals stdenv.isLinux [ fuse ] - ++ stdenv.lib.optionals stdenv.isDarwin [ osxfuse ]; + ++ lib.optionals stdenv.isLinux [ fuse ] + ++ lib.optionals stdenv.isDarwin [ osxfuse ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = [ diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index 011387e7a4de..7f92da6a224d 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ lzma lzo xz zlib ] - ++ stdenv.lib.optional lz4Support lz4; + ++ lib.optional lz4Support lz4; patches = [ patch ]; patchFlags = [ "-p0" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=\${out}/bin" ]; makeFlags = [ "XZ_SUPPORT=1" ] - ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; + ++ lib.optional lz4Support "LZ4_SUPPORT=1"; meta = with lib; { homepage = "https://github.com/devttys0/sasquatch"; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index de6d25e128a9..d854558b7920 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "snapraid"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.snapraid.it/"; description = "A backup program for disk arrays"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.makefu ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.makefu ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 645633a87e1e..4e2cda7e9efc 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, xz +{ lib, stdenv, fetchFromGitHub, zlib, xz , lz4 ? null , lz4Support ? false , zstd @@ -22,23 +22,23 @@ stdenv.mkDerivation { # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + ] ++ lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ zlib xz zstd ] - ++ stdenv.lib.optional lz4Support lz4; + ++ lib.optional lz4Support lz4; preBuild = "cd squashfs-tools"; installFlags = [ "INSTALL_DIR=\${out}/bin" ]; makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ] - ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; + ++ lib.optional lz4Support "LZ4_SUPPORT=1"; meta = { homepage = "http://squashfs.sourceforge.net/"; description = "Tool for creating and unpacking squashfs filesystems"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ ruuda ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ruuda ]; }; } diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 9f9c4a605c6a..1a57cc8a0007 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, pkgconfig, lz4, xz, zlib, lzo, zstd }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index bec84b3810e5..69826941d00f 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 glib ]; checkInputs = [ which python3Packages.pytest ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 4ae4ebb6f197..bef4d6b5cea1 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }: +{ lib, stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }: stdenv.mkDerivation { name = "svnfs-0.4"; @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { description = "FUSE filesystem for accessing Subversion repositories"; homepage = "http://www.jmadden.eu/index.php/svnfs/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 152fd1d7a71e..d2779e2b4c59 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: +{ lib, stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: let p = if stdenv.is64bit then { @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://help.yandex.com/disk/cli-clients.xml"; description = "A free cloud file storage service"; - maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ]; + maintainers = with lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; longDescription = '' Yandex.Disk console client for Linux lets you manage files on Disk without using a window interface or programs that support WebDAV. The advantages diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index f9fd8a3c7f35..2489357f73f9 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, e2fsprogs }: +{ lib, stdenv, fetchurl, e2fsprogs }: stdenv.mkDerivation rec { pname = "zerofree"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://frippery.org/uml/"; description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.theuni ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.theuni ]; }; } diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a7c6d6eb4394..3f15a33ffc79 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; patches = - (stdenv.lib.optional (stdenv.lib.versionOlder version "2.68") + (lib.optional (stdenv.lib.versionOlder version "2.68") (fetchpatch { url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch"; sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm"; @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glm - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ freeglut libGLU libGL mesa.osmesa - ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]); diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index 3ac49b690d71..b554ac9b3c0e 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -1,6 +1,6 @@ # The releases of this project are apparently precompiled to .jar files. -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation { meta = { homepage = "https://sourceforge.net/projects/briss/"; description = "Java application for cropping PDF files"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix index b1ce3082d25b..4a4920ec6b9e 100644 --- a/pkgs/tools/graphics/convchain/default.nix +++ b/pkgs/tools/graphics/convchain/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, mono}: +{lib, stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { pname = "convchain"; version = "0.0pre20160901"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''Bitmap generation from a single example with convolutions and MCMC''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index a43c7a16d97e..488fdb2b2679 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: +{lib, stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }: stdenv.mkDerivation rec { name = "dcraw-9.28.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = lib.optional stdenv.isDarwin libiconv; buildInputs = [ libjpeg lcms2 gettext ]; # Jasper is disabled because the library is abandoned and has many @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.dechifro.org/dcraw/"; description = "Decoder for many camera raw picture formats"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; # Once had cygwin problems + license = lib.licenses.free; + platforms = lib.platforms.unix; # Once had cygwin problems maintainers = [ ]; knownVulnerabilities = [ "CVE-2018-19655" diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index 24e43044697d..3422b9a53bdc 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -10,7 +10,7 @@ ­~~~ */ -{ stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }: +{ lib, stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }: let @@ -35,7 +35,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; - buildCommand = with stdenv.lib; + buildCommand = with lib; concatStrings (intersperse "\n" (map exeWrapper backends)); # Will be faster to build the wrapper locally then to fetch it from a binary cache. diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index 776ce333da64..36146f08dbfe 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libdmtx, pkgconfig, imagemagick}: +{lib, stdenv, fetchurl, libdmtx, pkgconfig, imagemagick}: let s = # Generated upstream information rec { @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Data matrix command-line utilities"; - license = stdenv.lib.licenses.lgpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 3ca748aa956f..afe8a5ecbcc3 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "exiftags-1.01"; @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = "http://johnst.org/sw/exiftags/"; description = "Displays EXIF data from JPEG files"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.free; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 9694fb728f8c..40308ffa1a9a 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/share/fgallery/fgallery" \ --set PERL5LIB "$PERL5LIB" \ - --set PATH "${stdenv.lib.makeBinPath + --set PATH "${lib.makeBinPath [ coreutils zip imagemagick pngcrush lcms2 facedetect fbida ]}" ''; diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index 58aefd1d5852..2015de607d25 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "flam3"; - version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}"; + version = "3.1.1-${lib.strings.substring 0 7 rev}"; rev = "e0801543538451234d7a8a240ba3b417cbda5b21"; src = fetchFromGitHub { diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 72220fab4803..c05a552f2051 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, xorgproto, libXt, libX11 +{ lib, stdenv, fetchurl, xorgproto, libXt, libX11 , gifview ? false , static ? stdenv.hostPlatform.isStatic }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "gifsicle"; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; homepage = "https://www.lcdf.org/gifsicle/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.all; - maintainers = with stdenv.lib.maintainers; [ zimbatm ]; + maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index fad37d1e08eb..136e805e7936 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "glee"; rev = "f727ec7463d514b6279981d12833f2e11d62b33d"; - version = "20170205-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20170205-${lib.strings.substring 0 7 rev}"; src = fetchgit { inherit rev; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index a3cdf9c6fc8e..5162419e05dc 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -7,7 +7,7 @@ assert stdenv.isDarwin -> ApplicationServices != null; let - inherit (stdenv.lib) optional optionals optionalString; + inherit (lib) optional optionals optionalString; raw_patch = # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196 fetchpatch { @@ -17,13 +17,13 @@ let excludes = ["tests/*"]; # we don't run them and they don't apply }; # the patch needs a small adaption for older versions - patchToUse = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else + patchToUse = if lib.versionAtLeast version "2.37" then raw_patch else stdenv.mkDerivation { inherit (raw_patch) name; buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out"; }; # 2.42 has the patch included - patches = optional (stdenv.lib.versionOlder version "2.42") patchToUse; + patches = optional (lib.versionOlder version "2.42") patchToUse; in stdenv.mkDerivation { @@ -46,13 +46,13 @@ stdenv.mkDerivation { hardeningDisable = [ "fortify" ]; - CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin) + CPPFLAGS = lib.optionalString (xorg != null && stdenv.isDarwin) "-I${cairo.dev}/include/cairo"; configureFlags = [ "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" - ] ++ stdenv.lib.optional (xorg == null) "--without-x"; + ] ++ lib.optional (xorg == null) "--without-x"; inherit patches; diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/tools/graphics/guff/default.nix index f03adb7bff0f..daca6f4344eb 100644 --- a/pkgs/tools/graphics/guff/default.nix +++ b/pkgs/tools/graphics/guff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "guff"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A plot device"; homepage = "https://github.com/silentbicycle/guff"; license = licenses.isc; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 0689c9cc2486..704c3a2db526 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { name = "icoutils-0.32.3"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/icoutils/"; description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index db96299abe13..885638c28b8c 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, curl, jq, gnugrep, libnotify, scrot, which, xclip }: -let deps = stdenv.lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ]; +let deps = lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ]; in stdenv.mkDerivation rec { version = "2.0.0"; pname = "imgur-screenshot"; diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 84e25150fab0..8b79e3373a68 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cat <$out/bin/imgurbash2 #!${bash}/bin/bash - PATH=${stdenv.lib.makeBinPath [curl xsel]}:\$PATH + PATH=${lib.makeBinPath [curl xsel]}:\$PATH EOF cat imgurbash2 >> $out/bin/imgurbash2 chmod +x $out/bin/imgurbash2 diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index 05818bf8dda1..a4b396c3d232 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: +{ lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { name = "jbig2enc-0.28"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Encoder for the JBIG2 image compression format"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.asl20; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/graphics/ldgallery/compiler/default.nix b/pkgs/tools/graphics/ldgallery/compiler/default.nix index 37aa2983b49f..000f227075ed 100644 --- a/pkgs/tools/graphics/ldgallery/compiler/default.nix +++ b/pkgs/tools/graphics/ldgallery/compiler/default.nix @@ -1,7 +1,7 @@ # generated with cabal2nix by ./generate.sh { mkDerivation, aeson, base, cmdargs, containers, data-ordlist , directory, fetchgit, filepath, Glob, hpack, parallel-io, process -, safe, stdenv, text, time, yaml +, safe, lib, stdenv, text, time, yaml }: mkDerivation { pname = "ldgallery-compiler"; @@ -32,6 +32,6 @@ mkDerivation { prePatch = "hpack"; homepage = "https://ldgallery.pacien.org"; description = "A static generator which turns a collection of tagged pictures into a searchable web gallery"; - license = stdenv.lib.licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ pacien ]; + license = lib.licenses.agpl3; + maintainers = with lib.maintainers; [ pacien ]; } diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index 0c56f3859839..1915b4b919f4 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, poppler }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, poppler }: stdenv.mkDerivation { name = "leela-12.fe7a35a"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { meta = { description = "CLI frontend to the poppler-glib libary of PDF tools"; homepage = "https://github.com/TrilbyWhite/Leela"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.puffnfresh ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.puffnfresh ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 1835b9fec213..eb3135032218 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake git ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ]; + buildInputs = lib.optionals stdenv.isLinux [ glibc.static ]; meta = with lib; { homepage = "https://github.com/dropbox/lepton"; diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index 9c666462ef76..92737e333fe7 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }: +{ lib, stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }: /* how to calibrate your monitor: Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "Little CMS ICC profile construction set"; homepage = "https://sourceforge.net/projects/lprof"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index af71990e459c..c4b8622f479b 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -41,8 +41,8 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS gnome3.adwaita-icon-theme - (stdenv.lib.getLib dconf) - ] ++ stdenv.lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ]; + (lib.getLib dconf) + ] ++ lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ]; cmakeFlags = [ "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" @@ -54,7 +54,7 @@ in stdenv.mkDerivation { "-DEMBREE_INCLUDE_PATH=${embree2}/include" "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" - ] ++ stdenv.lib.optional withOpenCL + ] ++ lib.optional withOpenCL "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; preConfigure = '' @@ -73,7 +73,7 @@ in stdenv.mkDerivation { wrapProgram "$out/bin/luxcoreui" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" ''; meta = with lib; { diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 99bbd4b13dae..8ea707da749b 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { supposed to be an improved scrot. ''; changelog = "https://github.com/naelstrof/maim/releases/tag/v${version}"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + license = lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; }; } diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index f6bec5983c2a..6cd8777f5258 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , bison , fetchurl , flex @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.mcternan.me.uk/mscgen/"; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Mscgen is a small program that parses Message Sequence Chart @@ -51,7 +51,7 @@ stdenv.mkDerivation { printing. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 948b590249fd..d9a8321a31a2 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; # Environment variables - STRIPPROG = "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"; + STRIPPROG = "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"; postPatch = '' # Install libnetpbm.so symlink to correct destination @@ -68,12 +68,12 @@ stdenv.mkDerivation { echo "STATICLIB_TOO = N" >> config.mk # Enable cross-compilation - echo 'AR = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk + echo 'AR = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk echo 'PKG_CONFIG = ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' >> config.mk - echo 'RANLIB = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk + echo 'RANLIB = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk # Use libraries from Nixpkgs echo "TIFFLIB = libtiff.so" >> config.mk @@ -86,7 +86,7 @@ stdenv.mkDerivation { # Fix path to rgb.txt echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk echo "NETPBMLIBTYPE = dylib" >> config.mk echo "NETPBMLIBSUFFIX = dylib" >> config.mk @@ -120,6 +120,6 @@ stdenv.mkDerivation { homepage = "http://netpbm.sourceforge.net/"; description = "Toolkit for manipulation of graphic images"; license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index d91f163c50b8..0a053a3ad323 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch"; sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj"; }) - ] ++ (stdenv.lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch); + ] ++ (lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch); buildInputs = [ qtbase qttools libGLU.dev ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix index 688d1c496294..320acaba420c 100644 --- a/pkgs/tools/graphics/optar/default.nix +++ b/pkgs/tools/graphics/optar/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { --replace /usr/local $out substituteInPlace pgm2ps \ - --replace 'convert ' "${stdenv.lib.getBin imagemagick}/bin/convert " + --replace 'convert ' "${lib.getBin imagemagick}/bin/convert " ''; preInstall = '' diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 772e7d192d1c..72caf6f86aec 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -4,7 +4,7 @@ # This package comes with its own copy of zlib, libpng and pngxtern -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "optipng-0.7.7"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-system-zlib" "--with-system-libpng" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ #"-prefix=$out" ]; diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 912aa07ea8d4..abe560c81feb 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { cp -R *.py pylrs $PYDIR wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \ - --prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]} + --prefix PATH : ${lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]} ''; meta = with lib; { diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index c22746c52146..8611060d0557 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -18,9 +18,9 @@ mkDerivation rec { preConfigure = '' rm cmake/FindNETPBM.cmake - echo "SET(NETPBM_LIBRARY `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake - echo "SET(NETPBM_LIBRARIES `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake - echo "SET(NETPBM_INCLUDE_DIR ${stdenv.lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake + echo "SET(NETPBM_LIBRARY `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake + echo "SET(NETPBM_LIBRARIES `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake + echo "SET(NETPBM_INCLUDE_DIR ${lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake echo "INCLUDE(FindPackageHandleStandardArgs)" >> cmake/FindNETPBM.cmake echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake ''; diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index d3f01fa7d1f0..14cd83c3fcfe 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: -with stdenv.lib; +with lib; let version = "6.14.12"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format command line program"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/tools/graphics/piglit/default.nix index e2c2b6e6e972..0a4dfc4bafc5 100644 --- a/pkgs/tools/graphics/piglit/default.nix +++ b/pkgs/tools/graphics/piglit/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/piglit \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]} \ --prefix PATH : "${waffle}/bin" ''; diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 7292b2ac37bf..001b4cd174b4 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libpng, autoreconfHook }: +{ fetchurl, lib, stdenv, libpng, autoreconfHook }: # debian splits this package into plotutils and libplot2c2 @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/plotutils/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.marcweber ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index ba5082ac3048..7fba539977f9 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { name = "pngcheck-2.3.0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; - license = stdenv.lib.licenses.free; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.free; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 5bc52b92f0d2..e4a8b705a165 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng }: +{ lib, stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { name = "pngcrush-1.8.13"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pmt.sourceforge.net/pngcrush"; description = "A PNG optimizer"; - license = stdenv.lib.licenses.free; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.free; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 33a62478a4b6..d1d069c7ff78 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let folder = if stdenv.hostPlatform.system == "i686-linux" then "i686" @@ -16,7 +16,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cp ${folder}/pngout $out/bin - + ${if stdenv.hostPlatform.system == "i686-linux" then '' patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/pngout '' else if stdenv.hostPlatform.system == "x86_64-linux" then '' @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = "A tool that aggressively optimizes the sizes of PNG images"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ stdenv.lib.maintainers.sander ]; + maintainers = [ lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index 2300c65f24b5..7eabfb89d5a6 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng }: +{ lib, stdenv, fetchurl, libpng }: stdenv.mkDerivation { name = "pngtoico-1.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.kernel.org/pub/software/graphics/pngtoico/"; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 4b610ebbfef2..6872fb232f97 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}: +{lib, stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}: let s = rec { @@ -32,8 +32,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''A small QR code decoding library''; - license = stdenv.lib.licenses.isc; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.isc; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index 745a032b068a..49a27c1e9e97 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }: stdenv.mkDerivation rec { pname = "s2png"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/dbohdan/s2png/"; description = "Store any data in PNG images"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.dbohdan ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.dbohdan ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix index 693f116a6e80..e39742d76d0b 100644 --- a/pkgs/tools/graphics/syntex/default.nix +++ b/pkgs/tools/graphics/syntex/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, mono}: +{lib, stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { pname = "syntex"; version = "0.0pre20160915"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''Texture synthesis from examples''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index 9226809c5c5b..a6c9cd988c07 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: +{ lib, stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: stdenv.mkDerivation { name = "transfig-3.2.4"; @@ -56,6 +56,6 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 4ea4e49cdbe9..1a64820950c1 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { python27 libpng expat - ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; + ] ++ lib.optional stdenv.isDarwin ApplicationServices; # Required by .pc file propagatedBuildInputs = [ diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index fa2088ca297b..083db90a9b08 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -1,4 +1,4 @@ -{ cmake, fetchFromGitHub, makeWrapper, opencv3, stdenv, ocl-icd, opencl-headers +{ cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers , cudaSupport ? false, cudatoolkit ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocl-icd opencv3 opencl-headers - ] ++ stdenv.lib.optional cudaSupport cudatoolkit; + ] ++ lib.optional cudaSupport cudatoolkit; nativeBuildInputs = [ cmake makeWrapper ]; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.xzfc ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.xzfc ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix index 65fe38937dfb..4e84380f9591 100644 --- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix +++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, mono}: +{lib, stdenv, fetchFromGitHub, mono}: stdenv.mkDerivation rec { pname = "wavefunctioncollapse"; version = "0.0pre20170130"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A generator of bitmaps that are locally similar to the input bitmap''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index be4ba53319ae..53e7378bd3be 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, jre, makeWrapper }: +{ lib, stdenv, fetchsvn, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "welkin"; @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { meta = { description = "An RDF visualizer"; - maintainers = with stdenv.lib.maintainers; [ + maintainers = with lib.maintainers; [ raskin ]; hydraPlatforms = []; - license = stdenv.lib.licenses.free; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.free; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index a8b0b406aa42..c1b12ca5fe72 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libpng, perl, gettext }: +{lib, stdenv, fetchurl, libpng, perl, gettext }: stdenv.mkDerivation { name = "xcftools-1.0.7"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { These tools work independently of the Gimp engine and do not require the Gimp to even be installed. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index f0dd183dc2c6..cd9faa85ab1d 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost165 opencv zlib libxml2 freetype libjpeg libtiff swig openexr ilmbase - ] ++ stdenv.lib.optional withPython python3; + ] ++ lib.optional withPython python3; meta = with lib; { description = "A free, open source raytracer"; diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix index ff7e26064ae9..349303346f42 100644 --- a/pkgs/tools/graphics/yaxg/default.nix +++ b/pkgs/tools/graphics/yaxg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin/ mv yaxg $out/bin/ chmod +x $out/bin/yaxg - wrapProgram $out/bin/yaxg --prefix PATH : ${ stdenv.lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]} + wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]} ''; meta = with lib; { diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index d295a5899c50..c3f03da8bc56 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { pname = "zxing"; version = "3.1.0"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''1D and 2D code reading library''; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/zxing/zxing"; }; } diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix index 95f322ed8c68..01f312fa63d6 100644 --- a/pkgs/tools/inputmethods/evscript/default.nix +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "evscript"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp"; verifyCargoDeps = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/myfreeweb/${pname}"; description = "A tiny sandboxed Dyon scripting environment for evdev input devices"; license = licenses.unlicense; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 180dc302ca0c..6d8ed7d5ca92 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cp ${dicts} src/module/spell/dict/$(stripHash ${dicts}) cp ${table} src/im/table/data/$(stripHash ${table}) '' - + stdenv.lib.optionalString withPinyin '' + + lib.optionalString withPinyin '' cp ${pystroke-data} src/module/pinyin-enhance/data/$(stripHash ${pystroke-data}) cp ${pytable-data} src/module/pinyin-enhance/data/$(stripHash ${pytable-data}) cp ${pinyin-data} src/im/pinyin/data/$(stripHash ${pinyin-data}) diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 5fa85064fa3f..b3dd2260d1cf 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , pkg-config @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { libxkbfile ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Next generation of fcitx"; homepage = "https://github.com/fcitx/fcitx5"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 2b8a07537b0b..b5955be3cb0a 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchurl , fetchFromGitHub @@ -64,9 +64,9 @@ mkDerivation rec { opencc qtwebengine fmt - ] ++ stdenv.lib.optional luaSupport fcitx5-lua; + ] ++ lib.optional luaSupport fcitx5-lua; - meta = with stdenv.lib; { + meta = with lib; { description = "Addons related to Chinese, including IME previous bundled inside fcitx4"; homepage = "https://github.com/fcitx/fcitx5-chinese-addons"; license = with licenses; [ gpl2Plus lgpl21Plus ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index e5b55c26cd4b..92563e890131 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , cmake @@ -45,12 +45,12 @@ mkDerivation rec { xkeyboardconfig libxkbfile libXdmcp - ] ++ stdenv.lib.optionals kcmSupport [ + ] ++ lib.optionals kcmSupport [ kdeclarative kwidgetsaddons ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Configuration Tool for Fcitx5"; homepage = "https://github.com/fcitx/fcitx5-configtool"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index ce157f792535..f153c238c539 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , cmake @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" - ] ++ stdenv.lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; + ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; buildInputs = [ gtk3 @@ -54,14 +54,14 @@ stdenv.mkDerivation rec { dbus at-spi2-core libXtst - ] ++ stdenv.lib.optional withGTK2 gtk2; + ] ++ lib.optional withGTK2 gtk2; nativeBuildInputs = [ cmake extra-cmake-modules ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fcitx5 gtk im module and glib based dbus client library"; homepage = "https://github.com/fcitx/fcitx5-gtk"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 310cae035ba7..3a11e6f319d8 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Lua support for Fcitx 5"; homepage = "https://github.com/fcitx/fcitx5-lua"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 580082096ece..e04993048899 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , cmake @@ -36,7 +36,7 @@ mkDerivation rec { libXdmcp ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fcitx5 Qt Library"; homepage = "https://github.com/fcitx/fcitx5-qt"; license = with licenses; [ lgpl21Plus bsd3 ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 9992e1987589..ebbee817998f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchFromGitHub , pkgconfig @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { librime ]; - meta = with stdenv.lib; { + meta = with lib; { description = "RIME support for Fcitx5"; homepage = "https://github.com/fcitx/fcitx5-rime"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 7dcca7e130d0..3415ed40345c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fcitx5 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick"; homepage = "https://github.com/fcitx/fcitx5-table-extra"; license = licenses.gpl2Only; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index eb9d93d6e7ce..f59571357189 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { fcitx5 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Some other tables for Fcitx"; homepage = "https://github.com/fcitx/fcitx5-table-other"; license = licenses.gpl3Only; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 8964b1809897..405861e308f2 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { postUnpack = '' rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/ ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi ''; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 32db48503919..e5f4aa5002dc 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , substituteAll , fetchurl , fetchFromGitHub @@ -36,7 +36,7 @@ assert withWayland -> wayland != null && libxkbcommon != null; -with stdenv.lib; +with lib; let python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 1b14629d2830..74426b2b04ed 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,9 +1,9 @@ -{ stdenv, runCommand, makeWrapper, lndir +{ lib, stdenv, runCommand, makeWrapper, lndir , dconf, hicolor-icon-theme, ibus, librsvg, plugins ? [] }: let - name = "ibus-with-plugins-" + stdenv.lib.getVersion ibus; + name = "ibus-with-plugins-" + lib.getVersion ibus; env = { buildInputs = [ ibus ] ++ plugins; nativeBuildInputs = [ lndir makeWrapper ]; @@ -25,7 +25,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ @@ -44,7 +44,7 @@ let wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index 39a28214fe20..043afe5a499d 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, libyamlcpp, +{ lib, stdenv, fetchurl, pkgconfig, cmake, libyamlcpp, libevdev, udev }: let @@ -26,8 +26,8 @@ in stdenv.mkDerivation { meta = { description = "A minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.vyp ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.vyp ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index 1abd84608454..7feb14080e9f 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { name = "m17n-db-1.8.0"; @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ]; - configureFlags = stdenv.lib.optional (stdenv ? glibc) + configureFlags = lib.optional (stdenv ? glibc) "--with-charmaps=${stdenv.glibc.out}/share/i18n/charmaps" ; meta = { homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (database)"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl ]; }; } diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index f7bff5092051..51e52ce4e953 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m17n_db}: +{lib, stdenv, fetchurl, m17n_db}: stdenv.mkDerivation rec { name = "m17n-lib-1.8.0"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (runtime)"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl ]; }; } diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index 7703de957167..f4d276e0a61d 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXaw, freetype }: +{ lib, stdenv, fetchurl, libXaw, freetype }: stdenv.mkDerivation rec { name = "libotf-0.9.16"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (libotf)"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bendlas ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index 4d2f37b865db..c7a42e5a82c1 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconv, skktools }: +{ lib, stdenv, fetchurl, libiconv, skktools }: let # kana to kanji @@ -31,7 +31,7 @@ stdenv.mkDerivation { pname = "skk-dicts-unstable"; version = "2017-10-26"; srcs = [ small medium large edict assoc ]; - nativeBuildInputs = [ skktools ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; phases = [ "installPhase" ]; installPhase = '' @@ -66,8 +66,8 @@ stdenv.mkDerivation { dictionaries for the SKK Japanese input method. ''; homepage = "https://github.com/skk-dev/dict"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ yuriaisaka ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix index b150521396c3..2c97547488e9 100644 --- a/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }: # Note (2017-10-24, yuriaisaka): # - Version 1.3.3 dates from Jul. 19, 2013. @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "skk-dev"; repo = "skktools"; - rev = "skktools-${stdenv.lib.replaceStrings ["."] ["_"] version}"; + rev = "skktools-${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1zway8jsm18279xq8zlpr84iqiw373x3v0ysay74n9bjqxbl234a"; }; # # See "12.2. Package naming" @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { input method. ''; homepage = "https://github.com/skk-dev/skktools"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ yuriaisaka ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index 6bda390dc4aa..d2bd7a14663b 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: +{ lib, stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: stdenv.mkDerivation rec { pname = "touchegg"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/JoseExposito/touchegg"; description = "Macro binding for touch surfaces"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index f7ee905b9eee..b58f1fe70a08 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -18,7 +18,7 @@ , withMisc ? false, libeb ? null }: -with stdenv.lib; +with lib; assert withGtk2 -> gtk2 != null; assert withGtk3 -> gtk3 != null; diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index 1fc081d71abf..e0f84329b897 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/0x0 wrapProgram $out/bin/0x0 \ - --prefix PATH : '${stdenv.lib.makeBinPath [ curl xsel ]}' + --prefix PATH : '${lib.makeBinPath [ curl xsel ]}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index a0868344d4cf..dbba2193b14c 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, writeText, conf ? null }: +{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "abduco-2018-05-16"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; meta = { homepage = "http://brain-dump.org/projects/abduco"; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 05ee0145636f..2a8b8b0b024d 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-liconv"; preBuild = '' substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://www.aescrypt.com/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; hydraPlatforms = with platforms; unix; }; } diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 2ee81460b283..369f7dd219f4 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -34,7 +34,7 @@ buildGoPackage { postInstall = '' installShellCompletion --bash ${aptlyCompletionSrc}/aptly wrapProgram "$out/bin/aptly" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" + --prefix PATH ":" "${lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index c5f4b0f5670a..7e60d4988424 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://requester.mturk.com/developer"; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = stdenv.lib.licenses.amazonsl; + license = lib.licenses.amazonsl; longDescription = '' diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index cb38f2705b12..f8a17790ba19 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "azure-vhd-utils"; - version = "20160614-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160614-${lib.strings.substring 0 7 rev}"; rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; goPackagePath = "github.com/Microsoft/azure-vhd-utils"; diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index c52cae4eac06..7d3f1dc0a36c 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -116,9 +116,9 @@ let runHook preInstall mkdir -p $out/bin cp -p bin/${name} $out/bin/${name} - '' + stdenv.lib.optionalString (dependencies != []) '' + '' + lib.optionalString (dependencies != []) '' wrapProgram $out/bin/${name} \ - --prefix PATH : ${stdenv.lib.makeBinPath dependencies} + --prefix PATH : ${lib.makeBinPath dependencies} '' + '' runHook postInstall ''; @@ -130,7 +130,7 @@ let }; optionalDep = cond: dep: assert cond -> dep != null; - stdenv.lib.optional cond dep; + lib.optional cond dep; in { batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta); diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index ac043ca7fea0..d6e1e9e5d774 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { # expected with certain flag combinations. postFixup = '' wrapProgram "$out/bin/bat" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ less ]}" + --prefix PATH : "${lib.makeBinPath [ less ]}" ''; passthru.tests = { inherit (nixosTests) bat; }; diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index d065732a2991..96c2d00ffa82 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, buildPackages +{ lib, stdenv, autoreconfHook, buildPackages , fetchurl, flex, readline, ed, texinfo }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU software calculator"; homepage = "https://www.gnu.org/software/bc/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 2b84412f3b27..80ec398ef8c7 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A general-purpose command-line pipe buffer"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 5bf38f1b0e7a..76fadcb7c154 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb1, pkgconfig, ... }: +{ lib, stdenv, fetchurl, libusb1, pkgconfig, ... }: stdenv.mkDerivation rec { pname = "blink1"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for the blink(1) notification light"; homepage = "https://blink1.thingm.com/"; - license = stdenv.lib.licenses.cc-by-sa-30; - maintainers = [ stdenv.lib.maintainers.cransom ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.cc-by-sa-30; + maintainers = [ lib.maintainers.cransom ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 1924968f2d35..30a17bf188a6 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, flex, db}: +{fetchurl, lib, stdenv, flex, db}: stdenv.mkDerivation rec { name = "bogofilter-1.2.4"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { classifications and corrections. It is based on a Bayesian filter. ''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 1320f28ede24..244e945bb20a 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, bluez +{ lib, stdenv, fetchurl, pkgconfig, python3, bluez , alsaSupport ? stdenv.isLinux, alsaLib ? null , systemdSupport ? stdenv.isLinux, systemd ? null }: @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; buildInputs = [ bluez ] - ++ stdenv.lib.optional alsaSupport alsaLib - ++ stdenv.lib.optional systemdSupport systemd; + ++ lib.optional alsaSupport alsaLib + ++ lib.optional systemdSupport systemd; meta = { description = "Access software for a blind person using a braille display"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { Some speech capability has also been incorporated. ''; homepage = "http://www.brltty.com/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bramd ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.bramd ]; + platforms = lib.platforms.all; }; makeFlags = [ "PYTHON_PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index afda7dd7abc9..bdb1fe37586c 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security zlib diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index f6762af11aa2..d0e6c1673497 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/capture wrapProgram $out/bin/capture \ - --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg_3 ]}' + --prefix PATH : '${lib.makeBinPath [ slop ffmpeg_3 ]}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/tools/misc/catimg/default.nix index 30845759a28e..3f94a559e612 100644 --- a/pkgs/tools/misc/catimg/default.nix +++ b/pkgs/tools/misc/catimg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake } : +{ lib, stdenv, fetchFromGitHub, cmake } : -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "catimg"; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 8097744692bc..262fd853d10e 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { docbook_xsl ]; - buildInputs = [ glib imagemagick ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; + buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; patches = [ ./xmlcatalog_patch.patch ]; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 12730d262234..3f2218ac871d 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { cp share/zsh.txt $out/share/zsh/site-functions/_cht wrapProgram "$out/bin/cht.sh" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl rlwrap ncurses xsel ]}" + --prefix PATH : "${lib.makeBinPath [ curl rlwrap ncurses xsel ]}" ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 2b9cbfe10305..f518c1b8e3f2 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: stdenv.mkDerivation rec { pname = "cloc"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A program that counts lines of source code"; homepage = "https://github.com/AlDanial/cloc"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ rycee ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rycee ]; }; } diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 290bb92faa1c..b10259f24fc2 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -37,11 +37,11 @@ in stdenv.mkDerivation rec { moveToOutput bin/vcs-run $guest for i in $out/bin/*; do - wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath binDeps}:$out/bin" + wrapProgram $i --prefix PATH : "${lib.makeBinPath binDeps}:$out/bin" done for i in $guest/bin/*; do - wrapProgram $i --prefix PATH : "${stdenv.lib.makeBinPath guestDeps}:$guest/bin" + wrapProgram $i --prefix PATH : "${lib.makeBinPath guestDeps}:$guest/bin" ln -s $i $out/bin done ''; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 40b8289e68b7..7b652f36a19f 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "http://www.gnufoo.org/contacts/contacts.html"; license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; - platforms = stdenv.lib.platforms.darwin; - hydraPlatforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.darwin; }; } diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 84a5d3b32554..c05d50cdbc1b 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: +{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: let version = "4.13"; - commonMeta = with stdenv.lib; { + commonMeta = with lib; { description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = licenses.gpl2; @@ -91,14 +91,14 @@ let installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all"; postFixup = let binPath = [ coreutils acpica-tools iasl gnugrep gnused file ]; - in "wrapProgram $out/bin/acpidump-all --set PATH ${stdenv.lib.makeBinPath binPath}"; + in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}"; }; }; in utils // { coreboot-utils = (buildEnv { name = "coreboot-utils-${version}"; - paths = stdenv.lib.attrValues utils; + paths = lib.attrValues utils; postBuild = "rm -rf $out/sbin"; }) // { inherit version; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1a0c9b2e10c8..4a4a9343c6a8 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -154,6 +154,6 @@ stdenv.mkDerivation (rec { } // optionalAttrs stdenv.hostPlatform.isMusl { # Work around a bogus warning in conjunction with musl. NIX_CFLAGS_COMPILE = "-Wno-error"; -} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isAndroid { +} // lib.optionalAttrs stdenv.hostPlatform.isAndroid { NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0"; }) diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index d99662d8ff3e..a23675fe911f 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -6,7 +6,7 @@ let date = "20160316"; in stdenv.mkDerivation { - name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + name = "cpuminer-multi-${date}-${lib.strings.substring 0 7 rev}"; src = fetchFromGitHub { owner = "hyc"; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 305084b900d1..0322f3b708f1 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: +{ lib, stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: stdenv.mkDerivation rec { pname = "CUnit"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "http://cunit.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/tools/misc/dasht/default.nix index 7c2ff3548366..4ab9cfdd0e0f 100644 --- a/pkgs/tools/misc/dasht/default.nix +++ b/pkgs/tools/misc/dasht/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { meta = { description = "Search API docs offline, in terminal or browser"; homepage = "https://sunaku.github.io/dasht/man"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.unix; #cannot test other - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + license = lib.licenses.isc; + platforms = lib.platforms.unix; #cannot test other + maintainers = with lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index a6bc0111ad4f..d8510975915b 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv}: +{fetchurl, lib, stdenv}: stdenv.mkDerivation rec { name = "dbacl-1.14"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { homepage = "http://dbacl.sourceforge.net/"; longDescription = "a digramic Bayesian classifier for text recognition."; maintainers = []; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index 024572eaa7a8..4de50693b744 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "ddate"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; license = licenses.publicDomain; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index c57f0570d1eb..4e3733533a88 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ddccontrol/ddccontrol"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.pakhfn ]; + maintainers = [ lib.maintainers.pakhfn ]; }; } diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index f0e6a8ec4055..ea60887ebfab 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -2,7 +2,7 @@ , gnugrep, gnutar, gnused, gzip, makeWrapper }: # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? -let binPath = stdenv.lib.makeBinPath [ +let binPath = lib.makeBinPath [ coreutils dpkg gawk diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 045e199e3ae7..93e711a4a860 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, libintl }: +{ lib, stdenv, fetchurl, pkgconfig, glib, libintl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "desktop-file-utils"; diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index deb70d082d98..653f150fecff 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, check }: +{ lib, stdenv, fetchurl, check }: stdenv.mkDerivation rec { pname = "ding-libs"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "'D is not GLib' utility libraries"; homepage = "https://fedorahosted.org/sssd/"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ e-user ]; - license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ e-user ]; + license = [ lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; }; } diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index c3317ec0b307..ee068450344e 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { # we have no bash at the moment for windows BASH_PATH = - stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows) + lib.optionalString (!stdenv.hostPlatform.isWindows) "${bash}/bin/bash"; # replace the build phase to use the GNUMakefile instead diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index bf61a844196a..ff5ade2e67ae 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "0bivmjn7h4lfp5azbc6q0xiqq3fk68jdd4kwrwgbxiljg4xd2qy8"; diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 6ba446d7bc04..5caa5eaf5391 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python, xorg, makeWrapper }: stdenv.mkDerivation rec { pname = "disper"; @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/disper \ - --prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}" + --prefix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}" ''; meta = { description = "On-the-fly display switch utility"; homepage = "http://willem.engen.nl/projects/disper/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index b132079a28e8..a3f023e2ad5c 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: +{ lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "dmg2img-1.6.7"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { ''; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; description = "An Apple's compressed dmg to standard (hfsplus) image disk file convert tool"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index 9973eddc7efa..f036ba9ea3e6 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dtach"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { themselves. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index f24f62cb5f44..4879e186b5a3 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ tokyocabinet ncurses ] ++ - stdenv.lib.optionals enableCairo [ cairo pango ]; + lib.optionals enableCairo [ cairo pango ]; configureFlags = - stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; + lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; meta = with lib; { homepage = "http://duc.zevv.nl/"; diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index d8bb54cb4cb6..9a42655b7378 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -3,9 +3,9 @@ stdenv.mkDerivation { inherit name src patches; - CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; - postPatch = stdenv.lib.optionalString (customConfig != null) '' + postPatch = lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h ''; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index c755f73b118b..99a21e28b075 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: let version = "2018-12-06"; in stdenv.mkDerivation { @@ -19,9 +19,9 @@ in stdenv.mkDerivation { meta = { description = "EDID decoder and conformance tester"; homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.chiiruno ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.chiiruno ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index 49b6277faef5..89ac21db5f57 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , dos2unix , edid-decode @@ -25,7 +25,7 @@ in stdenv.mkDerivation { patchShebangs modeline2edid ''; - configurePhase = (stdenv.lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); + configurePhase = (lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); installPhase = '' install -Dm 444 *.bin -t "$out/lib/firmware/edid" @@ -34,8 +34,8 @@ in stdenv.mkDerivation { meta = { description = "Hackerswork to generate an EDID blob from given Xorg Modelines"; homepage = "https://github.com/akatrevorjay/edid-generator"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.flokli ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.flokli ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 76ea8ceba0d9..1dbb5199f754 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { pname = "emv"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.i0i0.de/toolchest/emv"; description = "Editor Move: Rename files with your favourite text editor"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.publicDomain; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 0fa265c2db6c..05dcd36c40ce 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; - buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang"; + buildFlags = lib.optional stdenv.cc.isClang "CC=clang"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix index 54ae0155b311..938beff33532 100644 --- a/pkgs/tools/misc/envchain/default.nix +++ b/pkgs/tools/misc/envchain/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsecret readline ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ]; + ++ lib.optionals stdenv.isDarwin [ libedit ncurses Security ]; makeFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix index 957f5941cb6b..7ec763f16c6e 100644 --- a/pkgs/tools/misc/envdir-go/default.nix +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { version = "1.0.0"; @@ -16,12 +16,12 @@ buildGoPackage rec { preBuild = '' # TODO: is there a way to get the commit ref so we can set main.buildCommit? - buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") + buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") ''; meta = { description = "A go rewrite of envdir"; homepage = "https://github.com/d10n/envdir"; - maintainers = with stdenv.lib.maintainers; [ edude03 ]; + maintainers = with lib.maintainers; [ edude03 ]; }; } diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index 546ad8d3d7dd..53aa696a4fdb 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig }: +{lib, stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { pname = "eot_utilities"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.w3.org/Tools/eot-utils/"; description = "Create Embedded Open Type from OpenType or TrueType font"; - license = stdenv.lib.licenses.w3c; - maintainers = with stdenv.lib.maintainers; [ leenaars ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.w3c; + maintainers = with lib.maintainers; [ leenaars ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 8e5c5d918cc6..0f68137066ed 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 44c821f542d7..890edc5d0ca2 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -28,7 +28,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ]; buildInputs = [ zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ] ; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 2c5548abd839..6e8bb7fd96cd 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wrapProgram $i \ --prefix PATH : "${tcl}/bin" \ --prefix TCLLIBPATH ' ' $out/lib/* \ - ${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} + ${lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} done ''; diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 6c2cbd257442..a3cdc388cdf7 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub } : +{ lib, stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "fasd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/clvv/${pname}"; description = "Quick command-line access to files and directories for POSIX shells"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; longDescription = '' Fasd is a command-line productivity booster. @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { command line. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index f3f7afd30f68..743d930fdf8e 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -32,7 +32,7 @@ buildRustPackage rec { if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) else [ openssl ]; - preBuild = stdenv.lib.optionalString (x11Support && usesX11) ( + preBuild = lib.optionalString (x11Support && usesX11) ( if preferXsel && xsel != null then '' export XSEL_PATH="${xsel}/bin/xsel" '' else '' diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 90fb0981fbd0..01ff40b2b743 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { name = "figlet-2.2.5"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Program for making large letters out of ordinary text"; homepage = "http://www.figlet.org/"; - license = stdenv.lib.licenses.afl21; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.afl21; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 6867038c6450..4a9dc7ee774e 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { ./webassembly-format-fix.patch ]; - nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; + nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] - ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx; + ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; doCheck = true; - makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; + makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; meta = with lib; { homepage = "https://darwinsys.com/file"; diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 056943e96d78..2c64c4c1edca 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gamin }: +{ lib, stdenv, fetchurl, gamin }: stdenv.mkDerivation rec { name = "fileschanged-0.6.9"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; longDescription = '' This utility is a client to FAM (File Alteration Monitor) servers @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { standard-output or executes a given command. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 6e07125ab724..18881ef181d2 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , coreutils }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./no-install-statedir.patch ] # fix gnulib tests on 32-bit ARM. Included on findutils master. # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html - ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; + ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { * xargs - build and execute command lines from standard input. ''; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 772ae236764c..092d33b2e819 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "060102"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 8da5c8716524..0e1671071bda 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { meta = { description = "A font editor"; homepage = "http://fontforge.github.io"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.erictapen ]; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index b00f2198dbc1..6c2abbf6c644 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "fpp"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program that accepts piped input and presents files for selection"; homepage = "https://facebook.github.io/PathPicker/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index 581ef0aa838d..4fcb5a655732 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # See now-cli/default.nix dontStrip = true; preFixup = let - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; + libPath = lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; bin = "$out/bin/${pname}"; in '' diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 0723735228a4..f91acbf264a5 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}: +{ lib, stdenv, fetchurl, unzip, file, licenseFile ? null, optgamsFile ? null}: assert licenseFile != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -a * "$out/share/gams" cp ${licenseFile} $out/share/gams/gamslice.txt - '' + stdenv.lib.optionalString (optgamsFile != null) '' + '' + lib.optionalString (optgamsFile != null) '' cp ${optgamsFile} $out/share/gams/optgams.def ln -s $out/share/gams/optgams.def $out/bin/optgams.def ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "General Algebraic Modeling System"; longDescription = '' The General Algebraic Modeling System is a high-level modeling system for mathematical optimization. diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 2856dd485595..d518ba88fb6c 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: with builtins; buildGoPackage rec { pname = "gawp"; - version = "20160121-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160121-${lib.strings.substring 0 7 rev}"; rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; goPackagePath = "github.com/martingallagher/gawp"; @@ -20,6 +20,6 @@ buildGoPackage rec { meta = { homepage = "https://github.com/martingallagher/gawp"; description = "A simple, configurable, file watching, job execution tool"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; } diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index e5dc243ede11..5856a73781ed 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -1,4 +1,4 @@ - { stdenv, fetchurl, pkgconfig, freetype, gtk }: + { lib, stdenv, fetchurl, pkgconfig, freetype, gtk }: stdenv.mkDerivation rec { version = "1.6"; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { description = "Bitmap Font Editor"; longDescription = '' gbdfed lets you interactively create new bitmap font files or modify existing ones. - It allows editing multiple fonts and multiple glyphs, + It allows editing multiple fonts and multiple glyphs, it allows cut and paste operations between fonts and glyphs and editing font properties. - The editor works natively with BDF fonts. + The editor works natively with BDF fonts. ''; homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.linquize ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.linquize ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 1e1c06a3a028..d6b0c84b61f2 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { for f in geekbench5 geekbench_x86_64 ; do patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f - wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/" + wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$out/lib/" done ''; diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index f94d6eeff4ed..c3b94465aea1 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "getopt"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; homepage = "http://frodo.looijaard.name/project/getopt"; description = "Parses command-line arguments from shell scripts"; }; diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix index 1357ab5196d7..70d0eb19ca85 100644 --- a/pkgs/tools/misc/gibo/default.nix +++ b/pkgs/tools/misc/gibo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, findutils, git }: +{ lib, stdenv, fetchFromGitHub, coreutils, findutils, git }: stdenv.mkDerivation rec { pname = "gibo"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/simonwhitaker/gibo"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; description = "A shell script for easily accessing gitignore boilerplates"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 25c316661917..13f2691e69f4 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez +{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Cellphone tool"; homepage = "http://www.gnokii.org"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; broken = true; # 2018-04-10 }; } diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index d14ef9d526ad..f54a61566e93 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }: +{ lib, stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }: stdenv.mkDerivation rec { version = "1.4"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = "https://goaccess.io"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ ederoyd46 ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with lib.maintainers; [ ederoyd46 ]; }; } diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index bd53529a5d25..7bc7eab34562 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "gosu"; @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; homepage = "https://github.com/tianon/gosu"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index b8d227df5e0f..849db12cfa76 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}" ) ''; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 5a9b692b1b8f..0355fe58f485 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, unzip, graylog }: +{ pkgs, lib, stdenv, fetchurl, unzip, graylog }: with pkgs.lib; @@ -77,7 +77,7 @@ in { meta = { homepage = "https://docs.graylog.org/en/3.3/pages/integrations.html#enterprise"; description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; }; }; filter-messagesize = glPlugin rec { diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index 31306fd7aa42..fca9cecc01c7 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 9df59b1c127e..ae161af488d6 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ./gringo-4.5.4-to_string.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace ./SConstruct \ --replace \ "env['CXX'] = 'g++'" \ diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 207396fb0895..d3761f34cdad 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -7,7 +7,7 @@ , xenSupport ? false }: -with stdenv.lib; +with lib; let pcSystems = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index a7233d5c4b1f..6d747bf8c6e7 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # grub-install isn't smart enough. ./symlink.patch ] - ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch) + ++ (lib.optional buggyBiosCDSupport ./buggybios.patch) ++ map fetchurl (import ./grub1.patches.nix) ; diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index ec5d0ff12955..d6aba812405c 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, grub2_xen }: -with stdenv.lib; +with lib; let efiSystemsBuild = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 7a2454cd7b58..b0a8c9e10338 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -3,7 +3,7 @@ , for_HP_laptop ? false }: -with stdenv.lib; +with lib; let pcSystems = { i686-linux.target = "i386"; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 2e85448bde82..b86c3cc75e33 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }: stdenv.mkDerivation rec { version="1.1.3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${stdenv.lib.makeBinPath [ smartmontools ]}" + --prefix PATH : "${lib.makeBinPath [ smartmontools ]}" ) ''; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { as well as run various tests on it. ''; homepage = "https://gsmartcontrol.sourceforge.io/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [qknight]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index caf7ceb49ee2..d127bc25c3c6 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; @@ -52,16 +52,16 @@ stdenv.mkDerivation rec { libjpeg szip zlib - ] ++ stdenv.lib.optionals uselibtirpc [ + ] ++ lib.optionals uselibtirpc [ libtirpc ]; - preConfigure = stdenv.lib.optionalString uselibtirpc '' + preConfigure = lib.optionalString uselibtirpc '' # Make tirpc discovery work with CMAKE_PREFIX_PATH substituteInPlace config/cmake/FindXDR.cmake \ --replace 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \ 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)' - '' + stdenv.lib.optionalString (szip != null) '' + '' + lib.optionalString (szip != null) '' export SZIP_INSTALL=${szip} ''; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" "-DHDF4_BUILD_FORTRAN=OFF" "-DJPEG_DIR=${libjpeg}" - ] ++ stdenv.lib.optionals (szip != null) [ + ] ++ lib.optionals (szip != null) [ "-DHDF4_ENABLE_SZIP_ENCODING=ON" "-DHDF4_ENABLE_SZIP_SUPPORT=ON" ]; @@ -84,11 +84,11 @@ stdenv.mkDerivation rec { preCheck = '' export LD_LIBRARY_PATH=$(pwd)/bin - '' + stdenv.lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.isDarwin) '' export DYLD_LIBRARY_PATH=$(pwd)/bin ''; - excludedTests = stdenv.lib.optionals stdenv.isDarwin [ + excludedTests = lib.optionals stdenv.isDarwin [ "MFHDF_TEST-hdftest" "MFHDF_TEST-hdftest-shared" "HDP-dumpsds-18" @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ]; checkPhase = let excludedTestsRegex = if (excludedTests != []) - then "(" + (stdenv.lib.concatStringsSep "|" excludedTests) + ")" + then "(" + (lib.concatStringsSep "|" excludedTests) + ")" else ""; in '' runHook preCheck ctest -E "${excludedTestsRegex}" --output-on-failure diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 891fadac12ac..0a5032074c1f 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , removeReferencesTo , cpp ? false @@ -13,7 +13,7 @@ # (--enable-unsupported could be used to force the build) assert !cpp || mpi == null; -let inherit (stdenv.lib) optional optionals; in +let inherit (lib) optional optionals; in stdenv.mkDerivation rec { version = "1.10.6"; @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; - license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant + license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant homepage = "https://www.hdfgroup.org/HDF5/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix index 7ee843998313..70a2f091116b 100644 --- a/pkgs/tools/misc/hdfjava/default.nix +++ b/pkgs/tools/misc/hdfjava/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, javac }: +{ lib, stdenv, fetchurl, cmake, javac }: stdenv.mkDerivation rec { pname = "hdf-java"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "A Java package that implements HDF4 and HDF5 data objects in an object-oriented form"; - license = stdenv.lib.licenses.free; # BSD-like + license = lib.licenses.free; # BSD-like homepage = "https://support.hdfgroup.org/products/java/index.html"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 0125bfa73696..dc13bb52791f 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ant, javac, hdf_java }: +{ lib, stdenv, fetchurl, ant, javac, hdf_java }: stdenv.mkDerivation rec { pname = "hdfview"; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = { description = "A visual tool for browsing and editing HDF4 and HDF5 files"; - license = stdenv.lib.licenses.free; # BSD-like + license = lib.licenses.free; # BSD-like homepage = "https://support.hdfgroup.org/products/java/index.html"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index bbc07141e1ad..41b6adb7bfa2 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -16,7 +16,7 @@ mkDerivation { buildInputs = [ zlib libusb1 - ] ++ stdenv.lib.optional enableGUI qtbase; + ] ++ lib.optional enableGUI qtbase; nativeBuildInputs = [ cmake ]; cmakeFlags = [ @@ -27,7 +27,7 @@ mkDerivation { preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index 0c0c56c52713..467e85128b82 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "hexd"; diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix index 78e45aa4cd09..a4ba369665e6 100644 --- a/pkgs/tools/misc/hhpc/default.nix +++ b/pkgs/tools/misc/hhpc/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Hides the mouse pointer in X11"; maintainers = with maintainers; [ nico202 ]; platforms = platforms.unix; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index fe39230a2145..39999677b11f 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "12qdllhydd29xh20l5gir6qpj4a1nkzp8ics344rcwj8wsj7g5zw"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; postInstall = '' installManPage doc/hyperfine.1 diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index bc934c424f30..d75b878ae6d4 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "i3cat"; - version = "20150321-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150321-${lib.strings.substring 0 7 rev}"; rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576"; goPackagePath = "github.com/vincent-petithory/i3cat"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index f749ea677bc0..d58efd7a0d42 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -26,9 +26,9 @@ pythonPackages.buildPythonApplication rec { project is inspired by tmuxinator and uses i3-py. ''; homepage = "https://github.com/carlesso/i3minator"; - license = stdenv.lib.licenses.wtfpl; + license = lib.licenses.wtfpl; maintainers = with maintainers; [ domenkozar ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index 5072d2d9b989..605b7bfc3cea 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Not listing other dependencies specified in # https://github.com/libimobiledevice/idevicerestore/blob/8a882038b2b1e022fbd19eaf8bea51006a373c06/README#L20 # because they are inherited `libimobiledevice`. - ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/idevicerestore"; diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 9afb92791340..ac64fe9e8bc4 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs }: +{ fetchurl, lib, stdenv, emacs }: stdenv.mkDerivation rec { name = "idutils-4.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i '/gets is a security hole/d' lib/stdio.in.h ''; - buildInputs = stdenv.lib.optional stdenv.isLinux emacs; + buildInputs = lib.optional stdenv.isLinux emacs; doCheck = !stdenv.isDarwin; @@ -46,10 +46,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/idutils/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; broken = true; }; } diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index ca1c58d465a2..2b187b657600 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0kf5afarfwcl47b40pwnslfvxmxllmb995vc5ls2lpz4cx0jwahn"; # include_hidden test tries to use `chflags` on darwin - checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; meta = with lib; { description = "User-friendly and featureful command-line BitTorrent metainfo utility"; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index beb6f0e708bf..641e86c22c4b 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; + meta = with lib; { description = "Network boot firmware"; homepage = "https://ipxe.org/"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index 3529324b30ad..9032a2d24514 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ised"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { meta = { description = "A numeric sequence editor"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ raskin ]; + platforms = with lib.platforms; linux; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix index bf298090f3fa..ed47e477854c 100644 --- a/pkgs/tools/misc/ix/default.nix +++ b/pkgs/tools/misc/ix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; postFixup = '' - wrapProgram $out/bin/ix --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + wrapProgram $out/bin/ix --prefix PATH : "${lib.makeBinPath [ curl ]}" ''; meta = with lib; { diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index c55c0879e5d8..4f13d0a17af2 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" - ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + ] ++ lib.optionals stdenv.cc.isGNU [ "HARDEN=1" ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index a65d408fa6b2..49b3ffbb7dde 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg , perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { @@ -32,23 +32,23 @@ stdenv.mkDerivation rec { meta = { description = "Keychain management tool"; homepage = "https://www.funtoo.org/Keychain"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; # other platforms are untested (AFAIK) platforms = - with stdenv.lib; + with lib; platforms.linux ++ platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ sigma ]; + maintainers = with lib.maintainers; [ sigma ]; longDescription = '' - Keychain helps you to manage SSH and GPG keys in a convenient and secure - manner. It acts as a frontend to ssh-agent and ssh-add, but allows you - to easily have one long running ssh-agent process per system, rather - than the norm of one ssh-agent per login session. + Keychain helps you to manage SSH and GPG keys in a convenient and secure + manner. It acts as a frontend to ssh-agent and ssh-add, but allows you + to easily have one long running ssh-agent process per system, rather + than the norm of one ssh-agent per login session. - This dramatically reduces the number of times you need to enter your - passphrase. With keychain, you only need to enter a passphrase once - every time your local machine is rebooted. Keychain also makes it easy - for remote cron jobs to securely "hook in" to a long-running ssh-agent - process, allowing your scripts to take advantage of key-based logins. + This dramatically reduces the number of times you need to enter your + passphrase. With keychain, you only need to enter a passphrase once + every time your local machine is rebooted. Keychain also makes it easy + for remote cron jobs to securely "hook in" to a long-running ssh-agent + process, allowing your scripts to take advantage of key-based logins. ''; }; } diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index bd112e4b8765..fb69610e4ef7 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -7,7 +7,7 @@ let - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ libGLU libGL stdenv.cc.cc libX11 diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index 517e195040f5..56795e7c93f3 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "kodi-cli"; version = "1.1.1"; - + src = fetchFromGitHub { owner = "nawar"; repo = pname; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -a kodi-cli $out/bin - wrapProgram $out/bin/kodi-cli --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash ]} + wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]} cp -a playlist_to_kodi $out/bin - wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} + wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} ''; - + meta = with lib; { homepage = "https://github.com/nawar/kodi-cli"; description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi"; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 976e87ba2d8b..d33cdbacb15e 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper +{ lib, stdenv, fetchurl, fetchpatch, perl, perlPackages, finger_bsd, makeWrapper , abook ? null , gnupg ? null , goobook ? null @@ -9,7 +9,7 @@ let version = "0.48.1"; in -with stdenv.lib; +with lib; with perlPackages; stdenv.mkDerivation { pname = "lbdb"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 9c062cf418d9..6e7fcfa62b62 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 5fa4b339b1ee..157fc6607b07 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. - ++ stdenv.lib.optional lessSecure [ "--with-secure" ]; + ++ lib.optional lessSecure [ "--with-secure" ]; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index e30b36919b77..68c2fb781f89 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, liblockfile }: +{ lib, stdenv, fetchurl, liblockfile }: stdenv.mkDerivation rec { _name = "lockfile-progs"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; homepage = "http://packages.debian.org/sid/lockfile-progs"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 6735b5fd0962..97ee5b2ed3f3 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -6,7 +6,7 @@ , jre }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = elk6Version; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index df661988877d..0817a7ab087e 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -6,7 +6,7 @@ , jre }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = elk7Version; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index d4fb6532ef59..d4c88dc32ed4 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community-maintained logstash plugins"; homepage = "https://github.com/elasticsearch/logstash-contrib"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index d191a82853fc..951cb8b5caa9 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -47,7 +47,7 @@ in (rustPlatform.buildRustPackage rec { nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ]; buildInputs = - stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + lib.optionals stdenv.isDarwin [ CoreServices Security ]; # copy the docs to the $man and $doc outputs postInstall = '' diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 2816392e18ca..5f2c7a751bd7 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-pager=less" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin [ + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ "ac_cv_func__set_invalid_parameter_handler=no" "ac_cv_func_posix_fadvise=no" "ac_cv_func_mempcpy=no" @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done ''; - postFixup = stdenv.lib.optionalString (buildPackages.groff != groff) '' + postFixup = lib.optionalString (buildPackages.groff != groff) '' # Check to make sure none of the outputs depend on build-time-only groff: for outName in $outputs; do out=''${!outName} @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 4007a3f77388..6fdd4a69ebc4 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, - openssl, +{ lib, stdenv, fetchurl, + openssl, } : stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # objdump binary during cross-building for foreign platforms. # The correct objdump is exposed via the environment variable # $OBJDUMP, which should be used in such cases. - preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}' ''; doCheck = true; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.maier-komor.de/mbuffer.html"; description = "A tool for buffering data streams with a large set of unique features"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ tokudan ]; - platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ tokudan ]; + platforms = lib.platforms.linux; # Maybe other non-darwin Unix }; } diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 8dd6bd0195b2..153c0d59389b 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { slang unzip zip - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index b2237ce04839..8349e0fd4d71 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libmcrypt, libmhash }: +{ lib, stdenv, fetchurl, libmcrypt, libmhash }: stdenv.mkDerivation rec { version = "2.6.8"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ever-wider range of algorithms and modes. ''; homepage = "http://mcrypt.sourceforge.net"; - license = stdenv.lib.licenses.gpl3Only; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.qknight ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.qknight ]; }; } diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index e202cc7ae469..7cf1e14dc18e 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }: +{ lib, stdenv, rpmextract, ncurses5, patchelf, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "megacli"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [rpmextract ncurses5 unzip]; libPath = - stdenv.lib.makeLibraryPath + lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ncurses5 ]; buildCommand = '' @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; - license = stdenv.lib.licenses.unfree; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 57cf5bb97e2e..0db6f9f72872 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "memtest86+"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.memtest.org/"; description = "A tool to detect memory errors"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index b52d2d26baa0..15df26d5cc68 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0j95727xni4r122dalp09963gvc1nqa18l1d4wzz8746kw5s2rrb"; }; - buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { postInstall = '' for f in $out/bin/*minicom ; do wrapProgram $f \ - --prefix PATH : ${stdenv.lib.makeBinPath [ lrzsz ]}:$out/bin + --prefix PATH : ${lib.makeBinPath [ lrzsz ]}:$out/bin done ''; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index aa549f5691a9..7fb66e22e98d 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0s1gdngpf6gxz2lyapblxxmc6aydg2i9kmrfvngkbmqh4as1a2vl"; nativeBuildInputs = [ pkg-config zlib ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "For when you really just want to serve some files over HTTP right now!"; diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 485c3403cff7..194a0c62721d 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, openssl}: +{lib, stdenv, fetchFromGitHub, openssl}: stdenv.mkDerivation rec { pname = "mktorrent"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; makeFlags = [ "USE_PTHREADS=1" "USE_OPENSSL=1" "USE_LONG_OPTIONS=1" ] - ++ stdenv.lib.optional stdenv.isi686 "USE_LARGE_FILES=1" - ++ stdenv.lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; + ++ lib.optional stdenv.isi686 "USE_LARGE_FILES=1" + ++ lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; installFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mktorrent.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - maintainers = with stdenv.lib.maintainers; [Profpatsch]; + maintainers = with lib.maintainers; [Profpatsch]; }; } diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index d28828f2a4f6..12d9f5622cc4 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, config }: let - dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; + dbfile = lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; in stdenv.mkDerivation rec { pname = "mlocate"; version = "0.26"; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 48c3b3932628..ed45c2682039 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "mmv"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://linux.maruhn.com/sec/mmv.html"; description = "Utility for wildcard renaming, copying, etc"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 3774a77f5a44..26056364b774 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -5,7 +5,7 @@ let version = "1.23.0"; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk at-spi2-core diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index c3e9a0dc2ff2..d497505d9b7f 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -44,7 +44,7 @@ in buildGoPackage { # move vendored codes so nixpkgs go builder could find it runHook preBuild - ${stdenv.lib.concatMapStrings (t: '' + ${lib.concatMapStrings (t: '' go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main '') tools} diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 92402797d112..5d39cb00b95a 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perlPackages, makeWrapper, darwin }: +{ lib, stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perlPackages, makeWrapper, darwin }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "moreutils"; version = "0.63"; diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 047cd87308f5..e8ebde4ad4d9 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gd, rrdtool }: +{ lib, stdenv, fetchurl, perl, gd, rrdtool }: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "The Multi Router Traffic Grapher"; homepage = "https://oss.oetiker.ch/mrtg/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.robberer ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.robberer ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index eef53769f06d..3304d3c19120 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pkg-config }: +{ lib, stdenv, fetchurl, ncurses, pkg-config }: stdenv.mkDerivation rec { version = "6.5.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; installPhase = '' mkdir -p $out/bin @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.vanheusden.com/multitail/"; description = "tail on Steroids"; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/multitime/default.nix b/pkgs/tools/misc/multitime/default.nix index a46ee2b7c9c1..015f50fa57fa 100644 --- a/pkgs/tools/misc/multitime/default.nix +++ b/pkgs/tools/misc/multitime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "multitime"; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { performance. ''; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://tratt.net/laurie/src/multitime/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index e3f05e1a761c..f0556b69f23e 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: # The homepage says this script is mature.. stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Convert MySQL dump files to PostgreSQL-loadable files"; homepage = "https://pgfoundry.org/projects/mysql2pgsql/"; - license = stdenv.lib.licenses.bsdOriginal; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsdOriginal; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index adca412daf84..dc9dcb1e5bec 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html"; description = "A synthetic computing benchmark program"; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + maintainers = with lib.maintainers; [ bennofs ]; }; } diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 00926663a6c0..c5ac32af3be4 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: +{ fetchurl, lib, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: let system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libxcb freetype @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocz.com/ssd-guru"; description = "SSD Management Tool for OCZ disks"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jagajaga ]; }; } diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 62772021baca..345df9cfbf4d 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2; platforms = platforms.all; - maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; + maintainers = [ lib.maintainers.expipiplus1 ]; }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index bbfecd58686c..d1fd243467df 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Time series database with millisecond precision"; homepage = "http://opentsdb.net"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 4914572f1563..f991b1bc26d6 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ + --suffix PATH : ${lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 184ebc19bf24..b3f4971a55ac 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ] - ++ stdenv.lib.optional withLuaJIT luajit - ++ stdenv.lib.optional (!withLuaJIT) lua; + ++ lib.optional withLuaJIT luajit + ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] - ++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index c1716fef5db9..dc013cfe1978 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -119,7 +119,7 @@ in stdenv.mkDerivation rec { ''; postFixup = let - typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [ + typelibPath = lib.makeSearchPath "/lib/girepository-1.0" [ (placeholder "out") gobject-introspection ]; diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index c4a9c5a278e6..a363b875895c 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./move-makefiles.patch ]; - buildFlags = stdenv.lib.optional stdenv.isAarch64 [ "config=release_arm" ]; + buildFlags = lib.optional stdenv.isAarch64 [ "config=release_arm" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index c285dc2463bb..6be42f576a44 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, glib, gettext, readline, pkgconfig }: +{lib, stdenv, fetchurl, glib, gettext, readline, pkgconfig }: stdenv.mkDerivation rec { name = "pal-0.4.3"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://palcal.sourceforge.net/"; description = "Command-line calendar program that can keep track of events"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 9cc4926443b5..720b73f3fe21 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/parallel \ - --prefix PATH : "${stdenv.lib.makeBinPath [ procps perl ]}" + --prefix PATH : "${lib.makeBinPath [ procps perl ]}" ''; doCheck = true; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 2b21b2f1427c..7c7a611b97c5 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , lvm2 @@ -29,16 +29,16 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libuuid ] - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2; + ++ lib.optional (readline != null) readline + ++ lib.optional (gettext != null) gettext + ++ lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" - ++ stdenv.lib.optional enableStatic "--enable-static"; + ++ lib.optional (lvm2 == null) "--disable-device-mapper" + ++ lib.optional enableStatic "--enable-static"; # Tests were previously failing due to Hydra running builds as uid 0. # That should hopefully be fixed now. @@ -59,13 +59,13 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/parted/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ # Add your name here! ]; # GNU Parted requires libuuid, which is part of util-linux-ng. - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index 0375b8e14840..81590e1dd45d 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0z8x70mwg0mvz6iap92gil37d4kpg5dizlyfx3zk7984ynycgap8"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoSha256 = "0sja0q9i0b1zb3a0a6z561yg9lqykylwr3iwin4r6cmi7j2sw5j6"; diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix index 9d33f088af0d..eacbc0d6bd2d 100644 --- a/pkgs/tools/misc/pb_cli/default.nix +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - liveDeps = [ jq curl ] ++ stdenv.lib.optional screenshots maim - ++ stdenv.lib.optional video capture - ++ stdenv.lib.optional clipboard xclip; + liveDeps = [ jq curl ] ++ lib.optional screenshots maim + ++ lib.optional video capture + ++ lib.optional clipboard xclip; installPhase = '' install -Dm755 src/pb.sh $out/bin/pb patchShebangs $out/bin/pb wrapProgram $out/bin/pb \ - --prefix PATH : '${stdenv.lib.makeBinPath liveDeps}' + --prefix PATH : '${lib.makeBinPath liveDeps}' ''; meta = with lib; { diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 8cb8d67c733a..b3e78b350c41 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./install-sh $out wrapProgram $out/bin/phoronix-test-suite \ --set PHP_BIN ${php}/bin/php \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gnumake gcc ]} + --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]} ''; passthru.tests = { diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 47126bac304d..e9ec3c389943 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.isDarwin IOKit; installPhase = '' install -Dm555 -t $out/bin picocom diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index fe16406256f8..96027677fa86 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU, libGL, wine-staging }: +{ lib, stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU, libGL, wine-staging }: let wine_custom = wine-staging; @@ -53,9 +53,9 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://pipelight.net/"; - license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; + license = with lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; - maintainers = with stdenv.lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ skeidel ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix index a2dc84ed6a93..8152849d9b52 100644 --- a/pkgs/tools/misc/pixd/default.nix +++ b/pkgs/tools/misc/pixd/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "pixd"; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 8c7e5b8bcf22..7ffbd8ded1ca 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: +{lib, stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: stdenv.mkDerivation { name = "pk2cmd-1.20"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.microchip.com/pickit2"; - license = stdenv.lib.licenses.unfree; #MicroChip-PK2 + license = lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 662710388d31..d9c208510fc6 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make PREFIX="$out" install for fn in plow{del,down,list,mod,probe,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl recode spidermonkey_38 ]}" + wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_38 ]}" done ''; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { description = '' A command-line download/upload tool for popular file sharing websites ''; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ aforemny jfrankenau ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ aforemny jfrankenau ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 3fc3efa0eda0..b94ca6cfea34 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, texinfo, makeWrapper }: +{ lib, stdenv, fetchurl, python3, texinfo, makeWrapper }: stdenv.mkDerivation { name = "ponysay-3.0.3"; @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { description = "Cowsay reimplemention for ponies"; homepage = "https://github.com/erkin/ponysay"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ bodil ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ bodil ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index b8a747d4222a..c8a2b338817d 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: stdenv.mkDerivation rec { version = "2.41"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' PREFIX=\"\" DESTDIR=$out make install wrapProgram $out/bin/profile-cleaner \ - --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc file ]}" + --prefix PATH : "${lib.makeBinPath [ parallel sqlite bc file ]}" ''; meta = { @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { some email clients and newsreaders too. ''; homepage = "https://github.com/graysky2/profile-cleaner"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index 74c049059941..7743793143a2 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation { name = "proxytunnel-1.9.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = "http://proxytunnel.sourceforge.net/download.php"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index dd64366679c6..013ddb8e3dab 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ lib, stdenv, fetchurl } : stdenv.mkDerivation rec { name = "pv-1.6.6"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.ivarch.com/programs/pv"; description = "Tool for monitoring the progress of data through a pipeline"; - license = stdenv.lib.licenses.artistic2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.artistic2; + maintainers = with lib.maintainers; [ ]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 2b8a2fb02be5..185f0ca28169 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }: +{ lib, stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }: stdenv.mkDerivation rec { name = "qjoypad-4.1.0"; src = fetchurl { @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { experience just a little bit nicer. ''; homepage = "http://qjoypad.sourceforge.net"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index c71bd42c94c0..4b8ea50cd4ef 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/sort-pictures \ - --prefix PATH : ${stdenv.lib.makeBinPath [ exif imagemagick ]} + --prefix PATH : ${lib.makeBinPath [ exif imagemagick ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 416fa23f4534..5453ab75a4a7 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, emacs, curl, check, bc }: +{ fetchurl, lib, stdenv, emacs, curl, check, bc }: stdenv.mkDerivation rec { name = "recutils-1.8"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/recutils/"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 5c7fa9d4c249..ef684aebe3cb 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tk, tcllib, makeWrapper +{lib, stdenv, fetchurl, tk, tcllib, makeWrapper , tkremind ? true } : @@ -7,9 +7,9 @@ assert tkremind -> tcllib != null; assert tkremind -> makeWrapper != null; let - inherit (stdenv.lib) optional optionalString; - tclLibraries = stdenv.lib.optionals tkremind [ tcllib tk ]; - tclLibPaths = stdenv.lib.concatStringsSep " " + inherit (lib) optional optionalString; + tclLibraries = lib.optionals tkremind [ tcllib tk ]; + tclLibPaths = lib.concatStringsSep " " (map (p: "${p}/lib/${p.libPrefix}") tclLibraries); tkremindPatch = optionalString tkremind '' substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish" @@ -42,8 +42,8 @@ in stdenv.mkDerivation rec { meta = { homepage = "https://dianne.skoll.ca/projects/remind/"; description = "Sophisticated calendar and alarm program for the console"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [raskin kovirobi]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index 73146f09792b..e730b583d7c8 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline}: +{lib, stdenv, fetchurl, readline}: stdenv.mkDerivation { name = "renameutils-0.12.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.nongnu.org/renameutils/"; description = "A set of programs to make renaming of files faster"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix index 7e1d9307a167..9fa28264eed9 100644 --- a/pkgs/tools/misc/rig/default.nix +++ b/pkgs/tools/misc/rig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl } : +{ lib, stdenv, fetchurl } : stdenv.mkDerivation rec { version = "1.11"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./rig_1.11-1.diff ]; meta = { - homepage = "http://rig.sourceforge.net/"; + homepage = "http://rig.sourceforge.net/"; description = "Random identity generator"; longDescription = '' RIG (Random Identity Generator) is a free replacement for a shareware @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { if the Web site/BBS/person you are giving the information to tries to cross-check the city, state, zip, or area code, it will check out. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ tomberek ]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ tomberek ]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index c19b0f1f9acd..ac1431d3a1be 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, readline }: stdenv.mkDerivation rec { pname = "rlwrap"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Readline wrapper for console programs"; homepage = "https://github.com/hanslub42/rlwrap"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 36da8d0a463b..0d0095645af9 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , cairo , fetchFromGitHub , gettext @@ -18,7 +18,7 @@ , wrapGAppsHook , withGui ? false }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "rmlint"; version = "2.10.1"; @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; }; - CFLAGS="-I${stdenv.lib.getDev util-linux}/include"; + CFLAGS="-I${lib.getDev util-linux}/include"; nativeBuildInputs = [ pkgconfig sphinx gettext scons - ] ++ stdenv.lib.optionals withGui [ + ] ++ lib.optionals withGui [ makeWrapper wrapGAppsHook ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { json-glib libelf util-linux - ] ++ stdenv.lib.optionals withGui [ + ] ++ lib.optionals withGui [ cairo gobject-introspection gtksourceview3 @@ -59,10 +59,10 @@ stdenv.mkDerivation rec { # this doesn't seem to support configureFlags, and appends $out afterwards, # so add the --without-gui in front of it - prefixKey = stdenv.lib.optionalString (!withGui) " --without-gui " + "--prefix="; + prefixKey = lib.optionalString (!withGui) " --without-gui " + "--prefix="; # in GUI mode, this shells out to itself, and tries to import python modules - postInstall = stdenv.lib.optionalString withGui '' + postInstall = lib.optionalString withGui '' gappsWrapperArgs+=(--prefix PATH : "$out/bin") gappsWrapperArgs+=(--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3}):$(toPythonPath ${python3.pkgs.pycairo})") ''; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 1a13a1d2ed9f..3e1e504e1078 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -3,7 +3,7 @@ , qmake, withEspeak ? false, espeak ? null , qt5 }: -let inherit (stdenv.lib) getDev; in +let inherit (lib) getDev; in stdenv.mkDerivation rec { pname = "rockbox-utility"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cryptopp libusb1 qtbase qttools ] - ++ stdenv.lib.optional withEspeak espeak; + ++ lib.optional withEspeak espeak; nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm755 RockboxUtility $out/bin/rockboxutility ln -s $out/bin/rockboxutility $out/bin/RockboxUtility wrapProgram $out/bin/rockboxutility \ - ${stdenv.lib.optionalString withEspeak '' + ${lib.optionalString withEspeak '' --prefix PATH : ${espeak}/bin ''} diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index d75e51d4ed83..5f737dc6beb2 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patchFlags = [ "-p0" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/18fd229516a46e7272003acbe555735b2a902db7/gis/routino/files/patch-Makefile_conf.diff"; sha256 = "1b7hpa4sizansnwwxq1c031nxwdwh71pg08jl9z9apiab8pjsn53"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - CLANG = stdenv.lib.optionalString stdenv.cc.isClang "1"; + CLANG = lib.optionalString stdenv.cc.isClang "1"; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 88db9409316b..90d1e02b0df6 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] - ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' # for munin and rrdtool support diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 5d27af2050f6..60853d2cf7ef 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -4,7 +4,7 @@ let maybe64 = if stdenv.isx86_64 then "_64" else ""; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib libX11 libXScrnSaver libXext libXft libXrender freetype zlib fontconfig ]; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index aef209022ff0..0443deae0775 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -16,21 +16,21 @@ stdenv.mkDerivation rec { "--enable-colors256" ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch { url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; stripLen = 1; }); - postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) # XXX: Awful hack to allow cross-compilation. '' sed -i ./configure \ -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' ''; # " - buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam - ++ stdenv.lib.optional stdenv.isDarwin utmp; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux pam + ++ lib.optional stdenv.isDarwin utmp; doCheck = true; diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 06b5360086c1..69c9d726713b 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "sdate"; version = "0.7"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.df7cb.de/projects/sdate"; description = "Eternal september version of the date program"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ edef ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ edef ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index b3ab2002ca64..88f4840e2f07 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installManPage man/man1/shadowenv.1 diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index 84e241b7a2c9..c3c88a6baf00 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub, fetchpatch , openssl }: @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "Allows you to create customized .onion addresses for your hidden service"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/katmagic/Shallot"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix index f738ed71ec7a..52c61d917b12 100644 --- a/pkgs/tools/misc/sixpair/default.nix +++ b/pkgs/tools/misc/sixpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "sixpair-2007-04-18"; @@ -31,8 +31,8 @@ stdenv.mkDerivation { This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master. ''; homepage = "http://www.pabr.org/sixlinux/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.tomsmeets ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.tomsmeets ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 32d55a3733ce..158c62e60e92 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -16,15 +16,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ] - ++ stdenv.lib.optional doCheck cppcheck; + ++ lib.optional doCheck cppcheck; doCheck = false; meta = with lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; maintainers = with maintainers; [ primeos mbakke ]; }; } diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index 8078ee51eb2d..7f6f9fa40c2b 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "slsnif-0.4.4"; @@ -8,10 +8,10 @@ stdenv.mkDerivation { sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; - meta = { + meta = { description = "Serial line sniffer"; homepage = "http://slsnif.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index 190f637936de..ed4bb0037fbe 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - ] ++ stdenv.lib.optional buildDocs scdoc; + ] ++ lib.optional buildDocs scdoc; buildInputs = [ cairo @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - mesonFlags = stdenv.lib.optional buildDocs "-Dman-pages=enabled"; + mesonFlags = lib.optional buildDocs "-Dman-pages=enabled"; meta = with lib; { description = "Select a region in a Wayland compositor"; diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/tools/misc/somafm-cli/default.nix index b0aebd6224ed..abead39d3485 100644 --- a/pkgs/tools/misc/somafm-cli/default.nix +++ b/pkgs/tools/misc/somafm-cli/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m0755 -D src/somafm $out/bin/somafm - wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}"; + wrapProgram $out/bin/somafm --prefix PATH ":" "${lib.makeBinPath [ curl jq mpv ]}"; ''; meta = with lib; { diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix index 8321d03a48f4..a088705036d0 100644 --- a/pkgs/tools/misc/spigot/default.nix +++ b/pkgs/tools/misc/spigot/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command-line exact real calculator"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; maintainers = with maintainers; [ mcbeth ]; }; } diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 50d99db5322c..0089a551f0fe 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { sha256 = "1p37cfkcpqv74gp7g099alkqxanfc002kaq1cim6zkinx50gxjxw"; }; - nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' for shell in bash fish zsh; do diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index 80741f0543ce..05a8fab58d15 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages }: +{ lib, stdenv, fetchurl, perl, perlPackages }: let pname = "stow"; @@ -29,8 +29,8 @@ stdenv.mkDerivation { as .../share, .../man, and so on. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/stow/"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index c94b8f646a96..78172c5ef75d 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib }: +{ lib, stdenv, fetchFromGitHub, alsaLib }: stdenv.mkDerivation rec { version = "0.2"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Small command-line utilities"; homepage = "https://github.com/baskerville/sutils"; - maintainers = [ stdenv.lib.maintainers.meisternu ]; + maintainers = [ lib.maintainers.meisternu ]; license = "Custom"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index ae8679c03ad5..423135d53fd1 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/spaam/svtplay-dl"; description = "Command-line tool to download videos from svtplay.se and other sites"; license = licenses.mit; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 8a0c881a277b..08496bc11851 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/openprinting/system-config-printer"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index b3d2e1a77a71..24447dc74c32 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1clpl9fi07lms0din8f9m4y6br5jg8k5xsklsqmvgdwf83wyn321"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; # many tests are failing doCheck = false; diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index 835409be6576..a9afcfd40919 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Utility for easy management of Tensorflow containers"; homepage = "https://github.com/pop-os/tensorman/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thefenriswolf ]; }; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index b63ffb1cd107..0e07f3e53f32 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: buildGoPackage rec { pname = "tewisay-unstable"; @@ -29,7 +29,7 @@ buildGoPackage rec { meta = { homepage = "https://github.com/lucy/tewisay"; description = "Cowsay replacement with unicode and partial ansi escape support"; - license = stdenv.lib.licenses.cc0; - maintainers = [ stdenv.lib.maintainers.chiiruno ]; + license = lib.licenses.cc0; + maintainers = [ lib.maintainers.chiiruno ]; }; } diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 89af4f693d3f..8707309937be 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "time"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { `time' reports unavailable information as zero values. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/time/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/tools/misc/tmux-cssh/default.nix index c38769f448f1..f3f536279566 100644 --- a/pkgs/tools/misc/tmux-cssh/default.nix +++ b/pkgs/tools/misc/tmux-cssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, tmux }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, tmux }: stdenv.mkDerivation { name = "tmux-cssh-20151015"; @@ -33,9 +33,9 @@ stdenv.mkDerivation { like most server do. ''; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ zimbatm ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 7fa33ed82f21..32d27da67d42 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , autoreconfHook , pkgconfig @@ -72,9 +72,9 @@ stdenv.mkDerivation rec { * A clean, easily extended, BSD-licensed codebase, under active development. ''; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thammers fpletz ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thammers fpletz ]; }; } diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index b7888f0884bd..fcab21eb92b3 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, freetype }: +{ lib, stdenv, fetchurl, perl, freetype }: stdenv.mkDerivation { name = "ttf2pt1-3.4.4"; @@ -20,13 +20,13 @@ stdenv.mkDerivation { buildInputs = [ freetype ]; nativeBuildInputs = [ perl ]; - + patches = ./gentoo-makefile.patch; # also contains the freetype patch - meta = { + meta = { description = "True Type to Postscript Type 3 converter, fpdf"; homepage = "http://ttf2pt1.sourceforge.net/index.html"; license = "ttf2pt1"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index d75011ea6f40..bc1279a7dec7 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: +{ lib, stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: stdenv.mkDerivation { name = "ttf-mkfontdir-3.0.9-6"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz"; sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; }; - + # all the patches up from ttmkfdir-3.0.9/Makefile should be reviewed by someone # who knows more about C/C++ .. patches = @@ -15,7 +15,7 @@ stdenv.mkDerivation { url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz"; sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633"; }) - + ./cstring.patch # also fixes some other compilation issues (freetype includes) ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Create fonts.dir for TTF font directory"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index acebd4f92e8e..dd7b1fae862f 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake perl pkgconfig ]; buildInputs = [ openssl curl libusb1 protobufc ]; - cmakeFlags = stdenv.lib.optional enableUnsafe [ "-Dunsafe=on" ]; + cmakeFlags = lib.optional enableUnsafe [ "-Dunsafe=on" ]; preFixup = '' chmod +x $out/bin/ttbin2mysports diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/tools/misc/ttygif/default.nix index 045448f03020..226109ab20c0 100644 --- a/pkgs/tools/misc/ttygif/default.nix +++ b/pkgs/tools/misc/ttygif/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/ttygif \ - --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick xorg.xwd ]} + --prefix PATH : ${lib.makeBinPath [ imagemagick xorg.xwd ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index 9c200f1030ea..d5a37e2e67f0 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Programming language for convenient data munging"; license = licenses.bsd2; homepage = "http://nongnu.org/txr"; - maintainers = with stdenv.lib.maintainers; [ dtzWill ]; + maintainers = with lib.maintainers; [ dtzWill ]; platforms = platforms.linux; # Darwin fails although it should work AFAIK }; } diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index ded409754bcb..27ff219a6e13 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, gawk }: +{ lib, stdenv, fetchurl, coreutils, gawk }: stdenv.mkDerivation rec { pname = "txt2man"; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = { description = "Convert flat ASCII text to man page format"; homepage = "http://mvertes.free.fr/"; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + license = lib.licenses.gpl2; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ bjornfor ]; }; } diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 612ace92f5bc..95c2cbb7625d 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Rewrite of unclutter using the X11 Xfixes extension"; platforms = platforms.unix; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; inherit version; maintainers = [ maintainers.globin ]; }; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index a7470fae6894..1b7602981919 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }; } diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index 2258f31fd311..ddc0fa42c691 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # @@ -8,7 +8,7 @@ # ''; buildGoPackage rec { pname = "upower-notify"; - version = "20160310-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20160310-${lib.strings.substring 0 7 rev}"; rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; goPackagePath = "github.com/omeid/upower-notify"; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index f058f2cb8dde..ab1abec7b69f 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison +{ lib, stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison , flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline , python3 , svfSupport ? true @@ -21,18 +21,18 @@ stdenv.mkDerivation rec { subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ]; configureFlags = [ - (stdenv.lib.enableFeature svfSupport "svf") - (stdenv.lib.enableFeature bsdlSupport "bsdl") - (stdenv.lib.enableFeature staplSupport "stapl") - (stdenv.lib.enableFeature jedecSupport "jedec-exp") + (lib.enableFeature svfSupport "svf") + (lib.enableFeature bsdlSupport "bsdl") + (lib.enableFeature staplSupport "stapl") + (lib.enableFeature jedecSupport "jedec-exp") ]; meta = { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; homepage = "http://urjtag.org/"; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice - maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ lowfatcomputing ]; }; } diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix index a6871526f181..83dad9ebe7f8 100644 --- a/pkgs/tools/misc/urn-timer/default.nix +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchpatch , unstableGitUpdater @@ -57,7 +57,7 @@ stdenv.mkDerivation { url = "https://github.com/3snowp7im/urn.git"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/3snowp7im/urn"; description = "Split tracker / timer for speedrunning with GTK+ frontend"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 1516e9dba33a..42084fa6296e 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "uucp-1.07"; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/uucp/uucp.html"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix index a8495d7767c4..47bc916ceb50 100644 --- a/pkgs/tools/misc/uudeview/default.nix +++ b/pkgs/tools/misc/uudeview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tk }: +{ lib, stdenv, fetchurl, tcl, tk }: stdenv.mkDerivation rec { name = "uudeview-0.5.20"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "The Nice and Friendly Decoder"; homepage = "http://www.fpx.de/fp/Software/UUDeview/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 1d0b5d84f77b..f207eda0de89 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "Y/vDYXWQ65zZ86vTwP4aCZYCMZuqbz6tpfv4uRkFAzc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf rdkafka ] - ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; # needed for internal protobuf c wrapper library PROTOC="${protobuf}/bin/protoc"; diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index 944b6e4ef644..28c4508525ec 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: stdenv.mkDerivation rec { pname = "venus"; @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { single combined feed, latest news first. ''; homepage = "http://intertwingly.net/code/venus/docs/index.html"; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.psfl; + platforms = lib.platforms.all; maintainers = []; }; } diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 0f46d8141f1c..276389205f05 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, perl}: +{lib, stdenv, fetchFromGitHub, perl}: stdenv.mkDerivation rec { pname = "vmtouch"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { description = "Portable file system cache diagnostics and control"; longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; homepage = "https://hoytech.com/vmtouch/"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.garrison ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.garrison ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 8a68bef264cd..5f80dad854e3 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; postInstall = '' installManPage doc/watchexec.1 diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 0d4bfacfa273..1a3afb0d65f4 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1hsms8rlnds8npr8m0dm21h04ci5ljda09pqb598v7ny3j2dldiq"; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; # The wrapping is required so that the "sh-c" option of websocat works even # if sh is not in the PATH (as can happen, for instance, when websocat is # started as a systemd service). postInstall = '' wrapProgram $out/bin/websocat \ - --prefix PATH : ${stdenv.lib.makeBinPath [ bash ]} + --prefix PATH : ${lib.makeBinPath [ bash ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index 8ddc7960cbbe..cbc09b0ce649 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; buildInputs = [ wayland-protocols ] - ++ stdenv.lib.optional stdenv.isLinux libseccomp; + ++ lib.optional stdenv.isLinux libseccomp; - mesonFlags = stdenv.lib.optional stdenv.isLinux "-Dseccomp=enabled"; + mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; meta = with lib; { description = "A lightweight overlay bar for Wayland"; diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 63c2d017868a..8cbd1ad06977 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # should be patched with a less useless default PATH, but for now # we add everything we need manually. wrapProgram "$out/bin/woeusb" \ - --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}' + --set PATH '${lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted util-linux wget p7zip ]}' ''; doInstallCheck = true; diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index 5c48a3cb2758..3f13cd496c54 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.home.unix-ag.org/simon/woof.html"; description = "Web Offer One File - Command-line utility to easily exchange files over a local network"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 78affe34b58b..36ad53e00d05 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf +{ lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf , libxml2, bzip2 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Converter from Microsoft Word formats to human-editable ones"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index 8ed0455a33ea..c0f85b4b8de7 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: stdenv.mkDerivation rec { name = "wv2-0.4.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; - license = stdenv.lib.licenses.lgpl2; + license = lib.licenses.lgpl2; homepage = "http://wvware.sourceforge.net"; }; } diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 12acbcfbe1c8..bf91e966239e 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig +{ lib, stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig , gccCross ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { sh autogen.sh ''; - configureFlags = stdenv.lib.optionals (gccCross != null) [ + configureFlags = lib.optionals (gccCross != null) [ "--enable-firmware" "CROSS_COMPILE=${gccCross.targetPrefix}" ]; @@ -31,13 +31,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake pkgconfig ]; buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++ - stdenv.lib.optional (gccCross != null) gccCross; + lib.optional (gccCross != null) gccCross; meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; homepage = "http://www.linux-mtd.infradead.org/"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.x86_64; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.x86_64; }; } diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index c1a015d3c09a..6c5857f1c9a1 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libXmu }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libXmu }: stdenv.mkDerivation rec { pname = "xclip"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; homepage = "https://github.com/astrand/xclip"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index adc3b87ffa72..92c00d7e44d1 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: +{lib, stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: stdenv.mkDerivation { name = "xflux-2013-09-01"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = lib.makeLibraryPath [ gcc.cc libXxf86vm libXext @@ -32,8 +32,8 @@ stdenv.mkDerivation { when the sun rises. ''; homepage = "https://justgetflux.com/"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.paholg ]; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.paholg ]; }; } diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 03a458e818d2..378337f6232b 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk , pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3 }: @@ -42,8 +42,8 @@ buildPythonApplication rec { meta = { description = "Better lighting for Linux. Open source GUI for xflux"; homepage = "https://justgetflux.com/linux.html"; - license = stdenv.lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary - maintainers = [ stdenv.lib.maintainers.sheenobu ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.unfree; # marked as unfree since the source code contains a copy of the unfree xflux binary + maintainers = [ lib.maintainers.sheenobu ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix index 553863dda1ae..b130de949756 100644 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ b/pkgs/tools/misc/xprite-editor/default.nix @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage rec { ''; }; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk3 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.isLinux [ gtk3 ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ]; cargoSha256 = "1a0zy8gfc1gdk8nnv5qr4yspqy1jsip5nql3w74rl6h46cplpf5y"; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 2c24e627b634..5199977e587f 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: +{ lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation { name = "xtitle-0.4.4"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "Outputs X window titles"; homepage = "https://github.com/baskerville/xtitle"; - maintainers = [ stdenv.lib.maintainers.meisternu ]; + maintainers = [ lib.maintainers.meisternu ]; license = "Custom"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 8717d9012392..a0392bf4754c 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ --set FONTCONFIG_FILE "${fontsConf}" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} + --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 5b5fb66be306..fd6610a1973e 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildPythonPath "$pythonPath" wrapQtApp $out/bin/ykman-gui \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ + --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ --prefix PYTHONPATH : "$program_PYTHONPATH" mkdir -p $out/share/applications diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 72aa2d77bc33..61589345d702 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { variables (overwriting and restoring). ''; homepage = "https://github.com/Tarrasch/zsh-autoenv"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index 00f8778cafd5..d4d4e34aff0e 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , apple_sdk ? null , libbsd @@ -6,7 +6,7 @@ , pkgconfig }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "acme-client"; diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 0789b37c65a0..75a7fc83858a 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ahcpd-0.53"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 76c1de651e01..9728a20bd5ca 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram $out/bin/airmon-ng --prefix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram $out/bin/airmon-ng --prefix PATH : ${lib.makeBinPath [ ethtool iw pciutils usbutils ]} ''; diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index fb3f7228c8dc..935c1e926e6b 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { substituteInPlace events/argus-vmstat.sh \ --replace vm_stat ${procps}/bin/vmstat substituteInPlace events/argus-snmp.sh \ - --replace /usr/bin/snmpget ${stdenv.lib.getBin net-snmp}/bin/snmpget \ - --replace /usr/bin/snmpwalk ${stdenv.lib.getBin net-snmp}/bin/snmpwalk + --replace /usr/bin/snmpget ${lib.getBin net-snmp}/bin/snmpget \ + --replace /usr/bin/snmpwalk ${lib.getBin net-snmp}/bin/snmpwalk ''; meta = with lib; { diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 428e8a2e112e..7357d4873d86 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ - stdenv.lib.optional stdenv.isDarwin Security; + lib.optional stdenv.isDarwin Security; outputs = [ "bin" "dev" "out" "doc" "man" ]; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index debd918eb39d..a889821c9475 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nixosTests }: +{ lib, stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "babeld"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index ab898a869360..0445a424a405 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}: +{lib, stdenv, fetchurl, cmake, openssl, nss, pkg-config, nspr, bash, debug ? false}: let s = # Generated upstream information rec { @@ -11,7 +11,7 @@ let }; - compileFlags = "-O3 ${stdenv.lib.optionalString (!debug) "-DNDEBUG"}"; + compileFlags = "-O3 ${lib.optionalString (!debug) "-DNDEBUG"}"; in stdenv.mkDerivation { inherit (s) name version; @@ -32,8 +32,8 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''A set of network-related (mostly VPN-related) tools''; - license = stdenv.lib.licenses.bsd3 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index a9bf8c5189b0..e3ef0f62ef00 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0b5pqsdggdjq9sl54rmh2gaq31va6b2crdv7ihh3198ixwasaf02"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A CLI utility for displaying current network utilization"; diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix index a6f66ea10fc5..e5159fef1017 100644 --- a/pkgs/tools/networking/bgpdump/default.nix +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, zlib, bzip2 }: +{ lib, stdenv, fetchurl, autoreconfHook, zlib, bzip2 }: stdenv.mkDerivation rec { pname = "bgpdump"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bitbucket.org/ripencc/bgpdump/"; description = ''Analyze dump files produced by Zebra/Quagga or MRT''; - license = stdenv.lib.licenses.hpnd; - maintainers = with stdenv.lib.maintainers; [ lewo ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.hpnd; + maintainers = with lib.maintainers; [ lewo ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index b2d41bf8019c..00b35dc4192c 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0bms93xg75b23ls2hb8dv26y4al4nr67pqcm57rp9d4rbsfafg8c"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # Testing this project requires sudo, Docker and network access, etc. doCheck = false; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index e8caddcbe29a..9e78622d18f1 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, runtimeShell }: +{ lib, stdenv, fetchurl, jre, runtimeShell }: let version = "2020.1"; @@ -32,9 +32,9 @@ in stdenv.mkDerivation { ''; homepage = "https://portswigger.net/burp/"; downloadPage = "https://portswigger.net/burp/freedownload"; - license = [ stdenv.lib.licenses.unfree ]; + license = [ lib.licenses.unfree ]; platforms = jre.meta.platforms; hydraPlatforms = []; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + maintainers = with lib.maintainers; [ bennofs ]; }; } diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 229b4a636c4c..26cdfe7c0dbf 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-std=gnu89"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=gnu89"; meta = with lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index e11674f5b1b7..e17c6c75eab2 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { ''; buildInputs = [ readline texinfo nss nspr gnutls ] - ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; + ++ lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; nativeBuildInputs = [ pkgconfig ]; hardeningEnable = [ "pie" ]; configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ] - ++ stdenv.lib.optional stdenv.isLinux "--enable-scfilter"; + ++ lib.optional stdenv.isLinux "--enable-scfilter"; meta = with lib; { description = "Sets your computer's clock from time servers on the Net"; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index cfc591cb2eff..474c9d59c9e5 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ which python27 nodejs ] ++ # for flock - stdenv.lib.optional stdenv.isLinux util-linux; + lib.optional stdenv.isLinux util-linux; CFLAGS = "-O2 -Wno-error=stringop-truncation"; buildPhase = - stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; installPhase = '' install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index a12ceb1d4480..fdfac8fdcbc2 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ which ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "xlc_r gcc" "xlc_r gcc $CC" substitute Makefile Makefile.$CC --replace "CC=gcc" "CC=$CC" ''; diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 2fbd8ddf4a36..455824ec1cc0 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "connect"; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { description = "Make network connection via SOCKS and https proxy"; longDescription = '' This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand - in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. + in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. ''; homepage = "https://bitbucket.org/gotoh/connect/wiki/Home"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index 7f2552d11419..3dc589eaf2c4 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -48,10 +48,10 @@ , enableTist ? false }: -assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; -assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; +assert lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; +assert lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; -let inherit (stdenv.lib) optionals; in +let inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "connman"; diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix index 8bc1b47e1981..3ac730f471f7 100644 --- a/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, connman, dmenu }: +{ lib, stdenv, fetchFromGitHub, connman, dmenu }: stdenv.mkDerivation { pname = "connman_dmenu"; @@ -28,8 +28,8 @@ stdenv.mkDerivation { meta = { description = "A dmenu wrapper for connmann"; homepage = "https://github.com/march-linux/connman_dmenu"; - license = stdenv.lib.licenses.free; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.free; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index d5756cefdaf8..58a43c30a935 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://agroman.net/corkscrew/"; description = "A tool for tunneling SSH through HTTP proxies"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a08ec75bfaa6..95a81bba210a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # Zlib and OpenSSL must be propagated because `libcurl.la' contains # "-lz -lssl", which aren't necessary direct build inputs of # applications that use Curl. - propagatedBuildInputs = with stdenv.lib; + propagatedBuildInputs = with lib; optional http2Support nghttp2 ++ optional idnSupport libidn ++ optional ldapSupport openldap ++ @@ -90,13 +90,13 @@ stdenv.mkDerivation rec { ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) ( if brotliSupport then "--with-brotli" else "--without-brotli" ) ] - ++ stdenv.lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" - ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" + ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" + ++ lib.optional c-aresSupport "--enable-ares=${c-ares}" + ++ lib.optional gssSupport "--with-gssapi=${libkrb5.dev}" # For the 'urandom', maybe it should be a cross-system option - ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" - ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [ + ++ lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ]; @@ -111,9 +111,9 @@ stdenv.mkDerivation rec { # Install completions make -C scripts install - '' + stdenv.lib.optionalString scpSupport '' + '' + lib.optionalString scpSupport '' sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la - '' + stdenv.lib.optionalString gnutlsSupport '' + '' + lib.optionalString gnutlsSupport '' ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4 ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0 diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 8c8824657799..60ff5cf0e7c1 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # "please ignore the GitHub-generated tarballs, as they are incomplete" # https://github.com/cern-fts/davix/releases/tag/R_0_7_6 src = fetchurl { - url = "https://github.com/cern-fts/${pname}/releases/download/R_${stdenv.lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; + url = "https://github.com/cern-fts/${pname}/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2"; }; diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index dd206eb8c975..c220f24046fc 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python +{ lib, stdenv, fetchFromGitHub, python , unzip, makeWrapper }: let python' = python.override { @@ -105,8 +105,8 @@ in stdenv.mkDerivation rec { -- v5 Python implementation ''; homepage = "https://www.datadoghq.com"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice domenkozar ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ thoughtpolice domenkozar ]; }; } diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 34e6395ca6d5..bc854dfd0d5a 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -34,7 +34,7 @@ in buildGoPackage rec { preBuild = let - ldFlags = stdenv.lib.concatStringsSep " " [ + ldFlags = lib.concatStringsSep " " [ "-X ${goPackagePath}/pkg/version.Commit=${src.rev}" "-X ${goPackagePath}/pkg/version.AgentVersion=${version}" "-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}" diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 55feb29af1d2..c56ba5a4a661 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" ] ++ lib.optional stdenv.isLinux "--with-randomdev=/dev/random" - ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; + ++ lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=pointer-compare" diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 3b55687ddd9e..085227a52126 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ]; # Check that the udev plugin got built. - postInstall = stdenv.lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; + postInstall = lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]"; meta = with lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix index b8b40635a969..1633505763c6 100644 --- a/pkgs/tools/networking/dibbler/default.nix +++ b/pkgs/tools/networking/dibbler/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "--enable-resolvconf" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1"; meta = with lib; { description = "Portable DHCPv6 implementation"; diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix index 1f9516ccaccd..09f1fbc2f9f9 100644 --- a/pkgs/tools/networking/dirb/default.nix +++ b/pkgs/tools/networking/dirb/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoreconfHook, curl }: +{ fetchurl, lib, stdenv, autoreconfHook, curl }: let major = "2"; @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { meta = { description = "A web content scanner"; homepage = "http://dirb.sourceforge.net/"; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; - license = with stdenv.lib.licenses; [ gpl2 ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ bennofs ]; + license = with lib.licenses; [ gpl2 ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 19dbd00c1ee9..8d6ed130a83a 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus, nettle, fetchpatch +{ lib, stdenv, fetchurl, pkgconfig, dbus, nettle, fetchpatch , libidn, libnetfilter_conntrack }: -with stdenv.lib; +with lib; let copts = concatStringsSep " " ([ "-DHAVE_IDN" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0cn1xd1s6xs78jmrmwjnh9m6w3q38pk6dyqy2phvasqiyd33cll4"; }; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' sed '1i#include ' -i src/dhcp.c ''; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index 705888568d9b..cee24f1976ff 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, ncurses }: +{ lib, stdenv, fetchurl, libpcap, ncurses }: stdenv.mkDerivation rec { name = "dnstop-20140915"; @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man8 $out/bin ''; - meta = { + meta = { description = "libpcap application that displays DNS traffic on your network"; homepage = "http://dns.measurement-factory.com/tools/dnstop"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 53a3e32aa6c4..597592b4d7ce 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { install -Dm755 -t $man/share/man/man8 dnstracer.8 ''; - buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ libresolv ]; + buildInputs = [] ++ lib.optionals stdenv.isDarwin [ libresolv ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lresolv"; meta = with lib; { description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data"; diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 4e3b255fc55d..4fe57eb4990f 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ installShellFiles ] - ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6"; diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 7c1ba1928ec3..3be4707a5297 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1nbfbmm9v1yp7380zdzz7qrc7x6krwlvgn5x5yzb8yn1rc99jzx4"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "HTTP load testing application inspired by Ansible syntax"; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index b61503b1b3f4..5c24acb912f9 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { description = "Command line SMTP client"; license = with lib.licenses; [ gpl2 ]; homepage = "https://deanproxy.com/code"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 855a57b7720f..f344dec61868 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: +{ lib, stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: let - inherit (stdenv.lib.versions) majorMinor; + inherit (lib.versions) majorMinor; in stdenv.mkDerivation rec { version = "2.5.1"; pname = "ferm"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { postInstall = '' rm -r $out/lib/systemd for i in "$out/sbin/"*; do - wrapProgram "$i" --prefix PATH : "${stdenv.lib.makeBinPath [ iptables ipset ebtables ]}" + wrapProgram "$i" --prefix PATH : "${lib.makeBinPath [ iptables ipset ebtables ]}" done ''; @@ -39,8 +39,8 @@ in stdenv.mkDerivation rec { command. The firewall configuration resembles structured programming-like language, which can contain levels and lists. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [mic92]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [mic92]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index 57f29b275e37..869cd46b3307 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -25,15 +25,15 @@ stdenv.mkDerivation rec { description = "Command-line RTMP client"; longDescription = - '' flvstreamer is an open source command-line RTMP client intended to + '' flvstreamer is an open source command-line RTMP client intended to stream audio or video content from all types of flash or rtmp servers. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://savannah.nongnu.org/projects/flvstreamer"; - maintainers = [ stdenv.lib.maintainers.thammers ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = [ lib.maintainers.thammers ]; + platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 0bf0ebb07b33..c82e0ab99850 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages }: +{ lib, stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { pname = "getmail"; @@ -19,12 +19,12 @@ python2Packages.buildPythonApplication rec { meta = { description = "A program for retrieving mail"; - maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ]; + platforms = lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; inherit version; updateWalker = true; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index f6aa4c061ce6..34480cf68c50 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkgconfig }: +{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkgconfig }: stdenv.mkDerivation { name = "gftp-2.0.19"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "GTK-based FTP client"; homepage = "http://www.gftp.org"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix index 0859472a446f..564c45d2e144 100644 --- a/pkgs/tools/networking/goreplay/default.nix +++ b/pkgs/tools/networking/goreplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, libpcap }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, libpcap }: buildGoPackage rec { pname = "goreplay"; @@ -18,9 +18,9 @@ buildGoPackage rec { meta = { homepage = "https://github.com/buger/goreplay"; - license = stdenv.lib.licenses.lgpl3Only; + license = lib.licenses.lgpl3Only; description = "Open-source tool for capturing and replaying live HTTP traffic"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ lovek323 ]; }; } diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index bace27f3d8dc..ee625b36ed8e 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "0.10.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13d1qr1avz9r76989nvgxhhclmqzr025xjk4rfnja94fpbspznj1"; }; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 9f01962250dc..50a19ff2d968 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "2.3.2"; src = fetchurl { - url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; + url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; sha256 = "1mcg0d6qiwl3xps65ir2sv5sc868zla5wnfhk24d2b0sg6xp7jwr"; }; diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 5d8b6ab37e84..97b45c64ee24 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0y0n1ybij3yg9lfgzcwfmjz1sjg913zcqrv391xx83dm0j80sdpb"; }; - buildInputs = [ libpcap ] ++ stdenv.lib.optional withTcl tcl; + buildInputs = [ libpcap ] ++ lib.optional withTcl tcl; postPatch = '' substituteInPlace Makefile.in --replace "gcc" "$CC" substituteInPlace version.c --replace "RELEASE_DATE" "\"$version\"" - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' sed -i -e 's|#include |#include |' \ libpcap_stuff.c script.c ''; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index bf80cd48ffa2..66513819ab89 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "httpie"; @@ -97,7 +97,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A command line HTTP client whose goal is to make CLI human-friendly"; homepage = "https://httpie.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ antono relrod schneefux ]; }; } diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index f404090e5e3a..a8b9630aab21 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }: +{ lib, stdenv, fetchFromGitHub, curl, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { pname = "httpstat"; @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "curl statistics made simple"; homepage = "https://github.com/reorx/httpstat"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ nequissimus ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nequissimus ]; }; } diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index 2ec22f2bab6f..d9300381bdb2 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libdnet, pkgconfig, libpcap}: +{lib, stdenv, fetchurl, libdnet, pkgconfig, libpcap}: stdenv.mkDerivation { name = "hyenae-0.36-1"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = ""; homepage = "https://sourceforge.net/projects/hyenae/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.marcweber]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 873ecf03bbb1..ab2159520918 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0bpkgq7srwpjmadsz3nsd14jpr19b1zfrpc074lzjaq15icxxgxc"; }; - buildInputs = with stdenv.lib; [ boost zlib openssl ] + buildInputs = with lib; [ boost zlib openssl ] ++ optional upnpSupport miniupnpc; makeFlags = let ynf = a: b: a + "=" + (if b then "yes" else "no"); in diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 900a740c7246..c3e71e6132de 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; preConfigure = '' cp ${automake}/share/automake*/config.{sub,guess} config diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 01480056a2ae..dd149f57432b 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, ncurses}: +{lib, stdenv, fetchurl, openssl, ncurses}: stdenv.mkDerivation { name = "imapproxy-1.2.7"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = "http://imapproxy.org/"; description = "It proxies IMAP transactions caching server connections"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 2703ca0fc64d..226cfb9ce8ef 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, nettools, nixosTests }: +{ lib, stdenv, fetchFromGitHub, zlib, nettools, nixosTests }: stdenv.mkDerivation rec { pname = "iodine"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://code.kryo.se/iodine/"; description = "Tool to tunnel IPv4 data through a DNS server"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.isc; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 269dd0f1f34e..4998eb1eb916 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, libyamlcpp, systemd , python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl , libxml2, docbook5 }: @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/nixcloud/ip2unix"; description = "Turn IP sockets into Unix domain sockets"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.aszlig ]; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.aszlig ]; }; } diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 7f118193a3a3..5fec55899e46 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{lib, stdenv, fetchurl, perl}: stdenv.mkDerivation rec { pname = "ipcalc"; version = "0.41"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple IP network calculator"; homepage = "http://jodies.de/ipcalc"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index aa9316642dd5..5ab3f7f30fbd 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb"; name = "remove-pg-flags.patch"; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 47b8abe54d33..158a979fb40c 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { "--disable-bundled-md5" "--disable-dynamic-load" "--enable-shared" - ] ++ stdenv.lib.optional (libmaxminddb != null) "--enable-mmdb" - ++ stdenv.lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP" - ++ stdenv.lib.optional (ip2location-c != null) "--enable-ip2location"; + ] ++ lib.optional (libmaxminddb != null) "--enable-mmdb" + ++ lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP" + ++ lib.optional (ip2location-c != null) "--enable-ip2location"; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 2d23ff1f1fd2..c3b5d1a84f8d 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }: +{ fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }: stdenv.mkDerivation { name = "jnettop-0.13.0"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; homepage = "http://jnettop.kubs.info/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix index 29fe71c9365a..218878a978e0 100644 --- a/pkgs/tools/networking/junkie/default.nix +++ b/pkgs/tools/networking/junkie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libpcap, guile, openssl }: +{ lib, stdenv, fetchFromGitHub, pkgconfig, libpcap, guile, openssl }: stdenv.mkDerivation rec { pname = "junkie"; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { meta = { description = "Deep packet inspection swiss-army knife"; homepage = "https://github.com/rixed/junkie"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = [ stdenv.lib.maintainers.rixed ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.rixed ]; + platforms = lib.platforms.unix; longDescription = '' Junkie is a network sniffer like Tcpdump or Wireshark, but designed to be easy to program and extend. diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 0a9ac99e2361..6eb26de82fc9 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -1,4 +1,4 @@ -{stdenv, lynx, fetchurl}: +{lib, stdenv, lynx, fetchurl}: stdenv.mkDerivation { name = "jwhois-4.0"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = "https://www.gnu.org/software/jwhois/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index d356601a9340..76a93844b0af 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls readline zlib libidn2 gmp libiconv libunistring gettext ]; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.isDarwin "format"; configureFlags = [ "--with-readline=${readline.dev}" diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 1281f1b21297..f787329e37a5 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -5,7 +5,7 @@ }: let - binPath = stdenv.lib.makeBinPath [ + binPath = lib.makeBinPath [ bash iproute iptables procps coreutils gnused gawk nss.tools which python ]; in @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent libcap_ng curl nspr nss python ldns ] - ++ stdenv.lib.optional docs xmlto - ++ stdenv.lib.optional stdenv.isLinux libselinux; + ++ lib.optional docs xmlto + ++ lib.optional stdenv.isLinux libselinux; prePatch = '' # Correct bash path diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 82cd9ec3f12f..4512e1dc6254 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; let arch = @@ -12,7 +12,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then "0zy0jzvdqccfsg42m2lq1rj8r2c4iypd1h9vxl9824cbl92yim37" else if stdenv.hostPlatform.system == "i686-linux" then "03ml9xv19km99f0z7fpr21b1zkxvw7q39kjzd8wpb2pds51wnc62" else throwSystem; - libraries = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; + libraries = lib.makeLibraryPath [ stdenv.cc.cc ]; in stdenv.mkDerivation rec { pname = "logmein-hamachi"; diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 56ed33ea36af..b03098d540a3 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gperf, guile, gmp, zlib, liboop, readline, gnum4, pam +{ lib, stdenv, fetchurl, gperf, guile, gmp, zlib, liboop, readline, gnum4, pam , nettools, lsof, procps }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.lysator.liu.se/~nisse/lsh/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix index 6b9a0caacb92..dd09d91a203f 100644 --- a/pkgs/tools/networking/mailsend/default.nix +++ b/pkgs/tools/networking/mailsend/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl}: +{lib, stdenv, fetchurl, openssl}: let s = # Generated upstream information rec { @@ -32,9 +32,9 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''CLI email sending tool''; - license = stdenv.lib.licenses.bsd3 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd3 ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; homepage = "https://github.com/muquit/mailsend"; downloadPage = "https://github.com/muquit/mailsend/releases"; }; diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index 7a5e8b8c5ac1..ed2596bc88ba 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mcrcon"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { It is well suited for remote administration and to be used as part of automated server maintenance scripts. It does not trigger "IO: Broken pipe" or "IO: Connection reset" spam bugs on the server side. ''; - maintainers = with stdenv.lib.maintainers; [ dermetfan ]; - license = with stdenv.lib.licenses; [ zlib libpng ]; + maintainers = with lib.maintainers; [ dermetfan ]; + license = with lib.licenses; [ zlib libpng ]; }; } diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 829ba028fd5a..ac37e93c7360 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ glib glib-networking curl ] - ++ stdenv.lib.optionals stdenv.isLinux [ fuse ]; + ++ lib.optionals stdenv.isLinux [ fuse ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index a45c3a2e33a1..f623d7cde76a 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , pkgconfig, libevent, pcre, zlib, openssl }: @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "Redis and Memcached traffic generation and benchmarking tool"; homepage = "https://github.com/redislabs/memtier_benchmark"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 152a0b0df66b..9fe476906bc6 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -11,9 +11,9 @@ let inherit sha256; }; - nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ which cctools ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ]; - patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; + patches = lib.optional stdenv.isFreeBSD ./freebsd.patch; doCheck = !stdenv.isFreeBSD; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index dba75400f6fa..6f57cf9c8e12 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB ''; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { homepage = "https://mosh.org/"; @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links. ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 532d69c3f4ee..360c35721399 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "01bj3c34x9ywxygsz4rdyw5gc9cz8x6zzl5fd7db8qy8bx2lhlr9"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; cargoSha256 = "0yxnpnxwis46wz4j5rjzyyzrvh94hn8vzxmmrcmrdz3gkakg77hg"; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 0ebeb8410a68..8296bc479195 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { --replace ' install-exec-hook' "" ''; - configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; + configureFlags = lib.optional (!withGtk) "--without-gtk"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optional withGtk gtk3 - ++ stdenv.lib.optional stdenv.isLinux libcap; + ++ lib.optional withGtk gtk3 + ++ lib.optional stdenv.isLinux libcap; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 3b505d34f2a0..7cb381e0de7f 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "03cp2ppj07xpb0c43d3cr8m9jps07mfm8clmlk03sjbxg1widsh0"; }; - postPatch = stdenv.lib.optionalString (batchSize != null) '' + postPatch = lib.optionalString (batchSize != null) '' sed -i lib/mu-store.cc --regexp-extended \ -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@' ''; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { sqlite xapian glib gmime3 texinfo emacs libsoup icu ] # Workaround for https://github.com/djcb/mu/issues/1641 - ++ stdenv.lib.optional (!stdenv.isDarwin) guile - ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; + ++ lib.optional (!stdenv.isDarwin) guile + ++ lib.optionals withMug [ gtk3 webkitgtk ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; # Install mug - postInstall = stdenv.lib.optionalString withMug '' + postInstall = lib.optionalString withMug '' for f in mug ; do install -m755 toys/$f/$f $out/bin/$f done diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index d634c37b1231..cf5c304a8a6d 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, which }: +{ lib, stdenv, fetchurl, pkgconfig, glib, which }: stdenv.mkDerivation rec { name = "nbd-3.20"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib ] - ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; + ++ lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; nativeBuildInputs = [ pkgconfig which ]; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { # Glib calls `clock_gettime', which is in librt. Linking that library # here ensures that a proper rpath is added to the executable so that # it can be loaded at run-time. - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lrt -lpthread"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lrt -lpthread"; meta = { homepage = "http://nbd.sourceforge.net"; description = "Map arbitrary files as block devices over the network"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.peti ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 3edfe9b7e5d6..08023367edfd 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, systemd, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, systemd, pkgconfig }: -with stdenv.lib; +with lib; stdenv.mkDerivation { version = "1.06"; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index 28d9f2c5b32c..a4737d6baac6 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; platforms = ["x86_64-linux"]; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; } diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index bfa64601ebfb..efa05591f521 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ - -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)" + -I$(echo "${lib.getDev libnl}"/include/libnl*/)" ''; meta = with lib; { diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 847d8cbcf895..3a7a3a1deb49 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "netkit-tftp-0.17"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; - license = stdenv.lib.licenses.bsdOriginal; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index f7d73283d48f..c5e54ab8f432 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , checksumType ? "built-in" , libmhash ? null , openssl ? null @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { "--with-checksum=${checksumType}" ]; - buildInputs = stdenv.lib.optional (checksumType == "mhash") libmhash - ++ stdenv.lib.optional (checksumType == "openssl") openssl; + buildInputs = lib.optional (checksumType == "mhash") libmhash + ++ lib.optional (checksumType == "openssl") openssl; src = fetchurl { urls = [ @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "Simple tool for transporting data over the network"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://mamuti.net/netrw/index.en.html"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix index d95171807dfa..c5cbcb19a971 100644 --- a/pkgs/tools/networking/nettee/default.nix +++ b/pkgs/tools/networking/nettee/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { meta = { homepage = "http://saf.bio.caltech.edu/nettee.html"; description = ''Network "tee" program''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 0eb5045ba2c2..45839eabb0b5 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { version = "1.18.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx"; }; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c5f59e3606fb..4a7e4a937c4f 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { version = "1.26.0"; src = fetchurl { - url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; + url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; sha256 = "0isdqwp58d7r92sqsk7l2vlqwy518n8b7c7z94jk9gc1bdmjf8sj"; }; diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix index 0e07f2cda801..9ea3dde19ab3 100644 --- a/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; homepage = "https://github.com/firecat53/networkmanager-dmenu"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.jensbin ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jensbin ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 0488f23481e4..20388f242ea4 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s"; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { networkmanager ppp glib - ] ++ stdenv.lib.optionals withGnome [ + ] ++ lib.optionals withGnome [ gtk3 libsecret libnma diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 2ead084d51ee..635d1645a14f 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ iodine networkmanager glib ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index cd79a612bf98..f7d3f1da8dc4 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ]; diff --git a/pkgs/tools/networking/network-manager/libnma/default.nix b/pkgs/tools/networking/network-manager/libnma/default.nix index 9e8bd915dee9..3d9749332255 100644 --- a/pkgs/tools/networking/network-manager/libnma/default.nix +++ b/pkgs/tools/networking/network-manager/libnma/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1d5gzn7ss5vi0bhc8s4i5gsrck1ajslajam5jxfqazg094mffcys"; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { networkmanager isocodes mobile-broadband-provider-info - ] ++ stdenv.lib.optionals withGnome [ + ] ++ lib.optionals withGnome [ # advanced certificate chooser gcr ]; diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index cc267aec68af..c91a2aab6103 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0nlp290nkawc4wqm978n4vhzg3xdqi8kpjjx19l855vab41rh44m"; }; @@ -47,7 +47,7 @@ in stdenv.mkDerivation { libxml2 openconnect networkmanager - ] ++ stdenv.lib.optionals withGnome [ + ] ++ lib.optionals withGnome [ gtk3 gcr libsecret diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 31b86bd2b005..8c1c4a85f269 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"; }; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; diff --git a/pkgs/tools/networking/network-manager/sstp/default.nix b/pkgs/tools/networking/network-manager/sstp/default.nix index bca53f8d9cd6..dc5f7e8adacd 100644 --- a/pkgs/tools/networking/network-manager/sstp/default.nix +++ b/pkgs/tools/networking/network-manager/sstp/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { }; buildInputs = [ sstp networkmanager glib ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ file intltool autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index f5f3d82d6c0a..ec9f60e08865 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy"; }; @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ vpnc networkmanager glib ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + ++ lib.optionals withGnome [ gtk3 libsecret libnma ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 3c1e0f498fba..0d9dbd19117e 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; let versions = builtins.fromJSON (builtins.readFile ./versions.json); arch = if stdenv.isi686 then "386" diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 309607941af1..3425d1e3a82e 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Dynamic DNS daemon for no-ip accounts"; homepage = "http://noip.com/download?page=linux"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.iand675 ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.iand675 ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 1aaead46f6ad..704c0b024c50 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, fetchpatch }: +{ fetchurl, lib, stdenv, fetchpatch }: stdenv.mkDerivation rec { name = "nss-mdns-0.10"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + patches = lib.optional stdenv.hostPlatform.isMusl ( fetchpatch { @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { ''; homepage = "http://0pointer.de/lennart/projects/nss-mdns/"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 7606cb06d905..910d800f08c1 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { rm -rf httpdocs/geoip ln -s ${geolite-legacy}/share/GeoIP httpdocs/geoip - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed 's|LIBS += -lstdc++.6||' -i Makefile ''; NIX_CFLAGS_COMPILE = "-fpermissive" - + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal"; + + lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal"; meta = with lib; { description = "High-speed web-based traffic analysis and flow collection tool"; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index b2f8d8a21076..281441049327 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" "--with-yielding-select=yes" - ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" - ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; + ] ++ lib.optional stdenv.isLinux "--enable-linuxcaps" + ++ lib.optional withSeccomp "--enable-libseccomp"; buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index 587379bde89a..846ebe0a1438 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; - rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "ocserv_${lib.replaceStrings [ "." ] [ "_" ] version}"; sha256 = "0k7sx9sg8akxwfdl51cvdqkdrx9qganqddgri2yhcgznc3f3pz5b"; }; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 73e2e6b60f51..698046358e38 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages, +{ lib, stdenv, fetchFromGitHub, python2Packages, asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { @@ -34,7 +34,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; homepage = "http://offlineimap.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ endocrimes ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ endocrimes ]; }; } diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix index 3f83081df5d0..4fb8892ec020 100644 --- a/pkgs/tools/networking/olsrd/default.nix +++ b/pkgs/tools/networking/olsrd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, bison, flex }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, flex }: stdenv.mkDerivation rec { pname = "olsrd"; @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { meta = { description = "An adhoc wireless mesh routing daemon"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; homepage = "http://olsr.org/"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index a36330add4df..fdef5df3b62c 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { }; outputs = [ "out" "dev" ]; - + configureFlags = [ "--with-vpnc-script=${vpnc}/vpnc-script" "--disable-nls" @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC; nativeBuildInputs = [ pkgconfig ]; meta = with lib; { @@ -36,6 +36,6 @@ in stdenv.mkDerivation rec { homepage = "http://www.infradead.org/openconnect/"; license = licenses.lgpl21; maintainers = with maintainers; [ pradeepchhetri tricktron ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 58985f73f30a..068b3e4ae894 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, coreutils }: +{ lib, stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { pname = "openresolv"; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; homepage = "https://roy.marples.name/projects/openresolv"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index ef98f4821405..18c185ffcced 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , pkgs , fetchurl , fetchpatch @@ -30,7 +30,7 @@ let }; in -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "openssh"; inherit version; @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { description = "An implementation of the SSH protocol"; homepage = "https://www.openssh.com/"; changelog = "https://www.openssh.com/releasenotes.html"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ eelco aneeshusa ]; }; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 09495ded9544..3337a5bbb7d1 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -17,7 +17,7 @@ assert useSystemd -> (systemd != null); assert pkcs11Support -> (pkcs11helper != null); -with stdenv.lib; +with lib; let # Check if the script needs to have other binaries wrapped when changing this. update-resolved = fetchurl { diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index f50d17eaf7de..16e97bab2146 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: +{ lib, stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: stdenv.mkDerivation { name = "openvpn-learnaddress-19b03c3"; @@ -15,13 +15,13 @@ stdenv.mkDerivation { install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress wrapProgram $out/libexec/openvpn/openvpn-learnaddress \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk util-linux ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gawk util-linux ]} ''; meta = { description = "Openvpn learn-address script to manage a hosts-like file"; homepage = "https://gist.github.com/offlinehacker/4058733/"; - maintainers = [ stdenv.lib.maintainers.offline ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.offline ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 03737f9af277..6453b2fbb16b 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jdk, swt}: +{lib, stdenv, fetchurl, jdk, swt}: stdenv.mkDerivation { name = "azureus-2.3.0.6"; @@ -11,6 +11,6 @@ stdenv.mkDerivation { inherit jdk swt; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 06b247b28bf9..4a3144c7da12 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { zlib ] ++ - stdenv.lib.optionals (enableGui) [ gtk2 ] + lib.optionals (enableGui) [ gtk2 ] ; configureScript = "./build.sh"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # See https://sourceforge.net/p/gtk-gnutella/bugs/555/ "--disable-malloc" ] - ++ stdenv.lib.optionals (!enableGui) [ "--topless" ] + ++ lib.optionals (!enableGui) [ "--topless" ] ; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index f9ad9773d4da..90dec70ec465 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # Optional patch adds support for custom configurable colors # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md - patches = stdenv.lib.optional colorSupport (fetchurl { + patches = lib.optional colorSupport (fetchurl { url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch"; sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965"; }); diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 2b1467cd3485..861e9c0383bb 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }: +{ lib, stdenv, fetchFromGitHub, bison, flex, cmake, libpcap }: stdenv.mkDerivation rec { pname = "packetdrill"; version = "unstable-2020-08-22"; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Quick, precise tests for entire TCP/UDP/IPv4/IPv6 network stacks"; homepage = "https://github.com/google/packetdrill"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ dmjio cleverca22 ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ dmjio cleverca22 ]; }; } diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 3f00964bfd35..87601b0ddf37 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: +{ lib, stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: stdenv.mkDerivation rec { name = "pdsh-2.34"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl readline ssh ] - ++ (stdenv.lib.optional slurmSupport slurm); + ++ (lib.optional slurmSupport slurm); preConfigure = '' configureFlagsArray=( @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/chaos/pdsh"; description = "High-performance, parallel remote shell utility"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Pdsh is a high-performance, parallel remote shell utility. It has @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { while timeouts occur on some connections. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index d0e76832ea90..ec275c5e6a81 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pixiecore"; @@ -21,8 +21,8 @@ buildGoModule rec { meta = { description = "A tool to manage network booting of machines"; homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ bbigras danderson ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bbigras danderson ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix index 98a780a1704f..ad9bfcfb1d10 100644 --- a/pkgs/tools/networking/pixiewps/default.nix +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "pixiewps"; @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out" substituteInPlace Makefile --replace "/local" "" ''; - + meta = { description = "An offline WPS bruteforce utility"; homepage = "https://github.com/wiire/pixiewps"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.nico202 ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nico202 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index 12c6eeaf4704..16a4dfada910 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -19,7 +19,7 @@ assert withSQLite -> sqlite != null; assert withPgSQL -> postgresql != null; assert withMysql -> libmysqlclient != null; -let inherit (stdenv.lib) getDev optional optionalString; in +let inherit (lib) getDev optional optionalString; in stdenv.mkDerivation rec { version = "1.7.5"; diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6ace8e139e13..8eb20538ea91 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub } : +{ lib, stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "proxychains"; version = "4.2.0"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Proxifier for SOCKS proxies"; homepage = "http://proxychains.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index b710b6601d1b..780477af2fcb 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://samy.pl/pwnat/"; description = "ICMP NAT to NAT client-server communication"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = with maintainers; [viric]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index f7ddd2ef3f99..f856f591bf48 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -17,7 +17,7 @@ let ); ''; - dbScript = writeScript "create_pykms_db.sh" (with stdenv.lib; '' + dbScript = writeScript "create_pykms_db.sh" (with lib; '' #!${runtimeShell} set -eEuo pipefail diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index 7f69dacedf31..af2dfe8040a0 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "redir"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "A TCP port redirector for UNIX"; homepage = "https://github.com/troglobit/redir"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index d389221eabb1..b609cce90bc5 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libevent }: +{ lib, stdenv, fetchFromGitHub, libevent }: let pkg = "redsocks"; @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = "Transparent redirector of any TCP connection to proxy"; homepage = "http://darkk.net.ru/redsocks/"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.ekleog ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ekleog ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index 0930be914cfe..390b35b0297f 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "s3gof3r"; - version = "20151109-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20151109-${lib.strings.substring 0 7 rev}"; rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445"; goPackagePath = "github.com/rlmcpherson/s3gof3r"; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index 0cc446edd9cd..44546465d9ee 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "samplicator"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Send copies of (UDP) datagrams to multiple receivers"; homepage = "https://github.com/sleinen/samplicator/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 4f927a684c03..8b159bc0b7b3 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { SODIUM_USE_PKG_CONFIG = 1; buildInputs = [ openssl libsodium ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkgconfig ]; meta = with lib; { diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix index c56f0eac7ff8..2456a7607219 100644 --- a/pkgs/tools/networking/shorewall/default.nix +++ b/pkgs/tools/networking/shorewall/default.nix @@ -8,12 +8,12 @@ , iptables , perl , perlPackages -, stdenv +, lib, stdenv , tree , util-linux }: let - PATH = stdenv.lib.concatStringsSep ":" + PATH = lib.concatStringsSep ":" [ "${coreutils}/bin" "${iproute}/bin" "${iptables}/bin" @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { not use Netfilter's ipchains compatibility mode and can thus take advantage of Netfilter's connection state tracking capabilities. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 125b66b36a5a..92e46b451b81 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1y3dnl1ziw0c0d4nw30aj0sdmjvarn4xfxgfkswffwnkm8z5p9xz"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; buildInputs = [ openssl zlib ]; diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index 320a856437b9..556204972860 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sipwise/sipsak"; description = "SIP Swiss army knife"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ sheenobu ]; platforms = with platforms; unix; }; diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 80f8b49a0cce..6d0d52271111 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fping, rrdtool, perlPackages }: +{ lib, stdenv, fetchurl, fping, rrdtool, perlPackages }: stdenv.mkDerivation rec { pname = "smokeping"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Network latency collector"; homepage = "http://oss.oetiker.ch/smokeping"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.erictapen ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.erictapen ]; }; } diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 52ad14c1d110..f65f97ed91d0 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools +{ lib, stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools ,supportOpenstack ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "snabb"; diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index 0f36b83e1651..0105fa322c1a 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - patches = stdenv.lib.singleton ./libressl-fixes.patch ; + patches = lib.singleton ./libressl-fixes.patch ; meta = with lib; { description = "A utility for bidirectional data transfer between two independent data channels"; diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 9cc3370c0a1f..67ee51d66102 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, coreutils }: +{ lib, stdenv, fetchurl, openssl, coreutils }: stdenv.mkDerivation rec { pname = "spiped"; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Utility for secure encrypted channels between sockets"; homepage = "https://www.tarsnap.com/spiped.html"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index b0aefa9ef114..b3686580907b 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute , withGUI ? false, qt5 }: -let inherit (stdenv.lib) optional; +let inherit (lib) optional; in stdenv.mkDerivation rec { @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ leenaars]; + maintainers = with lib.maintainers; [ leenaars]; }; } diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index 1e7486dd3059..9ff25d6a17cd 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "srelay-0.4.8"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "A SOCKS proxy and relay"; homepage = "http://socks-relay.sourceforge.net/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.bsd3; + platforms = lib.platforms.unix; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix index 33211fb0723b..c64a8ba945c0 100644 --- a/pkgs/tools/networking/ssh-ident/default.nix +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ccontavalli/ssh-ident"; description = "Start and use ssh-agent and load identities as necessary"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ telotortium ]; - platforms = with stdenv.lib.platforms; unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ telotortium ]; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index d7578c4adda8..fc92f43981b6 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libpcap }: +{ lib, stdenv, fetchFromGitHub, openssl, libpcap }: stdenv.mkDerivation { pname = "ssldump"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "An SSLv3/TLS network protocol analyzer"; homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; - maintainers = with stdenv.lib.maintainers; [ aycanirican ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ aycanirican ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 0e624631d47f..6957d43e7913 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { configureFlags = [ "--sysconfdir=/etc" - (stdenv.lib.enableFeature tlsSupport "ssl") + (lib.enableFeature tlsSupport "ssl") ]; postConfigure = @@ -34,9 +34,9 @@ stdenv.mkDerivation { installTargets = [ "install" "install-sendmail" ]; - buildInputs = stdenv.lib.optional tlsSupport openssl; + buildInputs = lib.optional tlsSupport openssl; - NIX_LDFLAGS = stdenv.lib.optionalString tlsSupport "-lcrypto"; + NIX_LDFLAGS = lib.optionalString tlsSupport "-lcrypto"; meta = with lib; { platforms = platforms.linux; diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 22ef9102ef85..d9ae9327344c 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }: +{ lib, stdenv, fetchurl, pkgconfig, ppp, libevent, openssl }: stdenv.mkDerivation rec { pname = "sstp-client"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "SSTP client for Linux"; homepage = "http://sstp-client.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ktosiek ]; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.ktosiek ]; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 6ff141e099c7..69a2f98832e9 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , pkgconfig, autoreconfHook , gmp, python3, iptables, ldns, unbound, openssl, pcsclite, glib , openresolv @@ -13,7 +13,7 @@ # strongswan curl plugin may break. # See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info. -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "strongswan"; diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix index a87204ff0c6c..abe11b7bcb91 100644 --- a/pkgs/tools/networking/stubby/default.nix +++ b/pkgs/tools/networking/stubby/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libyaml ]; buildInputs = [ doxygen getdns systemd ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; + ++ lib.optionals stdenv.isDarwin [ darwin.Security ]; meta = with lib; { description = "A local DNS Privacy stub resolver (using DNS-over-TLS)"; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index eaa05bfdbad6..6104a4d2b500 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { pname = "stunnel"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { meta = { description = "Universal tls/ssl wrapper"; homepage = "https://www.stunnel.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index d26bdbbb771a..d9bf06e825ea 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{lib, stdenv, fetchurl, perl}: stdenv.mkDerivation { name = "surfraw-2.3.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; homepage = "https://gitlab.com/surfraw/Surfraw"; maintainers = []; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.publicDomain; + platforms = lib.platforms.linux; + license = lib.licenses.publicDomain; }; } diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index e65bc5e208fc..71fea1c2e830 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, perlPackages }: +{ fetchurl, lib, stdenv, makeWrapper, perlPackages }: stdenv.mkDerivation rec { name = "swec-0.4"; @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { (well, not exactly true, SWEC will ignore robots.txt). ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index fa555ad4f99c..71c435df0c58 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, perl, fetchpatch }: +{ lib, stdenv, fetchurl, libpcap, perl, fetchpatch }: stdenv.mkDerivation rec { pname = "tcpdump"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ]; - configureFlags = stdenv.lib.optional + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "ac_cv_linux_vers=2"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Network sniffer"; homepage = "http://www.tcpdump.org/"; license = "BSD-style"; - maintainers = with stdenv.lib.maintainers; [ globin ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with lib.maintainers; [ globin ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 2875d13671a7..0c322fe9f63f 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpcap ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices ]; diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index e1e711ef16a1..1eacd685463e 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -1,4 +1,4 @@ -{ stdenv , fetchurl, libpcap, libnet +{ lib, stdenv , fetchurl, libpcap, libnet }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A traceroute implementation using TCP packets"; homepage = "https://github.com/mct/tcptraceroute"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 43b7702a818a..f4e790fea36f 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; postFixup = '' - wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]} + wrapProgram $out/bin/termshark --prefix PATH : ${lib.makeBinPath [ wireshark-cli ]} ''; buildFlagsArray = '' diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index e331916626e3..2387c903a9b0 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lzo, openssl, zlib}: +{lib, stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { version = "1.0.36"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { authentication, compression and ethernet bridging. ''; homepage="http://www.tinc-vpn.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 610322b23da5..2c6315b37c98 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook asciidoc libxml2 libxslt docbook_xsl ]; # -z flag is not supported in darwin - preAutoreconf = stdenv.lib.optionalString stdenv.isDarwin '' + preAutoreconf = lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace \ 'LDFLAGS="-Wl,-z,defs $LDFLAGS"' \ 'LDFLAGS="-Wl, $LDFLAGS"' @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "--enable-reverse" # Enable reverse proxying. ] ++ # See: https://github.com/tinyproxy/tinyproxy/issues/1 - stdenv.lib.optional stdenv.isDarwin "--disable-regexcheck"; + lib.optional stdenv.isDarwin "--disable-regexcheck"; meta = with lib; { homepage = "https://tinyproxy.github.io/"; diff --git a/pkgs/tools/networking/toss/default.nix b/pkgs/tools/networking/toss/default.nix index 9752dcc4f64b..3c8f72961812 100644 --- a/pkgs/tools/networking/toss/default.nix +++ b/pkgs/tools/networking/toss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "toss"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r"; }; preInstall = "export DESTDIR=$out/bin"; - meta = with stdenv.lib; + meta = with lib; src.meta // { description = "Dead simple LAN file transfers from the command line"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index 887200fa2aa5..c433d7d0a668 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -2,7 +2,7 @@ libtoxcore, libsodium, libcap, zeromq, systemd ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation { name = "toxvpn-2019-09-09"; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 7ac4c88325c9..a5486252a8af 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.lethalman ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 04e66f29fccc..c941aad258cc 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://traceroute.sourceforge.net/"; description = "Tracks the route taken by packets over an IP network"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ maintainers.koral ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index fc32d34ad316..8a5143d1e3bd 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, libtirpc }: +{ lib, stdenv, fetchurl, libevent, libtirpc }: stdenv.mkDerivation rec { name = "trickle-1.07"; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://monkey.org/~marius/pages/?page=trickle"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index a91a82b9d5dd..c18243347898 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0k0ig3dynj46kh8g7d6bljcaalmp40pvdbhbjmlxrmwnjq6bhzcq"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Expose your local web server to the internet with a public URL"; diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index 21cbd2dfefba..b6038aa54353 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { install -Dm 0644 README.md "$out/share/doc/twa/README.md" wrapProgram "$out/bin/twa" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ curl + --prefix PATH : ${lib.makeBinPath [ curl host.dnsutils jq ncurses diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 9ce7f5df247f..3e90f240641f 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit +{ lib, stdenv, buildGoPackage, fetchgit , pkgconfig , glib, libxml2 }: @@ -23,9 +23,9 @@ buildGoPackage rec { meta = { homepage = "https://github.com/sloonz/ua"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; description = "Universal Aggregator"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 08fb7cd62e06..6063cb38b568 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "udptunnel-19"; @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { homepage = "https://code.google.com/archive/p/udptunnel/"; description = "Tunnels TCP over UDP packets"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 5267eda9bf29..133d166fdb48 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { libnotify libappindicator-gtk3 gtk3 - (stdenv.lib.getLib dconf) + (lib.getLib dconf) ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) - ++ (stdenv.lib.optional (aria2 != null) aria2); + ++ (lib.optional (aria2 != null) aria2); enableParallelBuilding = true; - preFixup = stdenv.lib.optionalString (aria2 != null) + preFixup = lib.optionalString (aria2 != null) ''gappsWrapperArgs+=(--suffix PATH : "${aria2}/bin")''; meta = with lib; { diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index ce27f1113773..24b17af3d3e9 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "--with-rootkey-file=${dns-root-data}/root.key" "--enable-pie" "--enable-relro-now" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [ + ] ++ lib.optional stdenv.hostPlatform.isStatic [ "--disable-flto" ] ++ lib.optionals withSystemd [ "--enable-systemd" diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 71ff3b954f42..fcfd93be4d67 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; homepage = "http://www.unbound.net"; maintainers = with maintainers; [ leenaars ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; broken = true; }; } diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index bd38a1cfa2fe..e675268163ac 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pam, openssl }: +{ lib, stdenv, fetchurl, fetchpatch, pam, openssl }: stdenv.mkDerivation ({ name = "uw-imap-2007f"; @@ -12,13 +12,13 @@ stdenv.mkDerivation ({ then "osx" else "lnp") ] # Linux with PAM modules; # -fPIC is required to compile php with imap on x86_64 systems - ++ stdenv.lib.optional stdenv.isx86_64 "EXTRACFLAGS=-fPIC" - ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CC=${stdenv.hostPlatform.config}-gcc" "RANLIB=${stdenv.hostPlatform.config}-ranlib" ]; + ++ lib.optional stdenv.isx86_64 "EXTRACFLAGS=-fPIC" + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CC=${stdenv.hostPlatform.config}-gcc" "RANLIB=${stdenv.hostPlatform.config}-ranlib" ]; hardeningDisable = [ "format" ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional (!stdenv.isDarwin) pam; + ++ lib.optional (!stdenv.isDarwin) pam; patches = [ (fetchpatch { url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch"; @@ -31,7 +31,7 @@ stdenv.mkDerivation ({ sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,' ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${openssl.dev}/include/openssl"; installPhase = '' @@ -45,14 +45,14 @@ stdenv.mkDerivation ({ meta = { homepage = "https://www.washington.edu/imap/"; description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; - license = stdenv.lib.licenses.asl20; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + platforms = with lib.platforms; linux; }; passthru = { withSSL = true; }; -} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { +} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { # This is set here to prevent rebuilds on native compilation. # Configure phase is a no-op there, because this package doesn't use ./configure scripts. configurePhase = '' diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 98a521742407..babbd88fd166 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -15,17 +15,17 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61"; sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi"; }) - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [ + ] ++ lib.optional stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; }) ]; - configureFlags = stdenv.lib.optional (!withPython) "--disable-python"; + configureFlags = lib.optional (!withPython) "--disable-python"; buildInputs = [ openssl libpcap ] - ++ stdenv.lib.optional withPython python2; + ++ lib.optional withPython python2; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 7a52112e65ff..a754e7e9937c 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: +{ lib, stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: stdenv.mkDerivation { name = "vpnc-0.5.3-post-r550"; @@ -50,8 +50,8 @@ stdenv.mkDerivation { meta = { homepage = "https://www.unix-ag.uni-kl.de/~massar/vpnc/"; description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index cc28455d06a5..7efe7018d318 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "waitron-unstable-${version}"; @@ -23,8 +23,8 @@ buildGoPackage rec { meta = { description = "A tool to manage network booting of machines"; homepage = "https://github.com/ns1/waitron"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ guibert ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guibert ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index ff96509e15c5..96e01141c180 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "wakelan-1.1"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { power on. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 4b265e12fbf1..19bfd6ae4547 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin fpletz ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix index 8b10bb599c4e..3a5fce6808f8 100644 --- a/pkgs/tools/networking/wbox/default.nix +++ b/pkgs/tools/networking/wbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "wbox"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple HTTP benchmarking tool"; homepage = "http://www.hping.org/wbox/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix index efcb8d8cf425..72bd29247abb 100644 --- a/pkgs/tools/networking/weighttp/default.nix +++ b/pkgs/tools/networking/weighttp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python, libev, wafHook }: +{ lib, stdenv, fetchgit, python, libev, wafHook }: stdenv.mkDerivation rec { pname = "weighttp"; version = "0.4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ python libev ]; meta = { - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; homepage = "https://redmine.lighttpd.net/projects/weighttp/wiki"; description = "A lightweight and simple webserver benchmarking tool"; }; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index ca70126782d6..ce4fe2d1418c 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs doc - '' + stdenv.lib.optionalString doCheck '' + '' + lib.optionalString doCheck '' # Work around lack of DNS resolution in chroots. for i in "tests/"*.pm "tests/"*.px do @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext pkgconfig perlPackages.perl lzip libiconv libintl ]; buildInputs = [ libidn2 zlib pcre libuuid ] - ++ stdenv.lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] - ++ stdenv.lib.optional (openssl != null) openssl - ++ stdenv.lib.optional (libpsl != null) libpsl - ++ stdenv.lib.optional stdenv.isDarwin perlPackages.perl; + ++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] + ++ lib.optional (openssl != null) openssl + ++ lib.optional (libpsl != null) libpsl + ++ lib.optional stdenv.isDarwin perlPackages.perl; configureFlags = [ - (stdenv.lib.withFeatureAs (openssl != null) "ssl" "openssl") + (lib.withFeatureAs (openssl != null) "ssl" "openssl") ]; doCheck = false; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 40550b48abbe..7e702c0559b0 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { pname = "wicd"; version = "1.7.2.4"; - + src = fetchurl { url = "https://launchpad.net/wicd/1.7/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ./no-var-install.patch ./pygtk.patch ./no-optimization.patch - ./dhclient.patch + ./dhclient.patch ./fix-app-icon.patch ./fix-gtk-issues.patch ./urwid-api-update.patch @@ -33,10 +33,10 @@ in stdenv.mkDerivation rec { postPatch = '' # We don't have "python2". substituteInPlace wicd/wicd-daemon.py --replace 'misc.find_path("python2")' "'${python.interpreter}'" - + substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=${stdenv.lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in + sed -i "2iexport PATH=${lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in diff --git a/pkgs/tools/networking/wifish/default.nix b/pkgs/tools/networking/wifish/default.nix index f502a2fb0d54..a9e30710c1a2 100644 --- a/pkgs/tools/networking/wifish/default.nix +++ b/pkgs/tools/networking/wifish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , dialog , gawk , wpa_supplicant @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram ${placeholder "out"}/bin/wifish \ - --prefix PATH ":" ${stdenv.lib.makeBinPath [ dialog gawk wpa_supplicant ]} + --prefix PATH ":" ${lib.makeBinPath [ dialog gawk wpa_supplicant ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/bougyman/wifish"; description = "Simple wifi shell script for linux"; license = licenses.wtfpl; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index a9f0d7e77d62..1e401deaa264 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchzip , nixosTests , iptables ? null @@ -9,7 +9,7 @@ , wireguard-go ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix index 2a5e8e3a5dca..0cf40b87f5aa 100644 --- a/pkgs/tools/networking/wrk2/default.nix +++ b/pkgs/tools/networking/wrk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, luajit, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, luajit, openssl, zlib }: stdenv.mkDerivation rec { pname = "wrk2"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "Constant throughput, correct latency recording variant of wrk"; homepage = "https://github.com/giltene/wrk2"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index 79a968f806e3..6451c52d1daf 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }: +{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, glib, jansson }: stdenv.mkDerivation rec { name = "xnbd-0.4.0"; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://bitbucket.org/hirofuchi/xnbd"; description = "Yet another NBD (Network Block Device) server program"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.volth ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.volth ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 945c96ae8511..07b7a8441b8e 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ lib, stdenv, fetchurl, readline }: let version = "1.5c"; @@ -32,8 +32,8 @@ in stdenv.mkDerivation rec { meta = { description = "SSH and Telnet client with ZMODEM file transfer capability"; homepage = "http://zssh.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ ]; # required by deepin-terminal - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/nix/manix/default.nix b/pkgs/tools/nix/manix/default.nix index f93e25efae7f..6c9f02f0e4fd 100644 --- a/pkgs/tools/nix/manix/default.nix +++ b/pkgs/tools/nix/manix/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0fv3sgzwjsgq2h1177r8r1cl5zrfja4ll801sd0bzj3nzmkyww7p"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ]; cargoSha256 = "0f2q3bj1cmpbma0fjhc2lc92j4al78fhrx3yc37kmbgzaza0yan5"; diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 1c35e0ccd51c..38e2b060c0c1 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -1,5 +1,5 @@ { mkDerivation, ansi-terminal, async, attoparsec, base, containers -, directory, HUnit, mtl, nix-derivation, process, relude, stdenv +, directory, HUnit, mtl, nix-derivation, process, relude, lib, stdenv , stm, text, time, unix, fetchFromGitHub }: mkDerivation { @@ -27,6 +27,6 @@ mkDerivation { ]; homepage = "https://github.com/maralorn/nix-output-monitor"; description = "Parses output of nix-build to show additional information"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = [ stdenv.lib.maintainers.maralorn ]; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.maralorn ]; } diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 3d2e434912f6..d97a3d5bae3a 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s"; }; - buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ]; cargoSha256 = "1vamwynkbnffs8ryr2zb1a41cymjvr8zzh1bifyh9hpkx2k11rs3"; diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index e392d8c4a701..00cf7d69ecdd 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" wrapProgram "$out/bin/appimagetool" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ file gnupg ]}" + --prefix PATH : "${lib.makeBinPath [ file gnupg ]}" ''; checkInputs = [ gtest ]; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index a12271f5a99f..810aa6baa622 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv curl diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 64092ac2bb1d..d2a133052920 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index 4e3767579990..892de0ade273 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; buildInputs = [ libgit2 libssh2 openssl zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ]; + ++ lib.optionals stdenv.isDarwin [ curl Security ]; postBuild = '' # Man pages contain non-ASCII, so explicitly set encoding to UTF-8. diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index bd23da8efb51..3a1aa5e464e8 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gettext}: +{lib, stdenv, fetchurl, gettext}: assert stdenv.isLinux && stdenv ? glibc; @@ -37,7 +37,7 @@ stdenv.mkDerivation { ./set-buildroot.patch ] - ++ stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-linux") + ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") # Force use of old memcpy so that installwatch works on Glibc < # 2.14. ./use-old-memcpy.patch; @@ -67,8 +67,8 @@ stdenv.mkDerivation { meta = { homepage = "http://checkinstall.izto.org/"; description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index b4cb6d030411..1d2f3ab0fee5 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: +{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation { name = "DisnixWebService-0.10"; @@ -18,11 +18,11 @@ stdenv.mkDerivation { ''; buildPhase = "ant"; installPhase = "ant install"; - + meta = { description = "A SOAP interface and client for Disnix"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index f63c7dd737cd..1606214e9513 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: +{ lib, stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: stdenv.mkDerivation { name = "disnix-0.10"; @@ -13,8 +13,8 @@ stdenv.mkDerivation { meta = { description = "A Nix-based distributed service deployment tool"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = with stdenv.lib.maintainers; [ sander tomberek ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ sander tomberek ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 2fa7d3ed9d76..2f6e98496cf4 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: +{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { name = "disnixos-0.9"; @@ -13,8 +13,8 @@ stdenv.mkDerivation { meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix index 552d2a106fba..af7a79ad7e99 100644 --- a/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ b/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: stdenv.mkDerivation rec { version="2020-07-04"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "A toolset enabling self-adaptive redeployment on top of Disnix"; longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.tomberek ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.tomberek ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 031e926e78a6..56ba16afb47b 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, netcat +{ lib, stdenv, fetchurl, netcat , systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false @@ -48,24 +48,24 @@ stdenv.mkDerivation { (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") (if enableDockerContainer then "--with-docker" else "--without-docker") "--with-job-template=${jobTemplate}" - ] ++ stdenv.lib.optional enableLegacy "--enable-legacy"; + ] ++ lib.optional enableLegacy "--enable-legacy"; buildInputs = [ getopt netcat ] - ++ stdenv.lib.optional stdenv.isLinux systemd - ++ stdenv.lib.optional enableEjabberdDump ejabberd - ++ stdenv.lib.optional enableMySQLDatabase mysql.out - ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql - ++ stdenv.lib.optional enableSubversionRepository subversion - ++ stdenv.lib.optional enableMongoDatabase mongodb - ++ stdenv.lib.optional enableMongoDatabase mongodb-tools - ++ stdenv.lib.optional enableInfluxDatabase influxdb - ++ stdenv.lib.optional enableSupervisordProgram supervisor - ++ stdenv.lib.optional enableDockerContainer docker; + ++ lib.optional stdenv.isLinux systemd + ++ lib.optional enableEjabberdDump ejabberd + ++ lib.optional enableMySQLDatabase mysql.out + ++ lib.optional enablePostgreSQLDatabase postgresql + ++ lib.optional enableSubversionRepository subversion + ++ lib.optional enableMongoDatabase mongodb + ++ lib.optional enableMongoDatabase mongodb-tools + ++ lib.optional enableInfluxDatabase influxdb + ++ lib.optional enableSupervisordProgram supervisor + ++ lib.optional enableDockerContainer docker; meta = { description = "Automated deployment of mutable components and services for Disnix"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 96032bc0a695..7eee52f8efa8 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { "--disable-dselect" "--with-admindir=/var/lib/dpkg" "PERL_LIBDIR=$(out)/${perl.libPrefix}" - (stdenv.lib.optionalString stdenv.isDarwin "--disable-linker-optimisations") - (stdenv.lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon") + (lib.optionalString stdenv.isDarwin "--disable-linker-optimisations") + (lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon") ]; preConfigure = '' diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index c93f3031e825..08702e8bf6b1 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -12,7 +12,7 @@ gcc9Stdenv.mkDerivation rec { sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq"; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; nativeBuildInputs = [ cmake diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 64a5bc32b5c9..a18c4e55e6d8 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libxml2 ]; - cmakeFlags = [ "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ]; + cmakeFlags = [ "-DPYTHON_DESIRED=${lib.substring 0 1 python.pythonVersion}" ]; postFixup = '' moveToOutput "lib/${python.libPrefix}" "$py" diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/tools/package-management/microdnf/default.nix index af5d50460c1a..8e866abb3cca 100644 --- a/pkgs/tools/package-management/microdnf/default.nix +++ b/pkgs/tools/package-management/microdnf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Lightweight implementation of dnf in C"; homepage = "https://github.com/rpm-software-management/microdnf"; license = licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ rb2k ]; + maintainers = with lib.maintainers; [ rb2k ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/package-management/niff/default.nix b/pkgs/tools/package-management/niff/default.nix index 9d3736f6faad..93406095df25 100644 --- a/pkgs/tools/package-management/niff/default.nix +++ b/pkgs/tools/package-management/niff/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , python3 , fetchFromGitHub }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = { description = "A program that compares two Nix expressions and determines which attributes changed"; homepage = "https://github.com/FRidh/niff"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.fridh ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.fridh ]; }; } diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 0e4ad412e678..2b07827c4aba 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ boost nix - ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { description = "A tool to determine which gc-roots take space in your nix store"; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index af46c51235ed..c82a58cbf0cc 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl curl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security; doCheck = !stdenv.isDarwin; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace $out/etc/profile.d/command-not-found.sh \ --replace "@out@" "$out" wrapProgram $out/bin/nix-index \ - --prefix PATH : "${stdenv.lib.makeBinPath [ nix ]}" + --prefix PATH : "${lib.makeBinPath [ nix ]}" ''; meta = with lib; { diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index 1b4ecc8afec4..8b318306873c 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -13,7 +13,7 @@ let mkPrefetchScript = tool: src: deps: installPhase = '' install -vD ${src} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${stdenv.lib.makeBinPath (deps ++ [ gnused nix ])} \ + --prefix PATH : ${lib.makeBinPath (deps ++ [ gnused nix ])} \ --set HOME /homeless-shelter ''; @@ -22,7 +22,7 @@ let mkPrefetchScript = tool: src: deps: meta = with lib; { description = "Script used to obtain source hashes for fetch${tool}"; maintainers = with maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; }; in rec { @@ -40,7 +40,7 @@ in rec { meta = with lib; { description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; maintainers = with maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; }; } diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index fb19d3dac6a1..af077e5f939c 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -3,7 +3,7 @@ , gnugrep, gnused, jq, nix, fetchpatch }: let - binPath = stdenv.lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; + binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; in stdenv.mkDerivation rec { pname = "nix-prefetch"; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index fccfbe98f786..d468b2d2ade8 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, bzip2, nix, perl, perlPackages, }: -with stdenv.lib; +with lib; let rev = "e4675e38ab54942e351c7686e40fabec822120b9"; diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index 0a003ba6b6b4..da64ec138a60 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { install -D -m755 ./nix-top $out/bin/nix-top wrapProgram $out/bin/nix-top \ --prefix PATH : "$out/libexec/nix-top:${additionalPath}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' ln -s /bin/stty $out/libexec/nix-top ''; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d997a0a87d61..c29ba19ccb7b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -154,9 +154,9 @@ common = environments. ''; homepage = "https://nixos.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2Plus; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; outputsToInstall = [ "out" "man" ]; }; diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 12bf229580f6..0e6ff9ec7055 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem +{ lib, stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem , writeScript }: let version = "0.2.1"; @@ -37,8 +37,8 @@ stdenv.mkDerivation { meta = { description = "NodeWebkit user interface for Nix"; homepage = "https://github.com/matejc/nixui"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.matejc ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 2f2080358e5e..419de6cc85a8 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] - ++ stdenv.lib.optional stdenv.isLinux elfutils; + ++ lib.optional stdenv.isLinux elfutils; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index d9f7a7c7d331..cb4ba1a2c0e4 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { # Wrap the application with Electron. makeWrapper "${electron_11}/bin/electron" "$out/bin/${pname}" \ --add-flags "$out/share/${pname}/resources/app.asar" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeLibs}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index df30d18edfc6..eb31bf0cdebe 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcsclite libusb1 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index f0a1dbbf7aca..f2244f98d54b 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postInstall = '' cp bz2aespipe $out/bin wrapProgram $out/bin/bz2aespipe \ - --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ sharutils ]} + --prefix PATH : $out/bin:${lib.makeBinPath [ sharutils ]} ''; meta = with lib; { diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 091b52bfcf04..056aa3b07fde 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper +{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper , clang, llvm, which, libcgroup }: @@ -74,9 +74,9 @@ let testing regimes down the road. ''; homepage = "https://lcamtuf.coredump.cx/afl/"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; + maintainers = with lib.maintainers; [ thoughtpolice ris ]; }; }; in afl diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix index 1c22c7d1d244..400464c00567 100644 --- a/pkgs/tools/security/afl/libdislocator.nix +++ b/pkgs/tools/security/afl/libdislocator.nix @@ -1,7 +1,7 @@ { lib, stdenv, afl}: stdenv.mkDerivation { - version = stdenv.lib.getVersion afl; + version = lib.getVersion afl; pname = "libdislocator"; src = afl.src; @@ -28,7 +28,7 @@ stdenv.mkDerivation { the odds of bumping into heap-related security bugs in several ways. ''; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index 31aac2430b8b..b2c1618ed793 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -2,7 +2,7 @@ , texinfo, libuuid, flex, bison, pixman, autoconf }: -with stdenv.lib; +with lib; let qemuName = "qemu-2.10.0"; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 8e5db3cd22c9..79a0779e60a1 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper +{ lib, stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper , clang, llvm, gcc, which, libcgroup, python, perl, gmp , file, wine ? null, fetchpatch }: @@ -31,7 +31,7 @@ let # script. nativeBuildInputs = [ makeWrapper which clang gcc ]; buildInputs = [ llvm python gmp ] - ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython; + ++ lib.optional (wine != null) python.pkgs.wrapPython; postPatch = '' @@ -91,7 +91,7 @@ let patchShebangs $out/bin - '' + stdenv.lib.optionalString (wine != null) '' + '' + lib.optionalString (wine != null) '' substitute afl-wine-trace $out/bin/afl-wine-trace \ --replace "qemu_mode/unsigaction" "$out/lib/afl" chmod +x $out/bin/afl-wine-trace @@ -128,9 +128,9 @@ let and improvements from the community ''; homepage = "https://aflplus.plus"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; - maintainers = with stdenv.lib.maintainers; [ ris mindavi ]; + maintainers = with lib.maintainers; [ ris mindavi ]; }; }; in aflplusplus diff --git a/pkgs/tools/security/aflplusplus/libdislocator.nix b/pkgs/tools/security/aflplusplus/libdislocator.nix index 99f9d51ea7e6..ed695a7a7027 100644 --- a/pkgs/tools/security/aflplusplus/libdislocator.nix +++ b/pkgs/tools/security/aflplusplus/libdislocator.nix @@ -1,7 +1,7 @@ { lib, stdenv, aflplusplus}: stdenv.mkDerivation { - version = stdenv.lib.getVersion aflplusplus; + version = lib.getVersion aflplusplus; pname = "libdislocator"; src = aflplusplus.src; @@ -31,7 +31,7 @@ stdenv.mkDerivation { the odds of bumping into heap-related security bugs in several ways. ''; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/tools/security/aflplusplus/libtokencap.nix b/pkgs/tools/security/aflplusplus/libtokencap.nix index 87e06ed9aeb9..f3ea5d4ec6b7 100644 --- a/pkgs/tools/security/aflplusplus/libtokencap.nix +++ b/pkgs/tools/security/aflplusplus/libtokencap.nix @@ -1,7 +1,7 @@ { lib, stdenv, aflplusplus}: stdenv.mkDerivation { - version = stdenv.lib.getVersion aflplusplus; + version = lib.getVersion aflplusplus; pname = "libtokencap"; src = aflplusplus.src; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/vanhauser-thc/AFLplusplus"; description = "strcmp & memcmp token capture library"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index cc6bf3a83efa..74e081b95a3a 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -2,7 +2,7 @@ , texinfo, libuuid, flex, bison, pixman, autoconf }: -with stdenv.lib; +with lib; let qemuName = "qemu-3.1.0"; diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 1dcdeae832d5..579026f07ca9 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "apg-2.3.0b"; src = fetchurl { @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"]; + makeFlags = lib.optionals stdenv.isDarwin ["CC=cc"]; patches = [ ./apg.patch ./phony-install-target.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile ''; @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { password generation ''; homepage = "http://www.adel.nursat.kz/apg/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ astsmtl ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index b0e3a6449596..3256b5431a75 100644 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation { substitutions = [ ''--replace "convert" "${imagemagick}/bin/convert"'' ''--replace "qrencode" "${qrencode.bin}/bin/qrencode"'' - ] ++ stdenv.lib.optional testQR [ + ] ++ lib.optional testQR [ ''--replace "hash zbarimg" "true"'' # hash does not work on NixOS ''--replace "$(zbarimg --raw" "$(${zbar.out}/bin/zbarimg --raw"'' ]; in '' - substituteInPlace asc-to-gif.sh ${stdenv.lib.concatStringsSep " " substitutions} + substituteInPlace asc-to-gif.sh ${lib.concatStringsSep " " substitutions} ''; installPhase = '' diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index fdd4f2c73fd4..393043df6758 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, openmp ? null }: +{ lib, stdenv, fetchzip, openmp ? null }: -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "b2sum"; diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index cbacf8b33a47..9276c9b11677 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { installPhase = '' install -m755 -D supergenpass.sh "$out/bin/supergenpass" - wrapProgram "$out/bin/supergenpass" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnugrep ]}" + wrapProgram "$out/bin/supergenpass" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnugrep ]}" ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 3b0a6ca62640..0037b8cdff74 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libusb1 ] - ++ stdenv.lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; + ++ lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; meta = with lib; { description = "A man in the middle tool"; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 9bbcdab6bf7d..9d700686b1c9 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -78,7 +78,7 @@ let postFixup = '' makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ "''${gappsWrapperArgs[@]}" ''; }; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 482ba400e637..d2321523b32d 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -18,7 +18,7 @@ in rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = with stdenv.lib; [ openssl ] + buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ Security CoreServices ] ++ optional (dbBackend == "mysql") libmysqlclient ++ optional (dbBackend == "postgresql") postgresql; diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index 69d8dbc96235..25b9aecb8e0e 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin patchPythonScript $out/bin/brutespray wrapProgram $out/bin/brutespray \ - --prefix PATH : ${stdenv.lib.makeBinPath [ medusa ]} + --prefix PATH : ${lib.makeBinPath [ medusa ]} mkdir -p $out/share/brutespray cp -r wordlist/ $out/share/brutespray/wordlist diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index a3210b2a5987..bf5f26f7044f 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{lib, stdenv, fetchurl, perl}: stdenv.mkDerivation { name = "ccrypt-1.11"; @@ -15,8 +15,8 @@ stdenv.mkDerivation { meta = { homepage = "http://ccrypt.sourceforge.net/"; description = "Utility for encrypting and decrypting files and streams with AES-256"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; all; }; } diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index d0b75bdd42b2..ef462f5bf2dc 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ unzip ] - ++ stdenv.lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; + ++ lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; patches = [ ./00-chntpw-build-arch-autodetect.patch @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://pogostick.net/~pnh/ntpasswd/"; description = "An utility to reset the password of any user that has a valid local account on a Windows system"; - maintainers = with stdenv.lib.maintainers; [ deepfire ]; + maintainers = with lib.maintainers; [ deepfire ]; license = licenses.gpl2; - platforms = with stdenv.lib.platforms; linux; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 4b3048223f7a..eb9fc8e7b957 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack json_c check - ] ++ stdenv.lib.optional stdenv.isLinux systemd - ++ stdenv.lib.optional stdenv.isDarwin Foundation; + ] ++ lib.optional stdenv.isLinux systemd + ++ lib.optional stdenv.isDarwin Foundation; configureFlags = [ "--libdir=$(out)/lib" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--enable-milter" "--disable-unrar" # disable unrar because it's non-free and requires some extra patching to work properly "--enable-check" - ] ++ stdenv.lib.optional stdenv.isLinux + ] ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=$(out)/lib/systemd"; postInstall = '' diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix index 7d58de8553b3..4cd420650f3b 100644 --- a/pkgs/tools/security/cowpatty/default.nix +++ b/pkgs/tools/security/cowpatty/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, openssl, libpcap +{ lib, stdenv, fetchurl, openssl, libpcap }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "cowpatty"; diff --git a/pkgs/tools/security/crlfuzz/default.nix b/pkgs/tools/security/crlfuzz/default.nix index 2e4b17170c65..feddd893cece 100644 --- a/pkgs/tools/security/crlfuzz/default.nix +++ b/pkgs/tools/security/crlfuzz/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -18,7 +18,7 @@ buildGoModule rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool to scan for CRLF vulnerability"; homepage = "https://github.com/dwisiswant0/crlfuzz"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index ee97bda19064..cab059ca33ea 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap +{ lib, stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap , libiconv}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pth openldap libiconv ]; meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 2c3a7a441afd..40645ce089d8 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, openssl, zlib }: +{ lib, stdenv, fetchurl, pam, openssl, zlib }: stdenv.mkDerivation rec { pname = "duo-unix"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "Duo Security Unix login integration"; homepage = "https://duosecurity.com"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index dbec36cb12b0..a49c6713e095 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation rec { done ''; - configureFlags = stdenv.lib.optionals (!enablePython) [ "--disable-pywrap" ]; + configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; nativeBuildInputs = [ pkgconfig ] # if python2 support is requested, it is needed at builtime as well as runtime. - ++ stdenv.lib.optionals (enablePython) [ python2 ] + ++ lib.optionals (enablePython) [ python2 ] ; buildInputs = [ perl nss nspr pam intltool makeWrapper ] - ++ stdenv.lib.optionals (enablePython) [ python2 ] + ++ lib.optionals (enablePython) [ python2 ] ; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix index 3c7d3144d3b2..960ef251b1cd 100644 --- a/pkgs/tools/security/enchive/default.nix +++ b/pkgs/tools/security/enchive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "enchive"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted personal archives"; homepage = "https://github.com/skeeto/enchive"; - license = stdenv.lib.licenses.unlicense; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = lib.licenses.unlicense; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index 0cbfd79296dc..e1a5de7754e7 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { dontBuild = true; - rpath = stdenv.lib.makeLibraryPath [ + rpath = lib.makeLibraryPath [ glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi libXcursor libXext libXfixes libXrender libXcomposite alsaLib libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf diff --git a/pkgs/tools/security/enum4linux/default.nix b/pkgs/tools/security/enum4linux/default.nix index 4fe567d1ed0f..9a9f2039ac20 100644 --- a/pkgs/tools/security/enum4linux/default.nix +++ b/pkgs/tools/security/enum4linux/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp enum4linux.pl $out/bin/enum4linux wrapProgram $out/bin/enum4linux \ - --prefix PATH : ${stdenv.lib.makeBinPath [ samba openldap ]} + --prefix PATH : ${lib.makeBinPath [ samba openldap ]} ''; meta = with lib; { diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 45bea0ae99f1..922fb412cad7 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication { }; pythonPath = with python3.pkgs; - stdenv.lib.optionals stdenv.isLinux [ + lib.optionals stdenv.isLinux [ systemd ]; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 2f297ffd6b79..1837fc6d8501 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, gnupg, gtk2 +{ lib, stdenv, fetchurl, pkgconfig, gnupg, gtk2 , libxml2, intltool }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "fpm2"; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 368f49d944d2..14a9427b0f12 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; # FIXME: Ugly hack for tests to find libpam_wrapper.so - LIBRARY_PATH = stdenv.lib.makeLibraryPath [ python3.pkgs.pypamtest ]; + LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ]; doCheck = true; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index d3787f834d03..b56ba93dc7bc 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpcap texinfo ] - ++ stdenv.lib.optionals gnupgSupport [ gnupg gpgme.dev ] - ++ stdenv.lib.optionals wgetSupport [ wget ]; + ++ lib.optionals gnupgSupport [ gnupg gpgme.dev ] + ++ lib.optionals wgetSupport [ wget ]; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/run" "--with-iptables=${iptables}/sbin/iptables" - (stdenv.lib.enableFeature buildServer "server") - (stdenv.lib.enableFeature buildClient "client") - (stdenv.lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget") - ] ++ stdenv.lib.optionalString gnupgSupport [ + (lib.enableFeature buildServer "server") + (lib.enableFeature buildClient "client") + (lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget") + ] ++ lib.optionalString gnupgSupport [ "--with-gpgme" "--with-gpgme-prefix=${gpgme.dev}" "--with-gpg=${gnupg}" diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index 670b9631f219..51ff5b0e81e9 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let - path = stdenv.lib.makeBinPath [ + path = lib.makeBinPath [ coreutils file libcaca.bin diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index 88d6604be837..29703ee1fc87 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; meta = with lib; { description = "A simple yet robust commandline random password generator"; diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix index af6893b26e86..8478c3748366 100644 --- a/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gnu-pw-mgr/"; description = "A password manager designed to make it easy to reconstruct difficult passwords"; license = with licenses; [ gpl3Plus lgpl3Plus ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; maintainers = with maintainers; [ qoelet ]; }; } diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index a6b0d43aae21..8dd0c779c3bf 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -9,7 +9,7 @@ null }: -with stdenv.lib; +with lib; assert guiSupport -> pinentry != null && enableMinimal == false; @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in - '' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) '' - sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c + '' + lib.optionalString ( stdenv.isLinux && pcsclite != null) '' + sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 34abfe217573..d85c6ca28693 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -29,12 +29,12 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; - wrapperPath = stdenv.lib.makeBinPath ( + wrapperPath = lib.makeBinPath ( [ git gnupg xclip - ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard + ] ++ lib.optional stdenv.isLinux wl-clipboard ); postInstall = '' @@ -42,7 +42,7 @@ buildGoModule rec { $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell done - '' + stdenv.lib.optionalString passAlias '' + '' + lib.optionalString passAlias '' ln -s $out/bin/gopass $out/bin/pass ''; diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 975976c6a3c1..68aa7c488198 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: +{ fetchurl, makeWrapper, patchelf, lib, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }: stdenv.mkDerivation rec { pname = "gorilla-bin"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = let interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; - libPath = stdenv.lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ]; + libPath = lib.makeLibraryPath [ libXft libX11 freetype fontconfig libXrender libXScrnSaver libXext ]; in '' mkdir -p $out/opt/password-gorilla mkdir -p $out/bin @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Password Gorilla is a Tk based password manager"; homepage = "https://github.com/zdia/gorilla/wiki"; - maintainers = [ stdenv.lib.maintainers.namore ]; + maintainers = [ lib.maintainers.namore ]; platforms = [ "x86_64-linux" ]; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index c9a178cff42d..f6f6d3678109 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp gpgstats $out/bin ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit) + NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.is64bit) "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"; meta = with lib; { diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index bc57849dcd5e..809902e88976 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }: +{ lib, stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }: let version = "0.3.0"; in @@ -27,8 +27,8 @@ stdenv.mkDerivation { meta = { description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files"; homepage = "http://www.haka-security.org/"; - license = stdenv.lib.licenses.mpl20; - maintainers = [ stdenv.lib.maintainers.tvestelind ]; + license = lib.licenses.mpl20; + maintainers = [ lib.maintainers.tvestelind ]; platforms = [ "x86_64-linux" "i686-linux" ]; # fails on aarch64 }; } diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index 4fa0499f1dde..b8759d3571b5 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }: +{ lib, stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }: let inherit (pythonPackages) python; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = { description = "Various tools to generate special DNS records"; homepage = "https://github.com/letoams/hash-slinger"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.leenaars ]; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.leenaars ]; }; } diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix index 2f0a40dfc5e2..4841dc5e07fa 100644 --- a/pkgs/tools/security/hashdeep/default.nix +++ b/pkgs/tools/security/hashdeep/default.nix @@ -18,6 +18,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/jessek/hashdeep"; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; - maintainers = [ stdenv.lib.maintainers.karantan ]; + maintainers = [ lib.maintainers.karantan ]; }; } diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix index c676a173092d..b088f07c6e3d 100644 --- a/pkgs/tools/security/haveged/default.nix +++ b/pkgs/tools/security/haveged/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "haveged"; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { the barriers to using haveged for other tasks. ''; homepage = "http://www.issihosts.com/haveged/"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.domenkozar ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index a46acef81d75..081e26e34abb 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper +{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper , clang, llvm, libbfd, libopcodes, libunwind, libblocksruntime }: @@ -43,9 +43,9 @@ let feedback-based coverage metrics. ''; homepage = "https://honggfuzz.dev/"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = ["x86_64-linux"]; - maintainers = with stdenv.lib.maintainers; [ cpu ]; + maintainers = with lib.maintainers; [ cpu ]; }; }; in honggfuzz diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index 8440b0b6ec98..a5b0fe8d9289 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp usr/lib/ipscan/ipscan-any-${version}.jar $out/share/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/ipscan \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt xorg.libXtst ]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt xorg.libXtst ]}" \ --add-flags "-Xmx256m -cp $out/share/${pname}-${version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main" mkdir -p $out/share/applications diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 2fedec48c700..b243e10d3531 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 +{ lib, stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 , gcc, python3Packages, perl, perlPackages, makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "john"; diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index b607cabf916e..6b4639a53079 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1k13pw202fr5mvd0ys39n3dxwcl3sd01j6izfb28k06b6pav3wc8"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; doInstallCheck = true; installCheckPhase = "$out/bin/jwt --version"; diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index e7b1c95126a6..80e6e25518e6 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -14,18 +14,18 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1gvvmfavaq29p40p5mq1phpp2a1nw04dz4975pzm1b6z89p0jlzl"; nativeBuildInputs = [ installShellFiles ] - ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; + ++ lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ libxcb ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + ++ lib.optionals stdenv.isLinux [ libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; preCheck = '' export HOME=$TMPDIR ''; checkFlags = [ "--skip=kbs2::config::tests::test_find_config_dir" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ]; + ++ lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ]; postInstall = '' mkdir -p $out/share/kbs2 diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ba9649f36ab9..50724d1199ae 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -28,7 +28,7 @@ buildGoPackage rec { }) ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; + buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; buildFlags = [ "-tags production" ]; meta = with lib; { diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index a0dd8c7fc8b6..d0e260bb6775 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \ "${with perlPackages; makePerlPath ([ CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser - ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard)}" + ] ++ lib.optional stdenv.isDarwin MacPasteboard)}" ''; meta = with lib; { description = "KeePass Command Line Interface"; longDescription = '' - KeePass Command Line Interface (CLI) / interactive shell. + KeePass Command Line Interface (CLI) / interactive shell. Use this program to access and manage your KeePass 1.x or 2.x databases from a Unix-like command line. ''; license = licenses.artistic1; diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 6533c9e96fdf..42a6bfd34146 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -d $out/bin $out/share/lynis/plugins cp -r include db default.prf $out/share/lynis/ cp -a lynis $out/bin - wrapProgram "$out/bin/lynis" --prefix PATH : ${stdenv.lib.makeBinPath [ gawk ]} + wrapProgram "$out/bin/lynis" --prefix PATH : ${lib.makeBinPath [ gawk ]} installManPage lynis.8 installShellCompletion --bash --name lynis.bash \ diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix index 7292ac6785f6..dd73e1624c7d 100644 --- a/pkgs/tools/security/mbox/default.nix +++ b/pkgs/tools/security/mbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, which }: +{ lib, stdenv, fetchFromGitHub, openssl, which }: stdenv.mkDerivation { name = "mbox-20140526"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { cd src cp {.,}configsbox.h ''; - + doCheck = true; checkPhase = '' rm tests/test-*vim.sh tests/test-pip.sh @@ -27,7 +27,7 @@ stdenv.mkDerivation { ./testall.sh ''; - meta = with stdenv.lib; + meta = with lib; { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; homepage = "http://pdos.csail.mit.edu/mbox/"; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 54b96917623a..05aa8323cc91 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }: +{ lib, stdenv, fetchhg, openssl, pcre-cpp, qt4, boost, pkcs11helper }: stdenv.mkDerivation { name = "meo-20121113"; - + src = fetchhg { url = "http://oss.stamfest.net/hg/meo"; rev = "b48e5f16cff8"; @@ -27,9 +27,9 @@ stdenv.mkDerivation { meta = { homepage = "http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only"; description = "Tools to use cryptography for things like four-eyes principles"; - license = stdenv.lib.licenses.agpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; broken = true; }; } diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix index 54934b7111a9..59b48f1881d2 100644 --- a/pkgs/tools/security/mkrand/default.nix +++ b/pkgs/tools/security/mkrand/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "mkrand-0.1.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { description = "A Digital Random Bit Generator"; longDescription = "MKRAND is a utility for generating random information."; homepage = "https://github.com/mknight-tag/MKRAND/"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index b9b696c17be6..63813619abc2 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -6,7 +6,7 @@ with lib; let luaValue = if luaSupport then lua5 else "no"; - optional = stdenv.lib.optional; + optional = lib.optional; in stdenv.mkDerivation rec { @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = "https://www.modsecurity.org/"; maintainers = with maintainers; [offline]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index e5dca7721ac7..bc267a9a7703 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl libassuan libgcrypt ] - ++ stdenv.lib.optional doCheck + ++ lib.optional doCheck ([ gnupg opensshUnsafe which socat cpio hexdump procps lockfileProgs ] ++ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ])); @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { # but they aren't enabled by default because they "drain" entropy (GnuPG # still uses /dev/random). doCheck = false; - preCheck = stdenv.lib.optionalString doCheck '' + preCheck = lib.optionalString doCheck '' patchShebangs tests/ patchShebangs src/ sed -i \ @@ -64,12 +64,12 @@ in stdenv.mkDerivation rec { CryptOpenSSLRSA CryptOpenSSLBignum ]) - + stdenv.lib.optionalString + + lib.optionalString (builtins.length runtimeDeps > 0) - " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}"; + " --prefix PATH : ${lib.makeBinPath runtimeDeps}"; wrapMonkeysphere = runtimeDeps: program: "wrapProgram $out/bin/${program} ${wrapperArgs runtimeDeps}\n"; - wrapPrograms = runtimeDeps: programs: stdenv.lib.concatMapStrings + wrapPrograms = runtimeDeps: programs: lib.concatMapStrings (wrapMonkeysphere runtimeDeps) programs; in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ] diff --git a/pkgs/tools/security/monsoon/default.nix b/pkgs/tools/security/monsoon/default.nix index c2a5aa1debf9..3f414081500f 100644 --- a/pkgs/tools/security/monsoon/default.nix +++ b/pkgs/tools/security/monsoon/default.nix @@ -1,6 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib, stdenv }: buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { # tests fails on darwin doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast HTTP enumerator"; longDescription = '' A fast HTTP enumerator that allows you to execute a large number of HTTP diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix index a89fa7238269..a8143ae6925c 100644 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -1,9 +1,9 @@ -{ stdenv, nitrokey-app +{ lib, stdenv, nitrokey-app , group ? "nitrokey" }: stdenv.mkDerivation { - name = "nitrokey-udev-rules-${stdenv.lib.getVersion nitrokey-app}"; + name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}"; inherit (nitrokey-app) src; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index bd543154494c..e0a4f8a08fc9 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3 +{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3 , pcre, liblinear, libssh2 , graphicalSupport ? false , libX11 ? null @@ -8,7 +8,7 @@ , withLua ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index 0dfdba804c09..c46d5b65cd8e 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/${appName} \ --add-flags "-cp $out/share/java/cifs-${version}.jar" \ --add-flags "-jar $out/share/java/richclient-${version}.jar" \ - --suffix LD_LIBRARY_PATH ':' ${stdenv.lib.getLib pcsclite}/lib + --suffix LD_LIBRARY_PATH ':' ${lib.getLib pcsclite}/lib ''; meta = with lib; { diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index f623e3a2f6ff..8201b809d156 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 ] - ++ stdenv.lib.optional stdenv.isDarwin Carbon + ++ lib.optional stdenv.isDarwin Carbon ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { if withApplePCSC then "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" else - "${stdenv.lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" }" - (stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) + (lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc") ]; - PCSC_CFLAGS = stdenv.lib.optionalString withApplePCSC + PCSC_CFLAGS = lib.optionalString withApplePCSC "-I${PCSC}/Library/Frameworks/PCSC.framework/Headers"; installFlags = [ diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index 285e275a81f7..22374e1d302b 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which }: +{ lib, stdenv, fetchurl, which }: stdenv.mkDerivation { name = "ossec-client-2.6"; @@ -33,8 +33,8 @@ yes meta = { description = "Open source host-based instrusion detection system"; homepage = "https://www.ossec.net"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix index 02d888b725ff..84221fbd566c 100644 --- a/pkgs/tools/security/p0f/default.nix +++ b/pkgs/tools/security/p0f/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, bash }: +{ lib, stdenv, fetchurl, libpcap, bash }: stdenv.mkDerivation rec { pname = "p0f"; @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { description = "Passive network reconnaissance and fingerprinting tool"; homepage = "https://lcamtuf.coredump.cx/p0f3/"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.lgpl21; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index e2b163445ce2..a7872c50fb3b 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -26,7 +26,7 @@ let env = extensions: let selected = [ pass ] ++ extensions passExtensions - ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb; + ++ lib.optional tombPluginSupport passExtensions.tomb; in buildEnv { name = "pass-extensions-env"; paths = selected; @@ -63,10 +63,10 @@ stdenv.mkDerivation rec { patches = [ ./set-correct-program-name-for-sleep.patch ./extension-dir.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch + ] ++ lib.optional stdenv.isDarwin ./no-darwin-getopt.patch # TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next # version bump. - ++ stdenv.lib.optional waylandSupport ./clip-wayland-support.patch; + ++ lib.optional waylandSupport ./clip-wayland-support.patch; nativeBuildInputs = [ makeWrapper ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { cp "contrib/dmenu/passmenu" "$out/bin/" ''; - wrapperPath = with stdenv.lib; makeBinPath ([ + wrapperPath = with lib; makeBinPath ([ coreutils findutils getopt @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # Ensure all dependencies are in PATH wrapProgram $out/bin/pass \ --prefix PATH : "${wrapperPath}" - '' + stdenv.lib.optionalString dmenuSupport '' + '' + lib.optionalString dmenuSupport '' # We just wrap passmenu with the same PATH as pass. It doesn't # need all the tools in there but it doesn't hurt either. wrapProgram $out/bin/passmenu \ @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ -e '/which gpg/ d' \ tests/setup.sh - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # 'pass edit' uses hdid, which is not available from the sandbox. rm -f tests/t0200-edit-tests.sh rm -f tests/t0010-generate-tests.sh diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index d46aac93e86b..b6547deb560a 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep +{ lib, stdenv, fetchFromGitHub, pass, rofi, coreutils, util-linux, xdotool, gnugrep , libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp -a config.example $out/share/doc/rofi-pass/config.example ''; - wrapperPath = with stdenv.lib; makeBinPath [ + wrapperPath = with lib; makeBinPath [ coreutils findutils gawk @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = "https://github.com/carnager/rofi-pass"; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix index 25e945a082d2..a2533c1c6a0f 100644 --- a/pkgs/tools/security/pbis/default.nix +++ b/pkgs/tools/security/pbis/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { if [ $CC = gcc ]; then NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow -Wno-error=address-of-packed-member" fi - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${stdenv.lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable" + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable" ''; configureScript = ''../configure''; configureFlags = [ diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index a9697718e3cf..b7c4319fa058 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp -r proprietary/*.bundle $out/pcsc/drivers ''; - libPath = stdenv.lib.makeLibraryPath [ libusb-compat-0_1 ]; + libPath = lib.makeLibraryPath [ libusb-compat-0_1 ]; fixupPhase = '' patchelf --set-rpath $libPath \ diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 8a4ae0894403..da8fa96d10d9 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { # The OS should care on preparing the drivers into this location "--enable-usbdropdir=/var/lib/pcsc/drivers" "--enable-confdir=/etc" - ] ++ stdenv.lib.optional stdenv.isLinux + ] ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=\${out}/etc/systemd/system" - ++ stdenv.lib.optional (!stdenv.isLinux) + ++ lib.optional (!stdenv.isLinux) "--disable-libsystemd"; postConfigure = '' @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = [ python3 ] ++ stdenv.lib.optionals stdenv.isLinux [ udev dbus ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ] + ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 89ee6a9eab2d..c0f496438a4e 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0pi9qdbmcmi58gmljin51ylbi3zkknl8fm26jm67cpl55hvfsn23"; }; - buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ]; + buildInputs = lib.optionals supportCompressedPackets [ zlib bzip2 ]; meta = with lib; { description = "A PGP packet visualizer"; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index cac245bb256e..444dd3679f36 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -5,7 +5,7 @@ , enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] }: -with stdenv.lib; +with lib; assert isList enabledFlavors && enabledFlavors != []; diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 1c3b87cd9f02..f208576561e4 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }: +{ lib, stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }: stdenv.mkDerivation { name = "pinentry-mac-0.9.4"; @@ -24,8 +24,8 @@ stdenv.mkDerivation { meta = { description = "Pinentry for GPG on Mac"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://github.com/GPGTools/pinentry-mac"; - platforms = stdenv.lib.platforms.darwin; + platforms = lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index f1b4d80a3554..4c92d2e3e189 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, python3Packages, gnupg, perl }: +{ fetchFromGitHub, lib, stdenv, python3Packages, gnupg, perl }: let version = "3.0.0"; in python3Packages.buildPythonApplication { @@ -33,9 +33,9 @@ python3Packages.buildPythonApplication { to the process. ''; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ kierdavis ]; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = with lib.maintainers; [ kierdavis ]; }; } diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index 559911699680..bd8be01c697b 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }: +{ lib, stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }: stdenv.mkDerivation rec { pname = "polkit-gnome"; version = "0.105"; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/Archive/policykit-gnome"; description = "A dbus session bus service that is used to bring up authentication dialogs"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ phreedom ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ phreedom ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index a63e40b744e8..c84b9472e96f 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoreconfHook}: +{lib, stdenv, fetchurl, autoreconfHook}: stdenv.mkDerivation { name = "pwgen-2.08"; @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Password generator which creates passwords which can be easily memorized by a human"; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index b1d6400f2d0d..2ddbc4034926 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitLab, bash }: +{ lib, stdenv, fetchurl, fetchFromGitLab, bash }: let # Fetch explicitly, otherwise build will try to do so @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { checkInputs = [ bash ]; doCheck = true; - + meta = { description = "A general purpose fuzzer"; longDescription = "Radamsa is a general purpose data fuzzer. It reads data from given sample files, or standard input if none are given, and outputs modified data. It is usually used to generate malformed data for testing programs."; homepage = "https://gitlab.com/akihe/radamsa"; - maintainers = [ stdenv.lib.maintainers.markWot ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.markWot ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 5cf38cb756d9..d70e58d72939 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ Foundation Security ]; diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index e5bbb7e8421d..94800ca8c04f 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ libxml2 file p7zip unrar unzip ]; - buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang"; + buildFlags = lib.optional stdenv.cc.isClang "CC=clang"; installFlags = [ "PREFIX=\${out}" ]; patchPhase = '' diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 24e114634645..268641cb3cbc 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -21,7 +21,7 @@ buildRustPackage rec { nativeBuildInputs = [ pkgconfig gpgme python3 ]; buildInputs = [ ncurses openssl libgpgerror gpgme xorg.libxcb - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 16952e6dabb4..2b35ec94e6e7 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libtool, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, libtool, autoreconfHook, pkgconfig , sysfsutils , argp-standalone # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS @@ -10,7 +10,7 @@ , libp11 ? null, opensc ? null, withPkcs11 ? true }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "rng-tools"; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index 3d84900f18e6..80cc8c8cc1fb 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { --replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")' ''; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; checkFlags = [ "--skip=infer_ulimit_lowering_no_panic" diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 2e617a8de8a5..ade299ec5893 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; homepage = "https://github.com/Versent/saml2aws"; license = licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.pmyjavec ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.pmyjavec ]; }; } diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix index 91b92071fe79..6f0dcd1bb013 100644 --- a/pkgs/tools/security/scallion/default.nix +++ b/pkgs/tools/security/scallion/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share cp scallion/bin/Debug/* $out/share/ makeWrapper ${mono}/bin/mono $out/bin/scallion \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \ --add-flags $out/share/scallion.exe ''; diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix index e0f01f4f2c41..07c8d0382ca5 100644 --- a/pkgs/tools/security/seccure/default.nix +++ b/pkgs/tools/security/seccure/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, libgcrypt }: +{ lib, stdenv, fetchurl, libgcrypt }: stdenv.mkDerivation rec { pname = "seccure"; version = "0.5"; - + src = fetchurl { url = "http://point-at-infinity.org/seccure/${pname}-${version}.tar.gz"; sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5"; }; buildInputs = [ libgcrypt ]; - + preConfigure = '' sed -e s@/usr/@$out/@g -i Makefile sed -e 's@ln -f@ln -sf@g' -i Makefile @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://point-at-infinity.org/seccure/"; description = "Zero-configuration elliptic curve cryptography utility"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl3; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; }; } diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 55b02d7a8c30..a8acf3586c9e 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -13,7 +13,7 @@ }: -let inherit (stdenv.lib) optionals; in +let inherit (lib) optionals; in stdenv.mkDerivation { pname = "secp256k1"; diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index f9bdf66ed860..4cbedb232187 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://neurobin.org/projects/softwares/unix/shc/"; description = "Shell Script Compiler"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; license = licenses.gpl3; }; } diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index c2a51f3bdf5d..ee099b704aaa 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -127,62 +127,62 @@ in stdenv.mkDerivation rec { TextTemplate MIMETools MailTools TimeDate NetIDNEncode ] ++ GnuPGInterfaceRuntimeDependencies)} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ nettools gnupg ]}" + "${lib.makeBinPath [ nettools gnupg ]}" wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg libpaper ]}" + "${lib.makeBinPath [ gnupg libpaper ]}" wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ which gnupg libpaper ]}" + "${lib.makeBinPath [ which gnupg libpaper ]}" wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg qprint ]}" + "${lib.makeBinPath [ gnupg qprint ]}" wrapProgram $out/bin/gpgdir --set PERL5LIB \ ${with perlPackages; makePerlPath ([ TermReadKey ] ++ GnuPGInterfaceRuntimeDependencies)} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/gpglist --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ getopt gnupg ]}" + "${lib.makeBinPath [ getopt gnupg ]}" # wrapProgram $out/bin/gpgparticipants-prefill wrapProgram $out/bin/gpgparticipants-filter --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/gpgsigs --set PERL5LIB \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/gpgwrap --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" # wrapProgram $out/bin/keyanalyze --set PERL5LIB \ wrapProgram $out/bin/keyart --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/keylookup --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/pgp-clean --set PERL5LIB \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ gnupg ]}" + "${lib.makeBinPath [ gnupg ]}" # wrapProgram $out/bin/pgpring diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 5ba0bd11f827..873cfdbbb056 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = - stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ]; + lib.optionals stdenv.isDarwin [ libobjc Security ]; buildInputs = [ botan2 ]; diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 53797ef98514..49aa4a2a4ca5 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - installPhase = with stdenv.lib; '' + installPhase = with lib; '' runHook preInstall install -Dm755 spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 33ab4c373bca..acc617103d71 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "ssdeep"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "A program for calculating fuzzy hashes"; homepage = "http://www.ssdeep.sf.net"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 4a24e4596972..dbdd94a3d5c9 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -23,11 +23,11 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; - runtimeDeps = [ coreutils openssh procps ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables nettools ]; + runtimeDeps = [ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ]; postInstall = '' wrapProgram $out/bin/sshuttle \ - --prefix PATH : "${stdenv.lib.makeBinPath runtimeDeps}" \ + --prefix PATH : "${lib.makeBinPath runtimeDeps}" \ ''; meta = with lib; { diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index bd7de72e6bec..34407f5f5ad9 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation { name = "ssss-0.5"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Shamir Secret Sharing Scheme"; homepage = "http://point-at-infinity.org/ssss/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 497d3816a767..0c6699b439c3 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool libxml2 nettle - ] ++ stdenv.lib.optional withGTK3 gtk3; + ] ++ lib.optional withGTK3 gtk3; meta = with lib; { description = "Software Token for Linux/UNIX"; diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index 28c462cbb0a2..460838965a02 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "stricat"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Multi-use cryptographic tool based on the STRIBOB algorithm"; homepage = "https://www.stribob.com/stricat/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 3271af4a4b54..1e6af55baab2 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coreutils, pam, groff, sssd, nixosTests +{ lib, stdenv, fetchurl, coreutils, pam, groff, sssd, nixosTests , sendmailPath ? "/run/wrappers/bin/sendmail" , withInsults ? false , withSssd ? false @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { "--with-iologdir=/var/log/sudo-io" "--with-sendmail=${sendmailPath}" "--enable-tmpfiles.d=no" - ] ++ stdenv.lib.optional withInsults [ + ] ++ lib.optional withInsults [ "--with-insults" "--with-all-insults" - ] ++ stdenv.lib.optional withSssd [ + ] ++ lib.optional withSssd [ "--with-sssd" "--with-sssd-lib=${sssd}/lib" ]; @@ -78,8 +78,8 @@ stdenv.mkDerivation rec { license = "https://www.sudo.ws/sudo/license.html"; - maintainers = with stdenv.lib.maintainers; [ eelco delroth ]; + maintainers = with lib.maintainers; [ eelco delroth ]; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index a13764638237..bdaf8f129d02 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "sudolikeaboss-unstable"; - version = "20161127-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20161127-${lib.strings.substring 0 7 rev}"; rev = "2d9afe19f872c9f433d476e57ee86169781b164c"; goPackagePath = "github.com/ravenac95/sudolikeaboss"; diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 79a7cd839e5b..f8e78c66979f 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "super-3.30.0"; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { in /etc/super.tab); and 2) “setuid”, which allows root to execute a command under a different uid. ''; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index a6eb09fd2c5f..23b79af73cd0 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , openssl , libcap, libpcap, libnfnetlink, libnetfilter_conntrack, libnetfilter_queue }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "tcpcrypt"; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 038f4040d31a..a96dae5f5efd 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,7 +15,7 @@ }: let tor-client-auth-gen = writeShellScript "tor-client-auth-gen" '' - PATH="${stdenv.lib.makeBinPath [coreutils gnugrep openssl]}" + PATH="${lib.makeBinPath [coreutils gnugrep openssl]}" pem="$(openssl genpkey -algorithm x25519)" printf private_key=descriptor:x25519: @@ -41,15 +41,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ - stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; + lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; patches = [ ./disable-monotonic-timer-tests.patch ]; # cross compiles correctly but needs the following - configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-tool-name-check"; - NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s"; postPatch = '' substituteInPlace contrib/client-tools/torify \ diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix index 896ab50562d8..fcdb628e0f4a 100644 --- a/pkgs/tools/security/tor/tor-arm.nix +++ b/pkgs/tools/security/tor/tor-arm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ lib, stdenv, fetchurl, makeWrapper , python2Packages, ncurses, lsof, nettools }: @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "A terminal status monitor for Tor relays"; homepage = "https://www.atagar.com/arm/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 381377032d6e..22cfa51d4e52 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, autoreconfHook, libcap }: +{ lib, stdenv, fetchgit, fetchurl, autoreconfHook, libcap }: stdenv.mkDerivation rec { pname = "torsocks"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - patches = stdenv.lib.optional stdenv.isDarwin + patches = lib.optional stdenv.isDarwin (fetchurl { url = "https://trac.torproject.org/projects/tor/raw-attachment/ticket/28538/0001-Fix-macros-for-accept4-2.patch"; sha256 = "97881f0b59b3512acc4acb58a0d6dfc840d7633ead2f400fad70dda9b2ba30b0"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sed -i \ -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \ src/bin/torsocks.in - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' sed -i \ -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \ src/bin/torsocks.in @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { description = "Wrapper to safely torify applications"; homepage = "https://github.com/dgoulet/torsocks"; repositories.git = "https://git.torproject.org/torsocks.git"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ phreedom thoughtpolice ]; }; } diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index 94da17fabeca..938d0a6f2946 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, trousers, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "tpm-quote-tools"; version = "1.0.4"; - src = fetchurl { + src = fetchurl { url = "mirror://sourceforge/project/tpmquotetools/${version}/${pname}-${version}.tar.gz"; sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h"; }; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { postFixup = '' patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ openssl ]}:$(patchelf --print-rpath $out/bin/tpm_mkaik)" \ + --set-rpath "${lib.makeLibraryPath [ openssl ]}:$(patchelf --print-rpath $out/bin/tpm_mkaik)" \ $out/bin/tpm_mkaik ''; - meta = with lib; { + meta = with lib; { description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism"; longDescription = '' The TPM Quote Tools is a collection of programs that provide support diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 8ffdfc4e2b09..80cd0d971a3f 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -19,6 +19,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://www.volatilityfoundation.org/"; description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 19d409e03eea..f11e772390d9 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -23,17 +23,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ pcre protobufc ] - ++ stdenv.lib.optionals withCrypto [ openssl ] - ++ stdenv.lib.optionals enableMagic [ file ] - ++ stdenv.lib.optionals enableCuckoo [ jansson ] + ++ lib.optionals withCrypto [ openssl ] + ++ lib.optionals enableMagic [ file ] + ++ lib.optionals enableCuckoo [ jansson ] ; preConfigure = "./bootstrap.sh"; configureFlags = [ - (stdenv.lib.withFeature withCrypto "crypto") - (stdenv.lib.enableFeature enableMagic "magic") - (stdenv.lib.enableFeature enableCuckoo "cuckoo") + (lib.withFeature withCrypto "crypto") + (lib.enableFeature enableMagic "magic") + (lib.enableFeature enableCuckoo "cuckoo") ]; meta = with lib; { diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index 9050111fc17b..4ceb1aea72b3 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, perl, perlPackages }: +{ fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postInstall = "wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB"; - meta = with stdenv.lib; + meta = with lib; { description = "Intel AMT® SoL client + tools"; homepage = "https://www.kraxel.org/cgit/amtterm/"; license = licenses.gpl2; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 278b14cd1999..db3c066c0ba4 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, bison, flex, pam, perl +{ lib, stdenv, fetchurl, fetchpatch, bison, flex, pam, perl , sendmailPath ? "/run/wrappers/bin/sendmail" , atWrapperPath ? "/run/wrappers/bin/at" }: @@ -52,8 +52,8 @@ stdenv.mkDerivation rec { meta = { description = ''The classical Unix `at' job scheduling command''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://packages.qa.debian.org/at"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix index 32945a24bb16..79bb3f79a998 100644 --- a/pkgs/tools/system/bar/default.nix +++ b/pkgs/tools/system/bar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "bar-1.11.1"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { meta = { description = "Console progress bar"; homepage = "http://clpbar.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.rdnetto ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.rdnetto ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index c49f033c42ad..7ea7430e95d7 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { sha256 = "1iricyigm0rsc8fr91vk3krvyafbnp0y3ww1rjv94l6jbdl7rrlb"; }; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; + buildInputs = lib.optionals stdenv.isLinux [ libcap acl ]; # Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098 - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile --replace "-flto -DNDEBUG" "-DNDEBUG" ''; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index a79e8bdcebf2..d138ed4d8c1d 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; cargoSha256 = "sha256-qnh4Tl6JRgxBJbu+t9IJX/XChIR15rTRLvsl+/ZvPxY="; diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix index c4396aad9ca6..a37d9bbf47ad 100644 --- a/pkgs/tools/system/chase/default.nix +++ b/pkgs/tools/system/chase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }: +{ lib, stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }: stdenv.mkDerivation rec { pname = "chase"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "-e" ]; makeFlagsArray="LIBS=-lgc"; - meta = with stdenv.lib ; { + meta = with lib ; { description = "Follow a symlink and print out its target file"; longDescription = '' A commandline program that chases symbolic filesystems links to the original file diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index eb64a09a22bd..8add2b3ad628 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libtool - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ] ++ plugins.buildInputs; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index defeed4c8928..dd578cd6393b 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , curl , darwin , hiredis @@ -49,7 +49,7 @@ let aggregation = {}; amqp = { buildInputs = [ yajl ] ++ - stdenv.lib.optionals stdenv.isLinux [ rabbitmq-c ]; + lib.optionals stdenv.isLinux [ rabbitmq-c ]; }; apache = { buildInputs = [ curl ]; @@ -62,7 +62,7 @@ let }; barometer = {}; battery = { - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; }; @@ -94,9 +94,9 @@ let }; df = {}; disk = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.isLinux [ udev - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; }; @@ -126,7 +126,7 @@ let iptables = { buildInputs = [ libpcap - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ iptables libmnl ]; }; @@ -161,14 +161,14 @@ let memory = {}; mic = {}; modbus = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libmodbus ]; + buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; }; mqtt = { buildInputs = [ mosquitto ]; }; multimeter = {}; mysql = { - buildInputs = stdenv.lib.optionals (libmysqlclient != null) [ + buildInputs = lib.optionals (libmysqlclient != null) [ libmysqlclient ]; }; @@ -176,7 +176,7 @@ let netlink = { buildInputs = [ libpcap - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libmnl ]; }; @@ -236,20 +236,20 @@ let buildInputs = [ rrdtool libxml2 ]; }; sensors = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ lm_sensors ]; + buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; }; serial = {}; sigrok = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsigrok udev ]; + buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; }; smart = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libatasmart udev ]; + buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; }; snmp = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ]; + buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; }; snmp_agent = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ]; + buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; }; statsd = {}; swap = {}; @@ -280,7 +280,7 @@ let }; virt = { buildInputs = [ libvirt libxml2 yajl ] ++ - stdenv.lib.optionals stdenv.isLinux [ lvm2 udev + lib.optionals stdenv.isLinux [ lvm2 udev # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767 # is merged libapparmor numactl libcap_ng diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 415b647befa0..6478e699539f 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, gettext}: +{lib, stdenv, fetchurl, cmake, gettext}: stdenv.mkDerivation rec { pname = "dfc"; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://projects.gw-computing.net/projects/dfc"; description = "Displays file system space usage using graphs and colors"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [qknight]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index a67b975ec92c..2f2d35ef1e7a 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value"; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lblkid"; + CXXFLAGS = lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value"; + NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lblkid"; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby${stdenv.hostPlatform.extensions.sharedLibrary}" diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index c5765609a278..57a986e3da99 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }: +{ lib, stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }: stdenv.mkDerivation rec { version = "1.23"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"; }; - patches = stdenv.lib.optional stdenv.isLinux ./einval.patch + patches = lib.optional stdenv.isLinux ./einval.patch # patchset from brew - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ (fetchpatch { name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ getopt gnused ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libcap + ++ lib.optional (!stdenv.isDarwin) libcap ; postUnpack = '' @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://salsa.debian.org/clint/fakeroot"; description = "Give a fake root environment through LD_PRELOAD"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index d6f764b9ea6a..9e3b3c2c16d3 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { description="A command scheduler with extended capabilities over cron and anacron"; homepage = "http://fcron.free.fr"; license = licenses.gpl2; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 423b00bd5439..4ad654783dfc 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, parted, libuuid, gettext, guile }: +{ fetchurl, lib, stdenv, parted, libuuid, gettext, guile }: stdenv.mkDerivation rec { name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { cfdisk. It uses GNU Parted. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/fdisk/"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 6efa107ef321..a71bef4809c0 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python zlib ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libaio; + ++ lib.optional (!stdenv.isDarwin) libaio; nativeBuildInputs = [ makeWrapper ]; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio ''; - postInstall = stdenv.lib.optionalString withGnuplot '' + postInstall = lib.optionalString withGnuplot '' wrapProgram $out/bin/fio2gnuplot \ - --prefix PATH : ${stdenv.lib.makeBinPath [ gnuplot ]} + --prefix PATH : ${lib.makeBinPath [ gnuplot ]} ''; meta = with lib; { diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 76654d145399..610dfe0a6460 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libgcrypt, readline, libgpgerror }: +{ fetchurl, lib, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { version = "1.6.6"; @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/freeipmi/"; downloadPage = "https://www.gnu.org/software/freeipmi/download.html"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice updateWalker = true; inherit version; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 5e2f047674e9..b5f7c369dfdb 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs gdisk_test.sh - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.mac --replace \ "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6" substituteInPlace Makefile.mac --replace \ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "/opt/local/lib/libncurses.a" "${ncurses.out}/lib/libncurses.dylib" ''; - buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; + buildPhase = lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; buildInputs = [ libuuid popt icu ncurses ]; installPhase = '' diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index 61d25f414bbd..3e904e6c0ada 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { name = "gt5-1.4.0"; - + src = fetchurl { url = "mirror://sourceforge/gt5/${name}.tar.gz"; sha256 = "0gm0gzyp4d9rxqddbaskbz5zvmlhyr4nyb5x9g7x4abyyxqjlnkq"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; homepage = "http://gt5.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index fa5234d8cbc3..5e9796396a9c 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation { name = "idle3-tools-0.9.1"; @@ -15,8 +15,8 @@ stdenv.mkDerivation { meta = { homepage = "http://idle3-tools.sourceforge.net/"; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index 41fce9b9b912..1f35c0766d90 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }: +{ lib, stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }: stdenv.mkDerivation { version = "0.4"; @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/jmesmon/illum"; description = "Daemon that wires button presses to screen backlight level"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.dancek ]; - license = stdenv.lib.licenses.agpl3; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.dancek ]; + license = lib.licenses.agpl3; }; } diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index 6b732a92ebb9..1ef871c9d30f 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -9,7 +9,7 @@ let prefixPath = programs: - "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'"; + "--prefix PATH ':' '${lib.makeBinPath programs}'"; recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod lm_sensors smartmontools binutils tree upower pciutils diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 196e59953fe7..1d3150040180 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -29,15 +29,15 @@ stdenv.mkDerivation { configureFlags = [ "--infodir=${placeholder "out"}/share/info" "--mandir=${placeholder "out"}/share/man" - ] ++ stdenv.lib.optionals static [ + ] ++ lib.optionals static [ "LDFLAGS=-static" "--enable-static" "--disable-shared" - ] ++ stdenv.lib.optionals (!static) [ + ] ++ lib.optionals (!static) [ "--enable-shared" ]; - makeFlags = stdenv.lib.optional static "AM_LDFLAGS=-all-static"; + makeFlags = lib.optional static "AM_LDFLAGS=-all-static"; dontDisableStatic = static; meta = with lib; { diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/tools/system/ledmon/default.nix index ee9ba6c73466..0ca1aa441db7 100644 --- a/pkgs/tools/system/ledmon/default.nix +++ b/pkgs/tools/system/ledmon/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Enclosure LED Utilities"; platforms = platforms.linux; license = with licenses; [ gpl2 ]; - maintainers = with stdenv.lib.maintainers; [ sorki ]; + maintainers = with lib.maintainers; [ sorki ]; }; } diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 4c891e3e5b33..513b48c66304 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gzip, popt, autoreconfHook +{ lib, stdenv, fetchFromGitHub, gzip, popt, autoreconfHook , mailutils ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac - ${stdenv.lib.optionalString (mailutils != null) '' + ${lib.optionalString (mailutils != null) '' sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac ''} ''; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; description = "Rotates and compresses system logs"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index ca515cbdfd83..b8175b51483d 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, guile, which, ed, libtool }: +{ fetchurl, lib, stdenv, guile, which, ed, libtool }: stdenv.mkDerivation rec { name = "mcron-1.0.6"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/mcron/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 3349749d62e8..29536a595463 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl, bison, flex , zlib , usePAM ? stdenv.hostPlatform.isLinux, pam @@ -15,17 +15,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex ]; buildInputs = [ zlib.dev ] ++ - stdenv.lib.optionals useSSL [ openssl ] ++ - stdenv.lib.optionals usePAM [ pam ]; + lib.optionals useSSL [ openssl ] ++ + lib.optionals usePAM [ pam ]; configureFlags = [ - (stdenv.lib.withFeature usePAM "pam") + (lib.withFeature usePAM "pam") ] ++ (if useSSL then [ "--with-ssl-incl-dir=${openssl.dev}/include" "--with-ssl-lib-dir=${openssl.out}/lib" ] else [ "--without-ssl" - ]) ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ]) ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # will need to check both these are true for musl "libmonit_cv_setjmp_available=yes" "libmonit_cv_vsnprintf_c99_conformant=yes" @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = { homepage = "http://mmonit.com/monit/"; description = "Monitoring system"; - license = stdenv.lib.licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ raskin wmertens ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.agpl3; + maintainers = with lib.maintainers; [ raskin wmertens ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 3c1fe75b581d..7c528335344c 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig , CoreFoundation, IOKit, libossp_uuid , curl, libcap, libuuid, lm_sensors, zlib, fetchpatch , nixosTests @@ -10,7 +10,7 @@ , withDebug ? false }: -with stdenv.lib; +with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 226f55f00dcc..cd8e41c8256d 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib kmod which ] ++ - stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; preConfigure = if stdenv.cc.isGNU then null else '' substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index c7c2ff60a7d9..2b0df3c893ea 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { substituteInPlace bin/9c \ --replace 'which uniq' '${which}/bin/which uniq' - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' #add missing ctrl+c\z\x\v keybind for non-Darwin substituteInPlace src/cmd/acme/text.c \ --replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \ @@ -48,10 +48,10 @@ stdenv.mkDerivation { buildInputs = [ perl - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ xorgproto libX11 libXext libXt fontconfig freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. - ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit Metal QuartzCore ]); diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index e1871eeb7336..daf543d7f754 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation { sed -i /CROSS_COMPILE/d src/GNUmakefile ''; - buildInputs = [ talloc ] ++ stdenv.lib.optional enablePython python; - nativeBuildInputs = [ docutils ] ++ stdenv.lib.optional enablePython swig; + buildInputs = [ talloc ] ++ lib.optional enablePython python; + nativeBuildInputs = [ docutils ] ++ lib.optional enablePython swig; enableParallelBuilding = true; diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix index 5078adbf3b7b..4a2e14edc91f 100644 --- a/pkgs/tools/system/rofi-systemd/default.nix +++ b/pkgs/tools/system/rofi-systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper, jq +{ lib, stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper, jq }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -a rofi-systemd $out/bin/rofi-systemd ''; - wrapperPath = with stdenv.lib; makeBinPath [ + wrapperPath = with lib; makeBinPath [ coreutils gawk jq @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = { description = "Control your systemd units using rofi"; homepage = "https://github.com/IvanMalison/rofi-systemd"; - maintainers = with stdenv.lib.maintainers; [ imalison ]; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; linux; + maintainers = with lib.maintainers; [ imalison ]; + license = lib.licenses.gpl3; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index e2d736477ee7..9afb1933e17f 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-Wno-error=format"; buildPhase = "sh -e make.sh"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 7be7e5b3d379..0794f92bf122 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson +{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null , libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null @@ -8,7 +8,7 @@ , nixosTests ? null }: -with stdenv.lib; +with lib; let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis mongoc libmaxminddb - ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient - ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ lib.optional (libmysqlclient != null) libmysqlclient + ++ lib.optional stdenv.isLinux systemd; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 977550837df6..2553c07cd6b5 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -23,15 +23,15 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++ - stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; + buildInputs = lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ] ++ + lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; postPatch = '' sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h # usernamespace sandbox of nix seems to conflict with runit's assumptions # about unix users. Therefor skip the check sed -i '/.\/chkshsgr/d' src/Makefile - '' + stdenv.lib.optionalString (!static) '' + '' + lib.optionalString (!static) '' sed -i 's,-static,,g' src/Makefile ''; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # Both of these are originally hard-coded to gcc echo ${stdenv.cc.targetPrefix}cc > conf-cc - echo ${stdenv.cc.targetPrefix}cc ${stdenv.lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld + echo ${stdenv.cc.targetPrefix}cc ${lib.optionalString stdenv.isDarwin "-Xlinker -x "}> conf-ld ''; installPhase = '' diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 328dd3242d84..8b17ea583f22 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ lib, stdenv, skawarePackages }: with skawarePackages; @@ -8,7 +8,7 @@ buildPackage { sha256 = "1qpygkajalaziszhwfv5rr6hc27q05z8dayyv7im06z6vndimchs"; description = "A service manager for s6-based systems"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux; outputs = [ "bin" "lib" "dev" "doc" "out" ]; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index e8db6a2fd39b..5533c9a57ff5 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "safecopy-1.7"; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { homepage = "http://safecopy.sourceforge.net"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.bluescreen303 ]; }; } diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index 68ea32e1e8ac..da5d3b2a0d11 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, groff }: +{ lib, stdenv, fetchurl, groff }: stdenv.mkDerivation rec { pname = "setserial"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Serial port configuration utility"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 8dbc28d3a314..ae4ee9efa6e5 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { version = "4.6.5"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = { description = "A forensic/data recovery tool"; homepage = "https://www.sleuthkit.org/"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.ipl10; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.linux; + license = lib.licenses.ipl10; inherit version; }; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 093fd7b5bd50..e21fbcfd7004 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { postPatch = "cp -v ${driverdb} drivedb.h"; configureFlags = [ - "--with-scriptpath=${stdenv.lib.makeBinPath [ mailutils inetutils ]}" + "--with-scriptpath=${lib.makeBinPath [ mailutils inetutils ]}" ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; + buildInputs = [] ++ lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix index cf7fbe5e9a13..a235ea09d351 100644 --- a/pkgs/tools/system/socklog/default.nix +++ b/pkgs/tools/system/socklog/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "socklog"; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index f033b038267e..6eae792fa4d2 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # All platforms inputs then Linux-only ones buildInputs = [ judy libbsd libgcrypt zlib ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ attr keyutils libaio libapparmor libcap lksctp-tools ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "BASHDIR=${placeholder "out"}/share/bash-completion/completions" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; # Won't build on i686 because the binary will be linked again in the # install phase without checking the dependencies. This will prevent diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index 2776d28fa38d..3d69faf7bd4f 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "A minimal unprivileged process supervisor making use of modern Linux features"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ catern ]; + maintainers = with lib.maintainers; [ catern ]; }; } diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index 032b20617447..f76180638a3d 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -35,9 +35,9 @@ assert enableQt -> qwt != null; zlib libewf ] - ++ stdenv.lib.optional enableNtfs ntfs3g - ++ stdenv.lib.optional enableExtFs e2fsprogs - ++ stdenv.lib.optionals enableQt [ qtbase qttools qwt ]; + ++ lib.optional enableNtfs ntfs3g + ++ lib.optional enableExtFs e2fsprogs + ++ lib.optionals enableQt [ qtbase qttools qwt ]; nativeBuildInputs = [ pkgconfig ]; @@ -61,8 +61,8 @@ assert enableQt -> qwt != null; it will still work even if your media's file system has been severely damaged or reformatted. ''; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; maintainers = with maintainers; [ fgaz eelco ]; }; } diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index 48d5d5fc08be..14d6b90b77de 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}" "-DUSE_NVML=OFF" - ] ++ stdenv.lib.optional smartSupport "-DUSE_ATASMART=ON"; + ] ++ lib.optional smartSupport "-DUSE_ATASMART=ON"; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libyamlcpp ] ++ stdenv.lib.optional smartSupport libatasmart; + buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart; installPhase = '' runHook preInstall diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 24d11a9c0ee8..dea7fd2e2b6c 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "1.8.0"; @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = "http://mama.indstate.edu/users/ice/tree/"; description = "Command to produce a depth indented directory listing"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; longDescription = '' Tree is a recursive directory listing command that produces a @@ -53,7 +53,7 @@ stdenv.mkDerivation { the LS_COLORS environment variable is set and output is to tty. ''; - platforms = stdenv.lib.platforms.all; - maintainers = [stdenv.lib.maintainers.peti]; + platforms = lib.platforms.all; + maintainers = [lib.maintainers.peti]; }; } diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix index c0c0ef1b2138..92878c5386bc 100644 --- a/pkgs/tools/system/tuptime/default.nix +++ b/pkgs/tools/system/tuptime/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/share/tuptime/db-tuptime-migrate-4.0-to-5.0.sh \ - --prefix PATH : "${stdenv.lib.makeBinPath [ sqlite ]}" + --prefix PATH : "${lib.makeBinPath [ sqlite ]}" ''; meta = with lib; { diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/tools/system/undaemonize/default.nix index e82ee18b8314..45e7a8d6d628 100644 --- a/pkgs/tools/system/undaemonize/default.nix +++ b/pkgs/tools/system/undaemonize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "undaemonize-2017-07-11"; @@ -14,9 +14,9 @@ stdenv.mkDerivation { meta = { description = "Tiny helper utility to force programs which insist on daemonizing themselves to run in the foreground"; homepage = "https://github.com/nickstenning/undaemonize"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.canndrew ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.canndrew ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index d4ca083d0b10..3a7f8a55a129 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "16s7swv2sp15gry1j1pcyz29cspvafczaf4v02x4fd2jbn2y3f6r"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; meta = with lib; { description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"; diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index c5028b281288..9fe158b426ae 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; # Related: https://github.com/Wikinaut/agrep/pull/11 - prePatch = stdenv.lib.optionalString (stdenv.hostPlatform.isMusl || stdenv.isDarwin) '' + prePatch = lib.optionalString (stdenv.hostPlatform.isMusl || stdenv.isDarwin) '' sed -i '1i#include ' checkfil.c newmgrep.c recursiv.c ''; installPhase = '' diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 0f7a0eb5f846..e9ceaffa7342 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0h47xqqq8f8m28rl1s6r305cf3dvk94aa86j6m0rk535i2jqfvhp"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A code search-and-replace tool"; diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 407b2c67a8f0..3c58eda65018 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config" ''; - makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' install -Dm755 -t $out/bin src/boxes diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index a65506154777..e5a1bc9c2a07 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1ampmw0l2wk2xp4q13aj5shxncqfh4dc3rsmpk2scaivanrsikn5"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Commandline tool to display information about unicode characters"; diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 37336e63efe6..bdb273de372b 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,9 +1,9 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "codesearch"; - version = "20150717-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150717-${lib.strings.substring 0 7 rev}"; rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; goPackagePath = "github.com/google/codesearch"; @@ -17,8 +17,8 @@ buildGoPackage rec { meta = { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; - license = [ stdenv.lib.licenses.bsd3 ]; - maintainers = [ stdenv.lib.maintainers.bennofs ]; - platforms = stdenv.lib.platforms.unix; + license = [ lib.licenses.bsd3 ]; + maintainers = [ lib.maintainers.bennofs ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index 0a87e9b3905c..5dcf6f3da47f 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1w0q5w0bf1682jvzcml8cgmr9mrgi4if0p63wzchyjav330dp6pk"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "Colourise your checksum output"; diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index a947ef98a689..18dc01c01d02 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip, libtommath}: +{lib, stdenv, fetchzip, libtommath}: stdenv.mkDerivation { name = "convertlit-1.8"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.convertlit.com/"; description = "A tool for converting Microsoft Reader ebooks to more open formats"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix index f43cd94a83e7..be486cccf549 100644 --- a/pkgs/tools/text/diction/default.nix +++ b/pkgs/tools/text/diction/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "diction"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { characteristics of a document, including sentence length and other readability measures. ''; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index e2dcf4122b1b..78baa32630b0 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09yn02985yv40n9y0ipz0jmj7iqhz7l8hd3ry9ib3fyw9pyklnfa"; - buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); + buildInputs = (lib.optional stdenv.isDarwin Security); preCheck = '' export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 8fd36211e2ea..bcb7fad58dad 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { configureFlags = # "pr" need not be on the PATH as a run-time dep, so we need to tell # configure where it is. Covers the cross and native case alike. - stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" - ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; + lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; meta = with lib; { homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index b69ae66e1e26..bb93b217ea24 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: +{ lib, stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: stdenv.mkDerivation rec { name = "ebook-tools-0.2.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; maintainers = [ ]; diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 670e052772ef..1918029317a9 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext }: +{ lib, stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { name = "enscript-1.6.6"; @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { it has many options that can be used to customize printouts. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/enscript/"; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index d2a865335c18..ba2bedd5eacc 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "18bspi59vfnqijxgipmv2h6h5iy7qynpk1ph46yhjsnndjlxxcba"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A utility that makes sweeping changes to large, shared code bases"; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index bcc66cf93dad..b7eb00ee5944 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -16,7 +16,7 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; let - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation rec { name = "gawk-5.1.0"; diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index 058712df4095..24f8032c6a5e 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -4,7 +4,7 @@ , expat, tre, makeWrapper }: let - buildExtension = stdenv.lib.makeOverridable + buildExtension = lib.makeOverridable ({ name, gawkextlib, extraBuildInputs ? [ ], doCheck ? true }: let is_extension = !isNull gawkextlib; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ let ]; buildInputs = [ gawk ] ++ extraBuildInputs; - propagatedBuildInputs = stdenv.lib.optional is_extension gawkextlib; + propagatedBuildInputs = lib.optional is_extension gawkextlib; setupHook = if is_extension then ./setup-hook.sh else null; inherit gawk; diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index ceddda11c099..6bdd6dea029a 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "0hf1c2m8n88frmxmyn0ndr8129p7iky49nq565sw1asaydm5z6pb"; }; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace glogg.pro \ --replace "boost_program_options-mt" "boost_program_options" ''; @@ -22,7 +22,7 @@ mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; enableParallelBuilding = true; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv $out/bin/glogg.app $out/Applications/glogg.app rm -fr $out/{bin,share} diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 8cca7f15962a..97d3136e7e72 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , ed, autoreconfHook }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_strnlen_working=yes" ]; @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { homepage = "https://savannah.gnu.org/projects/patch"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix index 7ea637dc8c95..80aa9f654a6a 100644 --- a/pkgs/tools/text/gnused/422.nix +++ b/pkgs/tools/text/gnused/422.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "gnused-4.2.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; - configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no"; + configureFlags = lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no"; outputs = [ "out" "info" ]; @@ -25,9 +25,9 @@ stdenv.mkDerivation { multiple occurrences of a string within a file. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index d4da6f2c8ce8..9115efa22dd3 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "gnused"; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { multiple occurrences of a string within a file. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 611507da75c7..dd3568ef0bbe 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ lib, stdenv, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { program = "grin"; @@ -18,7 +18,7 @@ python2Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/rkern/grin"; description = "A grep program configured the way I like it"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.sjagoe ]; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.sjagoe ]; }; } diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index d6f1c051de98..fdc95456b44f 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation rec { ./0001-Fix-cross-compilation-by-looking-for-ar.patch ]; - postPatch = stdenv.lib.optionalString (psutils != null) '' + postPatch = lib.optionalString (psutils != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ --replace "psselect" "${psutils}/bin/psselect" - '' + stdenv.lib.optionalString (netpbm != null) '' + '' + lib.optionalString (netpbm != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ - --replace "pnmcut" "${stdenv.lib.getBin netpbm}/bin/pnmcut" \ - --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \ - --replace "pnmtopng" "${stdenv.lib.getBin netpbm}/bin/pnmtopng" + --replace "pnmcut" "${lib.getBin netpbm}/bin/pnmcut" \ + --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \ + --replace "pnmtopng" "${lib.getBin netpbm}/bin/pnmtopng" substituteInPlace tmac/www.tmac \ - --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \ - --replace "pngtopnm" "${stdenv.lib.getBin netpbm}/bin/pngtopnm" \ - --replace "@PNMTOPS_NOSETPAGE@" "${stdenv.lib.getBin netpbm}/bin/pnmtops -nosetpage" + --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \ + --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \ + --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage" ''; buildInputs = [ ghostscript psutils netpbm perl ]; @@ -48,14 +48,14 @@ stdenv.mkDerivation rec { # have to pass "--with-appresdir", too. configureFlags = [ "--without-x" - ] ++ stdenv.lib.optionals (ghostscript != null) [ + ] ++ lib.optionals (ghostscript != null) [ "--with-gs=${ghostscript}/bin/gs" - ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_path_PERL=${buildPackages.perl}/bin/perl" "gl_cv_func_signbit=yes" ]; - makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ # Trick to get the build system find the proper 'native' groff # http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html "GROFF_BIN_PATH=${buildPackages.groff}/bin" @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { substituteInPlace $perl/bin/grog \ --replace $out/lib/groff/grog $perl/lib/groff/grog - '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' find $perl/ -type f -print0 | xargs --null sed -i 's|${buildPackages.perl}|${perl}|' ''; diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index d8b2df1fc0bd..839e3af89df6 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU="; }; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 62b449ff9c4f..262c1356d5f7 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, getopt, lua, boost, pkgconfig, swig, perl, gcc }: -with stdenv.lib; +with lib; let self = stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ let buildInputs = [ getopt lua boost ]; - prePatch = stdenv.lib.optionalString stdenv.cc.isClang '' + prePatch = lib.optionalString stdenv.cc.isClang '' substituteInPlace src/makefile \ --replace 'CXX=g++' 'CXX=clang++' ''; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index 7cf276f2da3b..ae92f3ba9d9a 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { name = "html2text-1.3.2a"; @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = { description = "Convert HTML to plain text"; homepage = "http://www.mbayer.de/html2text/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eikek ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.eikek ]; }; } diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 2ed3005ee776..87f3f3daff3b 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonPackage rec { sha256 = "1phz0a8jxg074k0im7shrrdfvdps7bn1fa4zwcf8q3sa2iig26l4"; }; - makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]) ]; + makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ imagemagick xpdf tesseract ]) ]; propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ]; diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index 9b78b8dad7c9..f4403f4991f9 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { postPatch = '' cat >> local.h <|' src/macfonts.m ''; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework AppKit"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preBuild = stdenv.lib.optionalString stdenv.cc.isClang '' + preBuild = lib.optionalString stdenv.cc.isClang '' substituteInPlace libtexpdf/dpxutil.c \ --replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);" ''; diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 0e90e1cf614c..dc4a87c88592 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , gettext @@ -18,7 +18,7 @@ let pname = "skribilo"; version = "0.9.5"; - inherit (stdenv.lib) optional; + inherit (lib) optional; in stdenv.mkDerivation { inherit pname version; @@ -42,7 +42,7 @@ in stdenv.mkDerivation { --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" ''; - meta = with stdenv.lib;{ + meta = with lib;{ description = "The Ultimate Document Programming Framework"; longDescription = '' Skribilo is a free document production tool that takes a diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index 663f12611b1d..07c972420ab5 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = let - binPath = stdenv.lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; + binPath = lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; in '' mkdir -p $out/bin cp sshlatex $out/bin @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { purely local setting. ''; homepage = "https://github.com/iblech/sshlatex"; - license = stdenv.lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus + platforms = lib.platforms.all; maintainers = [ maintainers.iblech ]; }; } diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index f22840e2d862..0ad82b87c0c1 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -17,9 +17,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontconfig harfbuzz openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); - postInstall = stdenv.lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.isLinux '' install -D dist/appimage/tectonic.desktop -t $out/share/applications/ install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ ''; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index 0fc2427588f7..408af2204f20 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pushd $out/share/Ted/examples for f in rtf2*.sh do - makeWrapper "$PWD/$f" "$out/bin/$f" --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ ghostscript ]} + makeWrapper "$PWD/$f" "$out/bin/$f" --prefix PATH : $out/bin:${lib.makeBinPath [ ghostscript ]} done popd diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 38a333132492..6a9a2cb464c6 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, emacs, texlive, ghostscript }: - +{ lib, stdenv, fetchurl, emacs, texlive, ghostscript }: + let auctex = stdenv.mkDerivation ( rec { version = "12.3"; @@ -30,8 +30,8 @@ let auctex = stdenv.mkDerivation ( rec { meta = { description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; homepage = "https://www.gnu.org/software/auctex"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl3; + platforms = lib.platforms.unix; + license = lib.licenses.gpl3; }; }); diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 1f6939e1b11c..989f49b6d9a8 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2, libxslt, texlive +{ lib, stdenv, fetchurl, python2, libxslt, texlive , enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , tex ? texlive.combine { # satisfy all packages that ./configure mentions @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ python2 libxslt tex ] - ++ stdenv.lib.optionals enableAllFeatures [ imagemagick transfig ]; + ++ lib.optionals enableAllFeatures [ imagemagick transfig ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have # that yet. In Ubuntu, texindy is a part of the xindy package. preConfigure = '' sed -i 's|self.install_layout == "deb"|False|' setup.py - '' + stdenv.lib.optionalString enableAllFeatures '' + '' + lib.optionalString enableAllFeatures '' for file in $(find -name "*.py"); do sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt.bin}/bin/xsltproc|g' \ -e 's|Popen(\["xsltproc|Popen(\["${libxslt.bin}/bin/xsltproc|g' \ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = "http://dblatex.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index db0a4c016024..0f6bf5d0d55c 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; # fixes "error: conflicting types for 'calloc'", etc. - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' sed -i 57d texk/kpathsea/c-std.h ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation { "--without-oxdvik" "--without-texinfo" "--without-texi2html" "--with-system-zlib" "--with-system-pnglib" "--with-system-ncurses" ] # couldn't get gsftopk working on darwin - ++ stdenv.lib.optional stdenv.isDarwin "--without-gsftopk"; + ++ lib.optional stdenv.isDarwin "--without-gsftopk"; postUnpack = '' mkdir -p $out/share/texmf diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 3b09bc4a55a8..5fbc456ab210 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -145,7 +145,7 @@ core = stdenv.mkDerivation rec { meta = with lib; { description = "Basic binaries for TeX Live"; homepage = "http://www.tug.org/texlive"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ]; platforms = platforms.all; }; @@ -169,13 +169,13 @@ core-big = stdenv.mkDerivation { #TODO: upmendex ++ map (prog: "--disable-${prog}") # don't build things we already have ([ "tex" "ptex" "eptex" "uptex" "euptex" "aleph" "pdftex" "web-progs" "synctex" - ] ++ stdenv.lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]); + ] ++ lib.optionals (!withLuaJIT) [ "luajittex" "luajithbtex" "mfluajit" ]); configureScript = ":"; # we use static libtexlua, because it's only used by a single binary postConfigure = let - luajit = stdenv.lib.optionalString withLuaJIT ",luajit"; + luajit = lib.optionalString withLuaJIT ",luajit"; in '' mkdir ./WorkDir && cd ./WorkDir for path in libs/{teckit,lua53${luajit}} texk/web2c; do @@ -220,7 +220,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex mv "$out/bin"/{luatex,texlua,texluac} "$luatex/bin/" mv "$out/bin"/luahbtex "$luahbtex/bin/" mv "$out/bin"/xetex "$xetex/bin/" - '' + stdenv.lib.optionalString withLuaJIT '' + '' + lib.optionalString withLuaJIT '' mv "$out/bin"/mfluajit{,-nowin} "$mflua/bin/" mv "$out/bin"/{luajittex,luajithbtex,texluajit,texluajitc} "$luajittex/bin/" '' ; @@ -294,11 +294,11 @@ latexindent = perlPackages.buildPerlPackage rec { pname = "latexindent"; inherit (src) version; - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs); + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs); outputs = [ "out" ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ]; postPatch = '' @@ -315,7 +315,7 @@ latexindent = perlPackages.buildPerlPackage rec { install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent mkdir -p "$out"/${perl.libPrefix} cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/ - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang "$out"/bin/latexindent ''; }; @@ -325,7 +325,7 @@ pygmentex = python2Packages.buildPythonApplication rec { pname = "pygmentex"; inherit (src) version; - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); propagatedBuildInputs = with python2Packages; [ pygments chardet ]; @@ -361,7 +361,7 @@ pygmentex = python2Packages.buildPythonApplication rec { texlinks = stdenv.mkDerivation rec { name = "texlinks.sh"; - src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs); + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs); dontBuild = true; doCheck = false; @@ -425,7 +425,7 @@ xdvi = stdenv.mkDerivation { } # un-indented -// stdenv.lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062) +// lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062) { xindy = stdenv.mkDerivation { diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 31b260d846c7..73007b137199 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libxml2, libxslt +{ fetchurl, lib, stdenv, libxml2, libxslt , docbook_xml_dtd_45, docbook_xsl, w3m , bash, getopt, makeWrapper }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xmlto" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ libxslt libxml2 getopt ]}" + --prefix PATH : "${lib.makeBinPath [ libxslt libxml2 getopt ]}" # `w3m' is needed for HTML to text conversions. substituteInPlace "$out/share/xmlto/format/docbook/txt" \ @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { necessary post-processing. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; homepage = "https://fedorahosted.org/xmlto/"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 7f3bdcb1bd66..42c3b11c08ff 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; installPhase = '' runHook preInstall diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix index 9aa20a786dd2..ff2889b9b91e 100644 --- a/pkgs/tools/video/gopro/default.nix +++ b/pkgs/tools/video/gopro/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -Dm755 gopro -t $out/bin wrapProgram $out/bin/gopro \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}" + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}" runHook postInstall ''; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 06c035552e54..d0fa04aa83f8 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchpatch, zlib +{ lib, stdenv, fetchgit, fetchpatch, zlib , gnutlsSupport ? false, gnutls ? null, nettle ? null , opensslSupport ? true, openssl ? null }: @@ -8,7 +8,7 @@ assert (gnutlsSupport || opensslSupport); assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSupport; assert opensslSupport -> openssl != null && !gnutlsSupport; -with stdenv.lib; +with lib; stdenv.mkDerivation { pname = "rtmpdump"; version = "2019-03-30"; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index b675c1a57c2f..5439d64bbfdc 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , pkgconfig, libxslt, freetype, libpng, libxml2 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index a37f58937b81..cd3af661840e 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, freetype, libjpeg, libungif, zlib }: +{ lib, stdenv, fetchurl, freetype, libjpeg, libungif, zlib }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "swftools"; version = "0.9.2"; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://www.swftools.org/about.html"; license = licenses.gpl2; maintainers = [ maintainers.koral ]; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index ed2d872b874c..ba28ef08c8f9 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "vnc2flv"; @@ -15,6 +15,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; homepage = "http://www.unixuser.org/~euske/python/vnc2flv/"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 98b644a633c8..5a60fc4c5d2e 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xorgproto, imake, gccmakedep, libXt, libXmu +{ lib, stdenv, fetchurl, libX11, xorgproto, imake, gccmakedep, libXt, libXmu , libXaw, libXext, libSM, libICE, libXpm, libXp }: @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "VNC recorder"; homepage = "http://ronja.twibright.com/utils/vncrec/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; } diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 57aae0c695f9..4766be90a6db 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, curl }: +{ lib, stdenv, fetchurl, perl, curl }: stdenv.mkDerivation { name = "aws-1.75"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.timkay.com/aws/"; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index ccdd80fb37c5..257f5bddb15c 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -2,7 +2,7 @@ , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap }: -let binPath = stdenv.lib.makeBinPath [ +let binPath = lib.makeBinPath [ coreutils gnupg gnutar squashfsTools debootstrap ]; in diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index f8359e6286c9..eafd740b0650 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: +{ lib, stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation rec { pname = "ec2-ami-tools"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { for i in $out/bin/*; do wrapProgram $i \ --set EC2_HOME $out \ - --prefix PATH : ${stdenv.lib.makeBinPath [ ruby openssl ]} + --prefix PATH : ${lib.makeBinPath [ ruby openssl ]} done sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://aws.amazon.com/developertools/Amazon-EC2/368"; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; - license = stdenv.lib.licenses.amazonsl; + license = lib.licenses.amazonsl; }; } diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 409b2ba8f416..8e3ab0d9f28a 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, jre }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { name = "ec2-api-tools-1.7.5.1"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351"; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; - license = stdenv.lib.licenses.amazonsl; + license = lib.licenses.amazonsl; }; } diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 3d7b62777aa5..371a867d4ddb 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python2Packages }: +{ lib, stdenv, fetchgit, python2Packages }: let inherit (python2Packages) buildPythonApplication boto m2crypto; @@ -17,7 +17,7 @@ in buildPythonApplication { meta = { homepage = "https://github.com/eucalyptus/euca2ools"; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/virtualization/nixos-shell/default.nix b/pkgs/tools/virtualization/nixos-shell/default.nix index f0657f4638b1..458996704a80 100644 --- a/pkgs/tools/virtualization/nixos-shell/default.nix +++ b/pkgs/tools/virtualization/nixos-shell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/nixos-shell \ - --prefix PATH : ${stdenv.lib.makeBinPath [ nix ]} + --prefix PATH : ${lib.makeBinPath [ nix ]} ''; installFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index e5c5b0978af0..256d6175ba8a 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: +{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: stdenv.mkDerivation (rec { pname = "xe-guest-utilities"; @@ -6,9 +6,9 @@ stdenv.mkDerivation (rec { meta = { description = "Citrix XenServer Tools"; homepage = "http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"; - maintainers = with stdenv.lib.maintainers; [ benwbooth ]; - platforms = stdenv.lib.platforms.linux; - license = [ stdenv.lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 ]; + maintainers = with lib.maintainers; [ benwbooth ]; + platforms = lib.platforms.linux; + license = [ lib.licenses.gpl2 stdenv.lib.licenses.lgpl21 ]; }; src = fetchurl { url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; From 10eed48d10d1328621cda42bc2cf25a2fb53b209 Mon Sep 17 00:00:00 2001 From: clerie Date: Fri, 15 Jan 2021 12:54:14 +0100 Subject: [PATCH 61/81] nixos/gitea: make more secrets persistent (#108676) Added JWT_SECRET and INTERNAL_TOKEN to be persistent, like SECRET_KEY and LFS_JWT_SECRET do. Also renamed some vars belonging to SECRET_KEY and LFS_JWT_SECRET to get a consistent naming scheme over all secrets. --- nixos/modules/services/misc/gitea.nix | 50 ++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 7eb52fef43d5..2735185ec888 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -349,7 +349,7 @@ in { DOMAIN = cfg.domain; STATIC_ROOT_PATH = cfg.staticRootPath; - LFS_JWT_SECRET = "#jwtsecret#"; + LFS_JWT_SECRET = "#lfsjwtsecret#"; ROOT_URL = cfg.rootUrl; } (mkIf cfg.enableUnixSocket { @@ -381,6 +381,7 @@ in security = { SECRET_KEY = "#secretkey#"; + INTERNAL_TOKEN = "#internaltoken#"; INSTALL_LOCK = true; }; @@ -396,6 +397,10 @@ in mailer = mkIf (cfg.mailerPasswordFile != null) { PASSWD = "#mailerpass#"; }; + + oauth2 = { + JWT_SECRET = "#oauth2jwtsecret#"; + }; }; services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { @@ -455,10 +460,20 @@ in wantedBy = [ "multi-user.target" ]; path = [ gitea pkgs.git ]; + # In older versions the secret naming for JWT was kind of confusing. + # The file jwt_secret hold the value for LFS_JWT_SECRET and JWT_SECRET + # wasn't persistant at all. + # To fix that, there is now the file oauth2_jwt_secret containing the + # values for JWT_SECRET and the file jwt_secret gets renamed to + # lfs_jwt_secret. + # We have to consider this to stay compatible with older installations. preStart = let runConfig = "${cfg.stateDir}/custom/conf/app.ini"; secretKey = "${cfg.stateDir}/custom/conf/secret_key"; - jwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret"; + oauth2JwtSecret = "${cfg.stateDir}/custom/conf/oauth2_jwt_secret"; + oldLfsJwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret"; # old file for LFS_JWT_SECRET + lfsJwtSecret = "${cfg.stateDir}/custom/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET + internalToken = "${cfg.stateDir}/custom/conf/internal_token"; in '' # copy custom configuration and generate a random secret key if needed ${optionalString (cfg.useWizard == false) '' @@ -468,24 +483,41 @@ in ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey} fi - if [ ! -e ${jwtSecret} ]; then - ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret} + # Migrate LFS_JWT_SECRET filename + if [[ -e ${oldLfsJwtSecret} && ! -e ${lfsJwtSecret} ]]; then + mv ${oldLfsJwtSecret} ${lfsJwtSecret} fi - KEY="$(head -n1 ${secretKey})" + if [ ! -e ${oauth2JwtSecret} ]; then + ${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret} + fi + + if [ ! -e ${lfsJwtSecret} ]; then + ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret} + fi + + if [ ! -e ${internalToken} ]; then + ${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken} + fi + + SECRETKEY="$(head -n1 ${secretKey})" DBPASS="$(head -n1 ${cfg.database.passwordFile})" - JWTSECRET="$(head -n1 ${jwtSecret})" + OAUTH2JWTSECRET="$(head -n1 ${oauth2JwtSecret})" + LFSJWTSECRET="$(head -n1 ${lfsJwtSecret})" + INTERNALTOKEN="$(head -n1 ${internalToken})" ${if (cfg.mailerPasswordFile == null) then '' MAILERPASSWORD="#mailerpass#" '' else '' MAILERPASSWORD="$(head -n1 ${cfg.mailerPasswordFile} || :)" ''} - sed -e "s,#secretkey#,$KEY,g" \ + sed -e "s,#secretkey#,$SECRETKEY,g" \ -e "s,#dbpass#,$DBPASS,g" \ - -e "s,#jwtsecret#,$JWTSECRET,g" \ + -e "s,#oauth2jwtsecret#,$OAUTH2JWTSECRET,g" \ + -e "s,#lfsjwtsecret#,$LFSJWTSECRET,g" \ + -e "s,#internaltoken#,$INTERNALTOKEN,g" \ -e "s,#mailerpass#,$MAILERPASSWORD,g" \ -i ${runConfig} - chmod 640 ${runConfig} ${secretKey} ${jwtSecret} + chmod 640 ${runConfig} ${secretKey} ${oauth2JwtSecret} ${lfsJwtSecret} ${internalToken} ''} # update all hooks' binary paths From abc6fca7caede32d41966f1743e0017e40f37486 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 15 Jan 2021 13:07:21 +0100 Subject: [PATCH 62/81] emacs.pkgs.elpa-packages: 2021-01-15 --- .../editors/emacs-modes/elpa-generated.nix | 568 +++++++++++++++++- 1 file changed, 565 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index a4900ff951ad..b841c0df9593 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -553,6 +553,21 @@ license = lib.licenses.free; }; }) {}; + company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "company"; + ename = "company"; + version = "0.9.13"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/company-0.9.13.tar"; + sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/company.html"; + license = lib.licenses.free; + }; + }) {}; company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }: elpaBuild { pname = "company-ebdb"; @@ -636,6 +651,21 @@ license = lib.licenses.free; }; }) {}; + cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "cpio-mode"; + ename = "cpio-mode"; + version = "0.17"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar"; + sha256 = "144ajbxmz6amb2234a278c9sl4zg69ndswb8vk0mcq8y9s2abm1x"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cpio-mode.html"; + license = lib.licenses.free; + }; + }) {}; crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crisp"; @@ -696,6 +726,21 @@ license = lib.licenses.free; }; }) {}; + dash = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "dash"; + ename = "dash"; + version = "2.12.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dash-2.12.0.tar"; + sha256 = "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/dash.html"; + license = lib.licenses.free; + }; + }) {}; dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "dbus-codegen"; @@ -726,6 +771,21 @@ license = lib.licenses.free; }; }) {}; + delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: + elpaBuild { + pname = "delight"; + ename = "delight"; + version = "1.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/delight-1.7.el"; + sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1"; + }; + packageRequires = [ cl-lib nadvice ]; + meta = { + homepage = "https://elpa.gnu.org/packages/delight.html"; + license = lib.licenses.free; + }; + }) {}; dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }: elpaBuild { pname = "dict-tree"; @@ -741,6 +801,36 @@ license = lib.licenses.free; }; }) {}; + diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "diff-hl"; + ename = "diff-hl"; + version = "1.8.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar"; + sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/diff-hl.html"; + license = lib.licenses.free; + }; + }) {}; + diffview = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "diffview"; + ename = "diffview"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/diffview-1.0.el"; + sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/diffview.html"; + license = lib.licenses.free; + }; + }) {}; dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dired-du"; @@ -756,6 +846,21 @@ license = lib.licenses.free; }; }) {}; + dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dired-git-info"; + ename = "dired-git-info"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.el"; + sha256 = "1kd0rpw7l32wvwi7q8s0inx4bc66xrl7hkllnlicyczsnzw2z52z"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-git-info.html"; + license = lib.licenses.free; + }; + }) {}; disk-usage = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "disk-usage"; @@ -771,6 +876,21 @@ license = lib.licenses.free; }; }) {}; + dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "dismal"; + ename = "dismal"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dismal-1.5.tar"; + sha256 = "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dismal.html"; + license = lib.licenses.free; + }; + }) {}; djvu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "djvu"; @@ -846,6 +966,51 @@ license = lib.licenses.free; }; }) {}; + ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }: + elpaBuild { + pname = "ebdb-gnorb"; + ename = "ebdb-gnorb"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el"; + sha256 = "0bma7mqilp3lfgv0z2mk6nnqzh1nn1prkz2aiwrs4hxwydmda13i"; + }; + packageRequires = [ ebdb gnorb ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html"; + license = lib.licenses.free; + }; + }) {}; + ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }: + elpaBuild { + pname = "ebdb-i18n-chn"; + ename = "ebdb-i18n-chn"; + version = "1.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.1.el"; + sha256 = "02drr89i4kzjm1rs22sj0nv9sj95dmqk40xvxd75qzfn8y33k9vl"; + }; + packageRequires = [ ebdb pyim ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html"; + license = lib.licenses.free; + }; + }) {}; + ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "ediprolog"; + ename = "ediprolog"; + version = "2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ediprolog-2.1.el"; + sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/ediprolog.html"; + license = lib.licenses.free; + }; + }) {}; eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "eev"; @@ -934,6 +1099,36 @@ license = lib.licenses.free; }; }) {}; + electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "electric-spacing"; + ename = "electric-spacing"; + version = "5.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/electric-spacing-5.0.el"; + sha256 = "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/electric-spacing.html"; + license = lib.licenses.free; + }; + }) {}; + elisp-benchmarks = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "elisp-benchmarks"; + ename = "elisp-benchmarks"; + version = "1.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar"; + sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html"; + license = lib.licenses.free; + }; + }) {}; emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "emms"; @@ -964,6 +1159,21 @@ license = lib.licenses.free; }; }) {}; + epoch-view = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "epoch-view"; + ename = "epoch-view"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el"; + sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/epoch-view.html"; + license = lib.licenses.free; + }; + }) {}; ergoemacs-mode = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -984,6 +1194,43 @@ license = lib.licenses.free; }; }) {}; + excorporate = callPackage ({ elpaBuild + , emacs + , fetchurl + , fsm + , lib + , nadvice + , soap-client + , url-http-ntlm }: + elpaBuild { + pname = "excorporate"; + ename = "excorporate"; + version = "0.9.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/excorporate-0.9.1.tar"; + sha256 = "15rk0br7dmvni10f3mm94ylybl3jbf2ps1sypis6hxbazxxr443j"; + }; + packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ]; + meta = { + homepage = "https://elpa.gnu.org/packages/excorporate.html"; + license = lib.licenses.free; + }; + }) {}; + expand-region = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "expand-region"; + ename = "expand-region"; + version = "0.11.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/expand-region-0.11.0.tar"; + sha256 = "1q6xaqkv40z4c6rgdkxqqkvxgsaj8yjqjrxi40kz5y0ck3bjrk0i"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/expand-region.html"; + license = lib.licenses.free; + }; + }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; @@ -1119,6 +1366,21 @@ license = lib.licenses.free; }; }) {}; + ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "ggtags"; + ename = "ggtags"; + version = "0.8.13"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ggtags-0.8.13.el"; + sha256 = "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ggtags.html"; + license = lib.licenses.free; + }; + }) {}; gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; @@ -1276,6 +1538,21 @@ license = lib.licenses.free; }; }) {}; + greenbar = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "greenbar"; + ename = "greenbar"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/greenbar-1.1.el"; + sha256 = "01ixv3489zdx2b67zqad6h7g8cpnzpzrvvkqyx7csqyrfx0qy27n"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/greenbar.html"; + license = lib.licenses.free; + }; + }) {}; guess-language = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -1328,6 +1605,36 @@ license = lib.licenses.free; }; }) {}; + hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "hook-helpers"; + ename = "hook-helpers"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar"; + sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hook-helpers.html"; + license = lib.licenses.free; + }; + }) {}; + html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "html5-schema"; + ename = "html5-schema"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar"; + sha256 = "19k1jal6j64zq78w8h0lw7cljivmp2jzs5sa1ppc0mqkpn2hyq1i"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/html5-schema.html"; + license = lib.licenses.free; + }; + }) {}; hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "hydra"; @@ -1403,6 +1710,21 @@ license = lib.licenses.free; }; }) {}; + ivy-explorer = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: + elpaBuild { + pname = "ivy-explorer"; + ename = "ivy-explorer"; + version = "0.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.el"; + sha256 = "0q9gy9w22hnq30bfmnpqknk0qc1rcbjcybpjgb8hnlldvcci95l7"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ivy-explorer.html"; + license = lib.licenses.free; + }; + }) {}; ivy-posframe = callPackage ({ elpaBuild , emacs , fetchurl @@ -1453,6 +1775,21 @@ license = lib.licenses.free; }; }) {}; + js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "js2-mode"; + ename = "js2-mode"; + version = "20201220"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/js2-mode-20201220.tar"; + sha256 = "0zdrp8lap1ijrmsn9jsnvm44b6vxlgh9vcla5ysh1ga95zkjxrwm"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/js2-mode.html"; + license = lib.licenses.free; + }; + }) {}; json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "json-mode"; @@ -1708,6 +2045,21 @@ license = lib.licenses.free; }; }) {}; + memory-usage = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "memory-usage"; + ename = "memory-usage"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/memory-usage-0.2.el"; + sha256 = "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/memory-usage.html"; + license = lib.licenses.free; + }; + }) {}; metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "metar"; @@ -1783,6 +2135,36 @@ license = lib.licenses.free; }; }) {}; + mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "mmm-mode"; + ename = "mmm-mode"; + version = "0.5.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar"; + sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mmm-mode.html"; + license = lib.licenses.free; + }; + }) {}; + modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "modus-operandi-theme"; + ename = "modus-operandi-theme"; + version = "0.12.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el"; + sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html"; + license = lib.licenses.free; + }; + }) {}; modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "modus-vivendi-theme"; @@ -2137,6 +2519,21 @@ license = lib.licenses.free; }; }) {}; + paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "paced"; + ename = "paced"; + version = "1.1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; + sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/paced.html"; + license = lib.licenses.free; + }; + }) {}; parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "parsec"; @@ -2152,6 +2549,36 @@ license = lib.licenses.free; }; }) {}; + path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "path-iterator"; + ename = "path-iterator"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar"; + sha256 = "0kgl7rhv9x23jyr6ahfy6ql447zpz9fnmfwldkpn69g7jdx6a3cc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/path-iterator.html"; + license = lib.licenses.free; + }; + }) {}; + peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "peg"; + ename = "peg"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/peg-1.0.tar"; + sha256 = "0skr5dz9k34r409hisnj37n1b7n62l3md0glnfx578xkbmxlpcxl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/peg.html"; + license = lib.licenses.free; + }; + }) {}; persist = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "persist"; @@ -2216,10 +2643,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.8.3.el"; - sha256 = "05m56aw2yxik0pgcvyr5c92j2mwfksxgq1syzvik6161gy8hdd0g"; + url = "https://elpa.gnu.org/packages/posframe-0.8.4.tar"; + sha256 = "1sn35ibp5y4y80l1xm4b8i94ld953a9gbkk99zqd9mrq9bwjyhdp"; }; packageRequires = [ emacs ]; meta = { @@ -2242,6 +2669,36 @@ license = lib.licenses.free; }; }) {}; + psgml = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "psgml"; + ename = "psgml"; + version = "1.3.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar"; + sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/psgml.html"; + license = lib.licenses.free; + }; + }) {}; + pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "pspp-mode"; + ename = "pspp-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el"; + sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/pspp-mode.html"; + license = lib.licenses.free; + }; + }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; @@ -2753,6 +3210,21 @@ license = lib.licenses.free; }; }) {}; + smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "smalltalk-mode"; + ename = "smalltalk-mode"; + version = "4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/smalltalk-mode-4.0.tar"; + sha256 = "1i1w2fk241z10mph92lry8ly55rxr24n1v4840cddpiw81nrqpcn"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html"; + license = lib.licenses.free; + }; + }) {}; smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "smart-yank"; @@ -2843,6 +3315,21 @@ license = lib.licenses.free; }; }) {}; + spinner = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "spinner"; + ename = "spinner"; + version = "1.7.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/spinner-1.7.3.el"; + sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/spinner.html"; + license = lib.licenses.free; + }; + }) {}; sql-beeline = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "sql-beeline"; @@ -2933,6 +3420,21 @@ license = lib.licenses.free; }; }) {}; + swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: + elpaBuild { + pname = "swiper"; + ename = "swiper"; + version = "0.13.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/swiper-0.13.1.tar"; + sha256 = "0k39pa89y0bfvdfqg3nc5pjq5mwxwimc4ma3z28vaf14zd38x9m1"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/swiper.html"; + license = lib.licenses.free; + }; + }) {}; system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "system-packages"; @@ -3201,6 +3703,21 @@ license = lib.licenses.free; }; }) {}; + vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "vcl-mode"; + ename = "vcl-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vcl-mode-1.1.el"; + sha256 = "1r70pmvr95k5f2xphvhliqvyh7al0qabm7wvkamximcssvs38q1h"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/vcl-mode.html"; + license = lib.licenses.free; + }; + }) {}; vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: elpaBuild { pname = "vdiff"; @@ -3371,6 +3888,36 @@ license = lib.licenses.free; }; }) {}; + which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "which-key"; + ename = "which-key"; + version = "3.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar"; + sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/which-key.html"; + license = lib.licenses.free; + }; + }) {}; + windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "windower"; + ename = "windower"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/windower-0.0.1.el"; + sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/windower.html"; + license = lib.licenses.free; + }; + }) {}; windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "windresize"; @@ -3436,6 +3983,21 @@ license = lib.licenses.free; }; }) {}; + xclip = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "xclip"; + ename = "xclip"; + version = "1.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xclip-1.10.el"; + sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/xclip.html"; + license = lib.licenses.free; + }; + }) {}; xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; From 5f69227d55f23b2fd21615ba55d7b0d8f5d4b298 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 15 Jan 2021 13:07:59 +0100 Subject: [PATCH 63/81] emacs.pkgs.melpa-packages: 2021-01-15 --- .../emacs-modes/recipes-archive-melpa.json | 846 +++++++++--------- 1 file changed, 413 insertions(+), 433 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 42d2c84311ac..5dcb01dcefac 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -2331,14 +2331,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210106, - 1227 + 20210114, + 1520 ], - "deps": [ - "memoize" - ], - "commit": "9aa16ae198073fe839a0abfa9a7d3a9dc85ef5f9", - "sha256": "1ll69hb7108fcklyagkvgxkr96nh9sp06kkr73kz92j4cljsahc6" + "commit": "ed978fa64fdefc817e8b1b826c87e8928a26f2ce", + "sha256": "0l5jc0f5q5p4i2c5s6vrryxkc0fapxffz8x1yvk32j151rz932rc" }, "stable": { "version": [ @@ -5406,8 +5403,8 @@ "avy", "embark" ], - "commit": "94db870a7089cd3aeff994afde327e0c0acb2a27", - "sha256": "1i2niv9dwbrai9y9njp8h37wb8ssjavmghj2i9kld1d1jgmmnx1f" + "commit": "14dcc650d9339a6458bb0babfed35de13e76fa50", + "sha256": "15shi1i8071833mjzrwyy5iw818sxcqym0cb0zvi9bk5nvprp58b" } }, { @@ -7030,8 +7027,8 @@ "bind-key", "key-chord" ], - "commit": "caa92f1d64fc25480551757d854b4b49981dfa6b", - "sha256": "088kl3bml0rs5bkfymgzr15ram9qvy66h1kaisrbkynh0yxvf8g9" + "commit": "365c73d2618dd0040a32c2601c5456ab5495b812", + "sha256": "10c0rmi5axypx0xy3fib739rjnakl32spwcirzxz1p5r0x9gya4a" }, "stable": { "version": [ @@ -9970,15 +9967,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20201213, - 949 + 20210114, + 2059 ], "deps": [ "cl-lib", "powerline" ], - "commit": "23eda0a0292a84c7e0a0aa2b598f9e29c7e5b54f", - "sha256": "1zk0vf7yckv3zaws9z0svgbkvs94b2js1r9vjl6pxgxa2qc0khd6" + "commit": "50fd573ce9ed9f914940c79c82e411511ca5c8a8", + "sha256": "0dxis8w931chcbfwggc0jdirsxys42n2g21wqnqy892k70p7by1j" }, "stable": { "version": [ @@ -10105,8 +10102,8 @@ 20171115, 2108 ], - "commit": "fca303e3a22f72c1c4235e404bfdffd6031bd61c", - "sha256": "15wi6xc2ml549ps4ly2a2hxhrs957k6ynz1611zv7xskxkn9dwwd" + "commit": "a1f30acc05097d9def5925e8b48de3df4237610b", + "sha256": "18ixkfz41wa3h4041rlj6zxg30m3afhn1vfvcf6dz2vnj1z22h2z" }, "stable": { "version": [ @@ -12127,17 +12124,17 @@ 20210104, 1831 ], - "commit": "20a7d4485cb3f6520abc22d22fd516a19e4cfdb2", - "sha256": "0ga09h0pqb2bpbp94l21kl6vfdcq7yk1w0m4vd2bhdxvfb9r4s0d" + "commit": "e6b6e457a0e8d33402bc7d64d85b20a8ca0546a0", + "sha256": "1p5vd3dmp7q0nw5px2gplrrdi6zgd3qlvmc3ql7xclgaxbp0zrs2" }, "stable": { "version": [ 3, 19, - 2 + 3 ], - "commit": "0932b1c2b29f4ad1228fa71bf4f5c089474d9882", - "sha256": "0c6vncdqps7i1a3gxm94pp0wrgs8xvq77br178xna398f3ckf26p" + "commit": "19ff734e76a35d59eb0f973197cadb1c271c766c", + "sha256": "0yzwnb1vikbhqzrqq6ngzqv45dcngajjc3b2f4cc002ry3bnn1mv" } }, { @@ -13081,11 +13078,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210103, - 1124 + 20210114, + 35 ], - "commit": "6116c4617a7934acfe84cb82a058e9b198f0f480", - "sha256": "1a9ax30g57187ma27kg3p3khci6903hf0anjsxy6s2slvvy8c3fm" + "commit": "288a7617c4c3e5f22a887a17a697ac2bfe4e567d", + "sha256": "1h5wkgv7gny7dp01mq35fj9g18v62813gx6qvw7812rypaj068yw" }, "stable": { "version": [ @@ -15118,8 +15115,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20200818, - 1614 + 20210114, + 123 ], "deps": [ "dash", @@ -15127,8 +15124,8 @@ "pythonic", "s" ], - "commit": "9f7eea16e9ad3eb34fe3d1cbd9d6162b8046c2f8", - "sha256": "1151bk1fx8y8yql1sg9qqagxcbq57rz85gwnx0z2acfpljb2i7r7" + "commit": "dce431b25f5a13af58cc7cacfa7968b5a888609c", + "sha256": "1q4hnb42kp73ida37cgrrwi5dxl8vjdl1ibj8l51h47l2rlcrn09" }, "stable": { "version": [ @@ -15294,17 +15291,17 @@ }, { "ename": "consult", - "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", - "sha256": "1jkqrc9wzk2dhajnd84avppynqcmly9vc35xhaqi4skhx5il24wb", + "commit": "a0f3b8b11eb8f9adf182ab62fcb276b52bc26f19", + "sha256": "17zriam6hgz19ms78c9zh0hvb4b6h5hinrinbmbb2jcwi4cykxs3", "fetcher": "github", "repo": "minad/consult", "unstable": { "version": [ - 20210113, - 1 + 20210115, + 618 ], - "commit": "58be54e07f1d4e08769af77df7b51c8536891b53", - "sha256": "1z4478yrpa44kv584d17kicpp8as2jhxhrdrhxmn4xxwcrygl2hi" + "commit": "6e7fd01c217b2ee6cc5e02dd74d7e687c2ccf267", + "sha256": "0vzbv51q6ax824kcrr7hv4l93s91ii583lsx2wc0nvi0vklbq50i" } }, { @@ -15322,27 +15319,8 @@ "consult", "flycheck" ], - "commit": "58be54e07f1d4e08769af77df7b51c8536891b53", - "sha256": "1z4478yrpa44kv584d17kicpp8as2jhxhrdrhxmn4xxwcrygl2hi" - } - }, - { - "ename": "consult-selectrum", - "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", - "sha256": "08zhnzj70c3j4jkxa75a4wsaz1g35sc0wl7vkhjnhlpqhwidb2p5", - "fetcher": "github", - "repo": "minad/consult", - "unstable": { - "version": [ - 20210112, - 1916 - ], - "deps": [ - "consult", - "selectrum" - ], - "commit": "58be54e07f1d4e08769af77df7b51c8536891b53", - "sha256": "1z4478yrpa44kv584d17kicpp8as2jhxhrdrhxmn4xxwcrygl2hi" + "commit": "6e7fd01c217b2ee6cc5e02dd74d7e687c2ccf267", + "sha256": "0vzbv51q6ax824kcrr7hv4l93s91ii583lsx2wc0nvi0vklbq50i" } }, { @@ -15664,8 +15642,8 @@ "deps": [ "swiper" ], - "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", - "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" }, "stable": { "version": [ @@ -15688,15 +15666,15 @@ "repo": "gexplorer/counsel-ag-popup", "unstable": { "version": [ - 20210112, - 1320 + 20210114, + 1548 ], "deps": [ "counsel", "transient" ], - "commit": "b7179875a2185b7ed2460c71a786413be94bb6f6", - "sha256": "1fmsvznxglx97mwf6x51pnbg2flvivrbb5w2qpp72dlsfhgsa5jp" + "commit": "cf0ee4f5bdb43a576f5cde00d52744ddb49177d5", + "sha256": "1k9d0581imp65d6w9vmc8bx6phyx0pvl7mas56p06hgnwg1i9cyk" } }, { @@ -16716,11 +16694,11 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210112, - 1407 + 20210114, + 2018 ], - "commit": "1de65568b3b98d2a1009df35760149ba571fc694", - "sha256": "0kbcdk9wr4bv8z0jdfglnzh24k08d4mgkh2qwsvna9wdbi2bpqds" + "commit": "1d02a54f71b0c6ae0b5be9f764271ac31b1b0167", + "sha256": "02mbxqf4y04ancz89jkb8dmpmx3pmzxnxm5vc4fc6d828nzv56fx" }, "stable": { "version": [ @@ -17328,8 +17306,8 @@ 20190111, 2150 ], - "commit": "320fa6d73811a3fc240b7ec6494bb13c74bcbbed", - "sha256": "1b86f7b5wqc3smkscs56012ikxsm0svyg0i0q5ahk57drkaaqll0" + "commit": "30fc474830b4a5beb88cdc53a31797ed794cddb8", + "sha256": "08wb26skxw4gh1gzpbxxgi63x44zbb50xd6mi5nbsg538fqb9arj" }, "stable": { "version": [ @@ -17803,11 +17781,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210111, - 1247 + 20210114, + 2017 ], - "commit": "7a9c9378772b687a452966ce4745c54afb19a2fc", - "sha256": "14qj4zvbxqab6q2zbl46nvx5gyd897qxk6xapjxydfy6gsnan0y0" + "commit": "6f5888c77523c2373c5252ef2113612beac7e78f", + "sha256": "1kg6c0jv44wlc0pidphg0cpmxfkn72r9391x0jgl1w22bhsvy4cz" }, "stable": { "version": [ @@ -17882,8 +17860,8 @@ "deps": [ "dash" ], - "commit": "7a9c9378772b687a452966ce4745c54afb19a2fc", - "sha256": "14qj4zvbxqab6q2zbl46nvx5gyd897qxk6xapjxydfy6gsnan0y0" + "commit": "6f5888c77523c2373c5252ef2113612beac7e78f", + "sha256": "1kg6c0jv44wlc0pidphg0cpmxfkn72r9391x0jgl1w22bhsvy4cz" }, "stable": { "version": [ @@ -17906,14 +17884,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210104, - 1605 + 20210113, + 922 ], "deps": [ "page-break-lines" ], - "commit": "2b1ef13392be2f07d2a52636edf578b89512d501", - "sha256": "0lkx03y592jhac0s4d3vn5iqqsymqqwv7zzx5z0rpcyc46ym370r" + "commit": "fb5e47576a1c91374b008221277f0a45b2491085", + "sha256": "0c4rj8lm7dikjbnr2ynzhmzchg7mjirawp0hqxd5jgdv0lbn267n" }, "stable": { "version": [ @@ -18296,16 +18274,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20201012, - 619 + 20210113, + 829 ], "deps": [ "dash", "s", "spinner" ], - "commit": "baa352b982bded5fbca1ec9c14fec20e78b2089b", - "sha256": "08p2aaak27mf8nidl2nqfhrhvapswp0b79l3jn0vb2xabbhza7rv" + "commit": "bb374c625939ac2dd9e2408c2cc180b1c9f4aa20", + "sha256": "0galdbka4dmlrryn5pbyd7frc676hb91y0zf6di8p9j2v3r7gzqv" }, "stable": { "version": [ @@ -19108,14 +19086,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210107, - 220 + 20210113, + 1930 ], "deps": [ "cl-lib" ], - "commit": "89aeb2fc8b24b6c4de4394f85041c5dd5fa60dad", - "sha256": "17mar4w5q6yxqcz9qslnz6vg666l2mmy2fhja7r071x8hj5gla0c" + "commit": "dc3e12f14f5fddff3811310cd48640e2c9e626da", + "sha256": "1ackhs5rajydwfjgm4a9mwqhc75dk1jsby4yxkqbji495kwq4rsq" }, "stable": { "version": [ @@ -21225,11 +21203,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20201229, - 2136 + 20210113, + 1646 ], - "commit": "36075595cf5cf6460f215735b1aa562d6a07a496", - "sha256": "1c8676b81dx8zhmbv3ymdyi21rx0x60a2v104i6p9l7c2yilq9c2" + "commit": "a795fa4eafd42e016b6c9fed93d2f370c4f5eef5", + "sha256": "1z8yzphckcbykz5nxz75vbc75zigv3f5lwwpnk35ipzb20xnm563" } }, { @@ -21378,14 +21356,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210112, - 2045 + 20210113, + 1858 ], "deps": [ "cl-lib" ], - "commit": "58b57ff4d65a94635d901763bb3ff0e956851ba4", - "sha256": "09z5myr8c5rlj81f980zdmn1m9ric0ndnh7pyzz7k0swqq02w79c" + "commit": "18cddefb3c8b9da63086496142ad6756f0bc9167", + "sha256": "0ix7kfxhs45w763ajzi2qxr7f94rd4g4xfi6szv3c75q6y5mb3y3" }, "stable": { "version": [ @@ -22027,17 +22005,17 @@ 20191016, 1241 ], - "commit": "4d53aad7f8b91ec09a7c1691eb5392fa3d077a26", - "sha256": "1ija6kzzfvvx3vvjc7caa9ixf78g5nxb6g9g65y32m8zqdnclh0h" + "commit": "13642e22a405de7c4361e94dd9aaa35ad1b09847", + "sha256": "0liha8qf1f4w5x8kklxc30yrn9krcrs9wvvj7chmgrg3m4mk3172" }, "stable": { "version": [ 2, - 7, + 8, 1 ], - "commit": "5472766b2448308a7160dfd0fca1ec711e124a5c", - "sha256": "10qgx83fq8b522y9mpllrp0l5cgmr2bs5s7aix5img21hlbm34in" + "commit": "b796156167490e777131403f651e83779e954000", + "sha256": "118fc0bwqp4yn4b6sfir53y3b7acgmpd2n0d7dc2cdjcv72bv0bm" } }, { @@ -23530,8 +23508,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210110, - 1646 + 20210113, + 1843 ], "deps": [ "eldoc", @@ -23540,8 +23518,8 @@ "project", "xref" ], - "commit": "9da9d69a4296f2f0509c033a0aea263002ae5f4b", - "sha256": "1d5wdf6hyi46csgz4anv5jbgdzp7ys780fd1563lpmi9f0vzbi26" + "commit": "e5a9648beec6e83f5b4471261b07e1da6630da1d", + "sha256": "1ny2myy1yxz9xqd0cs3hciasyc6gfvr2gshgza3pry7w5z481yy3" }, "stable": { "version": [ @@ -23660,8 +23638,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210102, - 1351 + 20210115, + 120 ], "deps": [ "anaphora", @@ -23672,8 +23650,8 @@ "websocket", "with-editor" ], - "commit": "917f2a0b6ca76ed9e966985ca6f19d8b57690d40", - "sha256": "13ifj42v3sgyf7qbd13cyydy9jprlld16n5m172m06cxnixzrqi6" + "commit": "fbf1f71f52881dc23580053a6e188badb541388c", + "sha256": "1jnwl5yvw6bvj2hw0bnlzs4mz6xsv610ll1pk1rw3kricrnbmh1b" }, "stable": { "version": [ @@ -24415,11 +24393,11 @@ "repo": "justinbarclay/elegant-agenda-mode", "unstable": { "version": [ - 20210106, - 1753 + 20210115, + 353 ], - "commit": "6a812d7a22d9240cf5f1f40079b20ac6a083935c", - "sha256": "0ashjhghwdksjwbkhhwn0mjfzpvii05kj8wkgp9b9x13ipalqih3" + "commit": "5cbc688584ba103ea3be7d7b30e5d94e52f59eb6", + "sha256": "13jv4dars81b42593zijpjm0qci0z7hizbjsjab3xfxi3m3r4pk4" } }, { @@ -25980,11 +25958,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210112, - 2324 + 20210115, + 613 ], - "commit": "2e879c2e28e4fe38677a9c2d9ee13f9c7071ef53", - "sha256": "19p10qzcr65n3mvmbnincq86dpyda7b3rb70cf04szpbki7did9g" + "commit": "14dcc650d9339a6458bb0babfed35de13e76fa50", + "sha256": "15shi1i8071833mjzrwyy5iw818sxcqym0cb0zvi9bk5nvprp58b" }, "stable": { "version": [ @@ -26004,14 +25982,14 @@ "unstable": { "version": [ 20210113, - 6 + 1434 ], "deps": [ "consult", "embark" ], - "commit": "2e879c2e28e4fe38677a9c2d9ee13f9c7071ef53", - "sha256": "19p10qzcr65n3mvmbnincq86dpyda7b3rb70cf04szpbki7did9g" + "commit": "14dcc650d9339a6458bb0babfed35de13e76fa50", + "sha256": "15shi1i8071833mjzrwyy5iw818sxcqym0cb0zvi9bk5nvprp58b" } }, { @@ -26166,15 +26144,15 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210112, - 2108 + 20210113, + 2138 ], "deps": [ "cl-lib", "seq" ], - "commit": "d0142e771a4e9bd0d14f01ff020960759039e4d6", - "sha256": "07pv0pbgpmdlh8pzyni6h4bdajydxi7fdphrliq54pq1y9dx9zpn" + "commit": "50bdbcc619e376ac2d7472b7097b3a5ba2d1f64e", + "sha256": "1mbfdvh0fs824zvlw3vcy5rdbqdrq4dcx8031yyiq9qpxziswicd" }, "stable": { "version": [ @@ -27536,8 +27514,8 @@ 20201215, 830 ], - "commit": "9072e6f7135d9c38e12cfca742e3312b572a2330", - "sha256": "1qr0sz0yd5zgzh0gyx238s8rs1j7fcl6dbx9kcqfv9awbsgjil7k" + "commit": "ed4bc369fe6724083bd0decac961fb7b3462d202", + "sha256": "1bsf9y6rxwndafvi1lh2vgawjd9k469rhbqb42p6wjc4872lbb0q" }, "stable": { "version": [ @@ -28233,14 +28211,14 @@ "repo": "aaronjensen/eslintd-fix", "unstable": { "version": [ - 20201127, - 1639 + 20210114, + 1448 ], "deps": [ "dash" ], - "commit": "f287e61208a5ae532f6722e369400a530b697ea0", - "sha256": "05b00iacp792i05p10iaaj6385gmdygglfizhziag4s588afpj46" + "commit": "5f9daecd4a02418515070b8084cb06e2251e2119", + "sha256": "0px94k7ms0wpxyyj0qfn82hz59822yn7i1851h0ld1rs8mh0rhwk" }, "stable": { "version": [ @@ -28377,17 +28355,17 @@ }, { "ename": "ess", - "commit": "678b5515b5194da6ca605c2070ce1f3ed730f008", - "sha256": "0nw56mjp17xw7ay2ka10rxa0sa764spsvzjrh5hscn7x02qychy9", + "commit": "30182a89f9f9396f4b3ab8ee0722d99f2fedb221", + "sha256": "0flvvnyrym5dl095sm9r0cj5lgqrb4whl4zrzg0l124kwk5v9h50", "fetcher": "github", "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210109, - 1455 + 20210113, + 915 ], - "commit": "a9e9367976658391126c907b6a5dfc8ad3033ebd", - "sha256": "076aizfh62z85wdqpiir75jc5qvl9n66mhdvfkjaqzlzlisrhqax" + "commit": "19de88d2b3b2436955ce0f7e6cf8544d4ffaf8ac", + "sha256": "048b0274cj6hkri6hzsmp7r8g9vkx2vxxjljx24vvzxyqfwmn445" }, "stable": { "version": [ @@ -29167,15 +29145,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210112, - 956 + 20210115, + 641 ], "deps": [ "annalist", "evil" ], - "commit": "8b1bcd7e49c3fb4ae047d65e22e652a2fb65fa3a", - "sha256": "1jymnkaby6860llr8d2vcyncr073pa12idgskzcvvf8ajxdi8gnl" + "commit": "a67450ff537b9681a5fed25010ce28d4128e6db2", + "sha256": "0iyp72pp5db5pg7nrw81ij7r7gkzsl11d5hcvllcm7qwpj99az8q" }, "stable": { "version": [ @@ -31626,8 +31604,8 @@ "dash", "s" ], - "commit": "1814209e2ff43cf2e6d38c4cd476218915f550fb", - "sha256": "1l9lff15vbji9phpx4jrg8bmw2bkspzmhcgawchf5ylg2sb6yymm" + "commit": "c4dbf8c8e83df834f5d6f72cd5649b9d8a8812ec", + "sha256": "132zj5yvx4llzsh6rs0jwj0b5cfl140v0m6rk0kckw3vfgfh0cln" }, "stable": { "version": [ @@ -38087,15 +38065,15 @@ "repo": "davidshepherd7/frames-only-mode", "unstable": { "version": [ - 20200728, - 740 + 20210107, + 918 ], "deps": [ "dash", "s" ], - "commit": "187753b095a94f423763fe893408e1318fb7b2dc", - "sha256": "0b4aqilpxby3ac7rmcb4r6yhhlyjkrh47zhrshk8f3ndlyxbz9ch" + "commit": "d3f6647c484656ddabdac5d18546599a03823cd4", + "sha256": "02wai424sxxmaz7ilfm4ap4jl5rpx5dajg534x6vxm5alfjhlpag" }, "stable": { "version": [ @@ -38556,8 +38534,8 @@ "deps": [ "cl-lib" ], - "commit": "71ac38692ace9b90c27f214943e8e77542459b12", - "sha256": "14vcdvzn8pl15zcga925ldbvk7wl6bl6fvl9vd8gmhn6lcgl9b2b" + "commit": "527567aa9f668e9fa63df7d258b82004473dd7e4", + "sha256": "1w1k193hc2ihi2wh9gbsp9wcwl2gxqia21868ad7v3xadyik0a6i" }, "stable": { "version": [ @@ -40677,11 +40655,11 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20200803, - 1445 + 20210113, + 1307 ], - "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8", - "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" + "commit": "b083d0615dd88d9ec4f116015c98b5e3326f77a5", + "sha256": "09slgwmv59vwz34b5mcz46360a979h6k3pnqr3pmbakn7ysbdmqs" }, "stable": { "version": [ @@ -42413,11 +42391,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20210102, - 1843 + 20210113, + 1945 ], - "commit": "b85915517d3326ca08af5768df75f0be21c7acc3", - "sha256": "13xrwv2wgmblrdcm656rly3xmlh6wmbwv592vjfrmvchrx39np26" + "commit": "8b7d223eca9b26acb0e3eca4b58d39a3b933bf08", + "sha256": "1s0smkprlnmml4a2rqhzb81mz7dlxswnvqsn3wra4brbrs3almhi" } }, { @@ -42919,11 +42897,11 @@ "repo": "jcs-elpa/goto-line-preview", "unstable": { "version": [ - 20200927, - 252 + 20210113, + 616 ], - "commit": "66817b66ce124b2961df3521faa3adc87943d0d9", - "sha256": "0w9cqp5xcqnncwpb90xvirvm05bknsaxhd51y2wkhqr7j5xi489i" + "commit": "605a182c389b60b11dad0738babc66d227a4ed23", + "sha256": "1p5bpb5870mkfqgx8dqapx6mvfc6h2g8hzngljd71i3b5idlxx0s" }, "stable": { "version": [ @@ -42952,8 +42930,8 @@ "magit-popup", "s" ], - "commit": "50c576d6470e7ab9803ceb466ac34f936971dfc1", - "sha256": "0sria01kapgrxh0jpbgkhr9cr15nji09z1pk4fi650ckipr9alcw" + "commit": "c43a1c86c89e6e30e54d4a21b2d95c03c6ed0c4d", + "sha256": "0d43gkppk06w58xsawbnil83170k6h387jr5a4v48zy2amdq7rp2" }, "stable": { "version": [ @@ -43700,20 +43678,20 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210112, - 935 + 20210115, + 646 ], - "commit": "1911cecb0a48e653ed3c99d58a25266f01189722", - "sha256": "1a3pgzj943i0px7lc2qmsm3irybdl664xwvlcjx5axf16pdvlspl" + "commit": "7a3437feb777996dcb8f484b79e898cfdb714bfe", + "sha256": "0jfz54phg3db8cgp9sj1grvj3sf10jaq359024j72l71s5cqwmlx" }, "stable": { "version": [ 1, - 15, + 17, 0 ], - "commit": "e4ccfd416de6a5f70e3f1c718f773b9fa2e8e17a", - "sha256": "1gx1j5l0g7n706ri8rg20v6kkl393gbhh9wx8szzmcw0xjrawdzj" + "commit": "6820ae3aa9203f5e23e0cd80f51b410aaf1d32f3", + "sha256": "0sf3lkdvqb55bin8bx5jd06ncqiy9lkx7mx5i8q27r8wmi58q7v6" } }, { @@ -44971,16 +44949,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210111, - 2036 + 20210114, + 1521 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "77e5a433bfef84992c35f34de8211f84af536a10", - "sha256": "1wiyir8xcpv9wx3j77vz0yca6w40zvirfl97majy98dzmrzkrmzj" + "commit": "d0073fd556e5e2296b4fea824929dfab9b1895b8", + "sha256": "0wz12f190vsp71bcwygvagksqfihm85rj80bc4a3sx96wyrdjbqm" }, "stable": { "version": [ @@ -45905,8 +45883,8 @@ "deps": [ "async" ], - "commit": "77e5a433bfef84992c35f34de8211f84af536a10", - "sha256": "1wiyir8xcpv9wx3j77vz0yca6w40zvirfl97majy98dzmrzkrmzj" + "commit": "d0073fd556e5e2296b4fea824929dfab9b1895b8", + "sha256": "0wz12f190vsp71bcwygvagksqfihm85rj80bc4a3sx96wyrdjbqm" }, "stable": { "version": [ @@ -49055,16 +49033,16 @@ "repo": "emacs-helm/helm-sly", "unstable": { "version": [ - 20201120, - 1108 + 20210114, + 1928 ], "deps": [ "cl-lib", "helm", "sly" ], - "commit": "ccf8e83644bc1b2113eab46693e64d3f0c56198f", - "sha256": "13s2dj09mcdwlibjlahyyq2dxjkjlpxs88dbdyvcd64249jmahsx" + "commit": "7fbd6544511d8669c8122b6a9128fd09e835c3fe", + "sha256": "061qihf8fwka7jpcvn1z76rcjbipfri41xfkn17i7pg4nzmqhaaw" }, "stable": { "version": [ @@ -49317,15 +49295,15 @@ "repo": "Lompik/helm-systemd", "unstable": { "version": [ - 20180131, - 434 + 20210105, + 542 ], "deps": [ "helm", "with-editor" ], - "commit": "96f5cd3ee3412539c2f8d145201f47c4f8e53b4f", - "sha256": "0wyabh76q2lighd7qxpkzp35fkblxlz8g7p4lpgfwvjid0ixmnvq" + "commit": "8b26ab2d3a5b08c1e03c9312818512d7492bbc9a", + "sha256": "11v6pwkhdssg2f6azs3nw1y3s5ysmkxxv1jvgm7yy8gwg04zvcym" } }, { @@ -51142,14 +51120,14 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20201119, - 518 + 20210113, + 822 ], "deps": [ "dash" ], - "commit": "2850301d19176b8d3bb6cc8d95af6ab7e529bd56", - "sha256": "1qajlsqsvrngzbb1qss7xadrajgdk4pc6nvvyw6443p6947yx7rk" + "commit": "5876209c9712bd1acbbf1d31f6e3293e5ab88971", + "sha256": "03cn43vd2zq67hzb1hy82b7lshzslxzndjj1z1liv1kspww2hkch" }, "stable": { "version": [ @@ -52023,27 +52001,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20201219, - 224 + 20210115, + 137 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "dbe4957b08b70e157a05a7d8db84a51aeb9400ca", - "sha256": "0rkby252cyj2dxs89qgifysk615wwr0cm4zdnmamyyqcwpc4c223" + "commit": "41ca05a6d234c55c2963599648a9e3c433ad5902", + "sha256": "0skazm21xjp8w80g4iqpi1dj48xnhka03l46v6zz48v5686iqv5d" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "f4d40c48f770df68540934a3dfabd07d0edc081c", - "sha256": "1j70rljhmzh6ixxbf4cj8qkjkkl4l2mlj45dqls3b5h6kzxwg5cy" + "commit": "41ca05a6d234c55c2963599648a9e3c433ad5902", + "sha256": "0skazm21xjp8w80g4iqpi1dj48xnhka03l46v6zz48v5686iqv5d" } }, { @@ -52607,11 +52585,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210111, - 1147 + 20210114, + 1621 ], - "commit": "6eb7ff8191b1d271b6f4e7feb608dc72ca203a39", - "sha256": "158fhgvrgm5q1krsc7cssj0ylzkyjrvivpwpdymb45d0x9msin61" + "commit": "dc3b419f1b945bd806bf40b7a478e7a2144c2077", + "sha256": "1xqq0hl8wcxa64pfn11pxcb7gcfgczaw166h0qksczwib2v4racc" }, "stable": { "version": [ @@ -53222,11 +53200,11 @@ "repo": "zk-phi/indent-guide", "unstable": { "version": [ - 20191106, - 240 + 20210115, + 400 ], - "commit": "7fc710748f9e5a086acfe77970f117df89ee9749", - "sha256": "055cpcj57k14v2vdpc1an6dww5ncvfpxghpgw1spv53wzgv8vzkq" + "commit": "d388c3387781a370ca13233ff445d03f3c5cf12f", + "sha256": "0r303mzxj57l8rclzsmvhnx2p3lhf2k4zvn8a6145wb10jvcwfxi" }, "stable": { "version": [ @@ -53717,8 +53695,8 @@ 20200520, 2345 ], - "commit": "44829fa70f5c4cba03d36db5fa2c969001325b91", - "sha256": "1863s0qvnh7hcy2f86d86zajkqldvnz71q16dd9b4wvgnnicwk8s" + "commit": "10b8d7b12acbd1036e68dfb59f460714baedaa33", + "sha256": "1w7sq9famd4xbh5jk974zzpn6cf1nh2vmbvjvd4fwpjhmnnibqsm" }, "stable": { "version": [ @@ -54703,11 +54681,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210109, - 1619 + 20210114, + 1859 ], - "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", - "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" }, "stable": { "version": [ @@ -54734,8 +54712,8 @@ "avy", "ivy" ], - "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", - "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" } }, { @@ -55089,8 +55067,8 @@ "hydra", "ivy" ], - "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", - "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" }, "stable": { "version": [ @@ -56418,11 +56396,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20201222, - 2048 + 20210114, + 900 ], - "commit": "b028d48d22d72129b2b49d93298f65241de206fd", - "sha256": "1ky9vzvib9rp4k46n80hilff2yr5bg4ham1cx083nnaxshdw8n3b" + "commit": "6a307c7ee17d44f1b0fe3dfba2bc34e0ca055818", + "sha256": "0q8y512l91r32igdksc6i2gwv0csl35xqlnx1cw41fwdpnbvdx4m" } }, { @@ -56690,16 +56668,16 @@ "repo": "jakoblind/js-import", "unstable": { "version": [ - 20201209, - 735 + 20210105, + 829 ], "deps": [ "dash", "f", "projectile" ], - "commit": "0eac79d8d6277dde1c5de39c4bd529bc042f092a", - "sha256": "17l570zd8d9r1lg1yfri2w7628p7wp7nm5flq5iwm4v85048pair" + "commit": "941091b3ab074c482a5920194d61f50e9b50d503", + "sha256": "1p18lg3apmhcmvkwldnygy35s1kjj68sgv81lyyf0csvc0pxbcpk" } }, { @@ -57261,14 +57239,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20200625, - 924 + 20210114, + 1549 ], "deps": [ "s" ], - "commit": "d073acb6339e99edf77833f82277afd9a076f16a", - "sha256": "1p2d92mcbdl8j22qz04iwdlpkbv2qn9p8ds8n2vpf4m9mgzjplzi" + "commit": "0774d3b5b954e82e5bbcbe5123c689341297b01e", + "sha256": "056zv48nbqvnadca4q2hh0aal2bz00f9ayzqpwnsxl482p8bi93k" }, "stable": { "version": [ @@ -58646,14 +58624,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210105, - 1152 + 20210113, + 1834 ], "deps": [ "request" ], - "commit": "6c64f7b0776d346561bc887042a6cc5053b723f1", - "sha256": "03b94jzmw12q71j8nv09nk9g00asc0a2g2sj2x534syifhksb9dr" + "commit": "e5821f5ccb34262aedcb4ea3a19e583c6a97e2f8", + "sha256": "1g9cn34r948a0g9wyda1kzlq33ddgmarl9j6wbb76g0fgkh7qjh9" }, "stable": { "version": [ @@ -59207,16 +59185,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210108, - 1551 + 20210115, + 651 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "038bc694d45d5069cf3488682928d2315f0b0d17", - "sha256": "081sik013p310idnnv60qa5pm1qpk61ibqhchsvindp5ssw7ln8w" + "commit": "e4205c5da3a0c99f0b29677736711ee069e2c175", + "sha256": "0kxdli25dbzq7mjinnvfxy2x9zy79062l45kafpayywa1ipwgfkp" } }, { @@ -60517,8 +60495,8 @@ 20180219, 1024 ], - "commit": "ab112e3de44c062d9bebd2e2b32c6c9b9812c43e", - "sha256": "1zhdp4k1jm23n28x58vflxw7znxgwmg4711awq5qgicn7srj8vw3" + "commit": "30cc83af69216ceced310c058ffae48bbe67fed1", + "sha256": "143l1fb3i0z7dxd39lw5qds62kv5ii9wy4gbqy3jg11swva0xkcd" }, "stable": { "version": [ @@ -62246,8 +62224,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210111, - 1652 + 20210114, + 1955 ], "deps": [ "dash", @@ -62258,8 +62236,8 @@ "markdown-mode", "spinner" ], - "commit": "df809cf4afca507761bdd5a85817d5258aef26c7", - "sha256": "14i3gwvf3adfp8f5kblmmvlyb9wj7s2kyscgpqr8k0zjhbj2ibj7" + "commit": "0062a7cd4ab674390287e6b20d93ac42ed1f5512", + "sha256": "16awnan07b6ayf0rnxs8hal468bc7i24gw0l849s04v41y2i35cg" }, "stable": { "version": [ @@ -64304,11 +64282,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210110, - 2056 + 20210114, + 1652 ], - "commit": "09aaad9b01068481c71720058e9d828e0d87c806", - "sha256": "1j0k9ija5paidj7yvbagkkayz9bjwhia9yhmd2q4490ginbbxshs" + "commit": "327ad58bd69a372dc10dbb5b5d3d47f246e28020", + "sha256": "0nx5322278vr44aq27kaj5nr0rcq4d3wcbfyb3fpl80asj672m09" } }, { @@ -65367,16 +65345,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210112, - 700 + 20210114, + 1624 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "bfd5e52c826c27aab01aaded518179b1192a3620", - "sha256": "0w4aincibdfqcf9k3cgmsl054qx5rwhxcsqg8k676wg7b266wmrg" + "commit": "d012944ac149358d0e978b10ff0e8a090921e044", + "sha256": "0i89v52damd9jhg9sdqghxrcbdybix2cw8hzx6lawg847wc09j06" } }, { @@ -65390,8 +65368,8 @@ 20191025, 851 ], - "commit": "fc2f6e575077970dbabaac7643b820fcfd9d4f72", - "sha256": "0vm5rm4lym49nj4jk62s2inznkwx4gyrwlkgcz3q0qygylnn3r52" + "commit": "a1a6e02756426f58a885846cbe56c4704b2a79e1", + "sha256": "1drx20bj1bb45n6wan0ys04qp4ccqjapi4056qn0ry6fdzx3c35d" }, "stable": { "version": [ @@ -65681,11 +65659,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20201202, - 203 + 20210113, + 11 ], - "commit": "b5ca49f83f0b178fab4683b8443083515caaa4c2", - "sha256": "0qv6gazz5p46y5p2wc0h9pa4qq45aqbzx2s54aq1vviwl8v9hpj7" + "commit": "1dabdcd19ac93223ebc1a488666958e8c224449f", + "sha256": "0p5wwxfxds5h5v6jp4z2f423lzz3b3y84da8gw593byqzxd0sbf3" }, "stable": { "version": [ @@ -66553,11 +66531,11 @@ "repo": "sigma/mocker.el", "unstable": { "version": [ - 20201223, - 658 + 20210115, + 157 ], - "commit": "5d739d5170ff42e841cd2755b68151918052da2b", - "sha256": "1dc514cqbfmg33sb3j90s5jmw6jnm3wzvs0zhw3maz13bp7w6z48" + "commit": "cc538e5702274ad9e8c6c41c807f890ca38f427f", + "sha256": "0ai424aggmavj3yjqpzi8a7cxxz96bm3wdbs7vy4g68xxb88ll7n" }, "stable": { "version": [ @@ -66774,11 +66752,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210112, - 853 + 20210114, + 1245 ], - "commit": "fba8fb08544dd4a19fcc5c0b2ca50490bf4b10e9", - "sha256": "025ak5yvy2920djia1976p1fyxdkl27jyhgi4gdsg8c13yr0asqk" + "commit": "cefa14959c9118c279adccd151ac77e05b8beb3e", + "sha256": "1zqyvqkgy9w0ay0i61gq0mz5dwjdymcq4c2cbypq0adph4dlhkjq" }, "stable": { "version": [ @@ -67106,11 +67084,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20200514, - 1946 + 20210114, + 850 ], - "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", - "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" + "commit": "2a29baa0cb6e364c5acbbf590a6d7c936c4378ae", + "sha256": "0l6cgr2969flhkdkiycqppvblpsn0qkdp19r406jpqbc1ql394lj" }, "stable": { "version": [ @@ -69716,8 +69694,8 @@ 20181024, 1439 ], - "commit": "fb824d27b39e10acb97f9b105df2d9485a4677e9", - "sha256": "0sliljjiikgrl4b2cp21hnc1qv9rjb3alj4hk2h334iddcah1klh" + "commit": "68f09b03c090840162d1852f1e92afa8e117cc4e", + "sha256": "1ampghm9laigs0frqfw2yjsm0whh2vff5gqp96i4d88n9ar0wj5n" }, "stable": { "version": [ @@ -69815,11 +69793,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20201229, - 138 + 20210115, + 340 ], - "commit": "53ea839a52335d089699d3530bae8ea5914cdbb6", - "sha256": "1gmsq0simdrk8w1ywls3bn224wxgc0v8dmcch75zjp34rx9fg11n" + "commit": "e8e5211f6e083cf0ba9aac52acb6657818a32972", + "sha256": "1zhvj1j5pvsfa0xzky819fc1xlhy3a4snkyyp1dczbfdnk34kan9" }, "stable": { "version": [ @@ -70420,11 +70398,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20201225, - 1832 + 20210113, + 1123 ], - "commit": "a12bf2a52a560cc27503add26e9c3087929b60ec", - "sha256": "1xwzxw9nfcm12zzgbndj4qzlx9mwxh4z57yyx1v6r3zzgr7qgcpn" + "commit": "1bbbde4a0c3153f6caa30724bd173397be43144f", + "sha256": "0lawmpg52yc7fsh2rrmwajds2yhx9jr3h8g04ikf4cma95v4d8s2" }, "stable": { "version": [ @@ -72095,8 +72073,8 @@ 20201204, 945 ], - "commit": "aa7e9df7b2ea20c16f17a4f7c40e2a86b106b182", - "sha256": "06841x8adncyw5r3n8xv05mlsb1iv9i8klxf1pj3021b9nbhjkii" + "commit": "7c6e115c38e447e7cfd4d1d128bed363d3d10c4b", + "sha256": "0jik0j3mjyd8fxdlcdkxp0znlw29fm3knqa7i4fgwz6cvzkl9fa0" }, "stable": { "version": [ @@ -74495,14 +74473,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210112, - 635 + 20210114, + 1508 ], "deps": [ "all-the-icons" ], - "commit": "9e924c1f7a8d893b59e3a62e8731e1bceded5b08", - "sha256": "13q7l77nij20ybpgqch5waj5n1kggcbd9xr44lqzar6s00zxc47d" + "commit": "e20c116f7a7a42f0cd6af580ef6e53e006c5b538", + "sha256": "1321z866ahs07kil4yzqvsnjcdldapg1gvfx9k9rdx11x3awja2q" } }, { @@ -74726,11 +74704,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20201019, - 824 + 20210113, + 1416 ], - "commit": "1c407b6a577f4a995030574d58f76e78da854742", - "sha256": "166ac0gnn8zamgzn166skdv4i6hs392wrdi8pmdx5s9wa3b60xy3" + "commit": "e08e2ab2b71763f53f2029471057d58f96085a69", + "sha256": "10v1ric4xppx92vv722d50as350pw14cqkjlswi0nqssgihxrk11" }, "stable": { "version": [ @@ -74750,14 +74728,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210105, - 2114 + 20210111, + 2224 ], "deps": [ "htmlize" ], - "commit": "bb378c7942804b81ac9ddf4b14381cd9d84c993c", - "sha256": "0qmbajl91a6xcjgd9537cw6r75ahycwz77rzc7svsa0rhjji8sh9" + "commit": "c19f54beebe268833c44a015861bf02531591011", + "sha256": "06c8hlj3zpsx9xsw7xr06db8c61iczyvn3kkwpg54p03sjzmpsnx" } }, { @@ -75591,8 +75569,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210111, - 1838 + 20210113, + 1549 ], "deps": [ "bibtex-completion", @@ -75607,8 +75585,8 @@ "pdf-tools", "s" ], - "commit": "e7aab97a39839cec7ba016bb5caaa9f9288bf21f", - "sha256": "16j8qb985jzjflgbnvd521wavsz5pmyhqds991pp0v12awm0dq7j" + "commit": "cd0b4997fad3a050a0092d1458d34286ef5122d2", + "sha256": "1rn9x5p4kmm83smg7c9xalbziliqq02fwfl4v1cgczqyb7vir7nz" }, "stable": { "version": [ @@ -76021,8 +75999,8 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20201222, - 234 + 20210114, + 2006 ], "deps": [ "dash", @@ -76030,8 +76008,8 @@ "org", "s" ], - "commit": "61ff797d068947a4f1c172bb83aaf5cf897febf1", - "sha256": "112nbh12qgq3wy3p736k8hjzpaa621zv4x2rdbxhaib1il7x7i7p" + "commit": "0c5a7b97be4e5e11093276af310442ab5776ab90", + "sha256": "1311yxmsdb9gms0v20dd7ak0vdkkgda5p89zrp21v4dazjh7rl9a" }, "stable": { "version": [ @@ -76153,11 +76131,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20201221, - 1630 + 20210113, + 731 ], - "commit": "1dd66614cc54a2051646324c7910e3e295d1cc40", - "sha256": "18fawppxij4yd2w5s1h223v0jpv44dpxbja32w0n9975ip5ciir0" + "commit": "0da4f8cc3a09bdd107da18ab381a4cabb461430d", + "sha256": "1684cxa1qj3b90zckhph7vawwxwa0djpaqwps0vh9p8yngy794z2" }, "stable": { "version": [ @@ -77097,36 +77075,38 @@ }, { "ename": "organize-imports-java", - "commit": "e38a261ab64a1ce897d997fcfba6f01e9ad969f0", - "sha256": "1m7nqw0mgyjzh0wyqkk6542ibg7d6fx6mgj21gv32js8rcnmkrmv", + "commit": "fe3f9f732a69483bfa86446cd90f0f1c2611cc80", + "sha256": "07wllb95sahlr4rjj29wc59qhgiml9ll84grwd0x5xi04f69ayq4", "fetcher": "github", "repo": "jcs-elpa/organize-imports-java", "unstable": { "version": [ - 20201105, - 540 + 20210113, + 1838 ], "deps": [ "dash", "f", + "ht", "s" ], - "commit": "95cc282063338daf602200ddc140e3bb01a13c44", - "sha256": "0bb6l5kc744dsq650m316fs0a4f9kzvs393wpghl3k1y60i8k227" + "commit": "6e0b1d094bc624a895d198874a8a423dfc033247", + "sha256": "0fhnlzg0gh9bkb471kxgsx69zqk1xybnii4lyv2lshylxac918a6" }, "stable": { "version": [ 0, - 2, - 4 + 3, + 0 ], "deps": [ "dash", "f", + "ht", "s" ], - "commit": "95cc282063338daf602200ddc140e3bb01a13c44", - "sha256": "0bb6l5kc744dsq650m316fs0a4f9kzvs393wpghl3k1y60i8k227" + "commit": "6e0b1d094bc624a895d198874a8a423dfc033247", + "sha256": "0fhnlzg0gh9bkb471kxgsx69zqk1xybnii4lyv2lshylxac918a6" } }, { @@ -78087,15 +78067,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20210112, - 1746 + 20210113, + 1749 ], "deps": [ "htmlize", "org" ], - "commit": "d782d572c8684f313576d1bb63912654e42e65fc", - "sha256": "049a4azfls5l7l5wnwyj1380d5m5mhc5h56y742w8xpqdp18jbk4" + "commit": "bae9075745f21da2dfce311ae3ca8ad12d75046c", + "sha256": "04hnl7w6hf2jwd788p3p633bdfcziwll8638mlmslpws84iwx905" } }, { @@ -78996,14 +78976,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20210112, - 2058 + 20210113, + 329 ], "deps": [ "cl-lib" ], - "commit": "35650f45063cf5f028ec406ded222f6bc59058f1", - "sha256": "08n8riq4vgaxgicns025mv1msw9vp8s25d82wa6c6ca3v9fdlvam" + "commit": "71484efbf5f5df74c0db9936019c2e08f5ef3789", + "sha256": "08w97l0xycnm2z43n51bmgkf38cgaj4jq8p3qxyw3gx76605i8ck" }, "stable": { "version": [ @@ -79845,20 +79825,20 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20200513, - 2352 + 20210108, + 1525 ], - "commit": "3497b6068d78ae15ba1eaf94e4315d18e9ae6b00", - "sha256": "0vf9qrkc4dna2f9l0ry1qhfxy7yw1dlilgh38dlp42kqdyp5qny8" + "commit": "25ea94f57c6f3531dd8383f8c5a45ee8d81272bd", + "sha256": "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni" }, "stable": { "version": [ 2, - 3, - 3 + 4, + 1 ], - "commit": "683c970a6fb51591bc88ee80e295fedee876e044", - "sha256": "0mpgyy9qfb5x4fvlmb274hgayjbwf0bgk65dxyx31zikjwpcd56p" + "commit": "25ea94f57c6f3531dd8383f8c5a45ee8d81272bd", + "sha256": "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni" } }, { @@ -82230,11 +82210,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20210111, - 1508 + 20210114, + 1506 ], - "commit": "4d7c9f154652fbaa627899566c026c0c941bb146", - "sha256": "1gnlmwasci438d3j3fh6ivsdzb65lpjk87xx93hfzmg6wfas3j85" + "commit": "e4f0067bdce3e071a7d9316a6e142e1c61215169", + "sha256": "1mvn4w3k1wf8yls0mjl667yzlir1qyvxamlzdx62yhqpr9y55sip" }, "stable": { "version": [ @@ -83782,20 +83762,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210111, - 44 + 20210113, + 314 ], - "commit": "3543f1616a6a27a9156403d8677f04ec2f7fc129", - "sha256": "046vc10rwnmzwi85nlj8fxjgy48jhyigwpvw1skn0g1q7ximhdqr" + "commit": "efd7ea490defc53a5b78e7469a3a35d225b766cc", + "sha256": "1in1w9h1hal1qbcqxlk3mqn3q5qpcpni8a2c05dxqaqavbvz2y4j" }, "stable": { "version": [ 0, 8, - 3 + 4 ], - "commit": "f8cb9d6329f96af62ee2e5f401c5430960cf81e1", - "sha256": "022m8abjg0ay531jdkmdrc7y9gl539dprzyrzj7yk6hgmzjx088z" + "commit": "efd7ea490defc53a5b78e7469a3a35d225b766cc", + "sha256": "1in1w9h1hal1qbcqxlk3mqn3q5qpcpni8a2c05dxqaqavbvz2y4j" } }, { @@ -85237,8 +85217,8 @@ 20200619, 1742 ], - "commit": "468bc193ec155756bccf2b2d9eeb8e003d95ce31", - "sha256": "0vp57802im4smywk84ad991mdh78hwbcm3yvd22n4yfspmr0lz7j" + "commit": "48234f5f012582843bb476ee3afef36cda94cb66", + "sha256": "1rn10w72a98k2r98lv3vaq6k8vwasdkc6c1r8lix441hd1jl60gj" }, "stable": { "version": [ @@ -88842,14 +88822,14 @@ "repo": "tomterl/repl-toggle", "unstable": { "version": [ - 20201022, - 938 + 20210114, + 932 ], "deps": [ "fullframe" ], - "commit": "68e7e8ef6775a870eb00828e87de09dba65a0fd7", - "sha256": "1brmmh68qcznd0n296ad3547p2awv03kvg1swdz653akci2pkd0n" + "commit": "091aea753f59f2af5c581e73d15b4dd7ee394d94", + "sha256": "0r2zr6dxzml418rmar5v6yw6x1wfbrk89lqqvgsbjfps3yk9b27a" }, "stable": { "version": [ @@ -89286,8 +89266,8 @@ "f", "s" ], - "commit": "8163bcd16417b7c600ebc1f8142414da2b839f4d", - "sha256": "1hpvv4aak164bld7m2613c501cn7z4y73cnaxg2fnpwijgyyqaxq" + "commit": "5143c92c806fd3a80e6729a42167be9caea88f45", + "sha256": "1kpnk1fhzgiv2dc3y6fk27ina7j11s6siagqpi5fckbbi18hd84i" }, "stable": { "version": [ @@ -89430,15 +89410,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20201226, - 1050 + 20210113, + 1559 ], "deps": [ "transient", "wgrep" ], - "commit": "7055a673b557de8b886e08e15f9578676d729195", - "sha256": "0jf0z8n292qc3xahj18gl8jj41fdhhbkgi0yjmvv9lmmnj874waz" + "commit": "c34266646951618af916684e954c33a9b1f86085", + "sha256": "12v7x427rwg8q9i7c81bzd4r4jpqwsv0442dahjxiivlrxqdb18h" }, "stable": { "version": [ @@ -89587,8 +89567,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20210110, - 1153 + 20210113, + 742 ], "deps": [ "cl-lib", @@ -89596,8 +89576,8 @@ "popup", "posframe" ], - "commit": "88efb918d50bed46b2a8948a52293eba8fffdcac", - "sha256": "0zv9fm1iyclljyp54ynswd3971dmiaqq32ivfhvmn3mzz5h8xals" + "commit": "8012c6a09195d940c2ba24d7c63974fb5b3b0e51", + "sha256": "0wnx4saydjy6h97hg9277sqykxs2qh7731qs27n5nhxq2rbyw01p" }, "stable": { "version": [ @@ -91108,8 +91088,8 @@ 20200830, 301 ], - "commit": "0f79135ef8d53d638012d4fd2bbc1b0f7bc22c04", - "sha256": "076hzca4ia0q8hv45i30k2h9g1m11iaimxhafs87a7hp2cmn7r9v" + "commit": "85f1e8f2dabb94fb1c853a7c60c1dda07163ac8e", + "sha256": "16cnp54gvkx7kc6kr74mahvjwhkpc7y60c8v16m8n7si6h77lfqd" } }, { @@ -91897,11 +91877,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210112, - 1945 + 20210114, + 2154 ], - "commit": "95ec10ead32a229bf392cd629a79b5683085bd4e", - "sha256": "159asv71ja4hpdzmc23q6j2c4ffdbr176bg311gmg7ivqalmi3jl" + "commit": "3abbfd9bc7d8991cce20202942a5b59a6c8d8dab", + "sha256": "05g0cwyv77ajbbq3ja4bsgh84m1829mqrp5mxg5gbwhjp9xr974r" }, "stable": { "version": [ @@ -94119,11 +94099,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210105, - 1102 + 20210114, + 912 ], - "commit": "dffdf3caa12e964127d6eb45ba92ac0442cc5a48", - "sha256": "0vv185gz3rkfng5y79dijfnc11p92qdz2kdza05avjbpqfs6l0zn" + "commit": "eb67be9698794ba66a09f46b7cfffab742863a91", + "sha256": "11yclc8i6gpy26m1yj6bid6da22639zpil1qzj87m5gfvxiv4zg6" }, "stable": { "version": [ @@ -96692,11 +96672,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210111, - 2324 + 20210113, + 2052 ], - "commit": "669532e3cf56232f22c3b318fcd4961a3789ecc0", - "sha256": "0n6hy9g95jpxh919m4vfs82bxzbyxr45w9khx4ckpsq1bp60dq29" + "commit": "1fe8720e2e1e8884eac512d28257d655306a9686", + "sha256": "1s99ynhkak2qpfy448yi1iwxss4zwz1p61279xv1771jx7aclcd3" }, "stable": { "version": [ @@ -98170,8 +98150,8 @@ "deps": [ "ivy" ], - "commit": "8f2abd397dba7205806cfa1615624adc8cd5145f", - "sha256": "0x3yy8q9ixs4zn7slhm7rskcvlsa8fdd2pbc075rx7chqzv6vc58" + "commit": "cbce9ce71429c98c67bd76ef15d049ecced042f7", + "sha256": "08lgvpvkhp2i9q73bnr2v17w864rwp6wjnrl3b7qg06dacfs2rvl" }, "stable": { "version": [ @@ -98486,8 +98466,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20201229, - 352 + 20210113, + 1943 ], "deps": [ "dash-functional", @@ -98501,8 +98481,8 @@ "smartparens", "undo-tree" ], - "commit": "a0db2c80ccb6895981a6dfda7ef79fab201825cc", - "sha256": "1rpmxnz5xd02g0cfrn4l2ixh5bb6f9yvpp6n58mpriwdy99ndamn" + "commit": "c535794b539627b26b7e73481e41f3c870d4b33e", + "sha256": "0pyyjbwcacql4l45fi6jxxvrm4alz9rm8pp6abikh5di98yidjm6" }, "stable": { "version": [ @@ -99130,8 +99110,8 @@ 20210104, 1044 ], - "commit": "e1bfc473df22605355cdfbb2adc55296018e94be", - "sha256": "0zkrs8gq2pmyynhgahzrpgy9ndpg77ql213vrh18ksfzaywdpqml" + "commit": "fe4030a3b44a283dc3e1062d40f2bb7ab08db542", + "sha256": "0y9c40dw9fcrjf9pdqiva12fha6d3yww6yip1g7dadi648hzr0ip" }, "stable": { "version": [ @@ -99318,28 +99298,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210112, - 1316 + 20210114, + 1122 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "f74d685028fcb93e9f51023f0e186f0f012c9523", - "sha256": "1nk145vy5rb1b9rvcb54w836ys1xlqrm86z91gaax3zk6r6xdqdq" + "commit": "d72bd42f57c0a09c2e91ecb69516b2eaab1991bd", + "sha256": "05czr9wwvqbhrvvslv2nsgip78ayfx4p6lfbdxnq44qjmfvamx0y" }, "stable": { "version": [ 0, 7, - 1 + 9 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "1d28dc209e2acf1a3bf2852cc620b6e412ea73f9", - "sha256": "0h6kj3r36x26v6p4gkzg5s6fv0brlvrf6ycsdwnz27fw5sdb99k7" + "commit": "f87858583ca7c0e4328f3373aa57d715fd25bbb7", + "sha256": "14954lpkd22p3q66lykbl0fvapdly9cll313jrag5qzbcccrxq5j" } }, { @@ -100394,8 +100374,8 @@ 20200212, 1903 ], - "commit": "ca45993f45837d9e209a1d1ad4479abab2125a36", - "sha256": "18gdyyhizfhbdy39j8ch4z5yhvbahzswyj7q29c21f5phmkpq1fj" + "commit": "442466ab9411594350d4f9ef012f9892d4034773", + "sha256": "0srj6fnk7damyh6snwnvl599iad4ys7dw944vp0d4wpay0sxqvcl" }, "stable": { "version": [ @@ -100485,8 +100465,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20201223, - 432 + 20210105, + 812 ], "deps": [ "cl-lib", @@ -100495,8 +100475,8 @@ "s", "typescript-mode" ], - "commit": "ba09882d88dd0191e9c02c9b4e0fcd74199ff3cc", - "sha256": "1ivr9wj289zhsc4kkzmlbpxvl5nyhj6a0ir23i05fh5j93wc1da0" + "commit": "e622d4d879d8b1de2517962b243146ec18b6cfff", + "sha256": "1963yf9nzx4hgp16c9vyn3drx9ypyni4xrrz1kylkb3mcm10y97v" }, "stable": { "version": [ @@ -101447,8 +101427,8 @@ 20210103, 1546 ], - "commit": "90e640fe8fa3f309c7cf347501e86ca5cd0bd85e", - "sha256": "0fcwy6v409clw47mf6zir1qrkq9js1rh0f2wi8xijx3hidlqln0j" + "commit": "7811dcff825210c17bd15525fb6a98854501af99", + "sha256": "1nwpwviica8fv8q8pfgx0r4888giq48x0phgl2mkvbz8rr6nyn50" }, "stable": { "version": [ @@ -101679,8 +101659,8 @@ "deps": [ "tsc" ], - "commit": "3dd686565b222fb00ff54b374333b48598f5317c", - "sha256": "1afalhxn6kcfbs1f2zirwhs68lskif17npda8iarpjbpm9bhml21" + "commit": "e7f2f625c1b9a2dce4f6b16a5affbb4f57337ae0", + "sha256": "0175mr8wqkrv83lyx7q9vbb6j90abqfbd3h1qc1kqb80p03l5vcr" }, "stable": { "version": [ @@ -101722,14 +101702,14 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20210106, - 1552 + 20210113, + 1755 ], "deps": [ "tree-sitter" ], - "commit": "3dd686565b222fb00ff54b374333b48598f5317c", - "sha256": "1afalhxn6kcfbs1f2zirwhs68lskif17npda8iarpjbpm9bhml21" + "commit": "e7f2f625c1b9a2dce4f6b16a5affbb4f57337ae0", + "sha256": "0175mr8wqkrv83lyx7q9vbb6j90abqfbd3h1qc1kqb80p03l5vcr" }, "stable": { "version": [ @@ -101788,8 +101768,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210108, - 1145 + 20210110, + 2030 ], "deps": [ "ace-window", @@ -101802,8 +101782,8 @@ "pfuture", "s" ], - "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", - "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101839,8 +101819,8 @@ "all-the-icons", "treemacs" ], - "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", - "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" } }, { @@ -101858,8 +101838,8 @@ "evil", "treemacs" ], - "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", - "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101888,8 +101868,8 @@ "deps": [ "treemacs" ], - "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", - "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101920,8 +101900,8 @@ "pfuture", "treemacs" ], - "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", - "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101945,16 +101925,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210107, - 1251 + 20210114, + 2135 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", - "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -101978,16 +101958,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210107, - 1251 + 20210114, + 2135 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", - "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" } }, { @@ -102005,8 +101985,8 @@ "projectile", "treemacs" ], - "commit": "559fa09e32d5db7f620fdd08e03b938e67bf398b", - "sha256": "12r28i8dql9n808b4sry11r7w1sic0b3cqfs2w20wki77wb9isdx" + "commit": "16d757fc697a73cbf7920caf2f598e839e7e0e56", + "sha256": "036chafmgx0zdqa00yb5y0y6lq6mfimlvwhzkdy1n982jgqvk12f" }, "stable": { "version": [ @@ -102263,8 +102243,8 @@ 20201229, 1403 ], - "commit": "3dd686565b222fb00ff54b374333b48598f5317c", - "sha256": "1afalhxn6kcfbs1f2zirwhs68lskif17npda8iarpjbpm9bhml21" + "commit": "e7f2f625c1b9a2dce4f6b16a5affbb4f57337ae0", + "sha256": "0175mr8wqkrv83lyx7q9vbb6j90abqfbd3h1qc1kqb80p03l5vcr" }, "stable": { "version": [ @@ -103864,8 +103844,8 @@ "deps": [ "s" ], - "commit": "e1cab50306375d1868ce8ab42394ed508bb67cb9", - "sha256": "12s6c94f9nxpf97crd8p6l844hrvgjbdryy7qpmybvb9zqlxlm9s" + "commit": "408c01423d7036463891d83e4a21227250ed2a14", + "sha256": "1jz7x93c14f2nm8iqc30kzfjbn5bcdvxxnfljvwj77mwgir2ali8" }, "stable": { "version": [ @@ -104594,11 +104574,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210104, - 2336 + 20210112, + 2239 ], - "commit": "7ee2d15a14985f30ca2a750691817634b2382b38", - "sha256": "1viv0l0mrlavqnv57isjwza4dig3488i3d9gmb44n8dhjarfpv86" + "commit": "91827971f655936d8a8df95c9d2f39eaee667c97", + "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp" }, "stable": { "version": [ @@ -108086,11 +108066,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210111, - 510 + 20210114, + 751 ], - "commit": "bfb3c65ea6e578abab5294c1ef003ac0784446eb", - "sha256": "0jffl3fq7yzdfpk7jy45bwll88q6ds9bk218xgnhs6sfwk55k94d" + "commit": "015ec792050b4df00bb640602903258431ca6a44", + "sha256": "0h8sr9ig5ww2dwg5d22dfndyq68fv5mm1lf99k76wy5dxkqs5w5c" } }, { @@ -110285,15 +110265,15 @@ "repo": "egh/zotxt-emacs", "unstable": { "version": [ - 20200514, - 423 + 20210115, + 456 ], "deps": [ "deferred", "request" ], - "commit": "63f13c794b165d047867d8e688cd17ae91bad858", - "sha256": "1s15fyg2ib3kpcxpc5i3cp8cayh163937az49agicnfsqwny5cpd" + "commit": "87d8c4836c5f43530db8f00a66b7b69087236875", + "sha256": "01w529yr96kx7xg2w670ci61aljd1alrbqy1qxnj9yiymqsnmys1" }, "stable": { "version": [ From 48038eb32806a77ad3d21f4aa8c8d37197cfbc78 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Fri, 15 Jan 2021 14:08:54 +0100 Subject: [PATCH 64/81] phpExtensions.protobuf: fix build with PHP 8 --- .../php-packages/protobuf/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index 10b045897373..e2ef068120d7 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pcre' }: +{ buildPecl, lib, pcre', fetchpatch }: buildPecl { pname = "protobuf"; @@ -8,6 +8,23 @@ buildPecl { buildInputs = [ pcre' ]; + patches = [ + # TODO: remove with next update + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/823f351448f7c432bed40b89ee3309e0a94c1855.patch"; + sha256 = "sha256-ozHtO8s9zvmh/+wBEge3Yn3n0pbpR3dAojJcuAg/G3s="; + stripLen = 4; + includes = [ + "array.c" + "def.c" + "map.c" + "message.c" + "protobuf.h" + "wkt.inc" + ]; + }) + ]; + meta = with lib; { description = '' Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. From 56c843946f326eead2c0bb3b5faeed14d4f72e6c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 Jan 2021 14:20:14 +0100 Subject: [PATCH 65/81] gammastep: 2.0.6 -> 2.0.7 --- pkgs/applications/misc/redshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 3d2c4dd16844..81a8267e51df 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -132,13 +132,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "00s457yajnm7vq6jfanyri52pq000jbyjiy6wz2i3f0rq7cc01ya"; + sha256 = "sha256-78z2CQ+r7undbp+8E0mMDNWWl+RXeS5he/ax0VomRYY="; }; meta = redshift.meta // { From 9797139cbb3085d0ab5c13bad8b56c1d67cc085a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 15 Jan 2021 14:22:34 +0100 Subject: [PATCH 66/81] dockerTools: typo Italian. --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 2ce034134d06..916d3cd003ee 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -109,7 +109,7 @@ rec { ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. - # And we cannot untar it, because then we cannot preserve permissions ecc. + # And we cannot untar it, because then we cannot preserve permissions etc. tarsum = runCommand "tarsum" { nativeBuildInputs = [ go ]; } '' From a81c27cd54f4badd24924e82f0d7da7285137534 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Fri, 15 Jan 2021 15:53:31 +0200 Subject: [PATCH 67/81] docker: fix systemd socket activation --- nixos/modules/virtualisation/docker.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index f0ee2fe14608..83d90d9fc97e 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -165,7 +165,7 @@ in '' ${cfg.package}/bin/dockerd \ --group=docker \ - --host=unix:// \ + --host=fd:// \ --log-driver=${cfg.logDriver} \ ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ ${optionalString cfg.liveRestore "--live-restore" } \ From f53cf9a65c83c400aec421cb2eb105acc75431f6 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Fri, 15 Jan 2021 15:53:43 +0200 Subject: [PATCH 68/81] Revert "nixos/tests/docker: wait for docker service" This reverts commit c14bafd6c7db3b0c03574e28831821adda22a6f1. --- nixos/tests/docker-tools.nix | 2 +- nixos/tests/docker.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index e2bd9ddf6470..6638ec4927ce 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = with pkgs.dockerTools; '' unix_time_second1 = "1970-01-01T00:00:01Z" - docker.wait_for_unit("docker.service") + docker.wait_for_unit("sockets.target") with subtest("Ensure Docker images use a stable date by default"): docker.succeed( diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index a0f328af775c..58e33535ed31 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = '' start_all() - docker.wait_for_unit("docker.service") + docker.wait_for_unit("sockets.target") docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg") docker.succeed( "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" From 40000911235ca99ed5af4330356fb76ffeb6197d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Fri, 15 Jan 2021 14:56:29 +0100 Subject: [PATCH 69/81] nixos/docker: change misleading error message The socketActivation option was removed, but later on socket activation was added back without the option to disable it. The description now reflects that socket activation is used unconditionally in the current setup. --- nixos/modules/virtualisation/docker.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 83d90d9fc97e..689f664b676d 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -216,7 +216,7 @@ in ]); imports = [ - (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed in favor of starting docker at boot") + (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed and socket activation is now always active") ]; } From a4e13d2a1a88fc299f98ffa5dde3cf267a183f0d Mon Sep 17 00:00:00 2001 From: msteen Date: Fri, 15 Jan 2021 15:07:23 +0100 Subject: [PATCH 70/81] nix-prefetch: 0.3.1 -> 0.4.0 --- .../nix-prefetch/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index af077e5f939c..320d41068ccb 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,39 +1,25 @@ { lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk -, gnugrep, gnused, jq, nix, fetchpatch }: +, gnugrep, gnused, jq, nix }: let binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; in stdenv.mkDerivation rec { pname = "nix-prefetch"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "msteen"; repo = "nix-prefetch"; rev = version; - sha256 = "15h6f743nn6sdq8l771sjxh92cyzqznkcs7szrc7nm066xvx8rd4"; + sha256 = "11792677zyi06jw641xi9aywwgh9002b8406w6qids212c14va6n"; # the stat call has to be in a subshell or we get the current date extraPostFetch = '' echo $(stat -c %Y $out) > $out/.timestamp ''; }; - patches = [ - # Fix compatibility with nixUnstable - # https://github.com/msteen/nix-prefetch/pull/9 - (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/2722cda48ab3f4795105578599b29fc99518eff4.patch"; - sha256 = "037m388sbl72kyqnk86mw7lhjhj9gzfglw3ri398ncfmmkq8b7r4"; - }) - # https://github.com/msteen/nix-prefetch/pull/12 - (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/de96564e9f28df82bccd0584953094e7dbe87e20.patch"; - sha256 = "0mxai6w8cfs7k8wfbsrpg5hwkyb0fj143nm0v142am0ky8ahn0d9"; - }) - ]; - postPatch = '' lib=$out/lib/${pname} From b5ea656f1baff941d2c3091e2464364c06b625ef Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Jan 2021 10:13:29 -0500 Subject: [PATCH 71/81] python3Packages.botocore: 1.19.51 -> 1.19.55 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8e4812e868e1..3c351ca24573 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.51"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.55"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-sgTFtHewQ8f2HLpdtHnGsl9oT3QJtxqOzbWms/V7XLQ="; + sha256 = "sha256-s0Mn2Es7tWIPtUYDZ3qalzsWcpDCweeracSkayAcbUY="; }; propagatedBuildInputs = [ From 13a904eda3e6340cdf3dcd7a5a04675769042c94 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Jan 2021 10:13:40 -0500 Subject: [PATCH 72/81] python3Packages.boto3: 1.16.51 -> 1.16.55 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index d4bcb9381e82..fc2176aac258 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.51"; # N.B: if you change this, change botocore too + version = "1.16.55"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-EdxJJoLPKk+P85ewoQmDc0Dvk+d8ouZXFc4k7PBDcXw="; + sha256 = "sha256-tQUhRANOSQNYxlnQ5IDBek5gT9Ou6al93+bjYaJFpKU="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 7bead9b8faf2103c71ddf52e34e38ee7ef64dcbf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Jan 2021 10:14:29 -0500 Subject: [PATCH 73/81] awscli: 1.18.211 -> 1.18.215 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 772c4a2f3b9f..8a258f613478 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.211"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.215"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-dkPdr0Q05CjeNg1FKbye4Ndtfakido0wKR22Afls3Mk="; + sha256 = "sha256-1gKpZAWYWnniX2wOFtTaQbYWSaDDSE+y4RNIWHpDSks="; }; postPatch = '' From 3d39348aacb7d78bfddc13d096f8fe461d0c9ecd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Jan 2021 15:18:01 +0000 Subject: [PATCH 74/81] =?UTF-8?q?oh-my-zsh:=202021-01-07=20=E2=86=92=20202?= =?UTF-8?q?1-01-14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 36ef1843162e..11796bee94b6 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,19 +1,19 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ lib, stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts, git -, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: +{ lib, stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts +, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-01-07"; + version = "2021-01-14"; pname = "oh-my-zsh"; - rev = "c9bf8b4a84d4ae392cf1bdd6a4a7c7c4f7710b92"; + rev = "a3bdff694a388c9bede63afec3c4a0a78bffa1ba"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "13i4r2bhffdjcln5cml29m9gzw9m39yxcln49h3shpp7s1gl3z4a"; + sha256 = "03zw150d11hmkdy39pazprmpsgg2jqvif2kdysg86p43ah40x8w9"; }; installPhase = '' From 4a521fb5e98a9316797b12d2662ffdb2cafdc0be Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Jan 2021 15:19:48 +0000 Subject: [PATCH 75/81] =?UTF-8?q?jenkins:=202.263.1=20=E2=86=92=202.263.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 13a6d596599a..f54ef1acbb02 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.263.1"; + version = "2.263.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1wfn5r356fqy8ypqnw44ir0cy8qr5ck6xckxnnn2c9x324mypv8f"; + sha256 = "13l7y1307iv54z2zsjy0slzv2hpqv9i35qb15xa8s6sl7lcm9l49"; }; buildCommand = '' From 518a0c1901b0c647c00548d90bdf40ed7ff40062 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Jan 2021 15:23:03 +0000 Subject: [PATCH 76/81] =?UTF-8?q?minecraft-server:=201.16.4=20=E2=86=92=20?= =?UTF-8?q?1.16.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/games/minecraft-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index bba64fe4b4f9..7d70ee9e6d3c 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.16.4"; + version = "1.16.5"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar"; + url = "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar"; # sha1 because that comes from mojang via api - sha1 = "35139deedbd5182953cf1caa23835da59ca3d7cd"; + sha1 = "1b557e7b033b583cd9f66746b7a9ab1ec1673ced"; }; preferLocalBuild = true; From 10e0e8251c75fbc7ef479eeec6d9101e3bc2e986 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 Jan 2021 15:28:24 +0000 Subject: [PATCH 77/81] =?UTF-8?q?scala=5F2=5F12:=202.12.12=20=E2=86=92=202?= =?UTF-8?q?.12.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/scala/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 15c73f814007..5b4c3a610f13 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -22,8 +22,8 @@ let }; "2.12" = { - version = "2.12.12"; - sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis="; + version = "2.12.13"; + sha256 = "17548sx7liskkadqiqaajmwp2w7bh9m2d8hp2mwyg8yslmjx4pcc"; tests = [ nixosTests.scala.scala_2_12 ]; pname = "scala_2_12"; }; From 2fcab516c4cae0bc50455abd356f60e576fec5d9 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 10 Jan 2021 10:03:50 +0100 Subject: [PATCH 78/81] iso-image: enable XZ compress filter Minimal ISO: 1m21 -> 2m25 625M -> 617M Plasma5 ISO: 2m45 -> 5m18 1.4G -> 1.3G Decompression speed stays about the same. It's just a few seconds for the whole image anyways and, with that kind of speed, you're going to be bottlenecked by IO long before the CPU. --- nixos/modules/installer/cd-dvd/iso-image.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 43d20a556f8d..1418420afcd9 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -425,7 +425,12 @@ in }; isoImage.squashfsCompression = mkOption { - default = "xz -Xdict-size 100%"; + default = with pkgs.stdenv.targetPlatform; "xz -Xdict-size 100% " + + lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86" + # Untested but should also reduce size for these platforms + + lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm" + + lib.optionalString (isPowerPC) "-Xbcj powerpc" + + lib.optionalString (isSparc) "-Xbcj sparc"; description = '' Compression settings to use for the squashfs nix store. ''; From 893f6415043823b76f93a96afce6b43d785d4ad4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Jan 2021 15:40:00 +0100 Subject: [PATCH 79/81] python3Packages.pysoma: init at 0.0.10 --- .../python-modules/pysoma/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pysoma/default.nix diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix new file mode 100644 index 000000000000..893736ff1603 --- /dev/null +++ b/pkgs/development/python-modules/pysoma/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pysoma"; + version = "0.0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q8afi6m3mfh0rfpghyvx6z76kgrpkbnlqzbs4p8ax13n0fnlkdi"; + }; + + # Project has no test + doCheck = false; + pythonImportsCheck = [ "api" ]; + + meta = with lib; { + description = "Python wrapper for the HTTP API provided by SOMA Connect"; + homepage = "https://pypi.org/project/pysoma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b56d493df39b..3fe9360dd098 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5833,6 +5833,8 @@ in { pysolr = callPackage ../development/python-modules/pysolr { }; + pysoma = callPackage ../development/python-modules/pysoma { }; + py-sonic = callPackage ../development/python-modules/py-sonic { }; pysonos = callPackage ../development/python-modules/pysonos { }; From f03c38bb8fbb1504f33cc40bfc013e5c68aea287 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 15 Jan 2021 15:41:03 +0100 Subject: [PATCH 80/81] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 411506fe1773..aad3034f8946 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -759,7 +759,7 @@ "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher "solax" = ps: with ps; [ ]; # missing inputs: solax - "soma" = ps: with ps; [ ]; # missing inputs: pysoma + "soma" = ps: with ps; [ pysoma ]; "somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy "sonarr" = ps: with ps; [ ]; # missing inputs: sonarr From 1497071f23170651328b4ab0071fcbf3dd6a69d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Jan 2021 15:37:03 +0000 Subject: [PATCH 81/81] python37Packages.ansi: 0.1.5 -> 0.2.0 --- pkgs/development/python-modules/ansi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 65f51c17d7d4..d198fde80bb8 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ansi"; - version = "0.1.5"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "02sknsbx55r6nylznslmmzzkfi3rsw7akpyzi6f1bqvr2ila8p0f"; + sha256 = "98e9b27c4bb187867a69480cbc63b843331622fec7e7d090873d806e1b5d8a80"; }; checkPhase = ''