From 63aceac7660e1fd0c3211ff2399f0d0e7aec868f Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 26 May 2024 19:08:40 +0100 Subject: [PATCH] treewide: remove unused occurence of fetchFromGitHub argument --- pkgs/applications/audio/cardinal/default.nix | 1 - .../manual-packages/tree-sitter-langs/default.nix | 1 - pkgs/applications/editors/neovim/tests/default.nix | 2 +- pkgs/applications/finance/odoo/default.nix | 1 - .../version-management/gitlab/gitaly/default.nix | 1 - pkgs/applications/virtualization/docker/default.nix | 2 +- pkgs/applications/window-managers/xmonad/xmonadctl.nix | 2 +- pkgs/by-name/co/comic-mandown/package.nix | 1 - pkgs/by-name/dx/dxvk/package.nix | 1 - pkgs/by-name/fl/flatito/package.nix | 2 +- pkgs/by-name/pw/pwndbg/package.nix | 1 - pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix | 2 +- pkgs/development/compilers/bs-platform/build-bs-platform.nix | 5 +++-- pkgs/development/compilers/dotnet/vmr.nix | 1 - pkgs/development/compilers/nim/default.nix | 2 +- pkgs/development/embedded/platformio/default.nix | 2 +- pkgs/development/interpreters/ruby/default.nix | 4 ++-- pkgs/development/julia-modules/default.nix | 1 - pkgs/development/libraries/snap7/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- pkgs/development/misc/resholve/test.nix | 1 - pkgs/development/ocaml-modules/angstrom-async/default.nix | 2 +- pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix | 2 +- pkgs/development/ocaml-modules/angstrom-unix/default.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/default.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix | 2 +- pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix | 2 +- pkgs/development/ocaml-modules/landmarks-ppx/default.nix | 2 +- pkgs/development/ocaml-modules/mparser/pcre.nix | 2 +- pkgs/development/ocaml-modules/ocaml-protoc/default.nix | 2 +- pkgs/development/ocaml-modules/owl/default.nix | 1 - pkgs/development/ocaml-modules/plotkicadsch/default.nix | 1 - pkgs/development/python-modules/basemap-data/default.nix | 1 - pkgs/development/python-modules/edlib/default.nix | 1 - .../python-modules/llama-index-readers-database/default.nix | 1 - .../python-modules/llama-index-readers-twitter/default.nix | 1 - pkgs/development/python-modules/particle/default.nix | 1 - .../python-modules/pytest-server-fixtures/default.nix | 1 - pkgs/development/python-modules/python-csxcad/default.nix | 1 - pkgs/development/python-modules/qiling/default.nix | 1 - pkgs/development/python-modules/simpleitk/default.nix | 1 - pkgs/development/skaware-packages/execline/default.nix | 2 +- .../tools/build-managers/bazel/bazel_7/protobuf-test.nix | 1 - pkgs/development/tools/build-managers/rebar3/rebar-deps.nix | 2 +- pkgs/development/web/playwright/driver.nix | 1 - pkgs/games/redeclipse/default.nix | 2 +- pkgs/games/sm64ex/generic.nix | 1 - pkgs/os-specific/linux/g15daemon/default.nix | 1 - pkgs/servers/gotify/ui.nix | 1 - pkgs/servers/varnish/packages.nix | 2 +- pkgs/servers/web-apps/discourse/plugins/all-plugins.nix | 2 +- pkgs/test/vim/default.nix | 2 +- 57 files changed, 34 insertions(+), 59 deletions(-) diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index a3ac82f8fbaf..654d22233a3b 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -1,5 +1,4 @@ { stdenv -, fetchFromGitHub , fetchurl , cmake , dbus diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix index f8a0ec28a3a2..017c1c1eb0ce 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix @@ -4,7 +4,6 @@ , fetchzip , melpaBuild , stdenv -, fetchFromGitHub , writeText , melpaStablePackages , runCommand diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index cbe811c33b68..b07f517ea474 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,6 +1,6 @@ # run tests by building `neovim.tests` { vimUtils, writeText, neovim, vimPlugins -, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable +, lib, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab , runCommandLocal diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index c10e0d43686f..b9829326768a 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchFromGitHub , fetchzip , python310 , rtlcss diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 469ea9e8231b..96e91f820939 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitLab -, fetchFromGitHub , buildGoModule , pkg-config }: diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 7556ba47b722..742dd2d37c57 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchFromGitHub }: +{ lib, callPackage }: rec { dockerGen = { diff --git a/pkgs/applications/window-managers/xmonad/xmonadctl.nix b/pkgs/applications/window-managers/xmonad/xmonadctl.nix index f7dfe1354025..23495f5d0041 100644 --- a/pkgs/applications/window-managers/xmonad/xmonadctl.nix +++ b/pkgs/applications/window-managers/xmonad/xmonadctl.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ghcWithPackages, haskellPackages, ... }: +{ stdenv, lib, ghcWithPackages, haskellPackages, ... }: let xmonadctlEnv = ghcWithPackages (self: [ self.xmonad-contrib self.X11 ]); in stdenv.mkDerivation rec { diff --git a/pkgs/by-name/co/comic-mandown/package.nix b/pkgs/by-name/co/comic-mandown/package.nix index 1e08eb28cb45..15b81cc5e83e 100644 --- a/pkgs/by-name/co/comic-mandown/package.nix +++ b/pkgs/by-name/co/comic-mandown/package.nix @@ -1,6 +1,5 @@ { lib , python3Packages -, fetchFromGitHub , withGUI ? true }: diff --git a/pkgs/by-name/dx/dxvk/package.nix b/pkgs/by-name/dx/dxvk/package.nix index 7a8e059ecf78..89defd092b0e 100644 --- a/pkgs/by-name/dx/dxvk/package.nix +++ b/pkgs/by-name/dx/dxvk/package.nix @@ -2,7 +2,6 @@ lib, stdenvNoCC, overrideCC, - fetchFromGitHub, pkgsCross, bash, }: diff --git a/pkgs/by-name/fl/flatito/package.nix b/pkgs/by-name/fl/flatito/package.nix index 528a72390e1f..50fab5bdadbe 100644 --- a/pkgs/by-name/fl/flatito/package.nix +++ b/pkgs/by-name/fl/flatito/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ruby, buildRubyGem, bundlerEnv }: +{ lib, ruby, buildRubyGem, bundlerEnv }: let deps = bundlerEnv rec { inherit ruby; diff --git a/pkgs/by-name/pw/pwndbg/package.nix b/pkgs/by-name/pw/pwndbg/package.nix index 473a401ce1c5..bad009b07ab2 100644 --- a/pkgs/by-name/pw/pwndbg/package.nix +++ b/pkgs/by-name/pw/pwndbg/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , python3 -, fetchFromGitHub , makeWrapper , gdb }: diff --git a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix index 708fd6c15645..c52d6a835a8e 100644 --- a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix +++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix @@ -1,6 +1,6 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: +in { builder ? fetchOnly, fetchHex, fetchgit, overrides ? (x: y: { }), ... }: let self = packages // (overrides self packages); packages = with self; { diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix index c73bb72b9d0f..1097e7d3f81f 100644 --- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix +++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix @@ -1,7 +1,7 @@ # This file is based on https://github.com/turboMaCk/bs-platform.nix/blob/master/build-bs-platform.nix # to make potential future updates simpler -{ lib, stdenv, fetchFromGitHub, ninja, runCommand, nodejs, python3, +{ lib, stdenv, ninja, runCommand, nodejs, python3, ocaml-version, version, src, patches ? [], ocaml ? (import ./ocaml.nix { @@ -15,7 +15,8 @@ tar zxvf ${src}/vendor/ninja.tar.gz -C $out ''; patches = []; - })) + })), + ... }: let diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 3638da1117e9..fe5880f54c1d 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -2,7 +2,6 @@ , stdenvNoCC , lib , fetchurl -, fetchFromGitHub , dotnetCorePackages , jq , curl diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 089043dc6dee..0ac32994b00d 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -1,7 +1,7 @@ # https://nim-lang.github.io/Nim/packaging.html # https://nim-lang.org/docs/nimc.html -{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub +{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit , makeWrapper, openssl, pcre, readline, boehmgc, sqlite, Security , nim-unwrapped-2, nim-unwrapped-1, nim }: diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index 956d7dee06cd..8843c36a9f6a 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -1,4 +1,4 @@ -{ newScope, fetchFromGitHub, python3Packages }: +{ newScope, python3Packages }: let callPackage = newScope self; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index ed3a06591d16..5c8bb288bd7d 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages, lib -, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub +, fetchurl, fetchpatch, fetchFromSavannah , zlib, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison , autoconf, libiconv, libobjc, libunwind, Foundation , buildEnv, bundler, bundix, cargo, rustPlatform, rustc @@ -26,7 +26,7 @@ let yjitSupported = atLeast32 && (stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64)); rubyDrv = lib.makeOverridable ( { stdenv, buildPackages, lib - , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub + , fetchurl, fetchpatch, fetchFromSavannah , rubygemsSupport ? true , zlib, zlibSupport ? true , openssl, opensslSupport ? true diff --git a/pkgs/development/julia-modules/default.nix b/pkgs/development/julia-modules/default.nix index f2c90752f098..10db44717864 100644 --- a/pkgs/development/julia-modules/default.nix +++ b/pkgs/development/julia-modules/default.nix @@ -1,7 +1,6 @@ { lib , callPackage , runCommand -, fetchFromGitHub , fetchgit , fontconfig , git diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/development/libraries/snap7/default.nix index f83ee00d04fd..39cdf6d2b45e 100644 --- a/pkgs/development/libraries/snap7/default.nix +++ b/pkgs/development/libraries/snap7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchzip, p7zip }: +{ stdenv, lib, fetchzip, p7zip }: stdenv.mkDerivation rec { pname = "snap7"; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 0eb3bda4286d..e633be6ac2ea 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchgit , gn, ninja, python3, glib, pkg-config, icu , xcbuild, darwin , fetchpatch diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index 887c4e45cd88..ab61884963aa 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -3,7 +3,6 @@ , callPackage , resholve , shunit2 -, fetchFromGitHub , coreutils , gnused , gnugrep diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index c603d1b21e57..92dd90ff22cb 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, angstrom, async }: +{ lib, buildDunePackage, angstrom, async }: buildDunePackage rec { pname = "angstrom-async"; diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index 2742b8515de7..2867e4b1a813 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, angstrom, lwt }: +{ lib, buildDunePackage, angstrom, lwt }: buildDunePackage rec { pname = "angstrom-lwt-unix"; diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 04c380320199..be3414546317 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, angstrom }: +{ lib, buildDunePackage, angstrom }: buildDunePackage rec { pname = "angstrom-unix"; diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix index 10e837dcd62c..1ceea8a75f69 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/default.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, callPackage +{ lib, buildDunePackage, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil , ffmpeg-avcodec diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index b902f72bc1ec..58055aa6698c 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +{ lib, buildDunePackage, dune-configurator, pkg-config, callPackage , AudioToolbox , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg-avcodec, ffmpeg diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index bce592a8a2c8..8f268d4d5ec2 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +{ lib, buildDunePackage, dune-configurator, pkg-config, callPackage , AudioToolbox , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index 3d27ab803153..c8a1bf9de5a1 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +{ lib, buildDunePackage, dune-configurator, pkg-config, callPackage , AppKit , AudioToolbox , AVFoundation diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 524bc600093e..89d982483986 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +{ lib, buildDunePackage, dune-configurator, pkg-config, callPackage , AppKit , CoreImage , ffmpeg-base ? callPackage ./base.nix { } diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index 6cd71ebd58eb..8e299a536f63 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +{ lib, stdenv, buildDunePackage, dune-configurator, pkg-config, callPackage , AudioToolbox, VideoToolbox , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index a6012a44171d..d21e0d02ad4c 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +{ lib, buildDunePackage, dune-configurator, pkg-config, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg-avcodec, ffmpeg , stdenv diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index 773b10ee168c..b03d87596b03 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +{ lib, buildDunePackage, dune-configurator, pkg-config, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil, ffmpeg , stdenv diff --git a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix index c55836a9b75e..f15c86b9e1f3 100644 --- a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix +++ b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, landmarks, ppxlib }: +{ lib, buildDunePackage, ocaml, landmarks, ppxlib }: buildDunePackage { pname = "landmarks-ppx"; diff --git a/pkgs/development/ocaml-modules/mparser/pcre.nix b/pkgs/development/ocaml-modules/mparser/pcre.nix index 0f26e140ed87..6656deef1471 100644 --- a/pkgs/development/ocaml-modules/mparser/pcre.nix +++ b/pkgs/development/ocaml-modules/mparser/pcre.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildDunePackage, ocaml_pcre, mparser }: +{ buildDunePackage, ocaml_pcre, mparser }: buildDunePackage rec { pname = "mparser-pcre"; diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix index 301a0f2c9a61..d408daee5db2 100644 --- a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage +{ lib, buildDunePackage , pbrt , stdlib-shims }: diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index 22aa70d9ff1c..178a4f6349b3 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -1,6 +1,5 @@ { buildDunePackage , dune-configurator -, fetchFromGitHub , alcotest , ctypes , stdio diff --git a/pkgs/development/ocaml-modules/plotkicadsch/default.nix b/pkgs/development/ocaml-modules/plotkicadsch/default.nix index 27b3a0ac5ee7..8ac6ca5f66a1 100644 --- a/pkgs/development/ocaml-modules/plotkicadsch/default.nix +++ b/pkgs/development/ocaml-modules/plotkicadsch/default.nix @@ -1,6 +1,5 @@ { lib , buildDunePackage -, fetchFromGitHub , substituteAll , base64 , cmdliner diff --git a/pkgs/development/python-modules/basemap-data/default.nix b/pkgs/development/python-modules/basemap-data/default.nix index af62404ff84e..17963e1da763 100644 --- a/pkgs/development/python-modules/basemap-data/default.nix +++ b/pkgs/development/python-modules/basemap-data/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchFromGitHub, pythonAtLeast, basemap, cython, diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 50a773d15118..64f9f96db407 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonOlder, - fetchFromGitHub, edlib, cython, python, diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix index a0ded9aaddfe..b6c36bbabe85 100644 --- a/pkgs/development/python-modules/llama-index-readers-database/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchFromGitHub, fetchPypi, llama-index-core, poetry-core, diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix index aa51724306b7..168e3b691757 100644 --- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchFromGitHub, fetchPypi, llama-index-core, poetry-core, diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index 519c1f8f5b46..49771e8728ea 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -3,7 +3,6 @@ attrs, buildPythonPackage, deprecated, - fetchFromGitHub, fetchPypi, hatch-vcs, hatchling, diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 1466371e1af4..11f67121f4f7 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchFromGitHub, future, psutil, pytest, diff --git a/pkgs/development/python-modules/python-csxcad/default.nix b/pkgs/development/python-modules/python-csxcad/default.nix index 1208aa47cc82..364b266a9c73 100644 --- a/pkgs/development/python-modules/python-csxcad/default.nix +++ b/pkgs/development/python-modules/python-csxcad/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchFromGitHub, cython, openems, csxcad, diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 584cca959d6e..34de987c8e4e 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, capstone, - fetchFromGitHub, fetchPypi, gevent, keystone-engine, diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index 82a402f5280e..e69f39820c47 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonOlder, - fetchFromGitHub, cmake, swig4, elastix, diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index fc8dffe32fde..817787ce61e7 100644 --- a/pkgs/development/skaware-packages/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, skawarePackages, skalibs }: +{ lib, skawarePackages, skalibs }: let version = "2.9.5.1"; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix index 6658c0d5b0ed..4d188ed41454 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix @@ -5,7 +5,6 @@ , darwin , distDir , extraBazelArgs ? "" -, fetchFromGitHub , fetchurl , jdk11_headless , lib diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix index 7f6be584098d..21bb25c2e308 100644 --- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -1,6 +1,6 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }: +in { builder ? fetchOnly, fetchHex, fetchgit, overrides ? (x: y: { }), ... }: let self = packages // (overrides self packages); packages = with self; { diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 3e6f3f233965..a4fe8272be4c 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -5,7 +5,6 @@ , git , jq , nodejs -, fetchFromGitHub , fetchurl , makeFontsConf , makeWrapper diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix index 07c2b9e33adf..a9255b918911 100644 --- a/pkgs/games/redeclipse/default.nix +++ b/pkgs/games/redeclipse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch , curl, ed, pkg-config, freetype, zlib, libX11 , SDL2, SDL2_image, SDL2_mixer }: diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix index 95ba3be4a569..d3da340d502f 100644 --- a/pkgs/games/sm64ex/generic.nix +++ b/pkgs/games/sm64ex/generic.nix @@ -10,7 +10,6 @@ , lib , stdenv -, fetchFromGitHub , python3 , pkg-config , audiofile diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/os-specific/linux/g15daemon/default.nix index 90a818be4947..e1d310a995b4 100644 --- a/pkgs/os-specific/linux/g15daemon/default.nix +++ b/pkgs/os-specific/linux/g15daemon/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchFromGitHub , fetchurl , fetchpatch , patchelf diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index 43bb86e45823..7d43e219ccf1 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -2,7 +2,6 @@ , yarn , fixup-yarn-lock , nodejs-slim -, fetchFromGitHub , fetchYarnDeps , gotify-server }: diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 1ddfe7348ed0..ff9b565cae58 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackages, callPackage, varnish60, varnish74, varnish75, fetchFromGitHub }: { +{ callPackages, callPackage, varnish60, varnish74, varnish75 }: { varnish60Packages = rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index 4ddb8995b622..5845f16b2d27 100644 --- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -1,4 +1,4 @@ -{ mkDiscoursePlugin, newScope, fetchFromGitHub, ... }@args: +{ mkDiscoursePlugin, newScope, ... }@args: let callPackage = newScope args; in diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 33e1e551d4f9..75633adbd1a5 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,5 +1,5 @@ { vimUtils, vim-full, writeText, vimPlugins -, lib, fetchFromGitHub +, lib , pkgs }: let