Skip to content

Commit

Permalink
Merge pull request #313271 from Sigmanificient/remove-fetchpatch-pkgs…
Browse files Browse the repository at this point in the history
…-apps

pkgs/applications: remove uneeded fetchpatch arguments
  • Loading branch information
Aleksanaa authored May 21, 2024
2 parents a2c8fe8 + 0058552 commit efb5313
Show file tree
Hide file tree
Showing 70 changed files with 24 additions and 70 deletions.
1 change: 0 additions & 1 deletion pkgs/applications/accessibility/squeekboard/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
, rustc
, feedbackd
, wrapGAppsHook3
, fetchpatch
, nixosTests
}:

Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/audio/adlplug/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, fmt
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/audio/clementine/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, boost
, cmake
, chromaprint
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/fdkaac/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch, fdk_aac }:
{ lib, stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }:

stdenv.mkDerivation rec {
pname = "fdkaac";
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/audio/giada/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, fltk
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/lsp-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeWrapper
{ lib, stdenv, fetchurl, pkg-config, makeWrapper
, libsndfile, jack2
, libGLU, libGL, lv2, cairo
, ladspaH, php, libXrandr }:
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/audio/musikcube/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, cmake
, curl
, fetchFromGitHub
, fetchpatch
, ffmpeg
, gnutls
, lame
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/audio/tenacity/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitea
, fetchpatch
, cmake
, wxGTK32
, gtk3
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/blockchains/haven-cli/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
{ lib, stdenv, fetchFromGitHub
, cmake, pkg-config
, boost179, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/blockchains/solana-validator/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

{ stdenv
, fetchFromGitHub
, fetchpatch
, lib
, rustPlatform
, pkg-config
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/editors/rstudio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, stdenv
, mkDerivation
, fetchurl
, fetchpatch
, fetchFromGitHub
, makeDesktopItem
, copyDesktopItems
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/zee/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, openssl, stdenv, Security }:
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }:

rustPlatform.buildRustPackage rec {
pname = "zee";
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/emulators/darling/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
, runCommandWith
, writeShellScript
, fetchFromGitHub
, fetchpatch
, nixosTests

, freetype
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/emulators/vbam/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, cairo
, cmake
, fetchFromGitHub
, fetchpatch
, ffmpeg
, gettext
, wxGTK32
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/file-managers/nnn/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, installShellFiles
, makeWrapper
, pkg-config
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/graphics/gnome-photos/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchurl
, fetchpatch2
, at-spi2-core
, babl
, dbus
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/graphics/icon-library/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, wrapGAppsHook4
, cargo
, desktop-file-utils
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/tesseract/tesseract4.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config
, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }:
, leptonica, libpng, libtiff, icu, pango, opencl-headers }:

stdenv.mkDerivation rec {
pname = "tesseract";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/tesseract/tesseract5.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, curl, leptonica, libarchive, libpng, libtiff, icu, pango, opencl-headers, fetchpatch
, curl, leptonica, libarchive, libpng, libtiff, icu, pango, opencl-headers
, Accelerate, CoreGraphics, CoreVideo
}:

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/kde/falkon.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch
{ stdenv, mkDerivation, lib
, cmake, extra-cmake-modules, pkg-config
, libpthreadstubs, libxcb, libXdmcp
, qtsvg, qttools, qtwebengine, qtx11extras
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/bambu-studio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
webkitgtk,
wxGTK31,
xorg,
fetchpatch,
withSystemd ? stdenv.isLinux,
}:
let
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/bemenu/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, cairo, libxkbcommon
{ stdenv, lib, fetchFromGitHub, cairo, libxkbcommon
, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc
, ncursesSupport ? true, ncurses
, waylandSupport ? true, wayland, wayland-protocols, wayland-scanner
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/feedbackd/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch2
, docbook-xsl-nons
, docutils
, gi-docgen
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/lenmus/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, makeWrapper
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/lutris/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ buildPythonApplication
, lib
, fetchFromGitHub
, fetchpatch

# build inputs
, atk
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/maliit-keyboard/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ mkDerivation
, lib
, fetchFromGitHub
, fetchpatch

, anthy
, hunspell
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/mediaelch/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch

, cmake
, qttools
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/qlcplus/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, udev
{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev
, qtmultimedia, qtscript, qtserialport, alsa-lib, ola, libftdi1, libusb-compat-0_1
, libsndfile, libmad
}:
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/rlaunch/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchpatch
, rustPlatform
, xorg
}:
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/tandoor-recipes/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, nixosTests
, python3
, fetchFromGitHub
, fetchpatch
}:
let
python = python3.override {
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/wmenu/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromSourcehut
, fetchpatch
, pkg-config
, meson
, ninja
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/networking/avalanchego/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ IOKit
, buildGoModule
, fetchFromGitHub
, fetchpatch
, lib
, stdenv
}:
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/networking/browsers/lynx/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
, sslSupport ? true
, openssl
, nukeReferences
, fetchpatch
}:

stdenv.mkDerivation rec {
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/networking/giara/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitLab
, fetchpatch
, meson
, gobject-introspection
, pkg-config
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchurl
, fetchpatch
# native
, meson
, ninja
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/hydroxide/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
{ lib, buildGoModule, fetchFromGitHub }:

buildGoModule rec {
pname = "hydroxide";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused,
gradle, git, perl, makeWrapper, fetchpatch, substituteAll, jre_minimal
gradle, git, perl, makeWrapper, substituteAll, jre_minimal
}:

# NOTE: when updating the package, please check if some of the hacks in `deps.installPhase`
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/ipfs-cluster/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
{ lib, buildGoModule, fetchFromGitHub }:

buildGoModule rec {
pname = "ipfs-cluster";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/mailreaders/mmh/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, ncurses, autoreconfHook, flex }:
{ lib, stdenv, fetchurl, ncurses, autoreconfHook, flex }:
let rev = "b17ea39dc17e5514f33b3f5c34ede92bd16e208c";
in stdenv.mkDerivation rec {
pname = "mmh";
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/networking/mullvad/libwg.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, buildGoModule
, mullvad
, fetchpatch
}:
buildGoModule {
pname = "libwg";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/p2p/transgui/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, fetchpatch, unzip
{ lib, stdenv, fetchFromGitHub, pkg-config, makeDesktopItem, unzip
, fpc, lazarus, libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl
, unstableGitUpdater }:

Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/networking/sniffers/sngrep/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
, autoconf
, automake
, fetchFromGitHub
, fetchpatch
, libpcap
, ncurses
, openssl
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/sync/lsyncd/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkg-config, rsync,
{ lib, stdenv, fetchFromGitHub, cmake, lua, pkg-config, rsync,
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt, xnu }:

stdenv.mkDerivation rec {
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/office/banking/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ lib
, fetchpatch
, fetchFromGitLab
, python3
, appstream-glib
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/office/beancount/beancount_share.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, python3
, fetchFromGitHub
, fetchpatch
}:

python3.pkgs.buildPythonApplication rec {
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/office/gtg/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchpatch
, meson
, python3Packages
, ninja
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/printing/pappl/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ lib, stdenv, fetchFromGitHub
, fetchpatch
, avahi
, cups
, gnutls
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/radio/gnss-sdr/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchpatch
, armadillo
, cmake
, gmp
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/radio/gnuradio/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
# Remove gcc and python references
, removeReferencesTo
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/science/biology/samtools/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, zlib, htslib, perl, ncurses ? null }:
{ lib, stdenv, fetchurl, zlib, htslib, perl, ncurses ? null }:

stdenv.mkDerivation rec {
pname = "samtools";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/science/electronics/dsview/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, wrapQtAppsHook
, libzip, boost, fftw, qtbase, qtwayland, qtsvg, libusb1
, python3, fetchpatch, desktopToDarwinBundle
, python3, desktopToDarwinBundle
}:

stdenv.mkDerivation rec {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
lib,
python3,
fetchFromGitHub,
fetchpatch,
qt6,
}:
python3.pkgs.buildPythonApplication rec {
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/science/electronics/vhd2vl/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, bison
, flex
, verilog
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/science/math/pari/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, gmp
, libX11
, libpthreadstubs
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/science/medicine/dcmtk/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv
, libpng, cmake, fetchpatch }:
, libpng, cmake }:

with lib;
stdenv.mkDerivation rec {
Expand Down
Loading

0 comments on commit efb5313

Please sign in to comment.