diff --git a/doc/builders/packages/citrix.section.md b/doc/builders/packages/citrix.section.md index 4721f7e90f7..bcf0924249b 100644 --- a/doc/builders/packages/citrix.section.md +++ b/doc/builders/packages/citrix.section.md @@ -4,7 +4,7 @@ The [Citrix Workspace App](https://www.citrix.com/products/workspace-app/) is a ## Basic usage {#sec-citrix-base} -The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix. +The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix. ## Citrix Self-service {#sec-citrix-selfservice} @@ -19,7 +19,7 @@ $ selfservice ## Custom certificates {#sec-citrix-custom-certs} -The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`: +The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://citrix.github.io/receiver-for-linux-command-reference/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`: ```nix with import { config.allowUnfree = true; }; diff --git a/doc/builders/packages/ibus.section.md b/doc/builders/packages/ibus.section.md index 1b09d3fbbab..ec78cd0c9a9 100644 --- a/doc/builders/packages/ibus.section.md +++ b/doc/builders/packages/ibus.section.md @@ -4,7 +4,7 @@ This package is an ibus-based completion method to speed up typing. ## Activating the engine {#sec-ibus-typing-booster-activate} -IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html). +IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/). On NixOS, you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module: diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index d5996cce13c..0d4865b7af1 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -34,7 +34,7 @@ To allow software to use various virtual file systems, `gvfs` package can be als ### GdkPixbuf loaders {#ssec-gnome-gdk-pixbuf-loaders} -GTK applications typically use [GdkPixbuf](https://developer.gnome.org/gdk-pixbuf/stable/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`. +GTK applications typically use [GdkPixbuf](https://gitlab.gnome.org/GNOME/gdk-pixbuf/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`. Unlike other libraries mentioned in this section, GdkPixbuf only supports a single value in its controlling environment variable `GDK_PIXBUF_MODULE_FILE`. It is supposed to point to a cache file containing information about the available loaders. Each loader package will contain a `lib/gdk-pixbuf-2.0/2.10.0/loaders.cache` file describing the default loaders in `gdk-pixbuf` package plus the loader contained in the package itself. If you want to use multiple third-party loaders, you will need to create your own cache file manually. Fortunately, this is pretty rare as [not many loaders exist](https://gitlab.gnome.org/federico/gdk-pixbuf-survey/blob/master/src/modules.md). @@ -70,7 +70,7 @@ Also make sure that `icon-theme.cache` is installed for each theme provided by t ### GTK Themes {#ssec-gnome-themes} -Previously, a GTK theme needed to be in `XDG_DATA_DIRS`. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for [elementary HIG](https://elementary.io/docs/human-interface-guidelines#human-interface-guidelines)) might require a special theme like `pantheon.elementary-gtk-theme`. +Previously, a GTK theme needed to be in `XDG_DATA_DIRS`. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for [elementary HIG](https://docs.elementary.io/hig)) might require a special theme like `pantheon.elementary-gtk-theme`. ### GObject introspection typelibs {#ssec-gnome-typelibs} diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 69c7f3eb7af..bd804969951 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "7.1"; + version = "7.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "V7p1Hpt1GfD23e5QUgLjh8dd3kQMH3qhuTEMw4FAaDY="; + sha256 = "hvNEJ2i9KHPOxpP4PN+AtLRErTzBR2C3Q2FHT8h6RSY="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index d8fa27e34a0..0697497d43d 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,17 +1,13 @@ { - "version": "3.129.0", + "version": "3.139.0", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-x86_64.AppImage", - "hash": "sha512-JLO2jX9Us6BjqmTZIkVyxy2pqFM/eFGpwi6vXicMOgDB0UsgEMTK+Ww+9g+vJ1KbFRFmlt187qkdSNcevQPt7w==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-x86_64.AppImage", + "hash": "sha512-0s/tQmP5PINoQB7FOhR5wYuBvynKHpM9uMNmkJs77z84rY+WXOdZRjki6ZeG60niNXr8rUSLOBffy4jyLka6tg==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-arm64.AppImage", - "hash": "sha512-LGUSRqMrJ+hVHyi/bjI/NkWRVsmY0Kh/wRY9RNJXm0C3dKQSFV8ca4GeY9+VCuJEecR4LGnWp4agS5jPybPP6w==" - }, - "i686-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-i386.AppImage", - "hash": "sha512-XbQ4hn3QJ61hDC12cK95zsUowbyXPYArHZoRDx5trQ30phtQxtz6nV+pL00m4S9kYeEhsAwk1wXlRq9Ylbz2IA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-arm64.AppImage", + "hash": "sha512-LralbOiIVQCtQTqmhTtKttdtMz4M14drPFZ00LPFcwzQviLdU2C/od3NUxf5H5piGgqt5TJlgMCOcLIiyoNKFA==" } } } diff --git a/pkgs/applications/editors/standardnotes/update.nix b/pkgs/applications/editors/standardnotes/update.nix index 5b8794e9a44..7b5f6616602 100644 --- a/pkgs/applications/editors/standardnotes/update.nix +++ b/pkgs/applications/editors/standardnotes/update.nix @@ -50,6 +50,5 @@ writeScript "update-standardnotes" '' updatePlatform x86_64-linux linux-x86_64 updatePlatform aarch64-linux linux-arm64 - updatePlatform i686-linux linux-i386 setJsonKey .version "$newVersion" '' diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 9724ad95367..42909784263 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -16,7 +16,6 @@ , embree, gmp, libharu }: -with lib; let python = python310Packages.python; optix = fetchzip { @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] - ++ optionals cudaSupport [ addOpenGLRunpath ]; + ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp @@ -63,10 +62,10 @@ stdenv.mkDerivation rec { else [ llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) - ++ optional jackaudioSupport libjack2 - ++ optional cudaSupport cudaPackages.cudatoolkit - ++ optional colladaSupport opencollada - ++ optional spaceNavSupport libspnav; + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optional cudaSupport cudaPackages.cudatoolkit + ++ lib.optional colladaSupport opencollada + ++ lib.optional spaceNavSupport libspnav; pythonPath = with python310Packages; [ numpy requests ]; postPatch = '' @@ -118,16 +117,16 @@ stdenv.mkDerivation rec { "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" ] - ++ optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ "-DWITH_CYCLES_OSL=OFF" # requires LLVM "-DWITH_OPENVDB=OFF" # OpenVDB currently doesn't build on darwin "-DLIBDIR=/does-not-exist" ] # Clang doesn't support "-export-dynamic" - ++ optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" - ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optionals cudaSupport [ + ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" + ++ lib.optional jackaudioSupport "-DWITH_JACK=ON" + ++ lib.optionals cudaSupport [ "-DWITH_CYCLES_CUDA_BINARIES=ON" "-DWITH_CYCLES_DEVICE_OPTIX=ON" "-DOPTIX_ROOT_DIR=${optix}" @@ -137,7 +136,7 @@ stdenv.mkDerivation rec { # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. - NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; + NIX_LDFLAGS = lib.optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; blenderExecutable = placeholder "out" + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); @@ -154,7 +153,7 @@ stdenv.mkDerivation rec { # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be # found. See the explanation in libglvnd. - postFixup = optionalString cudaSupport '' + postFixup = lib.optionalString cudaSupport '' for program in $out/bin/blender $out/bin/.blender-wrapped; do isELF "$program" || continue addOpenGLRunpath "$program" diff --git a/pkgs/applications/misc/electrum/update.nix b/pkgs/applications/misc/electrum/update.nix index 247fabe3891..7a0fb8fd3eb 100644 --- a/pkgs/applications/misc/electrum/update.nix +++ b/pkgs/applications/misc/electrum/update.nix @@ -10,8 +10,6 @@ , nix }: -with lib; - let downloadPageUrl = "https://download.electrum.org"; @@ -23,7 +21,7 @@ writeScript "update-electrum" '' set -eu -o pipefail -export PATH=${makeBinPath [ +export PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl @@ -50,7 +48,7 @@ sigFile=$srcFile.asc export GNUPGHOME=$PWD/gnupg mkdir -m 700 -p "$GNUPGHOME" -gpg --batch --recv-keys ${concatStringsSep " " (map (x: "'${x}'") signingKeys)} +gpg --batch --recv-keys ${lib.concatStringsSep " " (map (x: "'${x}'") signingKeys)} gpg --batch --verify "$sigFile" "$srcFile" sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$srcFile") diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index 7ff20b16d79..56f8be698f3 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -25,8 +25,6 @@ , enableSystemd ? false }: -with lib; - stdenv.mkDerivation rec { pname = "elogind"; version = "246.10"; @@ -72,7 +70,7 @@ stdenv.mkDerivation rec { "-Dsysconfdir=${placeholder "out"}/etc" ]; - meta = { + meta = with lib; { homepage = "https://github.com/elogind/elogind"; description = ''The systemd project's "logind", extracted to a standalone package''; platforms = platforms.linux; # probably more diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 8a33ba3ea3a..78d5e010213 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -4,8 +4,6 @@ , postgresSupport ? false, postgresql ? null }: -with lib; - stdenv.mkDerivation rec { pname = "gammu"; version = "1.42.0"; @@ -31,10 +29,10 @@ stdenv.mkDerivation rec { strictDeps = true; buildInputs = [ bash bluez libusb1 curl gettext sqlite libiconv ] - ++ optionals dbiSupport [ libdbi libdbiDrivers ] - ++ optionals postgresSupport [ postgresql ]; + ++ lib.optionals dbiSupport [ libdbi libdbiDrivers ] + ++ lib.optionals postgresSupport [ postgresql ]; - meta = { + meta = with lib; { homepage = "https://wammu.eu/gammu/"; description = "Command line utility and library to control mobile phones"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index f2692243db6..2f244e20e15 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,7 +1,5 @@ { lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}: -with lib; - perlPackages.buildPerlPackage rec { pname = "get_iplayer"; version = "3.27"; @@ -26,11 +24,11 @@ perlPackages.buildPerlPackage rec { installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { description = "Downloads TV and radio from BBC iPlayer"; license = licenses.gpl3Plus; homepage = "https://squarepenguin.co.uk/"; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index b001b50c401..0bb01c38712 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -8,8 +8,6 @@ , enableTesseract ? true, leptonica, tesseract4 }: -with lib; - # k2pdfopt is a pain to package. It requires modified versions of mupdf, # leptonica, and tesseract. Instead of shipping patches for these upstream # packages, k2pdfopt includes just the modified source files for these @@ -140,12 +138,12 @@ in stdenv.mkDerivation rec { }; in [ zlib libpng ] ++ - optional enableGSL gsl ++ - optional enableGhostScript ghostscript ++ - optional enableMuPDF mupdf_modded ++ - optional enableDJVU djvulibre ++ - optional enableGOCR gocr ++ - optionals enableTesseract [ leptonica_modded tesseract_modded ]; + lib.optional enableGSL gsl ++ + lib.optional enableGhostScript ghostscript ++ + lib.optional enableMuPDF mupdf_modded ++ + lib.optional enableDJVU djvulibre ++ + lib.optional enableGOCR gocr ++ + lib.optionals enableTesseract [ leptonica_modded tesseract_modded ]; dontUseCmakeBuildDir = true; @@ -157,7 +155,7 @@ in stdenv.mkDerivation rec { install -D -m 755 k2pdfopt $out/bin/k2pdfopt ''; - preFixup = optionalString enableTesseract '' + preFixup = lib.optionalString enableTesseract '' wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract4}/share/tessdata ''; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 2cdaf78c028..bf386c116d4 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -37,8 +37,6 @@ , nixosTests }: -with lib; - stdenv.mkDerivation rec { pname = "keepassxc"; version = "2.7.4"; @@ -50,13 +48,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s="; }; - NIX_CFLAGS_COMPILE = 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"}" ]; - NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -67,13 +65,13 @@ stdenv.mkDerivation rec { "-DWITH_GUI_TESTS=ON" "-DWITH_XC_UPDATECHECK=OFF" ] - ++ (optional (!withKeePassX11) "-DWITH_XC_X11=OFF") - ++ (optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") - ++ (optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") - ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") - ++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") - ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") - ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); + ++ (lib.optional (!withKeePassX11) "-DWITH_XC_X11=OFF") + ++ (lib.optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") + ++ (lib.optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") + ++ (lib.optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") + ++ (lib.optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") + ++ (lib.optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") + ++ (lib.optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); doCheck = true; checkPhase = '' @@ -112,14 +110,14 @@ stdenv.mkDerivation rec { readline zlib ] - ++ optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication - ++ optional stdenv.isDarwin qtmacextras - ++ optional stdenv.isLinux libusb1 - ++ optional withKeePassX11 qtx11extras; + ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication + ++ lib.optional stdenv.isDarwin qtmacextras + ++ lib.optional stdenv.isLinux libusb1 + ++ lib.optional withKeePassX11 qtx11extras; passthru.tests = nixosTests.keepassxc; - meta = { + meta = with lib; { description = "Offline password manager with many features."; longDescription = '' A community fork of KeePassX, which is itself a port of KeePass Password Safe. diff --git a/pkgs/applications/misc/lukesmithxyz-bible/kjv.nix b/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix similarity index 100% rename from pkgs/applications/misc/lukesmithxyz-bible/kjv.nix rename to pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 141bdac87da..b9a1c0fd537 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "McKael"; repo = "madonctl"; rev = "v${version}"; - sha256 = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8="; + hash = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 39849f6827e..efa10faf2a0 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.3.1"; + version = "2.4.0"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-nH2BsfXFwBdu7/YH2OuG90HxYgiuqKJqMC4p0PRlgPw="; + hash = "sha256-/Zi82ri61cQHt1D8DjeVHTSeEn9ubQJD931kP0ffiOs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index a2f2a676aba..00d157eb25f 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "sha256-xedunFzar44o+b/45isXWacDcC81wWkxgGwnpLPH/n0="; + sha256 = "sha256-xV/1LFby0L/o648XEQQ9gS9/eHssWhMIG7R1E8bfIDU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix b/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix index c795e7f7634..62c6ed0f4a4 100644 --- a/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix +++ b/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "pokemon-colorscripts-mac"; - version = "stable=2021-08-10"; + version = "stable-2021-08-10"; src = fetchFromGitHub { owner = "nuke-dash"; diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/applications/misc/rm-improved/default.nix index c35fa3dc887..be5fb634449 100644 --- a/pkgs/applications/misc/rm-improved/default.nix +++ b/pkgs/applications/misc/rm-improved/default.nix @@ -1,7 +1,5 @@ { fetchFromGitHub, rustPlatform, lib }: -with lib; - rustPlatform.buildRustPackage rec { pname = "rm-improved"; version = "0.13.0"; @@ -15,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0d065xia4mwdhxkiqfg7pic6scfzipzmsvvx7l6l97w62lzpiqx3"; }; - meta = { + meta = with lib; { description = "Replacement for rm with focus on safety, ergonomics and performance"; homepage = "https://github.com/nivekuil/rip"; maintainers = with maintainers; [ nils-degroot ]; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 5badb7f1b35..9c96cb2444b 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }: -with lib; - stdenv.mkDerivation rec { pname = "slstatus"; version = "unstable-2019-02-16"; @@ -12,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0kayyhpmppybhwndxgabw48wsk9v8x9xdb05xrly9szkw3jbvgw4"; }; - configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; inherit patches; @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { homepage = "https://tools.suckless.org/slstatus/"; description = "status monitor for window managers that use WM_NAME like dwm"; license = licenses.isc; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 2897bb996c8..9f36d6bfa37 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -14,14 +14,12 @@ , btrfs-progs }: -with lib; - stdenv.mkDerivation rec { pname = "veracrypt"; version = "1.25.9"; src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; + url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; sha256 = "sha256-drbhgYS8IaQdKUn/Y9ch1JBUpxbO/zpL13tcNRC3lK8="; }; @@ -54,7 +52,7 @@ stdenv.mkDerivation rec { --replace "Icon=veracrypt" "Icon=veracrypt.xpm" ''; - meta = { + meta = with lib; { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = "https://www.veracrypt.fr/"; license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ]; diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index d6790759bab..b47bbef0188 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config , glib, libwnck, procps }: -with lib; - stdenv.mkDerivation rec { pname = "xsuspender"; version = "1.3"; @@ -21,10 +19,10 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/xsuspender \ - --prefix PATH : "${makeBinPath [ procps ]}" + --prefix PATH : "${lib.makeBinPath [ procps ]}" ''; - meta = { + meta = with lib; { description = "Auto-suspend inactive X11 applications"; homepage = "https://kernc.github.io/xsuspender/"; license = licenses.wtfpl; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 29140b04dd9..84015ba4a3f 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -6,8 +6,6 @@ , gtk-mac-integration }: -with lib; - stdenv.mkDerivation rec { pname = "zathura"; version = "0.5.2"; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { "-Dsynctex=enabled" # Make sure tests are enabled for doCheck "-Dtests=enabled" - ] ++ optional (!stdenv.isLinux) "-Dseccomp=disabled"; + ] ++ lib.optional (!stdenv.isLinux) "-Dseccomp=disabled"; nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx @@ -38,12 +36,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk girara libintl sqlite glib file librsvg texlive.bin.core - ] ++ optional stdenv.isLinux libseccomp - ++ optional stdenv.isDarwin gtk-mac-integration; + ] ++ lib.optional stdenv.isLinux libseccomp + ++ lib.optional stdenv.isDarwin gtk-mac-integration; doCheck = !stdenv.isDarwin; - meta = { + meta = with lib; { homepage = "https://git.pwmt.org/pwmt/zathura"; description = "A core component for zathura PDF viewer"; license = licenses.zlib; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index c50e672d075..f776c2c0388 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -38,7 +38,7 @@ , xorg , zlib }: -with lib; + let deps = [ alsa-lib @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { version = "6.0.3"; src = fetchurl { - url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; + url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; sha256 = "sha256-UDyVPoQM78CKVWXgr08An77QTiFVmRNHwQPGaj1jAIM="; }; @@ -134,16 +134,16 @@ stdenv.mkDerivation rec { --replace "/etc/appgate.conf" "$out/etc/appgate.conf" wrapProgram $out/opt/appgate/service/createdump \ - --set LD_LIBRARY_PATH "${makeLibraryPath [ stdenv.cc.cc ]}" + --set LD_LIBRARY_PATH "${lib.makeLibraryPath [ stdenv.cc.cc ]}" wrapProgram $out/opt/appgate/appgate-driver \ - --prefix PATH : ${makeBinPath [ iproute2 networkmanager dnsmasq ]} \ + --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]} \ --set LD_LIBRARY_PATH $out/opt/appgate/service # make xdg-open overrideable at runtime makeWrapper $out/opt/appgate/Appgate $out/bin/appgate \ - --suffix PATH : ${makeBinPath [ xdg-utils ]} \ - --set LD_LIBRARY_PATH $out/opt/appgate:${makeLibraryPath deps} + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --set LD_LIBRARY_PATH $out/opt/appgate:${lib.makeLibraryPath deps} wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH ''; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index ca52cf94d8c..2f39e82f3b2 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -3,8 +3,6 @@ , enableWideVine, ungoogled }: -with lib; - mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; @@ -76,7 +74,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google" - + optionalString ungoogled ", with dependencies on Google web services removed"; + + lib.optionalString ungoogled ", with dependencies on Google web services removed"; longDescription = '' Chromium is an open source web browser from Google that aims to build a safer, faster, and more stable way for all Internet users to experience @@ -86,11 +84,11 @@ mkChromiumDerivation (base: rec { homepage = if ungoogled then "https://github.com/Eloston/ungoogled-chromium" else "https://www.chromium.org/"; - maintainers = with maintainers; if ungoogled + maintainers = with lib.maintainers; if ungoogled then [ squalus primeos michaeladler ] else [ primeos thefloweringash ]; - license = if enableWideVine then licenses.unfree else licenses.bsd3; - platforms = platforms.linux; + license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; + platforms = lib.platforms.linux; mainProgram = "chromium"; hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") then ["aarch64-linux" "x86_64-linux"] diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 23b47c84555..413db2cf985 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -51,8 +51,6 @@ buildFun: -with lib; - let python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools @@ -75,16 +73,16 @@ let let # Serialize Nix types into GN types according to this document: # https://source.chromium.org/gn/gn/+/master:docs/language.md - mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; + mkGnString = value: "\"${lib.escape ["\"" "$" "\\"] value}\""; sanitize = value: if value == true then "true" else if value == false then "false" - else if isList value then "[${concatMapStringsSep ", " sanitize value}]" - else if isInt value then toString value - else if isString value then mkGnString value + else if lib.isList value then "[${lib.concatMapStringsSep ", " sanitize value}]" + else if lib.isInt value then toString value + else if lib.isString value then mkGnString value else throw "Unsupported type for GN value `${value}'."; toFlag = key: value: "${key}=${sanitize value}"; - in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + in attrs: lib.concatStringsSep " " (lib.attrValues (lib.mapAttrs toFlag attrs)); # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py gnSystemLibraries = [ @@ -151,9 +149,9 @@ let libdrm wayland mesa.drivers libxkbcommon curl libepoxy - ] ++ optional systemdSupport systemd - ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; + ] ++ lib.optional systemdSupport systemd + ++ lib.optionals cupsSupport [ libgcrypt cups ] + ++ lib.optional pulseSupport libpulseaudio; patches = [ # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): @@ -237,10 +235,10 @@ let # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py - '' + optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' - '' + optionalString ungoogled '' + '' + lib.optionalString ungoogled '' ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" ${ungoogler}/utils/patches.py . ${ungoogler}/patches ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . @@ -300,15 +298,15 @@ let # as well to avoid incompatibilities (if this continues to be a problem # from time to time): use_system_libwayland = true; - } // optionalAttrs proprietaryCodecs { + } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; - } // optionalAttrs pulseSupport { + } // lib.optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs ungoogled (importTOML ./ungoogled-flags.toml) + } // lib.optionalAttrs ungoogled (lib.importTOML ./ungoogled-flags.toml) // (extraAttrs.gnFlags or {})); configurePhase = '' @@ -317,7 +315,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" ${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} - ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + ${gnChromium}/bin/gn gen --args=${lib.escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 @@ -342,7 +340,7 @@ let ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; - in concatStringsSep "\n" commands; + in lib.concatStringsSep "\n" commands; postFixup = '' # Make sure that libGLESv2 is found by dlopen (if using EGL). diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 82d6107d119..01cd54cf8ee 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -47,8 +47,6 @@ , addOpenGLRunpath }: -with lib; - let opusWithCustomModes = libopus.override { withCustomModes = true; @@ -68,8 +66,8 @@ let bzip2 libcap at-spi2-atk at-spi2-core libkrb5 libdrm libglvnd mesa coreutils libxkbcommon pipewire wayland - ] ++ optional pulseSupport libpulseaudio - ++ optional libvaSupport libva + ] ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional libvaSupport libva ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -99,8 +97,8 @@ in stdenv.mkDerivation { tar xf data.tar.xz ''; - rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; - binpath = makeBinPath deps; + rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; + binpath = lib.makeBinPath deps; installPhase = '' runHook preInstall @@ -149,7 +147,7 @@ in stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ --set CHROME_WRAPPER "google-chrome-$dist" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${escapeShellArg commandLineArgs} + --add-flags ${lib.escapeShellArg commandLineArgs} for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf @@ -159,7 +157,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = { + meta = with lib; { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 56bf61aa03b..43865f051ba 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -53,10 +53,8 @@ , extraPrefs ? "" }: -with lib; - let - libPath = makeLibraryPath libPkgs; + libPath = lib.makeLibraryPath libPkgs; libPkgs = [ atk @@ -78,13 +76,13 @@ let stdenv.cc.libc zlib ] - ++ optionals pulseaudioSupport [ libpulseaudio ] - ++ optionals mediaSupport [ + ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals mediaSupport [ ffmpeg ]; # Library search path for the fte transport - fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; + fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source version = "11.5.8"; @@ -156,7 +154,7 @@ stdenv.mkDerivation rec { libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor # apulse uses a non-standard library path. For now special-case it. - ${optionalString (audioSupport && !pulseaudioSupport) '' + ${lib.optionalString (audioSupport && !pulseaudioSupport) '' libPath=${apulse}/lib/apulse:$libPath ''} @@ -224,7 +222,7 @@ stdenv.mkDerivation rec { clearPref("security.sandbox.content.write_path_whitelist"); ''} - ${optionalString (extraPrefs != "") '' + ${lib.optionalString (extraPrefs != "") '' ${extraPrefs} ''} EOF @@ -251,14 +249,14 @@ stdenv.mkDerivation rec { GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 EOF - WRAPPER_LD_PRELOAD=${optionalString useHardenedMalloc + WRAPPER_LD_PRELOAD=${lib.optionalString useHardenedMalloc "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} - WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ + WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ gnome.adwaita-icon-theme shared-mime-info ]} - WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ + WRAPPER_XDG_DATA_DIRS+=":"${lib.concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ glib gsettings-desktop-schemas gtk3 @@ -270,7 +268,7 @@ stdenv.mkDerivation rec { #! ${runtimeShell} set -o errexit -o nounset - PATH=${makeBinPath [ coreutils ]} + PATH=${lib.makeBinPath [ coreutils ]} export LC_ALL=C export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive @@ -317,7 +315,7 @@ stdenv.mkDerivation rec { : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" - ${optionalString pulseaudioSupport '' + ${lib.optionalString pulseaudioSupport '' # Figure out some envvars for pulseaudio : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}" : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}" diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 44599210458..02a65328cfd 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -25,8 +25,6 @@ , pkgsBuildBuild }: -with lib; - # k3s is a kinda weird derivation. One of the main points of k3s is the # simplicity of it being one binary that can perform several tasks. # However, when you have a good package manager (like nix), that doesn't @@ -73,7 +71,7 @@ let # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.26.0-rc.0-k3s1"; - baseMeta = { + baseMeta = with lib; { description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index e30a1214c3a..3312f957023 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -12,8 +12,6 @@ , R }: -with lib; - let spark = { pname, version, sha256, extraMeta ? {} }: stdenv.mkDerivation rec { @@ -26,7 +24,7 @@ let nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk python3Packages.python ] ++ extraPythonPackages - ++ optional RSupport R; + ++ lib.optional RSupport R; untarDir = "${pname}-${version}"; installPhase = '' @@ -38,12 +36,12 @@ let cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF export JAVA_HOME="${jdk}" export SPARK_HOME="$out/lib/${untarDir}" - '' + optionalString hadoopSupport '' + '' + lib.optionalString hadoopSupport '' export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) '' + '' export PYSPARK_PYTHON="${python3Packages.python}/bin/${python3Packages.python.executable}" export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" - ${optionalString RSupport '' + ${lib.optionalString RSupport '' export SPARKR_R_SHELL="${R}/bin/R" export PATH="\$PATH:${R}/bin"''} EOF @@ -64,10 +62,10 @@ let meta = { description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "https://spark.apache.org/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.all; - maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; + maintainers = with lib.maintainers; [ thoughtpolice offline kamilchm illustris ]; } // extraMeta; }; in diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index e6dca02dace..47298fb4dbc 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchFromGitHub, wrapPython, fetchpatch }: -with lib; - stdenv.mkDerivation { pname = "droopy"; version = "20160830"; @@ -32,7 +30,7 @@ stdenv.mkDerivation { wrapPythonPrograms ''; - meta = { + meta = with lib; { description = "Mini Web server that let others upload files to your computer"; homepage = "http://stackp.online.fr/droopy"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 4450eefa6eb..6badb7cda76 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,6 +1,5 @@ { lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee-discord"; version = "0.4.3"; @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "Bitlbee plugin for Discord"; homepage = "https://github.com/sm00th/bitlbee-discord"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index abd50868e03..3e09a6aa25b 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,6 +1,5 @@ { lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; version = "1.4.5"; @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { export BITLBEE_DATADIR=$out/share/bitlbee ''; - meta = { + meta = with lib; { description = "Bitlbee plugin for Mastodon"; homepage = "https://alexschroeder.ch/cgit/bitlbee-mastodon/about"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 580af6e2e0c..441963f57dd 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,6 +1,5 @@ { lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, libgcrypt }: -with lib; stdenv.mkDerivation rec { version = "1.4.2"; pname = "bitlbee-steam"; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "Steam protocol plugin for BitlBee"; homepage = "https://github.com/jgeboski/bitlbee-steam"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index de8c4dc1026..99ce3f8811e 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -3,7 +3,6 @@ , enablePam ? false, pam ? null }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee"; version = "3.6"; @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; - nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; + nativeBuildInputs = [ pkg-config ] ++ lib.optional doCheck check; buildInputs = [ gnutls libotr python3 ] - ++ optional enableLibPurple pidgin - ++ optional enablePam pam; + ++ lib.optional enableLibPurple pidgin + ++ lib.optional enablePam pam; propagatedBuildInputs = [ glib ]; @@ -25,8 +24,8 @@ stdenv.mkDerivation rec { "--otr=1" "--ssl=gnutls" "--pidfile=/var/lib/bitlbee/bitlbee.pid" - ] ++ optional enableLibPurple "--purple=1" - ++ optional enablePam "--pam=1"; + ] ++ lib.optional enableLibPurple "--purple=1" + ++ lib.optional enablePam "--pam=1"; patches = [ # This should be dropped once the issue is fixed upstream. @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "IRC instant messaging gateway"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix index 997882bbc8b..f750f7f9d60 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix @@ -1,7 +1,5 @@ { lib, runCommandLocal, bitlbee }: -with lib; - plugins: runCommandLocal "bitlbee-plugins" { inherit plugins; buildInputs = [ bitlbee plugins ]; diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 58cd952edbb..5dcb2205076 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchgit, libtoxcore , conf ? null }: -with lib; - let - configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); + configFile = lib.optionalString (conf!=null) (builtins.toFile "config.h" conf); in stdenv.mkDerivation { pname = "ratox"; @@ -22,12 +20,12 @@ in stdenv.mkDerivation { substituteInPlace config.mk \ --replace '-lsodium -lopus -lvpx ' "" - ${optionalString (conf!=null) "cp ${configFile} config.def.h"} + ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} ''; makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "FIFO based tox client"; homepage = "http://ratox.2f30.org/"; license = licenses.isc; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 58c6501a1ff..6e3a9e54f0d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -65,8 +65,6 @@ , MetalKit }: -with lib; - let tg_owt = callPackage ./tg_owt.nix { abseil-cpp = abseil-cpp.override { @@ -99,14 +97,14 @@ stdenv.mkDerivation rec { ./shortcuts-binary-path.patch ]; - postPatch = optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i "13i#import " Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm substituteInPlace Telegram/CMakeLists.txt \ --replace 'COMMAND iconutil' 'COMMAND png2icns' \ @@ -122,7 +120,7 @@ stdenv.mkDerivation rec { python3 wrapQtAppsHook removeReferencesTo - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ # to build bundled libdispatch clang extra-cmake-modules @@ -143,7 +141,7 @@ stdenv.mkDerivation rec { rnnoise tg_owt microsoft_gsl - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ kwayland alsa-lib libpulseaudio @@ -151,7 +149,7 @@ stdenv.mkDerivation rec { glibmm jemalloc wayland - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreFoundation CoreServices @@ -192,7 +190,7 @@ stdenv.mkDerivation rec { "-DDESKTOP_APP_QT6=OFF" ]; - installPhase = optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r Kotatogram.app $out/Applications ln -s $out/Applications/Kotatogram.app/Contents/MacOS $out/bin @@ -209,7 +207,7 @@ stdenv.mkDerivation rec { inherit tg_owt; }; - meta = { + meta = with lib; { description = "Kotatogram – experimental Telegram Desktop fork"; longDescription = '' Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 435268cdf62..73c71d294c8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,7 +1,5 @@ { stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }: -with lib; - stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; version = kotatogram-desktop.version; @@ -15,9 +13,9 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ webkitgtk ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk ]} ''; meta = kotatogram-desktop.meta // { - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index cf6410def0d..1190a35c69a 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -3,8 +3,6 @@ , xorg }: -with lib; - let bits = "x86_64"; @@ -19,7 +17,7 @@ let categories = [ "Network" ]; }; - tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; + tarball = "Wavebox_${lib.replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; in stdenv.mkDerivation { pname = "wavebox"; @@ -40,7 +38,7 @@ in stdenv.mkDerivation { alsa-lib gtk3 nss ]; - runtimeDependencies = [ (getLib udev) libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; installPhase = '' mkdir -p $out/bin $out/opt/wavebox diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 051a872151a..186f1a74020 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -2,8 +2,6 @@ , nixosTests }: -with lib; - perlPackages.buildPerlPackage rec { pname = "convos"; version = "7.02"; @@ -16,7 +14,7 @@ perlPackages.buildPerlPackage rec { }; nativeBuildInputs = [ makeWrapper ] - ++ optionals stdenv.isDarwin [ shortenPerlShebang ]; + ++ lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; buildInputs = with perlPackages; [ CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt @@ -79,7 +77,7 @@ perlPackages.buildPerlPackage rec { ln -s $AUTO_SHARE_PATH/public/asset $out/asset cp -vR templates $out/templates cp cpanfile $out/cpanfile - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/convos '' + '' wrapProgram $out/bin/convos --set MOJO_HOME $out @@ -91,6 +89,6 @@ perlPackages.buildPerlPackage rec { homepage = "https://convos.chat"; description = "Convos is the simplest way to use IRC in your browser"; license = lib.licenses.artistic2; - maintainers = with maintainers; [ sgo ]; + maintainers = with lib.maintainers; [ sgo ]; }; } diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index f896cc43867..bc5b692501a 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -52,8 +52,6 @@ , enablePluginVcalendar ? true, libical }: -with lib; - let pythonPkgs = with python3.pkgs; [ python3 wrapPython pygobject3 ]; @@ -130,7 +128,7 @@ in stdenv.mkDerivation rec { buildInputs = [ curl gsettings-desktop-schemas glib-networking gtk3 ] - ++ concatMap (f: optionals f.enabled f.deps) (filter (f: f ? deps) features) + ++ lib.concatMap (f: lib.optionals f.enabled f.deps) (lib.filter (f: f ? deps) features) ; configureFlags = @@ -141,7 +139,7 @@ in stdenv.mkDerivation rec { "--disable-gdata-plugin" # Complains about missing libgdata, even when provided ] ++ - (map (feature: map (flag: strings.enableFeature feature.enabled flag) feature.flags) features); + (map (feature: map (flag: lib.strings.enableFeature feature.enabled flag) feature.flags) features); enableParallelBuilding = true; @@ -155,7 +153,7 @@ in stdenv.mkDerivation rec { cp claws-mail.desktop $out/share/applications ''; - meta = { + meta = with lib; { description = "The user-friendly, lightweight, and fast email client"; homepage = "https://www.claws-mail.org/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 1e2d5c031d6..90b7dbd28d4 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -4,8 +4,6 @@ assert gpgSupport -> gpgme != null; assert sslSupport -> openssl != null; -with lib; - stdenv.mkDerivation rec { pname = "sylpheed"; version = "3.7.0"; @@ -33,17 +31,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] - ++ optionals gpgSupport [ gpgme ] - ++ optionals sslSupport [ openssl ] - ++ optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals gpgSupport [ gpgme ] + ++ lib.optionals sslSupport [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; - configureFlags = optional gpgSupport "--enable-gpgme" - ++ optional sslSupport "--enable-ssl"; + configureFlags = lib.optional gpgSupport "--enable-gpgme" + ++ lib.optional sslSupport "--enable-ssl"; # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation"; - meta = { + meta = with lib; { homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; maintainers = with maintainers; [ eelco ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 76fc70b3bad..319a5e7f0dc 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -9,7 +9,6 @@ assert guiSupport -> (dbus != null); assert trackerSearch -> (python3 != null); -with lib; mkDerivation rec { pname = "qbittorrent"; version = "4.4.5"; @@ -27,8 +26,8 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] - ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support - ++ optional trackerSearch python3; + ++ lib.optional guiSupport dbus # D(esktop)-Bus depends on GUI support + ++ lib.optional trackerSearch python3; # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. QMAKE_LRELEASE = "lrelease"; @@ -36,11 +35,11 @@ mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" ] - ++ optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files - ++ optional (!webuiSupport) "--disable-webui" - ++ optional debugSupport "--enable-debug"; + ++ lib.optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files + ++ lib.optional (!webuiSupport) "--disable-webui" + ++ lib.optional debugSupport "--enable-debug"; - qtWrapperArgs = optional trackerSearch "--prefix PATH : ${makeBinPath [ python3 ]}"; + qtWrapperArgs = lib.optional trackerSearch "--prefix PATH : ${lib.makeBinPath [ python3 ]}"; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin} @@ -48,7 +47,7 @@ mkDerivation rec { makeWrapper $out/{Applications/qbittorrent.app/Contents/MacOS,bin}/qbittorrent ''; - meta = { + meta = with lib; { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org/"; changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index fbb8842393f..452263f0742 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -8,8 +8,6 @@ assert withQt -> qt5 != null; -with lib; - let version = "4.0.2"; variant = if withQt then "qt" else "cli"; @@ -39,17 +37,17 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] - ++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; + ++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt libgpg-error gnutls geoip c-ares glib zlib - ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ optionals stdenv.isLinux [ libcap libnl ] - ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] - ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); + ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) + ++ lib.optionals stdenv.isLinux [ libcap libnl ] + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] + ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); strictDeps = true; @@ -72,7 +70,7 @@ in stdenv.mkDerivation { install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" done done - '' else optionalString withQt '' + '' else lib.optionalString withQt '' pwd install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index f73bb1c4bf7..66753387199 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -9,8 +9,6 @@ , withDebug ? false }: -with lib; - stdenv.mkDerivation rec { pname = "znc"; version = "1.8.2"; @@ -23,12 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ optional withPerl perl - ++ optional withPython python3 - ++ optional withTcl tcl - ++ optional withCyrus cyrus_sasl - ++ optional withUnicode icu - ++ optional withZlib zlib; + ++ lib.optional withPerl perl + ++ lib.optional withPython python3 + ++ lib.optional withTcl tcl + ++ lib.optional withCyrus cyrus_sasl + ++ lib.optional withUnicode icu + ++ lib.optional withZlib zlib; configureFlags = [ (lib.enableFeature withPerl "perl") @@ -36,8 +34,8 @@ stdenv.mkDerivation rec { (lib.enableFeature withTcl "tcl") (lib.withFeatureAs withTcl "tcl" "${tcl}/lib") (lib.enableFeature withCyrus "cyrus") - ] ++ optionals (!withIPv6) [ "--disable-ipv6" ] - ++ optionals withDebug [ "--enable-debug" ]; + ] ++ lib.optionals (!withIPv6) [ "--disable-ipv6" ] + ++ lib.optionals withDebug [ "--enable-debug" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 1e20e589636..1c173b75238 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, cereal, openmp , libjpeg ? null , zlib ? null , libpng ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ libjpeg zlib libpng eigen libtiff ]; + buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://openmvg.readthedocs.io/en/latest/"; license = lib.licenses.mpl20; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ mdaiter ]; + maintainers = with lib.maintainers; [ mdaiter bouk ]; }; } diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix index 4961a5e7449..5ae83519278 100644 --- a/pkgs/data/fonts/aileron/default.nix +++ b/pkgs/data/fonts/aileron/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "102"; - pname = "aileron"; in +stdenvNoCC.mkDerivation (self: { + pname = "aileron"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-Ht48gwJZrn0djo1yl6jHZ4+0b710FVwStiC1Zk5YXME="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "04xnzdy9plzd2p02yq367h37m5ygx0w8cpkdv39cc3754ljlsxim"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A helvetica font in nine weights"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix index 02e2a2de417..ed55855e434 100644 --- a/pkgs/data/fonts/arphic/default.nix +++ b/pkgs/data/fonts/arphic/default.nix @@ -1,22 +1,33 @@ -{ lib, fetchzip, mkfontscale, mkfontdir }: +{ lib, stdenvNoCC, fetchurl, mkfontdir, mkfontscale }: let version = "0.2.20080216.2"; -in { - arphic-ukai = fetchzip { - name = "arphic-ukai-${version}"; +in +{ + arphic-ukai = stdenvNoCC.mkDerivation rec { + pname = "arphic-ukai"; + inherit version; - url = "mirror://ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xjvf $downloadedFile --strip-components=1 install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc cd $out/share/fonts - ${mkfontdir}/bin/mkfontdir - ${mkfontscale}/bin/mkfontscale - ''; + mkfontdir + mkfontscale - sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl"; + runHook postInstall + ''; meta = with lib; { description = "CJK Unicode font Kai style"; @@ -28,20 +39,30 @@ in { }; }; - arphic-uming = fetchzip { - name = "arphic-uming-${version}"; + arphic-uming = stdenvNoCC.mkDerivation rec { + pname = "arphic-uming"; + inherit version; - url = "mirror://ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xjvf $downloadedFile --strip-components=1 install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc cd $out/share/fonts - ${mkfontdir}/bin/mkfontdir - ${mkfontscale}/bin/mkfontscale - ''; + mkfontdir + mkfontscale - sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d"; + runHook postInstall + ''; meta = with lib; { description = "CJK Unicode font Ming style"; diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index 92f7401b32d..6c80c2a02f5 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -1,15 +1,24 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { - name = "baekmuk-ttf-2.2"; +stdenvNoCC.mkDerivation rec { + pname = "baekmuk-ttf"; + version = "2.2"; + + src = fetchurl { + url = "http://kldp.net/baekmuk/release/865-${pname}-${version}.tar.gz"; + hash = "sha256-CKt9/7VdWIfMlCzjcPXjO3VqVfu06vC5DyRAcOjVGII="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts ttf/*.ttf - install -m444 -Dt $out/share/doc/${name} COPYRIGHT* + install -m444 -Dt $out/share/doc/${pname}-${version} COPYRIGHT* + + runHook postInstall ''; - sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g"; meta = { description = "Korean font"; @@ -17,4 +26,3 @@ fetchzip rec { license = "BSD-like"; }; } - diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index a8c01b41e67..38f028cd92e 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -1,17 +1,25 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "bakoma-ttf"; +stdenvNoCC.mkDerivation rec { + pname = "bakoma-ttf"; + version = "2.2"; - url = "http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; + src = fetchurl { + name = "${pname}.tar.bz2"; + url = "http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; + hash = "sha256-dYaUMneFn1yC5lIMSLQSNmFRW16AdUXGqWBobzAbPsg="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xjvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp ttf/*.ttf $out/share/fonts/truetype - ''; - sha256 = "0g7i723n00cqx2va05z1h6v3a2ar69gqw4hy6pjj7m0ml906rngc"; + runHook postInstall + ''; meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index 14a8de1b0d9..d6235d42f7f 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -1,19 +1,26 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "caladea"; version = "20130214"; -in fetchzip { - name = "caladea-${version}"; - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; + hash = "sha256-xI0cL9YTycBslZw02nuDiAWeJAjSuxmEXcPtNfduTQk="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf + + runHook postInstall ''; - sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z"; meta = with lib; { # This font doesn't appear to have any official web site but this @@ -27,7 +34,7 @@ in fetchzip { ''; license = licenses.asl20; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; # Reduce the priority of this package. The intent is that if you # also install the `vista-fonts` package, then you probably will diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index 0ecd3f85c69..283eb21a175 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchzip, stdenvNoCC }: +{ lib, fetchurl, stdenvNoCC }: stdenvNoCC.mkDerivation rec { pname = "carlito"; version = "20130920"; - src = fetchzip { + src = fetchurl { url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; - sha256 = "sha256-OGDO5WoF7OmiRdLRRrIXMzg276Pgeq1L3Offcl0W2jg="; + sha256 = "sha256-S9ErbLwyHBzxbaduLFhcklzpVqCAZ65vbGTv9sz9r1o="; }; installPhase = '' mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype - cp -v $src/*.ttf $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf ''; @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; # Reduce the priority of this package. The intent is that if you # also install the `vista-fonts` package, then you probably will diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index 3248813c3cb..7b6a9a1f087 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "cm-unicode"; version = "0.7.0"; -in fetchzip rec { - name = "cm-unicode-${version}"; - url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; + src = fetchurl { + url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${pname}-${version}-otf.tar.xz"; + hash = "sha256-VIp+vk1IYbEHW15wMrfGVOPqg1zBZDpgFx+jlypOHCg="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJvf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} README FontLog.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README FontLog.txt - sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; + runHook postInstall + ''; meta = with lib; { homepage = "https://cm-unicode.sourceforge.io/"; diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index 9400ef06cf9..2607f660284 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -1,25 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "crimson"; version = "2014.10"; -in fetchzip rec { - name = "crimson-${version}"; - url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; + src = fetchFromGitHub { + owner = "skosch"; + repo = "Crimson"; + rev = "fonts-october2014"; + hash = "sha256-Wp9L77q93TRmrAr0P4iH9gm0tqFY0X/xSsuFcd19aAE="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/opentype "Desktop Fonts/OTF/"*.otf - install -m444 -Dt $out/share/doc/${name} README.md - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md - sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/skosch/Crimson"; description = "A font family inspired by beautiful oldstyle typefaces"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix index 00c472d7fe3..8f8cd297484 100644 --- a/pkgs/data/fonts/culmus/default.nix +++ b/pkgs/data/fonts/culmus/default.nix @@ -1,12 +1,19 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "culmus"; version = "0.133"; -in fetchzip { - name = "culmus-${version}"; - url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz"; - postFetch = '' - tar xf $downloadedFile --strip=1 + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-wMaHN0LQdUT2us8q1S65yzkpdNVkJ5ONwd+8g5nGTQU="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/{truetype,type1} cp -v *.pfa $out/share/fonts/type1/ cp -v *.afm $out/share/fonts/type1/ @@ -14,8 +21,9 @@ in fetchzip { cp -v *.ttf $out/share/fonts/truetype/ cp -v *.otf $out/share/fonts/truetype/ cp -v fonts.scale-ttf $out/share/fonts/truetype/fonts.scale + + runHook postInstall ''; - sha256 = "0zqqjcrqmbd4389hqz2dwymkkcxjrq9ylyriiv3gbmzl6l1ffk3g"; meta = { description = "Culmus Hebrew fonts"; diff --git a/pkgs/data/fonts/dotcolon-fonts/default.nix b/pkgs/data/fonts/dotcolon-fonts/default.nix new file mode 100644 index 00000000000..fcd439ce30c --- /dev/null +++ b/pkgs/data/fonts/dotcolon-fonts/default.nix @@ -0,0 +1,49 @@ +{ lib +, symlinkJoin +, aileron +, vegur +, f5_6 +, tenderness +, medio +, ferrum +, seshat +, penna +, eunomia +, route159 +, f1_8 +, nacelle +, melete +, fa_1 +}: + +symlinkJoin { + name = "dotcolon-fonts"; + + paths = [ + aileron + vegur + f5_6 + tenderness + medio + ferrum + seshat + penna + eunomia + route159 + f1_8 + nacelle + melete + fa_1 + ]; + + meta = { + description = "Font Collection by Sora Sagano"; + + homepage = "https://dotcolon.net/"; + + license = with lib.licenses; [ cc0 ofl ]; + + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/data/fonts/efont-unicode/default.nix b/pkgs/data/fonts/efont-unicode/default.nix index f4ea61cbc9e..e45bdab7a4d 100644 --- a/pkgs/data/fonts/efont-unicode/default.nix +++ b/pkgs/data/fonts/efont-unicode/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchzip, libfaketime, xorg }: +{ lib, stdenv, fetchurl, libfaketime, xorg }: stdenv.mkDerivation rec { pname = "efont-unicode"; version = "0.4.2"; - src = fetchzip { + src = fetchurl { url = "http://openlab.ring.gr.jp/efont/dist/unicode-bdf/${pname}-bdf-${version}.tar.bz2"; - sha256 = "0bib3jgikq8s1m96imw4mlgbl5cbq1bs5sqig74s2l2cdfx3jaqc"; + sha256 = "sha256-fT7SsYlV3dCQrf0IZfiNI1grj3ngDgr8IkWdg+f9m3M="; }; nativeBuildInputs = with xorg; diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix index 272649582c3..a09a0ad0d78 100644 --- a/pkgs/data/fonts/eunomia/default.nix +++ b/pkgs/data/fonts/eunomia/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "200"; - pname = "eunomia"; in +stdenvNoCC.mkDerivation (self: { + pname = "eunomia"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-Rd2EakaTWjzoEV00tHTgg/bXgJUFfPjCyQUWi7QhFG4="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "0lpmczs1d4p9dy4s0dnvv7bl5cd0f6yzyasfrkxij5s86glps38b"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { homepage = "http://dotcolon.net/font/eunomia/"; description = "A futuristic decorative font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/pkgs/data/fonts/f1_8/default.nix b/pkgs/data/fonts/f1_8/default.nix new file mode 100644 index 00000000000..5898fe1eaba --- /dev/null +++ b/pkgs/data/fonts/f1_8/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "1"; + minorVersion = "101"; +in +stdenvNoCC.mkDerivation (self: { + pname = "f1_8"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://note.com/api/v2/attachments/download/d83b2c4ec63d7826acaa76725d261ff4"; + hash = "sha256-pe1G8WeFAo+KYjjsNwn0JmtXFn9QugE1SeGwaqnl1F0="; + stripRoot = false; + extension = "zip"; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A weighted decorative font"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix index 112111faa3d..a37ee591ef4 100644 --- a/pkgs/data/fonts/f5_6/default.nix +++ b/pkgs/data/fonts/f5_6/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "110"; - pname = "f5_6"; in +stdenvNoCC.mkDerivation (self: { + pname = "f5_6"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-FeCU+mzR0iO5tixI72XUnhvpGj+WRfKyT3mhBtud3uE="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "04p6lccd26rhjbpq3ddxi5vkk3lk8lqbpnk8lakjzixp3fgdqpp4"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A weighted decorative font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/pkgs/data/fonts/fa_1/default.nix b/pkgs/data/fonts/fa_1/default.nix new file mode 100644 index 00000000000..4e8ab3cbaa8 --- /dev/null +++ b/pkgs/data/fonts/fa_1/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "100"; +in +stdenvNoCC.mkDerivation (self: { + pname = "fa_1"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A weighted decorative font"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix index 3f122d22daf..33b3813cca3 100644 --- a/pkgs/data/fonts/ferrum/default.nix +++ b/pkgs/data/fonts/ferrum/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "200"; - pname = "ferrum"; in +stdenvNoCC.mkDerivation (self: { + pname = "ferrum"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-NDJwgFWZgyhMkGRWlY55l2omEw6ju3e3dHCEsWNzQIc="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "1w1b3ch7ik4264f05lxms01ls0aargvlx770a9szm682dfmizn8w"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A decorative font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index 45041bb805d..63b4acc9c31 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -1,22 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "go-font"; version = "2.010"; - rev = "41969df76e82aeec85fa3821b1e24955ea993001"; -in (fetchzip { - name = "go-font-${version}"; - url = "https://go.googlesource.com/image/+archive/${rev}/font/gofont/ttfs.tar.gz"; - stripRoot = false; - postFetch = '' + src = fetchzip { + url = "https://go.googlesource.com/image/+archive/41969df76e82aeec85fa3821b1e24955ea993001/font/gofont/ttfs.tar.gz"; + stripRoot = false; + hash = "sha256-rdzt51wY4b7HEr7W/0Ar/FB0zMyf+nKLsOT+CRSEP3o="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/go-font - mv $out/*.ttf $out/share/fonts/truetype - mv $out/README $out/share/doc/go-font/LICENSE + mv *.ttf $out/share/fonts/truetype + mv README $out/share/doc/go-font/LICENSE + + runHook postInstall ''; - sha256 = "175jwq16qjnd2k923n9gcbjizchy7yv4n41dm691sjwrhbl0b13x"; -}) // { meta = with lib; { homepage = "https://blog.golang.org/go-fonts"; description = "The Go font family"; @@ -24,6 +30,5 @@ in (fetchzip { license = licenses.bsd3; maintainers = with maintainers; [ sternenseemann ]; platforms = lib.platforms.all; - hydraPlatforms = []; }; } diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index 63633ffcda7..aa6e3fde257 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -1,15 +1,25 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - baseName = "gyre-fonts"; +stdenvNoCC.mkDerivation rec { + pname = "gyre-fonts"; version = "2.005"; -in (fetchzip { - name="${baseName}-${version}"; - url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; + src = fetchzip { + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; + stripRoot = false; + hash = "sha256-+6IufuFf+IoLXoZEPlfHUNgRhKrQNBEZ1OwPD9/uOjg="; + }; - sha256 = "17amdpahs6kn7hk3dqxpff1s095cg1caxzij3mxjbbxp8zy0l111"; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.otf $out/share/fonts/truetype + + runHook postInstall + ''; meta = { description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; @@ -25,9 +35,4 @@ in (fetchzip { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ bergey ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix index 999a8995b46..4e12a29ee8a 100644 --- a/pkgs/data/fonts/hermit/default.nix +++ b/pkgs/data/fonts/hermit/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "hermit"; version = "2.0"; -in fetchzip rec { - name = "${pname}-${version}"; - url = "https://pcaro.es/d/otf-${name}.tar.gz"; + src = fetchzip { + url = "https://pcaro.es/d/otf-${pname}-${version}.tar.gz"; + stripRoot = false; + hash = "sha256-RYXZ2yJ8BIxsgeEwhXz7g0NnWG3kMPZoJaOLMUQyWWQ="; + }; - stripRoot = false; - postFetch = '' - install -m444 -Dt $out/share/fonts/opentype $out/*.otf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/opentype *.otf + + runHook postInstall ''; - sha256 = "127hnpxicqya7v1wmzxxqafq3aj1n33i4j5ncflbw6gj5g3bizwl"; meta = with lib; { description = "monospace font designed to be clear, pragmatic and very readable"; @@ -25,4 +28,3 @@ in fetchzip rec { platforms = platforms.all; }; } - diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 66e91df010d..1bdddde0719 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "JuliaMono-ttf"; version = "0.046"; -in -fetchzip { - name = "JuliaMono-ttf-${version}"; - url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-+Ro517m1unQskQFhsT6oiz19aov87/tT1jlP/XB7kFU="; + src = fetchzip { + url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; + stripRoot = false; + hash = "sha256-mq37L3bhUhdjB8z3I9i8+wyLrMSsu/nZrZXOuqE3JlU="; + }; - stripRoot = false; + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype - rm $out/LICENSE + mv *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/kacst/default.nix b/pkgs/data/fonts/kacst/default.nix index 38f85d2ad0f..9d72ca9cdb4 100644 --- a/pkgs/data/fonts/kacst/default.nix +++ b/pkgs/data/fonts/kacst/default.nix @@ -1,16 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "kacst"; version = "2.01"; -in -fetchzip { - name = "kacst-${version}"; - url = "mirror://debian/pool/main/f/fonts-kacst/fonts-kacst_${version}+mry.orig.tar.bz2"; - sha256 = "sha256-pIO58CXfmKYRKYJ1oI+tjTwlKBRnkZ/CpIM2Xa0CDA4="; - postFetch = '' + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}+mry.orig.tar.bz2"; + hash = "sha256-byiZzpYiMU6kJs+NSISfHPFzAnJtc8toNIbV/fKiMzg="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts - tar xjf $downloadedFile --strip-components=1 -C $out/share/fonts + cp -R kacst $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/khmeros/default.nix b/pkgs/data/fonts/khmeros/default.nix index 28db0d00981..ba27b465bff 100644 --- a/pkgs/data/fonts/khmeros/default.nix +++ b/pkgs/data/fonts/khmeros/default.nix @@ -1,20 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "khmeros"; version = "5.0"; -in -fetchzip { - name = "khmeros-${version}"; - url = "mirror://debian/pool/main/f/fonts-khmeros/fonts-khmeros_${version}.orig.tar.xz"; - sha256 = "sha256-pS+7RQbGwlBxdCfSVxHmARCAkZrZttwYNlV/CrxqI+w="; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-gBcM9YHSuhbxvwfQTvywH/5kN921GOyvGtkROcmcBiw="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/lao/default.nix b/pkgs/data/fonts/lao/default.nix index abe359410b3..58b08c654a7 100644 --- a/pkgs/data/fonts/lao/default.nix +++ b/pkgs/data/fonts/lao/default.nix @@ -1,16 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "lao"; version = "0.0.20060226"; -in -fetchzip { - name = "lao-${version}"; - url = "mirror://debian/pool/main/f/fonts-lao/fonts-lao_${version}.orig.tar.xz"; - sha256 = "sha256-Ti3DNOgLR5VBJ1mSe8M+qs4UYbCR7qOPgqxRfmHa+jY="; - postFetch = '' + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-DlgdyfhxxzVkNIL+NGsQ+PRlNkCuG3v2OahkIEYx60o="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lao-${version}/Phetsarath_OT.ttf + cp Phetsarath_OT.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/lklug-sinhala/default.nix b/pkgs/data/fonts/lklug-sinhala/default.nix index 45f907f1cf0..6610d6a213e 100644 --- a/pkgs/data/fonts/lklug-sinhala/default.nix +++ b/pkgs/data/fonts/lklug-sinhala/default.nix @@ -1,16 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "lklug-sinhala"; version = "0.6"; -in -fetchzip { - name = "lklug-sinhala-${version}"; - url = "mirror://debian/pool/main/f/fonts-lklug-sinhala/fonts-lklug-sinhala_${version}.orig.tar.xz"; - sha256 = "sha256-Fy+QnAajA4yLf/I1vOQll5pRd0ZLfLe8UXq4XMC9qNc="; - postFetch = '' - mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lklug-sinhala-${version}/lklug.ttf + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-oPCCa01PMQcCK5fEILgXjrGzoDg+UvxkqK6AgeQaKio="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index af0e7033135..2df5f65e6c4 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,26 +1,29 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "lmodern-2.005"; +stdenvNoCC.mkDerivation rec { + pname = "lmodern"; + version = "2.005"; - url = "mirror://debian/pool/main/l/lmodern/lmodern_2.005.orig.tar.gz"; + src = fetchurl { + url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.orig.tar.gz"; + hash = "sha256-xlUuZt6rjW0pX4t6PKWAHkkv3PisGCj7ZwatZPAUNxk="; + }; - postFetch = '' - tar xzvf $downloadedFile + dontBuild = true; + + installPhase = '' + runHook preInstall mkdir -p $out/texmf-dist/ mkdir -p $out/share/fonts/ - cp -r lmodern-2.005/* $out/texmf-dist/ - cp -r lmodern-2.005/fonts/{opentype,type1} $out/share/fonts/ + cp -r * $out/texmf-dist/ + cp -r fonts/{opentype,type1} $out/share/fonts/ - ln -s -r $out/texmf* $out/share/ + runHook postInstall ''; - sha256 = "sha256-ySdKUt8o5FqmpdnYSzbGJ1f9t8VmKYXqPt53e1/E/FA="; - meta = { description = "Latin Modern font"; }; } - diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix index 9d61931db36..8dd60f23d0c 100644 --- a/pkgs/data/fonts/luculent/default.nix +++ b/pkgs/data/fonts/luculent/default.nix @@ -1,17 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let version = "2.0.0"; in -fetchzip { - name = "luculent-${version}"; - url = "http://www.eastfarthing.com/luculent/luculent.tar.xz"; +stdenvNoCC.mkDerivation rec { + pname = "luculent"; + version = "2.0.0"; + + src = fetchurl { + url = "http://www.eastfarthing.com/${pname}/${pname}.tar.xz"; + hash = "sha256-6NxLnTBnvHmTUTFa2wW0AuKPEbCqzaWQyiFVnF0sBqU="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype - ''; - sha256 = "1m3g64galwna1xjxb1fczmfplm6c1fn3ra1ln7f0vkm0ah5m4lbv"; + runHook postInstall + ''; meta = with lib; { description = "luculent font"; diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix index bb36d9a920a..f38991233ae 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -1,22 +1,25 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.245.1"; + version = "1.250"; - url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; + hash = "sha256-Nkd0xXYCnR0NZAk/JCxy+zOlxIxD52Px4F9o2L9mgRE="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype + mv *.ttf $out/share/fonts/truetype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; - hash = "sha256-4RQ+aqAZPQH3t6v2KvrNWgYT3J3uMuY34XTuvyLEOeI="; - meta = with lib; { homepage = "https://lxgw.github.io/"; description = "An open-source Chinese font derived from Fontworks' Klee One"; diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index 8c228fd91a7..3dfb46fff69 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "marathi-cursive"; version = "2.0"; -in fetchzip rec { - name = "marathi-cursive-${version}"; - url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; + src = fetchurl { + url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; + hash = "sha256-JE9T3UMSYn/JfEWuWHikDJIlt4nZl6GzY98v3vG6di4="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/marathi-cursive *.otf *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README *.txt - sha256 = "17pj60ajnjghxhxka8a046mz6vfwr79wnby7xd6pg5hgncin2hgg"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/MihailJP/MarathiCursive"; diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix index c94046f085f..240b6fbeead 100644 --- a/pkgs/data/fonts/medio/default.nix +++ b/pkgs/data/fonts/medio/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "200"; - pname = "medio"; in +stdenvNoCC.mkDerivation (self: { + pname = "medio"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-S+CcwD4zGVk7cIFD6K4NnpE/0mrJq4RnDJC576rhcLQ="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "0gxcmhjlsh2pzsmj78vw4v935ax7hfk533ddlhfhfma52zyxyh7x"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Serif font designed by Sora Sagano"; longDescription = '' Medio is a serif font designed by Sora Sagano, based roughly @@ -26,7 +31,7 @@ fetchzip { but with hairline serifs in the style of a Didone. ''; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/melete/default.nix b/pkgs/data/fonts/melete/default.nix new file mode 100644 index 00000000000..cae6bcaf4ea --- /dev/null +++ b/pkgs/data/fonts/melete/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "200"; +in +stdenvNoCC.mkDerivation (self: { + pname = "melete"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-y1xtNM1Oy92gOvbr9J71XNxb1JeTzOgxKms3G2YHK00="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A headline typeface that could be used as a movie title"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/pkgs/data/fonts/nacelle/default.nix b/pkgs/data/fonts/nacelle/default.nix new file mode 100644 index 00000000000..007de90b75a --- /dev/null +++ b/pkgs/data/fonts/nacelle/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "1"; + minorVersion = "00"; +in +stdenvNoCC.mkDerivation (self: { + pname = "nacelle"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-e4QsPiyfWEAYHWdwR3CkGc2UzuA3hZPYYlWtIubY0Oo="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A improved version of the Aileron font"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/pkgs/data/fonts/nanum/default.nix b/pkgs/data/fonts/nanum/default.nix index 1aac2c53d82..d768c6d96d6 100644 --- a/pkgs/data/fonts/nanum/default.nix +++ b/pkgs/data/fonts/nanum/default.nix @@ -1,20 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "nanum"; version = "20170925"; -in -fetchzip { - name = "nanum-${version}"; - url = "mirror://ubuntu/pool/universe/f/fonts-nanum/fonts-nanum_${version}.orig.tar.xz"; - sha256 = "sha256-lSTeQEuMmlQxiQqrx9tNScifE8nMOUDJF3lCfoAFIJk="; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 + src = fetchurl { + url = "mirror://ubuntu/pool/universe/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-GlVXH9YUU3wHMkNoz5miBv7N2oUEbwUXlcVoElQ9++4="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index e0e783fd80a..9c805378400 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -1,25 +1,30 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "oldsindhi"; version = "1.0"; -in fetchzip rec { - name = "oldsindhi-${version}"; - url = "https://github.com/MihailJP/oldsindhi/releases/download/v${version}/OldSindhi-${version}.tar.xz"; + src = fetchurl { + url = "https://github.com/MihailJP/${pname}/releases/download/v${version}/OldSindhi-${version}.tar.xz"; + hash = "sha256-jOcl+mo6CJ9Lnn3nAUiXXHCJssovVgLoPrbGxj4uzQs="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/truetype *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README *.txt - sha256 = "03c483vbrwz2fpdfbys42fmik9788zxfmjmc4fgq4s2d0mraa0j1"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/MihailJP/oldsindhi"; description = "Free Sindhi Khudabadi font"; maintainers = with maintainers; [ mathnerd314 ]; - license = with licenses; [mit ofl]; + license = with licenses; [ mit ofl ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix index 784f9d2573e..893262f66e5 100644 --- a/pkgs/data/fonts/penna/default.nix +++ b/pkgs/data/fonts/penna/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; - minorVersion = "10"; - pname = "penna"; + minorVersion = "100"; in +stdenvNoCC.mkDerivation (self: { + pname = "penna"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-fmCJnEaoUGdW9JK3J7JSm5D4qOMRW7qVKPgVE7uCH5w="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "0hk15yndm56l6rbdykpkry2flffx0567mgjcqcnsx1iyzwwla5km"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Geometric sans serif designed by Sora Sagano"; longDescription = '' Penna is a geometric sans serif designed by Sora Sagano, @@ -26,7 +31,7 @@ fetchzip { with a small x-height. ''; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix index cbc89c550b3..4d0bf9941b4 100644 --- a/pkgs/data/fonts/route159/default.nix +++ b/pkgs/data/fonts/route159/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "1"; minorVersion = "10"; - pname = "route159"; in +stdenvNoCC.mkDerivation (self: { + pname = "route159"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-1InyBW1LGbp/IU/ql9mvT14W3MTxJdWThFwRH6VHpTU="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "1nv5csg73arvvwpac7ylh4j9n0s3qp79rbv2s4jvs2bf6gqhsq7h"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A weighted sans serif font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix index 71483a04cbb..7ed7abd5fb1 100644 --- a/pkgs/data/fonts/seshat/default.nix +++ b/pkgs/data/fonts/seshat/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "100"; - pname = "seshat"; in +stdenvNoCC.mkDerivation (self: { + pname = "seshat"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-XgprDhzAbcTzZw2QOwpCnzusYheYmSlM+ApU+Y0wO2Q="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "1zzgc2d0jrris92p3irmxjhdq8aj99alz0z7dlz25qf37lcilrir"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Roman body font designed for main text by Sora Sagano"; longDescription = '' Seshat is a Roman body font designed for the main text. By @@ -31,7 +36,7 @@ fetchzip { It incorporates symbols and ligatures used in the European region. ''; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/takao/default.nix b/pkgs/data/fonts/takao/default.nix index dcbce858e01..349edea60ff 100644 --- a/pkgs/data/fonts/takao/default.nix +++ b/pkgs/data/fonts/takao/default.nix @@ -1,20 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "takao"; version = "00303.01"; -in -fetchzip { - name = "takao-${version}"; - url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${version}.orig.tar.gz"; - sha256 = "sha256-TlPq3iIv8vHlxYu5dkX/Lf6ediYKQaQ5uMbFvypQM/w="; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 + src = fetchurl { + url = "mirror://ubuntu/pool/universe/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.gz"; + hash = "sha256-0wjHNv1yStp0q9D0WfwjgUYoUKcCrXA5jFO8PEVgq5k="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix index 09ea566e738..40b284c2549 100644 --- a/pkgs/data/fonts/tenderness/default.nix +++ b/pkgs/data/fonts/tenderness/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "601"; - pname = "tenderness"; in +stdenvNoCC.mkDerivation (self: { + pname = "tenderness"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-bwJKW+rY7/r2pBCSA6HYlaRMsI/U8UdW2vV4tmYuJww="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "0d88l5mzq0k63zsmb8d5w3hfqxy04vpv4j0j8nmj1xv6kikhhybh"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Serif font designed by Sora Sagano with old-style figures"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/pkgs/data/fonts/tibetan-machine/default.nix b/pkgs/data/fonts/tibetan-machine/default.nix index 67393a9c4ab..9fa22c5fa81 100644 --- a/pkgs/data/fonts/tibetan-machine/default.nix +++ b/pkgs/data/fonts/tibetan-machine/default.nix @@ -1,16 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "tibetan-machine"; version = "1.901b"; -in -fetchzip { - name = "tibetan-machine-${version}"; - url = "mirror://debian/pool/main/f/fonts-tibetan-machine/fonts-tibetan-machine_${version}.orig.tar.bz2"; - sha256 = "sha256-A+RgpFLsP4iTzl0PMRHaNzWGbDR5Qa38lRegNJ96ULo="; - postFetch = '' + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-c/1Sgv7xKHpsJGjY9ZY2qOJHShGHL1robvphFNJOt5w="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts ttf-tmuni-${version}/TibMachUni-${version}.ttf + cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 95e4ce2a52a..10098d6cf04 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { pname = "ttf-bitstream-vera"; version = "1.10"; -in -fetchzip rec { - name = "${pname}-${version}"; - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.bz2"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + hash = "sha256-21sn33u7MYA269t1rNPpjxvW62YI+3CmfUeM0kPReNw="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xjf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/truetype *.ttf + + runHook postInstall ''; - sha256 = "179hal4yi3367jg8rsvqx6h2w4s0kn9zzrv8c47sslyg28g39s4m"; - - meta = { - }; + meta = { }; } diff --git a/pkgs/data/fonts/unfonts-core/default.nix b/pkgs/data/fonts/unfonts-core/default.nix index 7f01d5531e1..7325730e4f2 100644 --- a/pkgs/data/fonts/unfonts-core/default.nix +++ b/pkgs/data/fonts/unfonts-core/default.nix @@ -1,16 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { pname = "unfonts-core"; version = "1.0.2-080608"; -in fetchzip { - name = "${pname}-${version}"; - url = "https://kldp.net/unfonts/release/2607-un-fonts-core-${version}.tar.gz"; - hash = "sha256-k9C7d/SbVLWFzRnDWpOIMtY6cAEIcaLcbxQAqjwuWds="; - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 + src = fetchurl { + url = "https://kldp.net/unfonts/release/2607-un-fonts-core-${version}.tar.gz"; + hash = "sha256-OwpydPmqt+jw8ZOMAacOFYF2bVG0lLoUVoPzesVXkY4="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/truetype *.ttf + + runHook postInstall ''; meta = with lib; { @@ -20,7 +26,7 @@ in fetchzip { The Un-fonts come from the HLaTeX as type1 fonts in 1998 by Koaunghi Un, he made type1 fonts to use with Korean TeX (HLaTeX) in the late 1990's and released it under the GPL license. They were converted to TrueType with the FontForge (PfaEdit) by Won-kyu Park in 2003. - ''; + ''; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index 4b280df5644..de4ef5f36f2 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -1,15 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "vdrsymbols-20100612"; +stdenvNoCC.mkDerivation rec { + pname = "vdrsymbols"; + version = "20100612"; - url = "http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz"; + src = fetchurl { + url = "http://andreas.vdr-developer.org/fonts/download/${pname}-ttf-${version}.tgz"; + hash = "sha256-YxB+JcDkta5are+OQyP/WKDL0vllgn0m26bU9mQ3C/Q="; + }; - sha256 = "0wpxns8zqic98c84j18dr4zmj092v07yq07vwwgzblr0rw9n6gzr"; + dontBuild = true; - postFetch = '' - tar xvzf "$downloadedFile" - install -Dm444 -t "$out/share/fonts/truetype" */*.ttf + installPhase = '' + runHook preInstall + + install -Dm444 -t "$out/share/fonts/truetype" *.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix index 2f03dac3914..effaf74be7d 100644 --- a/pkgs/data/fonts/vegur/default.nix +++ b/pkgs/data/fonts/vegur/default.nix @@ -1,26 +1,32 @@ -{ lib, buildPackages, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let - version = "0.701"; -in fetchzip { - name = "vegur-font-${version}"; + majorVersion = "0"; + minorVersion = "701"; +in +stdenvNoCC.mkDerivation (self: { + pname = "vegur"; + version = "${majorVersion}.${minorVersion}"; - # Upstream doesn't version their URLs. - # http://dotcolon.net/font/vegur/ → http://dotcolon.net/DL/font/vegur.zip - url = "http://download.opensuse.org/repositories/M17N:/fonts/SLE_12_SP3/src/dotcolon-vegur-fonts-0.701-1.4.src.rpm"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA="; + stripRoot = false; + }; - postFetch = '' - ${buildPackages.rpmextract}/bin/rpmextract $downloadedFile - unzip vegur.zip - install -m444 -Dt $out/share/fonts/Vegur *.otf + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; - sha256 = "0iisi2scq72lyj7pc1f36fhfjnm676n5byl4zaavhbxpdrbc6d1v"; meta = with lib; { homepage = "http://dotcolon.net/font/vegur/"; description = "A humanist sans serif font"; platforms = platforms.all; - maintainers = [ maintainers.samueldr ]; + maintainers = with maintainers; [ minijackson samueldr ]; license = licenses.cc0; }; -} +}) diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index f7d3b0333c5..80645bf496e 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -1,16 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { - name = "wqy-microhei-0.2.0-beta"; +stdenvNoCC.mkDerivation rec { + pname = "wqy-microhei"; + version = "0.2.0"; - url = "mirror://sourceforge/wqy/${name}.tar.gz"; + src = fetchurl { + url = "mirror://sourceforge/wqy/${pname}-${version}-beta.tar.gz"; + hash = "sha256-KAKsgCOqNqZupudEWFTjoHjTd///QhaTQb0jeHH3IT4="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc - ''; - sha256 = "0i5jh7mkp371fxqmsvn7say075r641yl4hq26isjyrqvb8cv92a9"; + runHook postInstall + ''; meta = { description = "A (mainly) Chinese Unicode font"; @@ -20,4 +27,3 @@ fetchzip rec { platforms = lib.platforms.all; }; } - diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 5d461d0f5b0..9b0757128cd 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "wqy-zenhei"; version = "0.9.45"; -in fetchzip rec { - name = "wqy-zenhei-${version}"; - url = "mirror://sourceforge/wqy/${name}.tar.gz"; + src = fetchurl { + url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz"; + hash = "sha256-5LfjBkdb+UJ9F1dXjw5FKJMMhMROqj8WfUxC8RDuddY="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts install -m644 *.ttc $out/share/fonts/ - ''; - sha256 = "0hbjq6afcd63nsyjzrjf8fmm7pn70jcly7fjzjw23v36ffi0g255"; + runHook postInstall + ''; meta = { description = "A (mainly) Chinese Unicode font"; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 388059f2fc4..0df621fdb64 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-FgQYnas0qkIedRAA8ApZXLzEylg6PS6+8zzl7j+yOeI="; }; - vendorSha256 = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; + vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; patches = [ # See https://github.com/google/go-jsonnet/issues/653. diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 23059b91e7c..edce9518c3c 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mdds"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitLab { owner = "mdds"; repo = "mdds"; rev = finalAttrs.version; - hash = "sha256-Y9uBJKM34UTEj/3c1w69QHhvwFcMNlAohEco0O0B+xI="; + hash = "sha256-RZ2wGwle4raWlogc5X+VEeriPGS0Nqs7CWGENFEotvs="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 72da2a34e75..0fc885033e6 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.11.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; - rev = "v${version}"; - sha256 = "050dwy34jh8dihfwfm0r1by2i3sy9crapipp9idw32idm79y4izb"; + rev = "refs/tags/v${version}"; + hash = "sha256-qDLAEhknY+BB83OC6tfi7w/ZY/K492J5ZglLNUoBwbc="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Ignore broken test, likely not causing huge breakage - # (https://github.com/canonical/raft/issues/292) - postPatch = '' - substituteInPlace test/integration/test_uv_tcp_connect.c --replace \ - "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, 0, NULL)" \ - "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, MUNIT_TEST_OPTION_TODO, NULL)" - ''; + patches = [ + # network tests either hang indefinitely, or fail outright + ./disable-net-tests.patch + + # missing dir check is flaky + ./disable-missing-dir-test.patch + ]; preConfigure = '' substituteInPlace configure --replace /usr/bin/ " " @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/canonical/raft"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ wucke13 adamcstephens ]; }; } diff --git a/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch b/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch new file mode 100644 index 00000000000..ddfec9b22e1 --- /dev/null +++ b/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch @@ -0,0 +1,23 @@ +diff --git a/test/unit/test_uv_fs.c b/test/unit/test_uv_fs.c +index 638c39c..c8758d2 100644 +--- a/test/unit/test_uv_fs.c ++++ b/test/unit/test_uv_fs.c +@@ -40,18 +40,6 @@ TEST(UvFsCheckDir, exists, DirSetUp, DirTearDown, 0, NULL) + return MUNIT_OK; + } + +-/* If the directory doesn't exist, it an error is returned. */ +-TEST(UvFsCheckDir, doesNotExist, DirSetUp, DirTearDown, 0, NULL) +-{ +- const char *parent = data; +- char errmsg[RAFT_ERRMSG_BUF_SIZE]; +- char dir[128]; +- sprintf(errmsg, "%s/sub", parent); +- sprintf(errmsg, "directory '%s' does not exist", dir); +- CHECK_DIR_ERROR(dir, RAFT_NOTFOUND, errmsg); +- return MUNIT_OK; +-} +- + /* If the process can't access the directory, an error is returned. */ + TEST(UvFsCheckDir, permissionDenied, NULL, NULL, 0, NULL) + { diff --git a/pkgs/development/libraries/raft-canonical/disable-net-tests.patch b/pkgs/development/libraries/raft-canonical/disable-net-tests.patch new file mode 100644 index 00000000000..7c8be29feaf --- /dev/null +++ b/pkgs/development/libraries/raft-canonical/disable-net-tests.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile.am b/Makefile.am +index 2137932..93abdb6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -198,11 +198,7 @@ test_integration_uv_SOURCES = \ + test/integration/test_uv_bootstrap.c \ + test/integration/test_uv_load.c \ + test/integration/test_uv_recover.c \ +- test/integration/test_uv_recv.c \ +- test/integration/test_uv_send.c \ + test/integration/test_uv_set_term.c \ +- test/integration/test_uv_tcp_connect.c \ +- test/integration/test_uv_tcp_listen.c \ + test/integration/test_uv_snapshot_put.c \ + test/integration/test_uv_truncate.c \ + test/integration/test_uv_work.c diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index ce133a5f015..ad0a641c35f 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -3,7 +3,6 @@ , aresponses , buildPythonPackage , fetchFromGitHub -, fetchpatch , geojson , haversine , mock @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.17"; + version = "0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,18 +22,9 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "refs/tags/v${version}"; - hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; + hash = "sha256-nvfy1XLiMjyCiQo/YuzRbDtxGmAUAiq8UJwS/SkN3oM="; }; - patches = [ - # Remove asynctest, https://github.com/exxamalte/python-aio-geojson-client/pull/35 - (fetchpatch { - name = "remove-asynctest.patch"; - url = "https://github.com/exxamalte/python-aio-geojson-client/commit/bf617d9898a99b026b43b28bd87bb6479f518c0a.patch"; - hash = "sha256-uomH3LCaklfGURDs8SsnvNyHkubbe+5dleLEjW+I+M4="; - }) - ]; - propagatedBuildInputs = [ aiohttp geojson diff --git a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index 1e8666de68b..534e8441e77 100644 --- a/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-generic-client"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-6Gc3SRRQiISBZnCg7a+rCQHR4NQipBHmG5gWZZXIsxY="; }; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-generic-client"; + changelog = "https://github.com/exxamalte/python-aio-geojson-generic-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index 53c72319af2..90645327c04 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.14"; + version = "0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; - rev = "v${version}"; - hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U="; + rev = "refs/tags/v${version}"; + hash = "sha256-/EPPEGLtiZBorZMnVg0NqwnHCbCXyZzz4449MzAYQx8="; }; propagatedBuildInputs = [ @@ -42,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; - homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-quakes"; + homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index ad213243925..3b61a49a4e5 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -5,7 +5,6 @@ , mock , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytest-asyncio , pytestCheckHook , pytz @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.7"; + version = "0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,18 +22,9 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2iVUHMk4ydmGmmGS6lJV5pvxJHyP9bRSeh/dOXbquE0="; + sha256 = "sha256-wJVFjy6QgYb6GX9pZTylYFvCRWmD2lAFZKnodsa8Yqo="; }; - patches = [ - # Remove asynctest, https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/pull/18 - (fetchpatch { - name = "remove-asynctest.patch"; - url = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/commit/d04a488130375c78efa541fd63a5d88bd6b0fd49.patch"; - hash = "sha256-ArG8CovJckzzNebd03WeU5i/jPqy2HRVBL3ICk5nZ5Y="; - }) - ]; - propagatedBuildInputs = [ aio-geojson-client aiohttp diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index 00ebe2c1f8f..b7c205179fd 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -2,7 +2,6 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , pytest-asyncio @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.5"; + version = "0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; - rev = "v${version}"; - sha256 = "sha256-rWlt4MYnuY+CzszFVDniWBnqpQW3WldSEl00ns3ko3U="; + rev = "refs/tags/v${version}"; + hash = "sha256-pn0r5iLpNnK3xmAhq/oX90hdiHgFDuwDQqfAzkp5jmw="; }; propagatedBuildInputs = [ @@ -33,7 +32,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses - asynctest pytest-asyncio pytestCheckHook ]; @@ -45,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 025e0c35684..04ffcf6b384 100644 --- a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-usgs-earthquakes"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Hb0/BdK/jjxlPl9WJJpFdOCzZpZDCguXoGreGIyN8oo="; }; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes"; + changelog = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix index 71e7c67fc40..4a5abb7fe94 100644 --- a/pkgs/development/python-modules/aioecowitt/default.nix +++ b/pkgs/development/python-modules/aioecowitt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioecowitt"; - version = "2022.11.0"; + version = "2023.01.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-v+O4J3GZZelF3H3BbL7LVRZEIH01WrDNnmOOWG4rVT0="; + hash = "sha256-xOoKrGBkMEdpeiU1r27xlZp5s5sGJzvD7Ats+w6KR/o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 511b1c5f84c..00ae13cd91f 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.2.1"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rz8r+FieBQAZKxZR741CffuEyGcLe6ghdEKFGfeD6vg="; + hash = "sha256-tsjHs1v5Yth5XToznCdAWoe70Lhxqh6Mq/MHKSYYg14="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 4ed9de7d17f..4f17d17c0d5 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.43"; + version = "0.2.48"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-qxJ1yt8KI3ekza1KNfRRBtpPLNC/X0q7ITPhZkS1hPM="; + sha256 = "sha256-EPS9kqlognIoMnpgmFl32FVT1ahyliizLzGfgE3N24Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cometblue-lite/default.nix b/pkgs/development/python-modules/cometblue-lite/default.nix index eea0b8dac04..89af6333ae9 100644 --- a/pkgs/development/python-modules/cometblue-lite/default.nix +++ b/pkgs/development/python-modules/cometblue-lite/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cometblue-lite"; - version = "0.5.3"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neffs"; repo = "python-cometblue_lite"; - rev = version; - hash = "sha256-KRWS2nqMFlF+IcBSmnQH3ptp6yxRQjAFY6aY0D7eZBs="; + rev = "refs/tags/${version}"; + hash = "sha256-Cjd7PdZ2/neRr1jStDY5iJaGMJ/srnFmCea8aLNan6g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 91acd24477b..b8f2fffe0e1 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.83.1"; + version = "1.84.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hfO4dbMA6efQPwP0Bp/5IDb7mLHf1NuTuiJjhHivG6I="; + hash = "sha256-AdfrzN7ufvy77tKjnHPNo+jHoHRw9fXtdUdYvdnMAjs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index e0790ad00d2..8a53a9d1d58 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "django-silk"; - version = "5.0.2"; + version = "5.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-silk"; rev = "refs/tags/${version}"; - hash = "sha256-LzcbRZ9NLTkDTZ2eW+uXYqPbWDSdLZAJcYdD8JLuiDc="; + hash = "sha256-91FcOqAYZK7/RCKgXjbQEPUQ2cZRFi7NzVLQF+MMDRI="; }; # "test_time_taken" tests aren't suitable for reproducible execution, but Django's @@ -95,6 +95,7 @@ buildPythonPackage rec { meta = with lib; { description = "Silky smooth profiling for the Django Framework"; homepage = "https://github.com/jazzband/django-silk"; + changelog = "https://github.com/jazzband/django-silk/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 6d9db5a901c..9a4303b1dd5 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.1.50"; + version = "0.1.51"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-M9FH8xbNo5NF2PktiG4SpZl4tjH7H937Rbqhe6VV+Bk="; + hash = "sha256-SEolk0bbq3vNNMFz5B/qELaiCFCZFXJD4zTH8hBUX+Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index d1a9f146db7..7c83f062307 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.7"; + version = "0.5.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FmCoryNX1DnqMlGalad5iWO2ZRZwXgWgARQMYlJ6yVo="; + hash = "sha256-x83CmOAZFaIDv4bzO01YZxVPVM/cwUpJtKdCWOxH/O4="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for GE smart appliances"; homepage = "https://github.com/simbaja/gehome"; + changelog = "https://github.com/simbaja/gehome/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix index 931c7c2917e..f315d99d8dd 100644 --- a/pkgs/development/python-modules/geojson-client/default.nix +++ b/pkgs/development/python-modules/geojson-client/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-geojson-client"; - rev = "v${version}"; - sha256 = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU="; + rev = "refs/tags/v${version}"; + hash = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU="; }; propagatedBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for convenient access to GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-geojson-client"; + changelog = "https://github.com/exxamalte/python-geojson-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index c3e2f26c92c..26446cc412e 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.12"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/qa/3RKWC0SDgDeax/CwiZtSc9Nxm1cHJAKT6si2ecw="; + hash = "sha256-4nFPB7dQRYvq9bB7Zw6ntgWO4VXAIcmH0LjmpAvzRG8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index e086137a022..3b67f04f673 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.14.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-q4OD37ryZqg40L89BNZdLCNeC1QPwVhUaT4S5tO88Jk="; + hash = "sha256-3XFvKnaK1nUCz9mbmSXFH/1uFr6TtBCr7v/arBkL/oE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 17e2c06b8d3..692b2fe6d8e 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.25.3"; + version = "0.25.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t36uWIREn01/+dIYP5HYlkSPPjgoZoYbJYnFo3Y6qSw="; + hash = "sha256-AZZhwHtVhdHkztzr/Hdi63VC5CjK2Vz8h8zizmSUdNY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 8eca00e712f..4d367c809d4 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.19.1"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,10 +22,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocstrings"; repo = pname; - rev = version; - sha256 = "sha256-VCWUV+3vXmKbAXImAqY/K4vsA64gHBg83VkxbJua/ao="; + rev = "refs/tags/${version}"; + hash = "sha256-eFHcwbYEIwVWvDJWlmeUvEdqp3NYAF8SgdHJGw6bEMc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' \ + --replace 'license = "ISC"' 'license = {text = "ISC"}' + ''; + nativeBuildInputs = [ pdm-pep517 ]; @@ -43,12 +49,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'dynamic = ["version"]' 'version = "${version}"' \ - --replace 'license = "ISC"' 'license = {text = "ISC"}' - ''; - pythonImportsCheck = [ "mkdocstrings" ]; @@ -58,6 +58,11 @@ buildPythonPackage rec { "tests/test_extension.py" ]; + disabledTests = [ + # Not all requirements are available + "test_disabling_plugin" + ]; + meta = with lib; { description = "Automatic documentation from sources for MkDocs"; homepage = "https://github.com/mkdocstrings/mkdocstrings"; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index cfc719e1366..8aa091a25c7 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, aiohttp , matplotlib , numpy , openpyxl , pandas , pandas-stubs , plotly +, pytest-asyncio , pytest-mock , pytestCheckHook , pythonOlder @@ -16,11 +18,12 @@ , tqdm , typing-extensions , wandb +, withOptionalDependencies ? false }: buildPythonPackage rec { pname = "openai"; - version = "0.25.0"; + version = "0.26.1"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -29,29 +32,35 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - hash = "sha256-bwv7lpdDYlk+y3KBjv7cSvaGr3v02riNCUfPFh6yv1I="; + hash = "sha256-M6ZaYTOBAwLogWPafSnBYw3rUry+sS9VwQWAM9tDfr8="; }; propagatedBuildInputs = [ - numpy - openpyxl - pandas - pandas-stubs + aiohttp requests tqdm + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ]; + ] ++ lib.optionals withOptionalDependencies (builtins.attrValues { + inherit (passthru.optional-dependencies) embeddings wandb; + }); passthru.optional-dependencies = { - wandb = [ - wandb + datalib = [ + numpy + openpyxl + pandas + pandas-stubs ]; embeddings = [ matplotlib plotly scikit-learn tenacity - ]; + ] ++ passthru.optional-dependencies.datalib; + wandb = [ + wandb + ] ++ passthru.optional-dependencies.datalib; }; pythonImportsCheck = [ @@ -60,6 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-asyncio pytest-mock ]; @@ -72,6 +82,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires a real API key "openai/tests/test_endpoints.py" + "openai/tests/asyncio/test_endpoints.py" # openai: command not found "openai/tests/test_file_cli.py" "openai/tests/test_long_examples_validator.py" diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 94479a12141..5dd2bf7f743 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "10.2.6"; + version = "10.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uQPz7IB14dFrupZIA87jG5P7USaGKs0WWlgbaLAEPp4="; + hash = "sha256-wMC5SnC0KJ6pauvAKq+jTJiFoD0dlYBtxU8cag/JmnM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index b01149da578..97d2b5a83ba 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.23.0"; + version = "2.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-EBDk0XuE8zVFoGYbK2LIWeDfsj3iUZUUERNKARKwuKU="; + sha256 = "sha256-D0N7kRTzfKCxLNtRJML+xykvsv3Mv0WHdlA05eLHl3M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index a4055fb65f0..dd75551b34e 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.6"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "722fefbd253d0bbcbf5250b7b9c4aca5722cde4ca38bfbf863a551a5fc26edfa"; + sha256 = "sha256-fpa1Pfo5EAafg7Pgha17G6k5G13fdErjclv0On/uYyI="; }; nativeCheckInputs = [ sphinx pytest-cov pytest ]; diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 104e5bfb829..4c4de7f75d8 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ewels"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-l8tMyxSkh4eckD21NofK9FBgeGKAqZB0J3B98HpWZ0s="; + hash = "sha256-Be6okg3zmbdbdlB4/uwioUxn6CZUay/istiIoiFrsJk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 07cfdca5c2c..e01c1828fe6 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.12.1"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-ugCbjhOZTJ1+DeTKDTQJMIO6wjkqVL5tvPGoRrZKwGI="; + hash = "sha256-2STQKIAoaGLreGGkqOSrNrByu7j+7oxZihwp9COhuGM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 04e7f890bf1..c51830b7fc7 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.0.2"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-W3WJPYQofNcpW5AyIW3ms6FxQ2yWzocL3nrZGCdm+gk="; + hash = "sha256-p58W6PIYdimJz8Cdzv/rr8GRW1wLcb0jnhNxkbuQiBo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 9b4d1091843..3e2de3d2afc 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.12.7"; + version = "1.12.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-f2JrUzgSPbko/H7n6IYiw3nLU9SkIH8BgSEyMlGppok="; + hash = "sha256-04Xl2TBs9RL+KWmJgUY+PDoYN4AAvrcWP7TJBEu5lNU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix index 0c0d90bb9fc..f95810fb771 100644 --- a/pkgs/development/tools/bingo/default.nix +++ b/pkgs/development/tools/bingo/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "bwplotka"; repo = "bingo"; rev = "v${version}"; - sha256 = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A="; + hash = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A="; }; - vendorSha256 = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM="; + vendorHash = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM="; postPatch = '' rm get_e2e_test.go get_e2e_utils_test.go diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 52fdf0c1e40..af3a32bb9d6 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-ZjDZMI84z8riRtidZVeCktwJUMkZU28E23MveJSD7xY="; + sha256 = "sha256-BqyV4hJw7H9yN5Kj/XwhYS6hElXdKUJEUi5M/PNlPO0="; }; - cargoSha256 = "sha256-oaWWAVTKxrshfvqE+HMQ1WeeEz8lOE7qc6RrgSjDtdU="; + cargoHash = "sha256-MA3XW2tPn0qVx7ve+UqCoG4nQ7UyuvXEebrPuLKqS4g="; # Test depend on git configuration that would likly exist in a normal user enviroment # and might be failing to create the test repository it works in. diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index d159a329e53..5ef396d3839 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - sha256 = "sha256-v9MYrijnbtJpTgRZ4hmkaekisOyujldGewCRNbkVzWw="; + hash = "sha256-v9MYrijnbtJpTgRZ4hmkaekisOyujldGewCRNbkVzWw="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -f cmd/cue/cmd/script_test.go ''; - vendorSha256 = "sha256-jTfV8DJlr5LxS3HjOEBkVzBvZKiySrmINumXSUIq2mI="; + vendorHash = "sha256-jTfV8DJlr5LxS3HjOEBkVzBvZKiySrmINumXSUIq2mI="; excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ]; diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index 177d838ff09..e1690aea4d1 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "itchyny"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xJx3ge+8cIGL1j5vnU4JhCcwmXIRhJ66PYnEG223Fbc="; + hash = "sha256-xJx3ge+8cIGL1j5vnU4JhCcwmXIRhJ66PYnEG223Fbc="; }; - vendorSha256 = "sha256-BnDtHqqU/kFJyeG1g4UZ51eSnUlbQ6eRKTFoz6kxl0s="; + vendorHash = "sha256-BnDtHqqU/kFJyeG1g4UZ51eSnUlbQ6eRKTFoz6kxl0s="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix index 690095d44fb..6261cdc1b50 100644 --- a/pkgs/development/tools/kube-linter/default.nix +++ b/pkgs/development/tools/kube-linter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-linter"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "stackrox"; repo = pname; rev = version; - sha256 = "sha256-FEiUnJFmrHj97aSjfJtsjS9Qy4A6mzXicIrJZdgZbag="; + sha256 = "sha256-/iwNyThgdXAXu1ulf68+X7nA9wE9jEqN7F5wuT5GMwk="; }; - vendorSha256 = "sha256-5dsM5jfD/apRs5NT/XqM8eHEgiyGQHHG3MG6cOFQKr8="; + vendorHash = "sha256-jWXR7tHYT15h7QSxinYyPaBs5utUmdeWWm+GPpfwiA4="; ldflags = [ "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" diff --git a/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix b/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix index 9a372b1c6d7..24b360a7818 100644 --- a/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.6.5"; + version = "3.6.7"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-4/RRE9IB/qy8YszPzEvrBVLi1X0XCNh+lJYwMXTTD1I="; + sha256 = "sha256-x7/yO1rJ+VBG4EFpISYblRECLW2lsLz5wcqLR14UV/g="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index f7f0eca56ca..530d349303c 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,15 +11,15 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.47.4"; + version = "0.48.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-EHDSil077g/K8XCWQ9Pry/oyh0Bs3ckS/5Co1z/+Yes="; + hash = "sha256-//xwk5T477Ae61MqZCrj8VcG23mqrP04/VVuUwtxyio="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; @@ -42,7 +42,7 @@ buildGoModule rec { getGoDirs() { go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"} } - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra rm server/server_test.go ''; diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix index 561187eae0f..948115c332e 100644 --- a/pkgs/development/tools/pulumictl/default.nix +++ b/pkgs/development/tools/pulumictl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.39"; + version = "0.0.41"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-85a0qW4Fy+ojAhdlRU/m7mkHX91GoZAHlEGPljLAj4c="; + sha256 = "sha256-6QBE6+wJ9MQXey9nXaJn69uVUhIVlWMdH9ROiMi7bZk="; }; vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk="; diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 496c8768ed4..7d58d112da3 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.14.3"; + version = "0.14.5"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OHr+VCYt+w1VWv6XAfMZv0I7IZJ1m0UtErgMonGytns="; + sha256 = "sha256-+H+T/PEpJyRySTJlVGbAevLzAEZs5J8BNqwZjiXhuuU="; }; - cargoSha256 = "sha256-tOJNQLPWpCqHCFRk85PW91axUTljo8YoeWUpPrl8P4c="; + cargoSha256 = "sha256-IOR/G+SPGl3MgOMjmsVPpvoode8U7K52vqs7yu0BdQk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index a1d6044871c..1a231575476 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.13.7"; + version = "1.13.8"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-9adccECtWty9GURjzUd6sPYn8qojGWzCrDIpUxswx4k="; + hash = "sha256-ROMO6IkfpzFvB5Y4RRqrX5NnYzdHT1tsJBdCc1lDu7k="; }; - cargoHash = "sha256-5hg+w2IZOI6d06H7sAokO0v4b6ofxvak64v3he5n4LI="; + cargoHash = "sha256-VAVlzciWVKcgl/QKiF3Hfzx11jUi/0J9b6EmaZzG9qE="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index ccf462702fd..d18818a10de 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "virtio_vmmci"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "voutilad"; repo = "virtio_vmmci"; rev = "${version}"; - sha256 = "104xnpcy5kb4y7ipy1fx1v6byddzs63bv2dqjy3yl23n764fsy43"; + hash = "sha256-ZHslYYZFjM3wp0W5J3/WwCtQ2wDzT1jNc26Z/giTC8g="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 03bbafce8d4..467e3ffe70b 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; - hash = "sha256-YKe4O2e50InSp0WhH93RJGH2MavHtkW2wIWt+Qs/VdY="; + hash = "sha256-PsRiojfQbR9EVdbsAKQvCxaGBh/JiOXImoQdAd11O1M="; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 681c7ca7a81..278f0b4c526 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -32,8 +32,8 @@ let pname = "hylafaxplus"; - version = "7.0.6"; - hash = "sha512-0faeEwF/XQE/85zwUMOnrGzvGanuWRDr53SnrgbX0i/SHjHelzSEd2TK6plVOfV4w8RY7Ox7lSO1gjqEEzfZyw=="; + version = "7.0.7"; + hash = "sha512-nUvt+M0HBYN+MsGskuuDt1j0nI5Dk8MbfK/OVxP2FCDby3eiDg0eDtcpIxlOe4o0klko07zDRIb06zqh8ABuKA=="; configSite = substituteAll { name = "${pname}-config.site"; @@ -72,16 +72,6 @@ stdenv.mkDerivation { patches = [ # adjust configure check to work with libtiff > 4.1 ./libtiff-4.patch - # fix missing exports in libtiff 4.5+ - # https://gitlab.com/libtiff/libtiff/-/issues/504 - # can probably be dropped with next hylafaxplus release - (fetchurl { - name = "hylafaxplus-7.0.6-tiff-4.5.0.patch"; - url = "https://dev.gentoo.org/~sam/distfiles/net-misc/hylafaxplus/hylafaxplus-7.0.6-tiff-4.5.0.patch.xz"; - downloadToTemp = true; - postFetch = ''xz -d < $downloadedFile > $out''; - hash = "sha256-koZvvzlgZHcANVaYdewnuLARz2TTeyDZRjm0EYWzsmk="; - }) ]; # Note that `configure` (and maybe `faxsetup`) are looking # for a couple of standard binaries in the `PATH` and diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch index c890f317e51..e00d94b5a97 100644 --- a/pkgs/servers/hylafaxplus/libtiff-4.patch +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -5,7 +5,7 @@ https://bugs.gentoo.org/706154 echo '#define TIFFSTRIPBYTECOUNTS uint32_t' echo '#define TIFFVERSION TIFF_VERSION' echo '#define TIFFHEADER TIFFHeader';; -- 4.[01234]) tiff_runlen_t="uint32_t" +- 4.[012345]) tiff_runlen_t="uint32_t" + 4.[0-9]) tiff_runlen_t="uint32_t" tiff_offset_t="uint64_t" echo '#define TIFFSTRIPBYTECOUNTS uint64_t' diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 18041897f23..9fc2c676b94 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, python3, openssl, rustPlatform -, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd , nixosTests , enableRedis ? true , callPackage diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index fcef839a9dd..017501ded00 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -1,10 +1,9 @@ { lib , stdenv -, systemd -, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , fetchFromGitHub , fetchpatch , python3 +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd }: python3.pkgs.buildPythonPackage rec { diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 52a3ff1b682..f1756924c15 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.9.1"; + version = "2.9.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-fvVSxDiGZAewyuQ2vZDb0I6tmlDXl6trjZp8+qDBtb8="; + sha256 = "sha256-3n3nqAVow8nIocXPsgCZcNkV+jr/G5/CmnSUfj2WMWo="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 05a36726c0c..2f793e31808 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -36,8 +36,6 @@ , xorgserver }: -with lib; - let inherit (python3.pkgs) cython buildPythonApplication; @@ -206,7 +204,7 @@ in buildPythonApplication rec { updateScript = ./update.sh; }; - meta = { + meta = with lib; { homepage = "https://xpra.org/"; downloadPage = "https://xpra.org/src/"; description = "Persistent remote applications for X"; diff --git a/pkgs/tools/admin/pulumi-bin/default.nix b/pkgs/tools/admin/pulumi-bin/default.nix index 71c61d7a054..9f2f7bd6c71 100644 --- a/pkgs/tools/admin/pulumi-bin/default.nix +++ b/pkgs/tools/admin/pulumi-bin/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper, installShellFiles }: -with lib; - let data = import ./data.nix {}; in stdenv.mkDerivation { @@ -16,7 +14,7 @@ in stdenv.mkDerivation { installPhase = '' install -D -t $out/bin/ * - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" '' + '' installShellCompletion --cmd pulumi \ @@ -25,9 +23,9 @@ in stdenv.mkDerivation { --zsh <($out/bin/pulumi completion zsh) ''; - nativeBuildInputs = [ installShellFiles ] ++ optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; - meta = { + meta = with lib; { homepage = "https://pulumi.io/"; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 724301854b4..e4933986176 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -23,8 +23,6 @@ , nixosTests }: -with lib; - stdenv.mkDerivation rec { version = "1.12.0"; pname = "tigervnc"; diff --git a/pkgs/tools/audio/dsp/default.nix b/pkgs/tools/audio/dsp/default.nix index 01b1ed107be..57990199dfa 100644 --- a/pkgs/tools/audio/dsp/default.nix +++ b/pkgs/tools/audio/dsp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "bmc0"; repo = "dsp"; rev = "v${version}"; - sha256 = "sha256-S1pzVQ/ceNsx0vGmzdDWw2TjPVLiRgzR4edFblWsekY="; + hash = "sha256-S1pzVQ/ceNsx0vGmzdDWw2TjPVLiRgzR4edFblWsekY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 072166f7a5b..86e598ff600 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -7,8 +7,6 @@ assert par2Support -> par2cmdline != null; let version = "0.32"; in -with lib; - stdenv.mkDerivation { pname = "bup"; inherit version; @@ -31,7 +29,7 @@ stdenv.mkDerivation { postPatch = '' patchShebangs . substituteInPlace Makefile --replace "-Werror" "" - '' + optionalString par2Support '' + '' + lib.optionalString par2Support '' substituteInPlace cmd/fsck-cmd.py --replace "'par2'" "'${par2cmdline}/bin/par2'" ''; @@ -49,7 +47,7 @@ stdenv.mkDerivation { --prefix PATH : ${git}/bin ''; - meta = { + meta = with lib; { homepage = "https://github.com/bup/bup"; description = "Efficient file backup system based on the git packfile format"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index ad2e237b3fb..61c0c186fe2 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -3,7 +3,6 @@ , rsync, ssh }: -with lib; mkDerivation rec { pname = "luckybackup"; version = "0.5.0"; @@ -26,7 +25,7 @@ mkDerivation rec { done ''; - meta = { + meta = with lib; { description = "A powerful, fast and reliable backup & sync tool"; longDescription = '' luckyBackup is an application for data back-up and synchronization diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix index e10c82d7201..da87a7b89e5 100644 --- a/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -9,8 +9,6 @@ # TODO: aptxSupport }: -with lib; - stdenv.mkDerivation rec { pname = "bluez-alsa"; version = "4.0.0"; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { alsa-lib bluez glib sbc dbus readline libbsd ncurses ] - ++ optional aacSupport fdk_aac; + ++ lib.optional aacSupport fdk_aac; configureFlags = [ "--with-alsaplugindir=${placeholder "out"}/lib/alsa-lib" @@ -36,9 +34,9 @@ stdenv.mkDerivation rec { "--enable-rfcomm" "--enable-hcitop" ] - ++ optional aacSupport "--enable-aac"; + ++ lib.optional aacSupport "--enable-aac"; - meta = { + meta = with lib; { description = "Bluez 5 Bluetooth Audio ALSA Backend"; longDescription = '' Bluez-ALSA (BlueALSA) is an ALSA backend for Bluez 5 audio interface. diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index a544fd7b8be..115928e4979 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "hanwen"; repo = "go-mtpfs"; rev = "v${version}"; - sha256 = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w="; + hash = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w="; }; - vendorSha256 = "sha256-OrAEvD2rF0Y0bvCD9TUv/E429lASsvC3uK3qNvbg734="; + vendorHash = "sha256-OrAEvD2rF0Y0bvCD9TUv/E429lASsvC3uK3qNvbg734="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 1b4033ea695..dba2a474ccc 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, pkg-config, lz4, xz, zlib, lzo, zstd }: -with lib; - stdenv.mkDerivation rec { pname = "squashfuse"; @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { description = "FUSE filesystem to mount squashfs archives"; homepage = "https://github.com/vasi/squashfuse"; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; license = "BSD-2-Clause"; }; } diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index b200f487b23..c21d51dce60 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -3,8 +3,6 @@ , static ? stdenv.hostPlatform.isStatic }: -with lib; - stdenv.mkDerivation rec { pname = "gifsicle"; version = "1.93"; @@ -14,11 +12,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-kvZweXMr9MHaCH5q4JBSBYRuWsd3ulyqZtEqc6qUNEc="; }; - buildInputs = optionals gifview [ xorgproto libXt libX11 ]; + buildInputs = lib.optionals gifview [ xorgproto libXt libX11 ]; - configureFlags = optional (!gifview) "--disable-gifview"; + configureFlags = lib.optional (!gifview) "--disable-gifview"; - LDFLAGS = optionalString static "-static"; + LDFLAGS = lib.optionalString static "-static"; doCheck = true; checkPhase = '' @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; homepage = "https://www.lcdf.org/gifsicle/"; license = lib.licenses.gpl2; - platforms = platforms.all; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/pkgs/tools/graphics/ldgallery/viewer/default.nix b/pkgs/tools/graphics/ldgallery/viewer/default.nix index d1acce2d7f3..bbaed09684e 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/default.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkgs, pandoc, CoreServices }: -with lib; - let # Note for maintainers: # * keep version in sync with the ldgallery compiler @@ -21,13 +19,13 @@ let nodePkg = nodePackages.package.override { src = "${sourcePkg}/viewer"; postInstall = "npm run build"; - buildInputs = optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; }; in # making sure that the source and the node package are in sync -assert versions.majorMinor nodePkg.version == removePrefix "v" sourcePkg.rev; +assert lib.versions.majorMinor nodePkg.version == lib.removePrefix "v" sourcePkg.rev; stdenv.mkDerivation { pname = nodePkg.packageName; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 7b8ddaf713b..3e9127a9a9a 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -4,8 +4,6 @@ # This package comes with its own copy of zlib, libpng and pngxtern -with lib; - stdenv.mkDerivation rec { pname = "optipng"; version = "0.7.7"; @@ -17,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; - LDFLAGS = optional static "-static"; + LDFLAGS = lib.optional static "-static"; # Workaround for crash in cexcept.h. See # https://github.com/NixOS/nixpkgs/issues/28106 preConfigure = '' diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index 7cac5a8e21b..a2adb7ee61d 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: -with lib; stdenv.mkDerivation rec { pname = "pgf"; version = "6.14.12"; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 4037868518f..e3403e334b8 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -34,8 +34,6 @@ , nixosTests }: -with lib; - let python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); python3BuildEnv = python3.buildEnv.override { @@ -88,10 +86,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-memconf" - (enableFeature (dconf != null) "dconf") - (enableFeature (libnotify != null) "libnotify") - (enableFeature withWayland "wayland") - (enableFeature enableUI "ui") + (lib.enableFeature (dconf != null) "dconf") + (lib.enableFeature (libnotify != null) "libnotify") + (lib.enableFeature withWayland "wayland") + (lib.enableFeature enableUI "ui") "--enable-gtk4" "--enable-install-tests" "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji" @@ -133,7 +131,7 @@ stdenv.mkDerivation rec { isocodes json-glib libnotify - ] ++ optionals withWayland [ + ] ++ lib.optionals withWayland [ libxkbcommon wayland ]; @@ -165,7 +163,7 @@ stdenv.mkDerivation rec { }; }; - meta = { + meta = with lib; { homepage = "https://github.com/ibus/ibus"; description = "Intelligent Input Bus, input method framework"; license = licenses.lgpl21Plus; diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index e1daecbd10f..cbc978821a0 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -18,8 +18,6 @@ , withMisc ? false, libeb ? null }: -with lib; - assert withGtk2 -> gtk2 != null; assert withGtk3 -> gtk3 != null; @@ -59,18 +57,18 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses m17n_lib m17n_db expat ] - ++ optional withAnthy anthy - ++ optional withGtk2 gtk2 - ++ optional withGtk3 gtk3 - ++ optional withQt4 qt4 - ++ optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ] - ++ optional withLibnotify libnotify - ++ optional withSqlite sqlite - ++ optionals withNetworking [ + ++ lib.optional withAnthy anthy + ++ lib.optional withGtk2 gtk2 + ++ lib.optional withGtk3 gtk3 + ++ lib.optional withQt4 qt4 + ++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ] + ++ lib.optional withLibnotify libnotify + ++ lib.optional withSqlite sqlite + ++ lib.optionals withNetworking [ curl openssl ] - ++ optional withFFI libffi - ++ optional withMisc libeb; + ++ lib.optional withFFI libffi + ++ lib.optional withMisc libeb; prePatch = '' patchShebangs *.sh */*.sh */*/*.sh @@ -113,25 +111,25 @@ stdenv.mkDerivation rec { "--with-xft" "--with-expat=${expat.dev}" ] - ++ optional withAnthy "--with-anthy-utf8" - ++ optional withGtk2 "--with-gtk2" - ++ optional withGtk3 "--with-gtk3" - ++ optionals withQt4 [ + ++ lib.optional withAnthy "--with-anthy-utf8" + ++ lib.optional withGtk2 "--with-gtk2" + ++ lib.optional withGtk3 "--with-gtk3" + ++ lib.optionals withQt4 [ "--with-qt4" "--with-qt4-immodule" ] - ++ optionals withQt5 [ + ++ lib.optionals withQt5 [ "--with-qt5" "--with-qt5-immodule" ] - ++ optional withLibnotify "--enable-notify=libnotify" - ++ optional withSqlite "--with-sqlite3" - ++ optionals withNetworking [ + ++ lib.optional withLibnotify "--enable-notify=libnotify" + ++ lib.optional withSqlite "--with-sqlite3" + ++ lib.optionals withNetworking [ "--with-curl" "--with-openssl-dir=${openssl.dev}" ] - ++ optional withFFI "--with-ffi" - ++ optional withMisc "--with-eb"; + ++ lib.optional withFFI "--with-ffi" + ++ lib.optional withMisc "--with-eb"; # TODO: things in `./configure --help`, but not in nixpkgs #--with-canna Use Canna [default=no] diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/tools/misc/catimg/default.nix index 3f94a559e61..6230b21c387 100644 --- a/pkgs/tools/misc/catimg/default.nix +++ b/pkgs/tools/misc/catimg/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake } : -with lib; - stdenv.mkDerivation rec { pname = "catimg"; version = "2.7.0"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = { + meta = with lib; { license = licenses.mit; homepage = "https://github.com/posva/catimg"; description = "Insanely fast image printing in your terminal"; diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix index 7c2cfecf27a..7c9a35f1ebc 100644 --- a/pkgs/tools/misc/claws/default.nix +++ b/pkgs/tools/misc/claws/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { rev = version; owner = "thehowl"; repo = pname; - sha256 = "sha256-3zzUBeYfu9x3vRGX1DionLnAs1e44tFj8Z1dpVwjdCg="; + hash = "sha256-3zzUBeYfu9x3vRGX1DionLnAs1e44tFj8Z1dpVwjdCg="; }; - vendorSha256 = "sha256-FP+3Rw5IdCahhx9giQrpepMMtF1pWcyjNglrlu9ju0Q="; + vendorHash = "sha256-FP+3Rw5IdCahhx9giQrpepMMtF1pWcyjNglrlu9ju0Q="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index af3e907c04a..597eced414f 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, glib, libintl }: -with lib; - stdenv.mkDerivation rec { pname = "desktop-file-utils"; version = "0.26"; @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = { + meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 8c625df390a..ca12c1f2588 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -13,7 +13,6 @@ , kbdcompSupport ? false, ckbcomp }: -with lib; let pcSystems = { i686-linux.target = "i386"; @@ -40,8 +39,8 @@ let riscv64-linux.target = "riscv64"; }; - canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); - inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); + canEfi = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) efiSystemsBuild); + inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) pcSystems); version = "2.06"; @@ -330,8 +329,8 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoreconfHook ]; buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool bash ] - ++ optional doCheck qemu - ++ optional zfsSupport zfs; + ++ lib.optional doCheck qemu + ++ lib.optional zfsSupport zfs; strictDeps = true; @@ -369,7 +368,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-grub-mount" # dep of os-prober - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # grub doesn't do cross-compilation as usual and tries to use unprefixed # tools to target the host. Provide toolchain information explicitly for # cross builds. @@ -380,9 +379,9 @@ stdenv.mkDerivation rec { "TARGET_OBJCOPY=${stdenv.cc.targetPrefix}objcopy" "TARGET_RANLIB=${stdenv.cc.targetPrefix}ranlib" "TARGET_STRIP=${stdenv.cc.targetPrefix}strip" - ] ++ optional zfsSupport "--enable-libzfs" - ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] - ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; + ] ++ lib.optional zfsSupport "--enable-libzfs" + ++ lib.optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] + ++ lib.optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; # save target that grub is compiled for grubTarget = if efiSupport diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index d6aba812405..3137c820eea 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, grub2_xen }: -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 4947949ac5b..2d07932dab2 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -18,14 +18,13 @@ , for_HP_laptop ? false }: -with lib; let pcSystems = { i686-linux.target = "i386"; x86_64-linux.target = "i386"; }; - inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); + inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) pcSystems); version = if for_HP_laptop then "1.2.1" else "1.2.0"; @@ -59,7 +58,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] - ++ optional doCheck qemu; + ++ lib.optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index e3a3f79f326..510de6a8ee3 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "hexd"; version = "1.1.0"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "Colourful, human-friendly hexdump tool"; homepage = "https://github.com/FireyFly/hexd"; maintainers = [ maintainers.FireyFly ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 4de78cf4cbd..ef5d04ee476 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -7,11 +7,9 @@ , jre }: -with lib; - let this = stdenv.mkDerivation rec { version = elk6Version; - pname = "logstash${optionalString (!enableUnfree) "-oss"}"; + pname = "logstash${lib.optionalString (!enableUnfree) "-oss"}"; src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; @@ -63,7 +61,7 @@ let this = stdenv.mkDerivation rec { maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; passthru.tests = - optionalAttrs (!enableUnfree) ( + lib.optionalAttrs (!enableUnfree) ( assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath; { elk = nixosTests.elk.ELK-6; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 221c7be83df..cdf810d2a20 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -9,12 +9,10 @@ , jre }: -with lib; - let - info = splitString "-" stdenv.hostPlatform.system; - arch = elemAt info 0; - plat = elemAt info 1; + info = lib.splitString "-" stdenv.hostPlatform.system; + arch = lib.elemAt info 0; + plat = lib.elemAt info 1; shas = if enableUnfree then { @@ -29,7 +27,7 @@ let }; this = stdenv.mkDerivation rec { version = elk7Version; - pname = "logstash${optionalString (!enableUnfree) "-oss"}"; + pname = "logstash${lib.optionalString (!enableUnfree) "-oss"}"; src = fetchurl { @@ -79,7 +77,7 @@ let maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; passthru.tests = - optionalAttrs (config.allowUnfree && enableUnfree) ( + lib.optionalAttrs (config.allowUnfree && enableUnfree) ( assert this.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.logstash.drvPath; { elk = nixosTests.elk.unfree.ELK-7; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 1f002136ad0..0a7423ec557 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -11,7 +11,6 @@ , darwin }: -with lib; stdenv.mkDerivation rec { pname = "moreutils"; version = "0.67"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ makeWrapper perl libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ]; - buildInputs = optional stdenv.isDarwin darwin.cctools; + buildInputs = lib.optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ts --prefix PERL5LIB : $PERL5LIB ''; - meta = { + meta = with lib; { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; homepage = "https://joeyh.name/code/moreutils/"; maintainers = with maintainers; [ koral pSub ]; diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix index 8152849d9b5..2e8f552e1a8 100644 --- a/pkgs/tools/misc/pixd/default.nix +++ b/pkgs/tools/misc/pixd/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "pixd"; version = "1.0.0"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "Colourful visualization tool for binary files"; homepage = "https://github.com/FireyFly/pixd"; maintainers = [ maintainers.FireyFly ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 8211c5aebc7..850bdb83c89 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -20,7 +20,6 @@ assert withGui -> !stdenv.isDarwin; -with lib; stdenv.mkDerivation rec { pname = "rmlint"; version = "2.10.1"; @@ -78,7 +77,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3}):$(toPythonPath ${python3.pkgs.pycairo})") ''; - meta = { + meta = with lib; { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; homepage = "https://rmlint.readthedocs.org"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 6d4e28f6cb6..766bb68e0f7 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -5,14 +5,13 @@ , nixosTests }: -with lib; let - copts = concatStringsSep " " ([ + copts = lib.concatStringsSep " " ([ "-DHAVE_IDN" "-DHAVE_DNSSEC" - ] ++ optionals dbusSupport [ + ] ++ lib.optionals dbusSupport [ "-DHAVE_DBUS" - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "-DHAVE_CONNTRACK" ]); in @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - postBuild = optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.isLinux '' make -C contrib/lease-tools ''; @@ -51,17 +50,17 @@ stdenv.mkDerivation rec { # module can create it in Nix-land? postInstall = '' install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install -Dm644 contrib/MacOSX-launchd/uk.org.thekelleys.dnsmasq.plist \ $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \ --replace "/usr/local/sbin" "$out/bin" - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6 - '' + optionalString dbusSupport '' + '' + lib.optionalString dbusSupport '' install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf mkdir -p $out/share/dbus-1/system-services cat < $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service @@ -75,8 +74,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle libidn ] - ++ optionals dbusSupport [ dbus ] - ++ optionals stdenv.isLinux [ libnetfilter_conntrack ]; + ++ lib.optionals dbusSupport [ dbus ] + ++ lib.optionals stdenv.isLinux [ libnetfilter_conntrack ]; passthru.tests = { prometheus-exporter = nixosTests.prometheus-exporters.dnsmasq; @@ -87,7 +86,7 @@ stdenv.mkDerivation rec { kubernetes-dns-multi = nixosTests.kubernetes.dns-multi-node; }; - meta = { + meta = with lib; { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = "https://www.thekelleys.org.uk/dnsmasq/doc.html"; license = licenses.gpl2; diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index 9c5c8efa5a7..0f5a2aebc98 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, tcl }: +{ lib, stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { pname = "eggdrop"; - version = "1.9.3"; + version = "1.9.4"; - src = fetchFromGitHub { - owner = "eggheads"; - repo = "eggdrop"; - rev = "v${version}"; - sha256 = "sha256-BYPDIPn1nuVhnPjs2vZ6KC6pjBVYDWsRjB8c1Z6UUdE="; + src = fetchurl { + url = "https://ftp.eggheads.org/pub/eggdrop/source/${lib.versions.majorMinor version}/eggdrop-${version}.tar.gz"; + hash = "sha256-DCh+N+h7XBidScnl2I9cwzhsmMB0MdPmAzgDwYkCltE="; }; buildInputs = [ tcl ]; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 57e75462e3a..873afdea2e8 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -1,7 +1,5 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: -with lib; - buildGoModule rec { pname = "flannel"; version = "0.20.2"; @@ -23,7 +21,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) flannel; }; - meta = { + meta = with lib; { description = "Network fabric for containers, designed for Kubernetes"; license = licenses.asl20; homepage = "https://github.com/flannel-io/flannel"; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index 74d32b45238..30a400df0a1 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl }: -with lib; - let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index ad3bf675278..6746f456cfe 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, systemd, pkg-config }: -with lib; - stdenv.mkDerivation { version = "1.06"; pname = "ndjbdns"; @@ -15,9 +13,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] - ++ optional stdenv.isLinux systemd; + ++ lib.optional stdenv.isLinux systemd; - meta = { + meta = with lib; { description = "A brand new release of the Djbdns"; longDescription = '' Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix index f12ae31a541..fb1574bfdc1 100644 --- a/pkgs/tools/networking/ngrok/default.nix +++ b/pkgs/tools/networking/ngrok/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl }: -with lib; - let versions = lib.importJSON ./versions.json; arch = if stdenv.isi686 then "386" else if stdenv.isx86_64 then "amd64" @@ -37,10 +35,10 @@ stdenv.mkDerivation { # Stripping causes SEGFAULT on x86_64-darwin dontStrip = true; - meta = { + meta = with lib; { description = "Allows you to expose a web server running on your local machine to the internet"; homepage = "https://ngrok.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ bobvanderlinden brodes ]; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 2f0b36f4972..c1b2199d0f9 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -30,7 +30,6 @@ , linkOpenssl ? true }: -with lib; stdenv.mkDerivation rec { inherit pname version src; @@ -57,12 +56,12 @@ stdenv.mkDerivation rec { # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is # needed here to access krb5-config in order to cross compile. See: # https://github.com/NixOS/nixpkgs/pull/107606 - ++ optional withKerberos pkgs.libkrb5 + ++ lib.optional withKerberos pkgs.libkrb5 ++ extraNativeBuildInputs; buildInputs = [ zlib openssl libedit ] - ++ optional withFIDO libfido2 - ++ optional withKerberos libkrb5 - ++ optional stdenv.isLinux pam; + ++ lib.optional withFIDO libfido2 + ++ lib.optional withKerberos libkrb5 + ++ lib.optional stdenv.isLinux pam; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -80,11 +79,11 @@ stdenv.mkDerivation rec { "--with-libedit=yes" "--disable-strip" (if stdenv.isLinux then "--with-pam" else "--without-pam") - ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withFIDO "--with-security-key-builtin=yes" - ++ optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") - ++ optional stdenv.isDarwin "--disable-libutil" - ++ optional (!linkOpenssl) "--without-openssl" + ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" + ++ lib.optional withFIDO "--with-security-key-builtin=yes" + ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") + ++ lib.optional stdenv.isDarwin "--disable-libutil" + ++ lib.optional (!linkOpenssl) "--without-openssl" ++ extraConfigureFlags; ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null}= [ "-laudit" ] ++ lib.optionals withKerberos [ "-lkeyutils" ]; @@ -97,7 +96,7 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelChecking = false; - nativeCheckInputs = optional (!stdenv.isDarwin) hostname; + nativeCheckInputs = lib.optional (!stdenv.isDarwin) hostname; preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # construct a dummy HOME export HOME=$(realpath ../dummy-home) @@ -145,7 +144,7 @@ stdenv.mkDerivation rec { # integration tests hard to get working on darwin with its shaky # sandbox # t-exec tests fail on musl - checkTarget = optional (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "t-exec" + checkTarget = lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "t-exec" # other tests are less demanding of the environment ++ [ "unit" "file-tests" "interop-tests" ]; @@ -165,7 +164,7 @@ stdenv.mkDerivation rec { borgbackup-integration = nixosTests.borgbackup; }; - meta = { + meta = with lib; { description = "An implementation of the SSH protocol${extraDesc}"; homepage = "https://www.openssh.com/"; changelog = "https://www.openssh.com/releasenotes.html"; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 97d9ff33ddf..f58fd9a998b 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -3,8 +3,6 @@ , fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "snabb"; version = "2022.10"; @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { cp src/snabb $out/bin ''; - meta = { + meta = with lib; { homepage = "https://github.com/SnabbCo/snabbswitch"; description = "Simple and fast packet networking toolkit"; longDescription = '' diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 119f81baf5c..40d2b68c449 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -14,8 +14,6 @@ # strongswan curl plugin may break. # See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info. -with lib; - stdenv.mkDerivation rec { pname = "strongswan"; version = "5.9.8"; # Make sure to also update when upgrading! @@ -32,10 +30,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook perl gperf bison flex ]; buildInputs = [ curl gmp python3 ldns unbound openssl pcsclite ] - ++ optionals enableTNC [ trousers sqlite libxml2 ] - ++ optionals stdenv.isLinux [ systemd.dev pam iptables ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) - ++ optionals enableNetworkManager [ networkmanager glib ]; + ++ lib.optionals enableTNC [ trousers sqlite libxml2 ] + ++ lib.optionals stdenv.isLinux [ systemd.dev pam iptables ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) + ++ lib.optionals enableNetworkManager [ networkmanager glib ]; patches = [ ./ext_auth-path.patch @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { ./updown-path.patch ]; - postPatch = optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' # glibc-2.26 reorganized internal includes sed '1i#include ' -i src/libstrongswan/utils/utils/memory.h @@ -62,16 +60,16 @@ stdenv.mkDerivation rec { "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" "--enable-chapoly" "--enable-curl" ] - ++ optionals stdenv.isLinux [ + ++ lib.optionals stdenv.isLinux [ "--enable-farp" "--enable-dhcp" "--enable-systemd" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--enable-xauth-pam" "--enable-forecast" "--enable-connmark" "--enable-af-alg" ] - ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] - ++ optional (stdenv.hostPlatform.system == "i686-linux") "--enable-padlock" - ++ optionals enableTNC [ + ++ lib.optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] + ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") "--enable-padlock" + ++ lib.optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" @@ -80,11 +78,11 @@ stdenv.mkDerivation rec { "--with-tss=trousers" "--enable-aikgen" "--enable-sqlite" ] - ++ optionals enableNetworkManager [ + ++ lib.optionals enableNetworkManager [ "--enable-nm" "--with-nm-ca-dir=/etc/ssl/certs" ] # Taken from: https://wiki.strongswan.org/projects/strongswan/wiki/MacOSX - ++ optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ "--disable-systemd" "--disable-xauth-pam" "--disable-kernel-netlink" @@ -100,11 +98,11 @@ stdenv.mkDerivation rec { echo "include /etc/ipsec.secrets" >> $out/etc/ipsec.secrets ''; - NIX_LDFLAGS = optionalString stdenv.cc.isGNU "-lgcc_s" ; + NIX_LDFLAGS = lib.optionalString stdenv.cc.isGNU "-lgcc_s" ; passthru.tests = { inherit (nixosTests) strongswan-swanctl; }; - meta = { + meta = with lib; { description = "OpenSource IPsec-based VPN Solution"; homepage = "https://www.strongswan.org"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index d9faea9cea4..20f374b8d10 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -8,8 +8,6 @@ , nixosTests }: -with lib; - let rev = "e4675e38ab54942e351c7686e40fabec822120b9"; sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr"; @@ -17,7 +15,7 @@ in stdenv.mkDerivation { pname = "nix-serve"; - version = "0.2-${substring 0 7 rev}"; + version = "0.2-${lib.substring 0 7 rev}"; src = fetchFromGitHub { owner = "edolstra"; @@ -33,7 +31,7 @@ stdenv.mkDerivation { install -Dm0755 nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi makeWrapper ${perl.withPackages(p: [ p.DBDSQLite p.Plack p.Starman nix.perl-bindings ])}/bin/starman $out/bin/nix-serve \ - --prefix PATH : "${makeBinPath [ bzip2 nix ]}" \ + --prefix PATH : "${lib.makeBinPath [ bzip2 nix ]}" \ --add-flags $out/libexec/nix-serve/nix-serve.psgi ''; @@ -42,7 +40,7 @@ stdenv.mkDerivation { nix-serve-ssh = nixosTests.nix-serve-ssh; }; - meta = { + meta = with lib; { homepage = "https://github.com/edolstra/nix-serve"; description = "A utility for sharing a Nix store as a binary cache"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index c6f4c24ed71..069b6f24eaa 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -6,7 +6,18 @@ }: let - python = python3; + python = python3.override { + packageOverrides = self: super: { + dulwich = super.dulwich.overridePythonAttrs (old: rec { + version = "0.20.50"; + src = self.fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-UKlBeWssZ1vjm+co1UDBa1t853654bP4VWUOzmgy0r4="; + }; + }); + }; + }; in python.pkgs.buildPythonApplication rec { pname = "poetry"; version = "1.3.2"; diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index e33c4c2fb03..9a8b4b3ca36 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -2,8 +2,6 @@ , texinfo, libuuid, flex, bison, pixman, autoconf }: -with lib; - let cpuTarget = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux-user" else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user" diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 1fb613aef2e..cfcaece232c 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -2,8 +2,6 @@ , texinfo, libuuid, flex, bison, pixman, autoconf }: -with lib; - let qemuName = "qemu-3.1.0"; cpuTarget = if stdenv.targetPlatform.system == "x86_64-linux" then "x86_64-linux-user" diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index c209fa82edb..2b08da598fa 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, openmp ? null }: -with lib; - stdenv.mkDerivation (finalAttrs: { pname = "b2sum"; version = "20190724"; @@ -24,10 +22,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openmp ]; - buildFlags = [ (optional (openmp == null) "NO_OPENMP=1") ]; + buildFlags = [ (lib.optional (openmp == null) "NO_OPENMP=1") ]; installFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "The b2sum utility is similar to the md5sum or shasum utilities but for BLAKE2"; homepage = "https://blake2.net"; license = with licenses; [ asl20 cc0 openssl ]; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 8409bd8d2bc..745b027a057 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -2,8 +2,6 @@ , gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch }: -with lib; - stdenv.mkDerivation rec { pname = "john"; version = "1.9.0-jumbo-1"; @@ -83,7 +81,7 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with lib; { description = "John the Ripper password cracker"; license = licenses.gpl2Plus; homepage = "https://github.com/openwall/john/"; diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index 8f0cd43bd16..a3342e0b380 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -5,13 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "5.4.0"; + version = "6.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = "refs/tags/${version}"; - hash = "sha256-If8w6Z75nQsayJBqJs+D9++7kqCbkmwkszOaMATDTpY="; + hash = "sha256-O4tXq4pDzuTBEGAls2I9bfBRdHssF4rFBec4OtfUx6A="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 0d3b2871671..f8564bfe00f 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -3,8 +3,6 @@ , luaSupport ? false, lua5, perl }: -with lib; - let luaValue = if luaSupport then lua5 else "no"; optional = lib.optional; in @@ -49,7 +47,7 @@ stdenv.mkDerivation rec { cp -R * $nginx ''; - meta = { + meta = with lib; { description = "Open source, cross-platform web application firewall (WAF)"; license = licenses.asl20; homepage = "https://www.modsecurity.org/"; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index d6276b3cc40..fbabe92b199 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -6,8 +6,6 @@ , withLua ? true }: -with lib; - stdenv.mkDerivation rec { pname = "nmap"; version = "7.93"; @@ -18,7 +16,7 @@ stdenv.mkDerivation rec { }; patches = [ ./zenmap.patch ] - ++ optionals stdenv.cc.isClang [( + ++ lib.optionals stdenv.cc.isClang [( # Fixes a compile error due an ambiguous reference to bind(2) in # nping/EchoServer.cc, which is otherwise resolved to std::bind. # https://github.com/nmap/nmap/pull/1363 @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { } )]; - prePatch = optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace libz/configure \ --replace /usr/bin/libtool ar \ --replace 'AR="libtool"' 'AR="ar"' \ @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { "--without-zenmap" ]; - makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.bintools.targetPrefix}ar" "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" "CC=${stdenv.cc.targetPrefix}gcc" @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 3 tests, probably needs the net - meta = { + meta = with lib; { description = "A free and open source utility for network discovery and security auditing"; homepage = "http://www.nmap.org"; license = licenses.gpl2; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index c856c020d69..498e715a8eb 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -11,8 +11,6 @@ , tombPluginSupport ? false }: -with lib; - assert x11Support -> xclip != null; assert waylandSupport -> wl-clipboard != null; @@ -35,7 +33,7 @@ let name = "pass"; paths = selected; nativeBuildInputs = [ makeWrapper ]; - buildInputs = concatMap (x: x.buildInputs) selected; + buildInputs = lib.concatMap (x: x.buildInputs) selected; postBuild = '' files=$(find $out/bin/ -type f -exec readlink -f {} \;) @@ -79,7 +77,7 @@ stdenv.mkDerivation rec { # dependencies (s.el) here. The user has to do this themselves. mkdir -p "$out/share/emacs/site-lisp" cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + optionalString dmenuSupport '' + '' + lib.optionalString dmenuSupport '' cp "contrib/dmenu/passmenu" "$out/bin/" ''; diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 2ad7fe3e909..8b00431b6cb 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -3,8 +3,6 @@ , libcap, libpcap, libnfnetlink, libnetfilter_conntrack, libnetfilter_queue }: -with lib; - stdenv.mkDerivation rec { pname = "tcpcrypt"; version = "0.5"; @@ -21,11 +19,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl libpcap ] - ++ optionals stdenv.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ]; + ++ lib.optionals stdenv.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ]; enableParallelBuilding = true; - meta = { + meta = with lib; { broken = stdenv.isDarwin; homepage = "http://tcpcrypt.org/"; description = "Fast TCP encryption"; diff --git a/pkgs/tools/security/tor/update.nix b/pkgs/tools/security/tor/update.nix index 50353ce32a6..f0106aa26ea 100644 --- a/pkgs/tools/security/tor/update.nix +++ b/pkgs/tools/security/tor/update.nix @@ -10,8 +10,6 @@ , nix }: -with lib; - let downloadPageUrl = "https://dist.torproject.org"; @@ -28,7 +26,7 @@ writeScript "update-tor" '' set -eu -o pipefail -export PATH=${makeBinPath [ +export PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl @@ -63,7 +61,7 @@ sigFile=''${sigUrl##*/} export GNUPGHOME=$PWD/gnupg mkdir -m 700 -p "$GNUPGHOME" -gpg --batch --recv-keys ${concatStringsSep " " (map (x: "'${x}'") signingKeys)} +gpg --batch --recv-keys ${lib.concatStringsSep " " (map (x: "'${x}'") signingKeys)} gpg --batch --verify "$sigFile" "$checksumFile" sha256sum -c "$checksumFile" diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index 31b3cae4460..c1e625e14c1 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "gsamokovarov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nlCuotEiAX2+xx7T8jWZo2p4LNLhWXDdcU6DxJprgx0="; + hash = "sha256-nlCuotEiAX2+xx7T8jWZo2p4LNLhWXDdcU6DxJprgx0="; }; - vendorSha256 = "sha256-nMUqZWdq//q/DNthvpKiYLq8f95O0QoItyX5w4vHzSA="; + vendorHash = "sha256-nMUqZWdq//q/DNthvpKiYLq8f95O0QoItyX5w4vHzSA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index ee9d132de30..a84113fe20b 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -14,8 +14,6 @@ , withDebug ? false }: -with lib; - let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { @@ -34,17 +32,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; buildInputs = [ curl jemalloc libuv zlib ] - ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] - ++ optionals (!stdenv.isDarwin) [ libcap libuuid ] - ++ optionals withCups [ cups ] - ++ optionals withDBengine [ lz4 ] - ++ optionals withIpmi [ freeipmi ] - ++ optionals withNetfilter [ libmnl libnetfilter_acct ] - ++ optionals withCloud [ json_c ] - ++ optionals withConnPubSub [ google-cloud-cpp grpc ] - ++ optionals withConnPrometheus [ snappy ] - ++ optionals (withCloud || withConnPrometheus) [ protobuf ] - ++ optionals withSsl [ openssl ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] + ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ] + ++ lib.optionals withCups [ cups ] + ++ lib.optionals withDBengine [ lz4 ] + ++ lib.optionals withIpmi [ freeipmi ] + ++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ] + ++ lib.optionals withCloud [ json_c ] + ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ] + ++ lib.optionals withConnPrometheus [ snappy ] + ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ] + ++ lib.optionals withSsl [ openssl ]; patches = [ # required to prevent plugins from relying on /etc @@ -68,12 +66,12 @@ in stdenv.mkDerivation rec { # We pick zlib.dev as a simple canary package with pkg-config input. disallowedReferences = [ zlib.dev ]; - NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; + NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' ln -s ${go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d ln -s ${go-d-plugin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin - '' + optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ $out/libexec/netdata/plugins.d/apps.plugin.org @@ -83,13 +81,13 @@ in stdenv.mkDerivation rec { $out/libexec/netdata/plugins.d/perf.plugin.org mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ $out/libexec/netdata/plugins.d/slabinfo.plugin.org - ${optionalString withIpmi '' + ${lib.optionalString withIpmi '' mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ $out/libexec/netdata/plugins.d/freeipmi.plugin.org ''} ''; - preConfigure = optionalString (!stdenv.isDarwin) '' + preConfigure = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \ --replace 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; @@ -99,9 +97,9 @@ in stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-ebpf" "--with-jemalloc=${jemalloc}" - ] ++ optionals (!withDBengine) [ + ] ++ lib.optionals (!withDBengine) [ "--disable-dbengine" - ] ++ optionals (!withCloud) [ + ] ++ lib.optionals (!withCloud) [ "--disable-cloud" ]; @@ -116,7 +114,7 @@ in stdenv.mkDerivation rec { tests.netdata = nixosTests.netdata; }; - meta = { + meta = with lib; { broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform; description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix index 7c40a8f0caf..dc9486a6e3d 100644 --- a/pkgs/tools/system/socklog/default.nix +++ b/pkgs/tools/system/socklog/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl }: -with lib; - stdenv.mkDerivation rec { pname = "socklog"; version = "2.1.0"; @@ -49,7 +47,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with lib; { broken = stdenv.isDarwin; description = "System and kernel logging services"; homepage = "http://smarden.org/socklog/"; diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix index 32a0f586388..38522293767 100644 --- a/pkgs/tools/text/ledger2beancount/default.nix +++ b/pkgs/tools/text/ledger2beancount/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }: -with lib; - let perlDeps = with perlPackages; [ DateCalc @@ -44,7 +42,7 @@ in stdenv.mkDerivation rec { --set PERL5LIB "${perlPackages.makeFullPerlPath perlDeps}" ''; - meta = { + meta = with lib; { description = "Ledger to Beancount text-based converter"; longDescription = '' A script to automatically convert Ledger-based textual ledgers to Beancount ones. diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 6e05f81fcd8..b6293ffbc53 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -12,7 +12,6 @@ assert (gnutlsSupport || opensslSupport); -with lib; stdenv.mkDerivation { pname = "rtmpdump"; version = "unstable-2021-02-19"; @@ -36,20 +35,20 @@ stdenv.mkDerivation { "prefix=$(out)" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] - ++ optional gnutlsSupport "CRYPTO=GNUTLS" - ++ optional opensslSupport "CRYPTO=OPENSSL" - ++ optional stdenv.isDarwin "SYS=darwin" - ++ optional stdenv.cc.isClang "CC=clang"; + ++ lib.optional gnutlsSupport "CRYPTO=GNUTLS" + ++ lib.optional opensslSupport "CRYPTO=OPENSSL" + ++ lib.optional stdenv.isDarwin "SYS=darwin" + ++ lib.optional stdenv.cc.isClang "CC=clang"; propagatedBuildInputs = [ zlib ] - ++ optionals gnutlsSupport [ gnutls nettle ] - ++ optional opensslSupport openssl; + ++ lib.optionals gnutlsSupport [ gnutls nettle ] + ++ lib.optional opensslSupport openssl; outputs = [ "out" "dev" ]; separateDebugInfo = true; - meta = { + meta = with lib; { description = "Toolkit for RTMP streams"; homepage = "https://rtmpdump.mplayerhq.hu/"; license = licenses.gpl2; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7112809d43a..b6da9b2ff5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3391,7 +3391,7 @@ with pkgs; kjv = callPackage ../applications/misc/kjv { }; - lukesmithxyz-bible-kjv = callPackage ../applications/misc/lukesmithxyz-bible/kjv.nix { }; + lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { }; luigi = callPackage ../applications/networking/cluster/luigi { }; @@ -10330,7 +10330,9 @@ with pkgs; openimagedenoise_1_2_x = callPackage ../development/libraries/openimagedenoise/1_2_x.nix { }; - openmvg = callPackage ../applications/science/misc/openmvg { }; + openmvg = callPackage ../applications/science/misc/openmvg { + inherit (llvmPackages) openmp; + }; openmvs = callPackage ../applications/science/misc/openmvs { }; @@ -26879,6 +26881,8 @@ with pkgs; dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; + dotcolon-fonts = callPackage ../data/fonts/dotcolon-fonts { }; + e17gtk = callPackage ../data/themes/e17gtk { }; eb-garamond = callPackage ../data/fonts/eb-garamond { }; @@ -26899,6 +26903,10 @@ with pkgs; eunomia = callPackage ../data/fonts/eunomia { }; + fa_1 = callPackage ../data/fonts/fa_1 { }; + + f1_8 = callPackage ../data/fonts/f1_8 { }; + f5_6 = callPackage ../data/fonts/f5_6 { }; faba-icon-theme = callPackage ../data/icons/faba-icon-theme { }; @@ -27236,6 +27244,8 @@ with pkgs; medio = callPackage ../data/fonts/medio { }; + melete = callPackage ../data/fonts/melete { }; + mno16 = callPackage ../data/fonts/mno16 { }; mnist = callPackage ../data/machine-learning/mnist { }; @@ -27272,6 +27282,8 @@ with pkgs; myrica = callPackage ../data/fonts/myrica { }; + nacelle = callPackage ../data/fonts/nacelle { }; + nafees = callPackage ../data/fonts/nafees { }; nanum = callPackage ../data/fonts/nanum { };