Skip to content
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

pkgsx86_64_v3-core: init #443

Merged
merged 2 commits into from
Nov 22, 2023
Merged

pkgsx86_64_v3-core: init #443

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
6042581
pkgsx86_64_v3-core: init
PedroHLC Nov 21, 2023
845ea05
comply with linter
PedroHLC Nov 22, 2023
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
30 changes: 29 additions & 1 deletion overlays/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# NOTE:
# - `*_next` packages will be removed once merged into nixpkgs-unstable.

{ flakes, self ? flakes.self, selfOverlay ? self.overlays.default }:
{ flakes, nixpkgs ? flakes.nixpkgs, self ? flakes.self, selfOverlay ? self.overlays.default }:
final: prev:
let
# Required to load version files and warning.
Expand Down Expand Up @@ -39,6 +39,28 @@ let

# Too much variations
cachyosPackages = callOverride ../pkgs/linux-cachyos/all-packages.nix { };

# Microarch stuff
makeMicroarch = lvl: with final;
if stdenv.hostPlatform.isx86 then import "${nixpkgs}"
{
overlays = [
selfOverlay
(_self': super': {
"pkgsx86_64_${lvl}" = super';
})
] ++ overlays;
${if stdenv.hostPlatform == stdenv.buildPlatform
then "localSystem" else "crossSystem"} = {
parsed = stdenv.hostPlatform.parsed // {
cpu = lib.systems.parse.cpuTypes.x86_64;
};
gcc = stdenv.hostPlatform.gcc // {
arch = "x86-64-${lvl}";
};
};
} // { recurseForDerivations = false; }
else throw "x86_64_${lvl} package set can only be used with the x86 family.";
in
{
inherit nyxUtils;
Expand Down Expand Up @@ -153,6 +175,12 @@ in
};
openmohaa_git = callOverride ../pkgs/openmohaa-git { };

pkgsx86_64_v2 = makeMicroarch "v2";
pkgsx86_64_v3 = makeMicroarch "v3";
pkgsx86_64_v4 = makeMicroarch "v4";

pkgsx86_64_v3-core = import ../shared/core-tier.nix final.pkgsx86_64_v3;

proton-ge-custom = final.callPackage ../pkgs/proton-ge-custom {
protonGeTitle = "Proton-GE";
protonGeVersions = importJSON ../pkgs/proton-ge-custom/versions.json;
Expand Down
19 changes: 19 additions & 0 deletions shared/core-tier.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
pkgs: with pkgs; {
# ArchLinux's core skipping efi-related, fs-related, kernel-related, bootloaders,
# text-editors, and network managers. Last synced 2023-11-21
inherit acl libargon2 attr audit bash binutils coreutils bison brotli bzip2 cracklib
cryptsetup curl dash db dbus debugedit dialog diffutils elfutils expat file findutils
flex gawk gcc gdbm gettext glib glibc gpm gnutls gpgme gmp gnugrep groff guile gzip
hwdata iana-etc icu inetutils iproute2 iptables iputils jansson jfsutils json_c kbd
keyutils kmod krb5 ldns lemon less libaio libarchive libcap libedit libelf libevent
libffi libgccjit libgcrypt libgpg-error libgssglue libidn2 inih isl libksba
libmicrohttpd libmnl libmpc libnetfilter_conntrack libnfnetlink libnftnl
libnghttp2 libnl libnsl libpcap libpipeline libpsl gsasl libseccomp
libsecret libssh2 libtasn1 libtirpc libtool libunistring libusb libverto;
inherit libxcrypt libxml2 links2 logrotate libgcc lz4 lzo m4 gnumake man-db mdadm
minizip mlocate mpfr ncurses nettools npth nspr nss openssl p11-kit patch pciutils
pcre pcre2 perl python3 readline rpcbind gnused sqlite gnutar texinfo tzdata
util-linux which xz zlib zstd;

recurseForDerivations = true;
}