Skip to content

fetchers: move to pkgs/ #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonringer merged 2 commits into from
Mar 10, 2026
Merged

fetchers: move to pkgs/ #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7ed997
lz4: fix build
jonringer Mar 10, 2026
e2d7801
fetchers: move to pkgs dir
jonringer Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 0 additions & 55 deletions build-support/fetchgitlocal/default.nix
View file
Open in desktop

This file was deleted.

0 build-support/fetchdebianpatch/default.nix → pkgs/fetchDebianPatch/default.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchdebianpatch/tests.nix → pkgs/fetchDebianPatch/tests.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchgitlab/default.nix → pkgs/fetchFromGitLab/default.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchpypi/default.nix → pkgs/fetchPypi/default.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchgit/builder.sh → pkgs/fetchgit/builder.sh
View file
Open in desktop
File renamed without changes.
0 build-support/fetchgit/default.nix → pkgs/fetchgit/default.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchgit/deterministic-git → pkgs/fetchgit/deterministic-git
View file
Open in desktop
File renamed without changes.
0 build-support/fetchgit/nix-prefetch-git → pkgs/fetchgit/nix-prefetch-git
View file
Open in desktop
File renamed without changes.
0 build-support/fetchgit/tests.nix → pkgs/fetchgit/tests.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchhg/builder.sh → pkgs/fetchhg/builder.sh
View file
Open in desktop
File renamed without changes.
0 build-support/fetchhg/default.nix → pkgs/fetchhg/default.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchhg/nix-prefetch-hg → pkgs/fetchhg/nix-prefetch-hg
View file
Open in desktop
File renamed without changes.
0 build-support/fetchpatch/default.nix → pkgs/fetchpatch/default.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchpatch/tests.nix → pkgs/fetchpatch/tests.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchsourcehut/default.nix → pkgs/fetchsourcehut/default.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchurl/boot.nix → pkgs/fetchurl/boot.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchurl/builder.sh → pkgs/fetchurl/builder.sh
View file
Open in desktop
File renamed without changes.
0 build-support/fetchurl/default.nix → pkgs/fetchurl/default.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchurl/mirrors.nix → pkgs/fetchurl/mirrors.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchurl/tests.nix → pkgs/fetchurl/tests.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchurl/write-mirror-list.sh → pkgs/fetchurl/write-mirror-list.sh
View file
Open in desktop
File renamed without changes.
0 build-support/fetchzip/default.nix → pkgs/fetchzip/default.nix
View file
Open in desktop
File renamed without changes.
0 build-support/fetchzip/tests.nix → pkgs/fetchzip/tests.nix
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pkgs/lz4/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

stdenv.mkDerivation (finalAttrs: {
pname = "lz4";
version = "131";
version = "1.10.0";

src = fetchFromGitHub {
repo = "lz4";
owner = "lz4";
rev = "v${finalAttrs.version}";
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
hash = "sha256-/dG1n59SKBaEBg72pAWltAtVmJ2cXxlFFhP+klrkTos=";
};

patches = [
Expand Down
2 changes: 1 addition & 1 deletion stdenv/linux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ let
shell = "${bootstrapTools}/bin/bash";
initialPath = [ bootstrapTools ];

fetchurlBoot = import ../../build-support/fetchurl/boot.nix {
fetchurlBoot = import ../../pkgs/fetchurl/boot.nix {
inherit system;
};

Expand Down
14 changes: 3 additions & 11 deletions top-level.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ with final;

# TODO(corepkgs): move these fetchers into pkgs
fetchpatch =
callPackage ./build-support/fetchpatch {
callPackage ./pkgs/fetchpatch {
# 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154
patchutils = __splicedPackages.patchutils_0_3_3;
}
Expand All @@ -497,27 +497,19 @@ with final;
version = 1;
};
fetchpatch2 =
callPackage ./build-support/fetchpatch {
callPackage ./pkgs/fetchpatch {
patchutils = __splicedPackages.patchutils_0_4_2;
}
// {
tests = pkgs.tests.fetchpatch2;
version = 2;
};
fetchDebianPatch = callPackage ./build-support/fetchdebianpatch { };
fetchgit = callFromScope ./build-support/fetchgit { };
fetchgitLocal = callPackage ./build-support/fetchgitlocal { };
fetchFromGitLab = callPackage ./build-support/fetchgitlab { };
fetchFromSourcehut = callPackage ./build-support/fetchsourcehut { };
fetchPypi = callPackage ./build-support/fetchpypi { };
fetchhg = callPackage ./build-support/fetchhg { };
# TODO(corepkgs): uppercase them?
fetchzip = callPackage ./build-support/fetchzip { };
fetchurl =
if stdenv.buildPlatform != stdenv.hostPlatform then
buildPackages.fetchurl # No need to do special overrides twice,
else
lib.makeOverridable (import ./build-support/fetchurl) {
lib.makeOverridable (import ./pkgs/fetchurl) {
inherit
lib
stdenvNoCC
Expand Down