Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ffc0f1526c
88 changed files with 1112 additions and 599 deletions
|
|
@ -560,6 +560,7 @@ with lib.maintainers; {
|
|||
emilytrau
|
||||
ericson2314
|
||||
jk
|
||||
siraben
|
||||
];
|
||||
scope = "Maintain the minimal-bootstrap toolchain and related packages.";
|
||||
shortName = "Minimal Bootstrap";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "faustPhysicalModeling";
|
||||
version = "2.59.6";
|
||||
version = "2.60.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grame-cncm";
|
||||
repo = "faust";
|
||||
rev = version;
|
||||
sha256 = "sha256-Z/hAq6JlhlWBzWlodwQW/k9AkozVeMXmbVhkicNZ5os=";
|
||||
sha256 = "sha256-kaKDZKs/UsrqYlGmGgpSRcqN7FypxLCcIF72klovD4k=";
|
||||
};
|
||||
|
||||
buildInputs = [ faust2jaqt faust2lv2 ];
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qpwgraph";
|
||||
version = "0.4.2";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "rncbc";
|
||||
repo = "qpwgraph";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MkPPr9gvEeW94fXH8K9GVYdYpuG1LDgKD16l2pNFvkA=";
|
||||
sha256 = "sha256-9HgxFqwmRG2mJy9aTT0MeWdtE+YKG6rU8g24IZFHSRY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoshimi";
|
||||
version = "2.3.0";
|
||||
version = "2.3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yoshimi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rVlwOxp8C/A56JDd6Bzi2smblJVqQWZiFqIP4oRhElM=";
|
||||
hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "nano-wallet";
|
||||
version = "25.0";
|
||||
version = "25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanocurrency";
|
||||
repo = "nano-node";
|
||||
rev = "V${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-VHefXHUj08k53+8mAAhbR31F5uDmIxBFR1hfGfrrugM=";
|
||||
hash = "sha256-YvYEXHC8kxviZLQwINs+pS61wITSfqfrrPmlR+zNRoE=";
|
||||
};
|
||||
|
||||
cmakeFlags = let
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bonzomatic";
|
||||
version = "2022-08-20";
|
||||
version = "2023-06-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gargaj";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-AaUMefxQd00O+MAH4OLoyQIXZCRQQbt2ucgt7pVvN24=";
|
||||
sha256 = "sha256-hwK3C+p1hRwnuY2/vBrA0QsJGIcJatqq+U5/hzVCXEg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.898"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.900"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "649d372f7da8559f8b6d74ca44af64ba7d7853c4";
|
||||
sha256 = "0vi87qd99dzshg4raiw158b3d5l62y359kandfabjqbjn7614bpp";
|
||||
rev = "d604e982276105db043ca495a16f1b047bb2d0f6";
|
||||
sha256 = "0fsl2cw0y7jfj9b75w4x213x9hsxkfprvb6riin87yrdhmjkwa4r";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
let
|
||||
inherit (rustPlatform) buildRustPackage bindgenHook;
|
||||
|
||||
version = "0.2.7";
|
||||
version = "0.2.8";
|
||||
in
|
||||
buildRustPackage {
|
||||
pname = "figma-agent";
|
||||
|
|
@ -18,10 +18,10 @@ buildRustPackage {
|
|||
owner = "neetly";
|
||||
repo = "figma-agent-linux";
|
||||
rev = version;
|
||||
sha256 = "sha256-Cq1hWNwJLBY9Bb41WFJxnr9fcygFZ8eNsn5cPXmGTyw=";
|
||||
sha256 = "sha256-GtbONBAXoJ3AdpsWGk4zBCtGQr446siMtuj3or27wYw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Gc94Uk/Ikxjnb541flQL7AeblgU/yS6zQ/187ZGRYco=";
|
||||
cargoHash = "sha256-EmBeRdnA59PdzSEX2x+sVYk/Cs7K3k0idDjbuEzI9j4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "k4dirstat";
|
||||
version = "3.4.2";
|
||||
version = "3.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeromerobert";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-nedtCa3h62pAmJYGIYp9jkNYiqe9WevVjwNAqVaaFuc=";
|
||||
hash = "sha256-TXMUtiPS7qRLm6cCy2ZntYrcNJ0fn6X+3o3P5u7oo08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mainsail";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
|
||||
hash = "sha256-xdmi1Q2j2gG4ajh57mBsjH3qCBwpsZCQbh0INFKifg4=";
|
||||
hash = "sha256-zTlM02brIiXWKkRQ4zW+BEp+66iCelNsd+uN6yWfqYM=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "therion";
|
||||
version = "6.1.7";
|
||||
version = "6.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "therion";
|
||||
repo = "therion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q+p1akGfzBeZejeYiJ8lrSbEIMTsX5YuIG/u35oh0JI=";
|
||||
hash = "sha256-bmp0IZ4uAqDpe2e8UeIDUdFaaocx4OBIYuhnaHirqGc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "3.26.0";
|
||||
version = "3.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectcalico";
|
||||
repo = "calico";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1wAFdzIReyL+mfuPKQdPrTjLmiGWoFCxtnT2ftBUlU0=";
|
||||
hash = "sha256-QSebSc4V8DFSKufSB6M4YSuwDJ9rn/6IR6Fr38F8BBQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-epmXf78DMHnyrAkf0V4wpFsfGvd8Hm+yXB9ODJDljys=";
|
||||
vendorHash = "sha256-SuV7OEt0ZlVt0i8L5rgQd0HJn63XuDHi7+pe+bq+6Yw=";
|
||||
|
||||
inherit doCheck subPackages;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "falcoctl";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "falcosecurity";
|
||||
repo = "falcoctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+6q7U/ipyIuoOPVo+yFuj2r3WAA2AozSqxjj4f5of68=";
|
||||
hash = "sha256-X4fZBTEbOIQbfmuxDODEkYW43ntVIkwFDULYq+ps+9s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-12n5OZtrPSl+XUm+wsaTI5SVfJz/aGEhNQdMyEOGhkw=";
|
||||
vendorHash = "sha256-26EXoXMWK/zPX4M7kG3QRAb4aqtIWgSnSgXcxKUwfZk=";
|
||||
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubedb-cli";
|
||||
version = "0.33.0";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubedb";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J5eEyLoeYC4JhreuN+ymeVMfnyf9ADL08FpnpmRy1vI=";
|
||||
sha256 = "sha256-mrWE1MwcS0KYEQmJ8DSP5Sp5w6jpsDxvU03+KqfPDx4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "stable";
|
||||
version = "2.13.4";
|
||||
sha256 = "094i9a5l5nmygja1q73ipi01m6w1jsnr6l04g5629na72568zh6w";
|
||||
version = "2.13.5";
|
||||
sha256 = "0mjb0wcwyd51ap0kvkfmykh6zqijg4z2g5yxvp9aq67l984wh7sb";
|
||||
vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "23.5.1";
|
||||
sha256 = "0zb0vyvrx5fbr2ixqnm7qk7bivdljakjw25zgq19hv4bv6khilqv";
|
||||
vendorSha256 = "sha256-mcxG60HHgKRWgJLRO7q2O6PL4qxW6CD0qbqJ/fSrIlk=";
|
||||
version = "23.6.2";
|
||||
sha256 = "1jvvywd1m87ivdcwzmi6cc9k4a53wsvmxac4v80rlqvmhaj1jq62";
|
||||
vendorSha256 = "sha256-fBpF4UZaO7EtCzjzF3lg6Hea/tEOmmwRVEwNono32LU=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "8.67.1";
|
||||
version = "8.71.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
|
||||
sha256 = "sha256-ms2mTmme+vaMa1uh9CDb4gxt2RCk9JSdHceYgmdc9kg=";
|
||||
sha256 = "sha256-xq/Qs31kUEgCpGWE3M9yg1JeayXzlSpRVn3fdNl68Zc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20230615";
|
||||
version = "20230625";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-mt9bs5GtBMVc0PZap+vKXFURoUe5zIfHwtj5OVfN8hE=";
|
||||
hash = "sha256-dtLCa0ufLrIpYAaK2RwnB01S1P2cmCXUjOIrfCiHE+8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "netmaker";
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gravitl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1h/UQXaLcc962IMw9Vt79GR0qx1rYcmy5E+duisi0ck=";
|
||||
hash = "sha256-oxXGNmec5s4yN2SAjAUrvF2gJ9XkafwK98kDroIIssQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0iByCr//nOaEjfGT2alxZpzSl57x2GxXAOIiza4gnGQ=";
|
||||
vendorHash = "sha256-p/MnieYNLq+mleqhqCYL9PBV2dVm+Zs945RwbdKjrus=";
|
||||
|
||||
inherit subPackages;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@ assert trackerSearch -> (python3 != null);
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox";
|
||||
version = "4.5.3";
|
||||
version = "4.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qbittorrent";
|
||||
repo = "qBittorrent";
|
||||
rev = "release-${version}";
|
||||
hash = "sha256-d3WYNMeM6ccn0M+EuCm4OBEq8NKU0Nx276Av5cobzfU=";
|
||||
hash = "sha256-c/ZJ83kxxFo/iI7Tjo3ZY0/vmVanjoJXBOu8XTnFm+Q=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb }:
|
||||
{ stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb1 }:
|
||||
let
|
||||
arch =
|
||||
if stdenv.isx86_64 then "x86_64"
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [ libusb udev stdenv.cc.cc.lib ];
|
||||
buildInputs = [ libusb1 udev stdenv.cc.cc.lib ];
|
||||
|
||||
unpackPhase = ''
|
||||
sh "$src" --noexec --target source
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "diamond";
|
||||
version = "2.1.7";
|
||||
version = "2.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbuchfink";
|
||||
repo = "diamond";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5AjP7zH0WZhJqhcjgQjeK/WPCqy1Tl1gXXqRsHbqkys=";
|
||||
sha256 = "sha256-6L/eS3shfJ33bsXo1BaCO4lKklh2KbOIO2tZsvwcjnA=";
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "horizon-eda";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "horizon-eda";
|
||||
repo = "horizon";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R827l7WxyeCPQFXSzFcn4nE4AZBAOQ7s5QylDpxbw3U=";
|
||||
sha256 = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qucs-s";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ra3xdh";
|
||||
repo = "qucs_s";
|
||||
rev = version;
|
||||
sha256 = "sha256-2YyVeeUnLBS1Si9gwEsQLZVG98715dz/v+WCYjB3QlI=";
|
||||
sha256 = "sha256-cQ9UNCTwRW61dOQYJX0mPNtCTk0qXKx8VQ6BIXl6Fa8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ];
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-vaapi";
|
||||
version = "0.2.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzwoch";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-wrbVuqIe+DY3R+Jp3zCy2Uw3fv5ejYHtRV2Sv+y/n0w=";
|
||||
hash = "sha256-lKDZ0YJjcbfHr1MoTbdOaYk6Dhl2bUVUImuoWWwFC1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
|
|
@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "OBS Studio VAAPI support via GStreamer";
|
||||
homepage = "https://github.com/fzwoch/obs-vaapi";
|
||||
changelog = "https://github.com/fzwoch/obs-vaapi/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ ahuzik pedrohlc ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kde-rounded-corners";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matinlotfali";
|
||||
repo = "KDE-Rounded-Corners";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5b23QCyjPMC6iba84Y2WEar5uXzxg2GonRv3e4mLQlQ=";
|
||||
hash = "sha256-mjZWfh00A0J6ijuLqW6frPH4AYbRI/BlVHblGCCmNEo=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "26.0";
|
||||
sha256 = "sha256-7z5LkCLyjqGlo48XlcwAUiu1FkmAAewEGnP30QDDme8=";
|
||||
version = "26.0.1";
|
||||
sha256 = "sha256-uvBJu3hAg2L2yuh/D42tEy2Gr3Adk9/o/ssgy60T4rY=";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,10 @@ let
|
|||
then if lib.versionOlder version "1.78" then "mips1" else "mips"
|
||||
else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x"
|
||||
else toString stdenv.hostPlatform.parsed.cpu.family}"
|
||||
"binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}"
|
||||
# env in host triplet for Mach-O is "macho", but boost binary format for Mach-O is "mach-o"
|
||||
"binary-format=${if stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.macho
|
||||
then "mach-o"
|
||||
else toString stdenv.hostPlatform.parsed.kernel.execFormat.name}"
|
||||
"target-os=${toString stdenv.hostPlatform.parsed.kernel.name}"
|
||||
|
||||
# adapted from table in boost manual
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
let
|
||||
cmakeBool = b: if b then "ON" else "OFF";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.5.6";
|
||||
pname = "draco";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "draco";
|
||||
rev = version;
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-2YQMav0JJMbJ2bvnN/Xv90tjE/OWLbrZDO4WlaOvcfI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
|
@ -59,4 +59,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ jansol ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
# for passthru.tests
|
||||
, intel-compute-runtime
|
||||
|
|
@ -9,15 +10,24 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.3.5";
|
||||
version = "22.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-txh0HGtWc39bWesTfyUjG4n560w8iRLyiHec6JA7FJQ=";
|
||||
sha256 = "sha256-/iwTPWRVTZk1dhZD2Grcnc76ItgXjf2VrFD+93h8YvM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build on i686
|
||||
# https://github.com/intel/gmmlib/pull/104
|
||||
(fetchpatch {
|
||||
url = "https://github.com/intel/gmmlib/commit/2526286f29d8ad3d3a5833bdc29e23e5f3300b34.patch";
|
||||
hash = "sha256-mChK6wprAt+bo39g6LTNy25kJeGoKabpXFq2gSDhaPw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
passthru.tests = {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ip2location-c";
|
||||
version = "8.5.1";
|
||||
version = "8.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrislim2888";
|
||||
repo = "IP2Location-C-Library";
|
||||
rev = version;
|
||||
sha256 = "sha256-+Az1bAJ3HT9mIjO43FOcEqxX3oA3RcIY7VvxfaHtBX8=";
|
||||
sha256 = "sha256-3/cLoGV7go4S1ew73IJzJEMTlLnvM3adl+/Sb7mPrZY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "level-zero";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "level-zero";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hCipWbhVsYYqfGXO6CFDPmxiFO7Dc0I/nCnj6lRS2go=";
|
||||
hash = "sha256-9XfvU01nVcY2NpCqjUyPEJ+F/+A4YjjE0ktMQyEkr3Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake addOpenGLRunpath ];
|
||||
|
|
|
|||
|
|
@ -66,16 +66,16 @@ let
|
|||
projectArch = "x86_64";
|
||||
};
|
||||
};
|
||||
platforms."aarch64-linux".sha256 = "0qn412iv3sl843vwx38c5wc9nwf0sx34a4x78qkdn17wjbrfjj79";
|
||||
platforms."x86_64-linux".sha256 = "02vipzdcmq5cvpmra44r82z8y9d53yqpnymsc2mfk98fvkvgz2j9";
|
||||
platforms."aarch64-linux".sha256 = "12mkg5gncwj7c3l7j6jcsnbwi4fxczvm51x2dgg0my7bl5ja6pd0";
|
||||
platforms."x86_64-linux".sha256 = "0nwvqs3l881w6d7gmcpgf6p3sbbjlzmbnz8imzijpnmki71j9s7f";
|
||||
|
||||
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cef-binary";
|
||||
version = "112.3.0";
|
||||
gitRevision = "b09c4ca";
|
||||
chromiumVersion = "112.0.5615.165";
|
||||
version = "114.2.11";
|
||||
gitRevision = "87c8807";
|
||||
chromiumVersion = "114.0.5735.134";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqb";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClusterLabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vt9FmIRojX3INOn3CXAjkswVFD8Th4sRIz3RR4GJHFQ=";
|
||||
sha256 = "sha256-Tfw5nGy3A3zLtVuyHn+8jzXPySRNwBx0opwkE+0k+RA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liquid-dsp";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgaeddert";
|
||||
repo = "liquid-dsp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EvCxBwzpi3riSBhlHr6MmIUYKTCp02y5gz7pDJCEC1Q=";
|
||||
sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8=";
|
||||
};
|
||||
|
||||
configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vapoursynth";
|
||||
version = "62";
|
||||
version = "63";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vapoursynth";
|
||||
repo = "vapoursynth";
|
||||
rev = "R${version}";
|
||||
sha256 = "sha256-/40+SXFLX8upGKP3K+wk8RnO1Al4YoF8GFXyoxTkKs0=";
|
||||
sha256 = "sha256-6ITmzz1xJN/UnzVl0aAO8VNs0Go8zGcswwGpJUwwLB8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "chart-studio";
|
||||
version = "5.13.1";
|
||||
version = "5.15.0";
|
||||
|
||||
# chart-studio was split from plotly
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = "plotly.py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LcCptMtRxXQPbghMIunrPcSLAXQ/r3xVktueMUQ0+gE=";
|
||||
hash = "sha256-H+p2fPBXn+VqrW63KkdmPn2xqxC9uAOzQUV1ruKEUSs=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/packages/python/chart-studio";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "drms";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-crPVo7ALErZWvNcsaJ/BuBa0VkfCsZ+C929x4kEZHKw=";
|
||||
hash = "sha256-fH290QRhhglkhkMrpwHUkqVuYvZ6w/MDIYo9V0queVY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "2.0.2";
|
||||
version = "2.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QtMt6bNq6nN5crITkRie/nE1TqnXM4Daf1VMPPY2Qcs=";
|
||||
hash = "sha256-iMFZLsXChfQfkkrbZycYjP53r8zQBHEEncVpOlVkcyc=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "huawei-lte-api";
|
||||
version = "1.6.11";
|
||||
version = "1.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Salamek";
|
||||
repo = "huawei-lte-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pOBYMSORgT8WOnhCdazuKucjPoOywnrWa+qCYR5qSls=";
|
||||
hash = "sha256-/2puuWdmVvq90/UAEKPMD6wjkdxzzCdukSH4VQia4qA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.104.2";
|
||||
version = "2.104.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JOsyu0zIzItK4+Rq8vnqhRO9YucxLLKtMTK+0EJbxSo=";
|
||||
hash = "sha256-1C5+h1w6ACYmzDjgeS7Xvy/xBQnrpEmLJAhNq9bVs4k=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymupdf";
|
||||
version = "1.22.3";
|
||||
version = "1.22.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyMuPDF";
|
||||
inherit version;
|
||||
hash = "sha256-Xs2SjpbmMJJXECCXOqFFtXt1cH86Pfl8dC5WMRJhWJE=";
|
||||
hash = "sha256-XsjVEGdSKXUp0NaNRs/EzpmRSqvZm+hD8VmaGELWP+k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyro-ppl";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-dm+tYeUt9IiF3pbUEhPaH46MG3ns8witUxifzRXBy0E=";
|
||||
hash = "sha256-wqwDWZWHT0rbjQfJKqRZT+eD/94WFKWczl4uDZzxkzQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -67,6 +67,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Library for probabilistic modeling and inference";
|
||||
homepage = "http://pyro.ai";
|
||||
changelog = "https://github.com/pyro-ppl/pyro/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ teh georgewhewell ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-metric-learning";
|
||||
version = "2.1.2";
|
||||
version = "2.2.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "KevinMusgrave";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-B2gDPOQSJGg29xjJbZsWUrSalBnn+S8h+2j8NQ4tfTM=";
|
||||
hash = "sha256-KolC1lcJWOcVjFEEYK2RNZodVrS/GjBzhlQ6z8kFOmE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorly";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6iZvUgsoYf8fDGEuAODgfr4jCkiJwaJXlQUAsaOF9JU=";
|
||||
hash = "sha256-hwpdExW/ESOavFkL3old1Efo5WC+PYmcgJp5/oLelaA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -54,8 +54,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
# tries to download data:
|
||||
"test_kinetic"
|
||||
# this can fail on hydra and other peoples machines, check with others before re-enabling
|
||||
# AssertionError: Partial_SVD took too long, maybe full_matrices set wrongly
|
||||
"test_svd_time"
|
||||
];
|
||||
|
|
@ -65,6 +64,5 @@ buildPythonPackage rec {
|
|||
homepage = "https://tensorly.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
broken = stdenv.isLinux && stdenv.isAarch64; # test failures: test_TTOI and test_validate_tucker_rank
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yfinance";
|
||||
version = "0.2.20";
|
||||
version = "0.2.22";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "ranaroussi";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-uFIfhu7Sq4yQAzEfegIo0xyok1Bo8M/esg6bZCIWO18=";
|
||||
hash = "sha256-+a972VZuNgf666VitrPSfRbcZbA49zlTIXbGWioKROc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -50,13 +50,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quickemu";
|
||||
version = "4.7";
|
||||
version = "4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quickemu-project";
|
||||
repo = "quickemu";
|
||||
rev = version;
|
||||
hash = "sha256-6ctO11dKUj+CnHPVdj705uTwx31zKNQp6AUb/0kCgK8=";
|
||||
hash = "sha256-QchY9inmBqAwNEhUL+uFCRX1laaM57ICbDJEBW7qTic=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abuild";
|
||||
version = "3.11.7";
|
||||
version = "3.11.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.alpinelinux.org";
|
||||
owner = "alpine";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-QcfUbjveSGAOMAyIrG0ZNNM4rqT7zWUHIhaMzBenKm0=";
|
||||
sha256 = "sha256-lp2+38eJLp0SU34pywrrXVON0PW2NvgaIO4n/KChMro=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-gazelle";
|
||||
version = "0.31.0";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Y1otQcGtG7jIJE5G0DET8bFRVL6AEG0r98X5PufT7Lw=";
|
||||
sha256 = "sha256-avc92qQS2d8MiQVRUYEiMOlsfgQFJ6HZG01rmZeC9Fo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "minizinc";
|
||||
version = "2.7.5";
|
||||
version = "2.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MiniZinc";
|
||||
repo = "libminizinc";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-RstT9jOfyTrl/pdsQT/U9+wHJoJyBqvlZn21dRaawG8=";
|
||||
sha256 = "sha256-1+bFF79lYt5RAx5gfNg7J3iB7ExxNgFUmBIcg6/hfQs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison cmake flex jq ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lttng-tools";
|
||||
version = "2.13.9";
|
||||
version = "2.13.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-jZTclbYIz3AhawEgOj+CQrl6Iy2y4jQhovQ3CNoI8zc=";
|
||||
sha256 = "sha256-5dEJXsEyJWXzjxSTRvcZZ0lsKB6sxR7Fx3mUuFDn0zU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "sem";
|
||||
version = "0.28.1";
|
||||
version = "0.28.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "semaphoreci";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pyin05mPIAq5dJebLehsCYDaIf5eGCcGzF5uz8egJV8=";
|
||||
sha256 = "sha256-L+OdUqhNbCI1UsFvihiKQnmPIzS0mxAKLPVv4u2VP6Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kuLN3r6CGL/fGQ5ggSLZWNC4AVvvGn6znTFGqkS4AXg=";
|
||||
vendorHash = "sha256-GAYCdq4eHTyxQ5JaNYLd3mQ2LvgLHdmYdz4RN+Hpe70=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uftrace";
|
||||
version = "0.13.1";
|
||||
version = "0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namhyung";
|
||||
repo = "uftrace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hpEExyvazCH+lNTK0Ej0zbnWyX0gVLPjM9XfOuAueis=";
|
||||
sha256 = "sha256-f0R3EbLd0sJ1kcsRquFZRrl8jXi0msIz2SZ0oJzoWUE=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
|||
118
pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix
Normal file
118
pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix
Normal file
|
|
@ -0,0 +1,118 @@
|
|||
{ lib
|
||||
, buildPlatform
|
||||
, hostPlatform
|
||||
, fetchurl
|
||||
, bash
|
||||
, gnumake
|
||||
, gnupatch
|
||||
, gnugrep
|
||||
, gnutar
|
||||
, gawk
|
||||
, bzip2
|
||||
, sed
|
||||
, mesBootstrap ? false, tinycc ? null
|
||||
, gcc ? null, glibc ? null, binutils ? null, linux-headers
|
||||
}:
|
||||
assert mesBootstrap -> tinycc != null;
|
||||
assert !mesBootstrap -> gcc != null && glibc != null && binutils != null;
|
||||
let
|
||||
pname = "binutils" + lib.optionalString mesBootstrap "-mes";
|
||||
version = "2.20.1";
|
||||
rev = "a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/binutils/binutils-${version}${rev}.tar.bz2";
|
||||
sha256 = "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Enables building binutils using TCC and Mes C Library
|
||||
(fetchurl {
|
||||
url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/binutils-boot-2.20.1a.patch?id=50249cab3a98839ade2433456fe618acc6f804a5";
|
||||
sha256 = "086sf6an2k56axvs4jlky5n3hs2l3rq8zq5d37h0b69cdyh7igpn";
|
||||
})
|
||||
|
||||
# Make binutils output deterministic by default.
|
||||
./deterministic.patch
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-nls"
|
||||
"--disable-shared"
|
||||
"--disable-werror"
|
||||
"--prefix=${placeholder "out"}"
|
||||
|
||||
"--build=${buildPlatform.config}"
|
||||
"--host=${hostPlatform.config}"
|
||||
|
||||
# Turn on --enable-new-dtags by default to make the linker set
|
||||
# RUNPATH instead of RPATH on binaries. This is important because
|
||||
# RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
|
||||
"--enable-new-dtags"
|
||||
|
||||
# By default binutils searches $libdir for libraries. This brings in
|
||||
# libbfd and libopcodes into a default visibility. Drop default lib
|
||||
# path to force users to declare their use of these libraries.
|
||||
"--with-lib-path=:"
|
||||
];
|
||||
in
|
||||
bash.runCommand "${pname}-${version}" {
|
||||
inherit pname version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
(if mesBootstrap then tinycc.compiler else gcc)
|
||||
gnumake
|
||||
gnupatch
|
||||
gnugrep
|
||||
gnutar
|
||||
gawk
|
||||
bzip2
|
||||
sed
|
||||
] ++ lib.optional (!mesBootstrap) binutils;
|
||||
|
||||
passthru.tests.get-version = result:
|
||||
bash.runCommand "${pname}-get-version-${version}" {} ''
|
||||
${result}/bin/ld --version
|
||||
mkdir $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for manipulating binaries (linker, assembler, etc.)";
|
||||
homepage = "https://www.gnu.org/software/binutils";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.minimal-bootstrap.members;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} ''
|
||||
# Unpack
|
||||
cp ${src} binutils.tar.bz2
|
||||
bunzip2 binutils.tar.bz2
|
||||
tar xf binutils.tar
|
||||
rm binutils.tar
|
||||
cd binutils-${version}
|
||||
|
||||
# Patch
|
||||
${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches}
|
||||
# Clear the default library search path.
|
||||
echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
|
||||
|
||||
# Configure
|
||||
${if mesBootstrap then ''
|
||||
export CC="tcc -B ${tinycc.libs}/lib -D __GLIBC_MINOR__=6 -D MES_BOOTSTRAP=1"
|
||||
export AR="tcc -ar"
|
||||
'' else ''
|
||||
export CC="gcc -B ${glibc}/lib -I${glibc}/include -I${linux-headers}/include"
|
||||
export CPP="gcc -E -I${glibc}/include -I${linux-headers}/include"
|
||||
export AR="ar"
|
||||
export LIBRARY_PATH="${glibc}/lib"
|
||||
export LIBS="-lc -lnss_files -lnss_dns -lresolv"
|
||||
''}
|
||||
export SED=sed
|
||||
bash ./configure ${lib.concatStringsSep " " configureFlags}
|
||||
|
||||
# Build
|
||||
make
|
||||
|
||||
# Install
|
||||
make install
|
||||
''
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c
|
||||
--- orig/ld/ldlang.c
|
||||
+++ new/ld/ldlang.c
|
||||
@@ -3095,6 +3095,8 @@
|
||||
ldfile_output_machine))
|
||||
einfo (_("%P%F:%s: can not set architecture: %E\n"), name);
|
||||
|
||||
+ link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT;
|
||||
+
|
||||
link_info.hash = bfd_link_hash_table_create (link_info.output_bfd);
|
||||
if (link_info.hash == NULL)
|
||||
einfo (_("%P%F: can not create hash table: %E\n"));
|
||||
|
|
@ -15,6 +15,20 @@ lib.makeScope
|
|||
|
||||
bash_2_05 = callPackage ./bash/2.nix { tinycc = tinycc-mes; };
|
||||
|
||||
binutils = callPackage ./binutils {
|
||||
bash = bash_2_05;
|
||||
gcc = gcc2;
|
||||
binutils = binutils-mes;
|
||||
glibc = glibc22;
|
||||
sed = heirloom.sed;
|
||||
};
|
||||
binutils-mes = callPackage ./binutils {
|
||||
bash = bash_2_05;
|
||||
tinycc = tinycc-mes;
|
||||
sed = heirloom.sed;
|
||||
mesBootstrap = true;
|
||||
};
|
||||
|
||||
bzip2 = callPackage ./bzip2 {
|
||||
bash = bash_2_05;
|
||||
tinycc = tinycc-mes;
|
||||
|
|
@ -27,6 +41,23 @@ lib.makeScope
|
|||
tinycc = tinycc-mes;
|
||||
};
|
||||
|
||||
gcc2 = callPackage ./gcc/2.nix {
|
||||
bash = bash_2_05;
|
||||
gcc = gcc2-mes;
|
||||
binutils = binutils-mes;
|
||||
glibc = glibc22;
|
||||
};
|
||||
gcc2-mes = callPackage ./gcc/2.nix {
|
||||
bash = bash_2_05;
|
||||
tinycc = tinycc-mes;
|
||||
binutils = binutils-mes;
|
||||
mesBootstrap = true;
|
||||
};
|
||||
|
||||
inherit (callPackage ./glibc {
|
||||
bash = bash_2_05;
|
||||
}) glibc22;
|
||||
|
||||
gnugrep = callPackage ./gnugrep {
|
||||
bash = bash_2_05;
|
||||
tinycc = tinycc-mes;
|
||||
|
|
@ -58,6 +89,8 @@ lib.makeScope
|
|||
|
||||
heirloom-devtools = callPackage ./heirloom-devtools { tinycc = tinycc-mes; };
|
||||
|
||||
linux-headers = callPackage ./linux-headers { bash = bash_2_05; };
|
||||
|
||||
ln-boot = callPackage ./ln-boot { };
|
||||
|
||||
mes = lib.recurseIntoAttrs (callPackage ./mes { });
|
||||
|
|
@ -80,8 +113,12 @@ lib.makeScope
|
|||
|
||||
test = kaem.runCommand "minimal-bootstrap-test" {} ''
|
||||
echo ${bash_2_05.tests.get-version}
|
||||
echo ${binutils.tests.get-version}
|
||||
echo ${binutils-mes.tests.get-version}
|
||||
echo ${bzip2.tests.get-version}
|
||||
echo ${gawk.tests.get-version}
|
||||
echo ${gcc2.tests.get-version}
|
||||
echo ${gcc2-mes.tests.get-version}
|
||||
echo ${gnugrep.tests.get-version}
|
||||
echo ${gnused.tests.get-version}
|
||||
echo ${gnutar.tests.get-version}
|
||||
|
|
|
|||
140
pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix
Normal file
140
pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
{ lib
|
||||
, buildPlatform
|
||||
, hostPlatform
|
||||
, fetchurl
|
||||
, bash
|
||||
, gnumake
|
||||
, gnupatch
|
||||
, gnugrep
|
||||
, gnutar
|
||||
, gzip
|
||||
, heirloom
|
||||
, binutils
|
||||
, mesBootstrap ? false, tinycc ? null, mes-libc
|
||||
, gcc ? null, glibc ? null, linux-headers
|
||||
}:
|
||||
assert mesBootstrap -> tinycc != null;
|
||||
assert !mesBootstrap -> gcc != null && glibc != null;
|
||||
let
|
||||
# Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C
|
||||
# Library v0.16 offers. Gcc-3.x (and 4.x) place higher demands on a C
|
||||
# library, such as dir.h/struct DIR/readdir, locales, signals... Also,
|
||||
# with gcc-2.95.3, binutils (2.14.0, 2.20.1a) and glibc-2.2.5 we found a
|
||||
# GNU toolchain triplet "that works".
|
||||
# - from guix/gnu/packages/commencement.scm
|
||||
pname = "gcc" + lib.optionalString mesBootstrap "-mes";
|
||||
version = "2.95.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.gz";
|
||||
sha256 = "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch enables building gcc-2.95.3 using TCC and Mes C Library.
|
||||
# * Disable building DOC
|
||||
# * Avoid running `fixproto'.
|
||||
# * Force running `fixinc'.
|
||||
# * Replace Makefile trickery of creating an libgcc1.a archive, then
|
||||
# extracting the .o files later to create a new libgcc2.a archive.
|
||||
# Instead, keep temporary .o files.
|
||||
(fetchurl {
|
||||
url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/gcc-boot-2.95.3.patch?id=50249cab3a98839ade2433456fe618acc6f804a5";
|
||||
sha256 = "03l3jaxch6d76mx4zkn6ky64paj58jk0biddck01qd4bnw9z8hiw";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"LANGUAGES=c"
|
||||
] ++ lib.optionals mesBootstrap [
|
||||
"LIBGCC2_INCLUDES=\"-I ${mes-libc}/include\""
|
||||
"BOOT_LDFLAGS=\" -B ${tinycc.libs}/lib\""
|
||||
] ++ lib.optionals (!mesBootstrap) [
|
||||
"LIBGCC2_INCLUDES=\"-I ${glibc}/include -I ${linux-headers}/include\""
|
||||
];
|
||||
in
|
||||
bash.runCommand "${pname}-${version}" {
|
||||
inherit pname version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
(if mesBootstrap then tinycc.compiler else gcc)
|
||||
gnumake
|
||||
gnupatch
|
||||
gnugrep
|
||||
gnutar
|
||||
gzip
|
||||
heirloom.sed
|
||||
binutils
|
||||
];
|
||||
|
||||
passthru.tests.get-version = result:
|
||||
bash.runCommand "${pname}-get-version-${version}" {} ''
|
||||
${result}/bin/gcc --version
|
||||
mkdir $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNU Compiler Collection, version ${version}";
|
||||
homepage = "https://gcc.gnu.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.minimal-bootstrap.members;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} ''
|
||||
# Unpack
|
||||
tar xzf ${src}
|
||||
cd gcc-${version}
|
||||
|
||||
# Patch
|
||||
${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches}
|
||||
# /build/glibc-2.2.5/intl/loadmsgcat.c:334: multiple definition of `_nl_load_domain'
|
||||
# ../intl/libintl.a(loadmsgcat.o):/build/gcc-2.95.3/texinfo/intl/loadmsgcat.c:66: first defined here
|
||||
rm -R texinfo
|
||||
mkdir -p texinfo
|
||||
echo 'all:'>texinfo/Makefile.in
|
||||
echo 'install:'>>texinfo/Makefile.in
|
||||
|
||||
# Configure
|
||||
${if mesBootstrap then ''
|
||||
export CC="tcc -B ${tinycc.libs}/lib -D __GLIBC_MINOR__=6"
|
||||
export CPP="tcc -E"
|
||||
export ac_cv_func_setlocale=no
|
||||
'' else ''
|
||||
export CC="gcc -I${glibc}/include -I${linux-headers}/include -I${gcc}/lib/gcc-lib/${hostPlatform.config}/${version}/include"
|
||||
export CPP="gcc -E -I${glibc}/include -I${linux-headers}/include -I${gcc}/lib/gcc-lib/${hostPlatform.config}/${version}/include"
|
||||
export LIBRARY_PATH="${glibc}/lib"
|
||||
export LIBS="-lc -lnss_files -lnss_dns -lresolv"
|
||||
''}
|
||||
export OLDCC="$CC"
|
||||
export CC_FOR_BUILD="$CC"
|
||||
export AR=ar
|
||||
export RANLIB=ranlib
|
||||
export ac_cv_c_float_format='IEEE (little-endian)'
|
||||
bash ./configure \
|
||||
--build=${buildPlatform.config} \
|
||||
--host=${hostPlatform.config} \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--disable-werror \
|
||||
--prefix=$out
|
||||
# no info at this stage
|
||||
touch gcc/cpp.info gcc/gcc.info
|
||||
|
||||
# Build
|
||||
make ${lib.concatStringsSep " " makeFlags}
|
||||
|
||||
# Install
|
||||
make install
|
||||
mkdir tmp
|
||||
cd tmp
|
||||
ar x ../gcc/libgcc2.a
|
||||
${lib.optionalString mesBootstrap "ar x ${tinycc.libs}/lib/libtcc1.a"}
|
||||
ar r $out/lib/gcc-lib/${hostPlatform.config}/${version}/libgcc.a *.o
|
||||
cd ..
|
||||
${lib.optionalString mesBootstrap ''
|
||||
cp gcc/libgcc2.a $out/lib/libgcc2.a
|
||||
ar x ${tinycc.libs}/lib/libtcc1.a
|
||||
ar x ${tinycc.libs}/lib/libc.a
|
||||
ar r $out/lib/gcc-lib/${hostPlatform.config}/${version}/libc.a libc.o libtcc1.o
|
||||
''}
|
||||
''
|
||||
121
pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix
Normal file
121
pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
{ lib
|
||||
, buildPlatform
|
||||
, hostPlatform
|
||||
, fetchurl
|
||||
, bash
|
||||
, gcc2-mes
|
||||
, gnumake
|
||||
, gnupatch
|
||||
, gnused
|
||||
, gnugrep
|
||||
, gnutar
|
||||
, gzip
|
||||
, gawk
|
||||
, heirloom
|
||||
, binutils-mes
|
||||
, linux-headers
|
||||
}:
|
||||
let
|
||||
pname = "glibc";
|
||||
|
||||
buildGlibc = { version, src, patches, configureFlags, gcc, binutils, CC, CPP }:
|
||||
bash.runCommand "${pname}-${version}" {
|
||||
inherit pname version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gcc
|
||||
gnumake
|
||||
gnupatch
|
||||
gnused
|
||||
gnugrep
|
||||
gnutar
|
||||
gzip
|
||||
gawk
|
||||
binutils
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The GNU C Library";
|
||||
homepage = "https://www.gnu.org/software/libc";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = teams.minimal-bootstrap.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} ''
|
||||
# Unpack
|
||||
tar xzf ${src}
|
||||
cd glibc-${version}
|
||||
|
||||
# Patch
|
||||
${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches}
|
||||
|
||||
# Configure
|
||||
export CC="${CC}"
|
||||
export CPP="${CPP}"
|
||||
bash ./configure --prefix=$out ${lib.concatStringsSep " " (
|
||||
[
|
||||
"--build=${buildPlatform.config}"
|
||||
"--host=${hostPlatform.config}"
|
||||
"--with-headers=${linux-headers}/include"
|
||||
"--enable-static"
|
||||
"--disable-shared"
|
||||
] ++ configureFlags)}
|
||||
|
||||
# Build
|
||||
make
|
||||
|
||||
# Install
|
||||
# GNU sed w/ mes-libc crashes on certain stdio actions
|
||||
export PATH="${heirloom.sed}/bin:$PATH"
|
||||
make install
|
||||
'';
|
||||
in
|
||||
{
|
||||
glibc22 = buildGlibc rec {
|
||||
# GNU C Library 2.2.5 is the most recent glibc that we managed to build
|
||||
# using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer
|
||||
# gcc.
|
||||
# - from guix/gnu/packages/commencement.scm
|
||||
version = "2.2.5";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
|
||||
sha256 = "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch enables building glibc-2.2.5 using TCC and GNU Make 4.x and Mes C Library.
|
||||
# * Makefile: Do not assemble from stdin, use file indirection.
|
||||
# * Makefile: Add new target: install-lib-all.
|
||||
# * Makefile: Avoid building stub DOC.
|
||||
# * [_LIBC_REENTRANT]: Add missing guarding.
|
||||
# * [MES_BOOTSTRAP]: Disable some GCC extensions.
|
||||
# * [MES_BOOTSTRAP]: Add missing GCC div/mod defines.
|
||||
(fetchurl {
|
||||
url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-boot-${version}.patch?id=50249cab3a98839ade2433456fe618acc6f804a5";
|
||||
sha256 = "1nyz2dr9g7scqwwygd6jvbl7xxpwh11ryvgdz8aikkkna02q1pm8";
|
||||
})
|
||||
# We want to allow builds in chroots that lack /bin/sh. Thus, system(3)
|
||||
# and popen(3) need to be tweaked to use the right shell. For the bootstrap
|
||||
# glibc, we just use whatever `sh' can be found in $PATH. The final glibc
|
||||
# instead uses the hard-coded absolute file name of `bash'.
|
||||
(fetchurl {
|
||||
url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-bootstrap-system-${version}.patch?id=50249cab3a98839ade2433456fe618acc6f804a5";
|
||||
sha256 = "1l67w9rysrlsg2i0r210qxxn37h2969ba9lx7pp3ywlnikvi98m8";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-sanity-checks"
|
||||
"--enable-static-nss"
|
||||
"--without-__thread"
|
||||
"--without-cvs"
|
||||
"--without-gd"
|
||||
"--without-tls"
|
||||
];
|
||||
|
||||
gcc = gcc2-mes;
|
||||
binutils = binutils-mes;
|
||||
CC = "gcc -D MES_BOOTSTRAP=1 -D BOOTSTRAP_GLIBC=1 -L $(pwd)";
|
||||
CPP = "gcc -E -D MES_BOOTSTRAP=1 -D BOOTSTRAP_GLIBC=1";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, bash
|
||||
, gnutar
|
||||
, xz
|
||||
}:
|
||||
let
|
||||
# WARNING: You probably don't want to use this package outside minimal-bootstrap
|
||||
#
|
||||
# We need some set of Linux kernel headers to build our bootstrap packages
|
||||
# (gcc/binutils/glibc etc.) against. As long as it compiles it is "good enough".
|
||||
# Therefore the requirement for correctness, completeness, platform-specific
|
||||
# features, and being up-to-date, are very loose.
|
||||
#
|
||||
# Rebuilding the Linux headers from source correctly is something we can defer
|
||||
# till we have access to gcc/binutils/perl. For now we can use Guix's assembled
|
||||
# kernel header distribution and assume it's good enough.
|
||||
pname = "linux-headers";
|
||||
version = "4.14.67";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnu/guix/bootstrap/i686-linux/20190815/linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz";
|
||||
sha256 = "0sm2z9x4wk45bh6qfs94p0w1d6hsy6dqx9sw38qsqbvxwa1qzk8s";
|
||||
};
|
||||
in
|
||||
bash.runCommand "${pname}-${version}" {
|
||||
inherit pname version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnutar
|
||||
xz
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Header files and scripts for Linux kernel";
|
||||
license = licenses.gpl2;
|
||||
maintainers = teams.minimal-bootstrap.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} ''
|
||||
# Unpack
|
||||
cp ${src} linux-headers.tar.xz
|
||||
unxz linux-headers.tar.xz
|
||||
tar xf linux-headers.tar
|
||||
|
||||
# Install
|
||||
mkdir $out
|
||||
cp -r include $out
|
||||
''
|
||||
|
|
@ -29,11 +29,9 @@ rec {
|
|||
, text
|
||||
, executable ? false # run chmod +x ?
|
||||
, destination ? "" # relative path appended to $out eg "/bin/foo"
|
||||
, allowSubstitutes ? false
|
||||
, preferLocalBuild ? true
|
||||
}:
|
||||
derivationWithMeta {
|
||||
inherit name text allowSubstitutes preferLocalBuild;
|
||||
inherit name text;
|
||||
passAsFile = [ "text" ];
|
||||
|
||||
builder = "${kaem}/bin/kaem";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vdo";
|
||||
version = "8.2.0.2"; # bump this version with kvdo
|
||||
version = "8.2.2.2"; # bump this version with kvdo
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dm-vdo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-IP/nL4jQ+rIWuUxXUiBtlIKTMZCNelvxgTfTcaB1it0=";
|
||||
hash = "sha256-+2w9jzJemI2xr+i/Jd5TIBZ/o8Zv+Ett0fbJbkOD7KI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, llvmPackages
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, python3
|
||||
|
|
@ -27,7 +28,7 @@ let
|
|||
else llvmPackages.stdenv).mkDerivation;
|
||||
in mkDerivation rec {
|
||||
pname = "clickhouse";
|
||||
version = "23.3.3.52";
|
||||
version = "23.3.5.9";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "ClickHouse";
|
||||
|
|
@ -35,9 +36,7 @@ in mkDerivation rec {
|
|||
rev = "v${version}-lts";
|
||||
fetchSubmodules = true;
|
||||
name = "clickhouse-${rev}.tar.gz";
|
||||
hash = if stdenv.isDarwin
|
||||
then "sha256-VaUGbUyDilYPK4iBv/nICOsfeolNQeBSEtC71gBTkpE="
|
||||
else "sha256-NH+OW6zr8XBmJr68fX1WIy8Wt7cLWFMskIv7Be0TLEU=";
|
||||
hash = "sha256-soF0L69oi95r0zgzPL0DfDhhXfRKekN5u/4+/mt8QwM=";
|
||||
postFetch = ''
|
||||
# delete files that make the source too big
|
||||
rm -rf $out/contrib/llvm-project/llvm/test
|
||||
|
|
@ -53,7 +52,7 @@ in mkDerivation rec {
|
|||
tar -I 'gzip -n' \
|
||||
--sort=name \
|
||||
--mtime=1970-01-01 \
|
||||
--owner=root --group=root \
|
||||
--owner=0 --group=0 \
|
||||
--numeric-owner --mode=go=rX,u+rw,a-s \
|
||||
--transform='s@^@source/@S' \
|
||||
-cf temp -C "$out" .
|
||||
|
|
@ -157,9 +156,11 @@ in mkDerivation rec {
|
|||
"-DENABLE_TESTS=OFF"
|
||||
"-DCOMPILER_CACHE=disabled"
|
||||
"-DENABLE_EMBEDDED_COMPILER=ON"
|
||||
"-DWERROR=OFF"
|
||||
];
|
||||
|
||||
# https://github.com/ClickHouse/ClickHouse/issues/49988
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/share/clickhouse-test
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "endlessh-go";
|
||||
version = "20230211";
|
||||
version = "20230613";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shizunge";
|
||||
repo = "endlessh-go";
|
||||
rev = version;
|
||||
sha256 = "sha256-hG+WIp7JzlHVHjVUouPoocRLpwxWl6hpNorMvc4MsWM=";
|
||||
sha256 = "sha256-XJcl8w36ZfcYp+0JlSvDW0BoW5MNC8pmTLZgkYLobBU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zhkQ3v8oN0hu3siu7yVxsFVTnNvJV59tHGpfXZzE+O4=";
|
||||
vendorHash = "sha256-UsbuB4GsL9pteebAF2ybAt7GgEpY0z4O9zjSYEIamdQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
pname = "tengine";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alibaba";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-h/eSa2wCPvnX29wdtDHNQh8r1No1/YGinZNYU2MnsTM=";
|
||||
hash = "sha256-h9PFzJc/29WFe4mW+xpJAL1Z2XqBxMEtQeN5DMgOVBA=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2023-06-21";
|
||||
version = "unstable-2023-06-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "d32a83345518f4bb632bef9ca2de669b35f0e555";
|
||||
sha256 = "sha256-XpAUv4NVERVGxV4lk6u15lIIce8ZrYf9uN3fdL5xolI=";
|
||||
rev = "b9247810b90938339e87056a5d0f8a7f207d4ea4";
|
||||
sha256 = "sha256-FJoSQSmlrceG9NVoEx1PvcS3IX/8Eu+Q2tzgx8DJjjc=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/klippy";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mediamtx";
|
||||
version = "0.23.5";
|
||||
version = "0.23.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aler9";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LGD6VL5guUqBFjN36KOTVyWRupCuoch3yhW8SabkihY=";
|
||||
hash = "sha256-7Afer0lzI264qK9iWfGMxgUuKBmDDdR+fTapt3SIGYY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5G557by0nqE3a9R1/TZZ2I+4KX5J6dqzwc1pP95mGAg=";
|
||||
vendorHash = "sha256-wgTMobmIu6nJdyFOoFVhyKvWQEuZTDSEzJGQLUYS6o4=";
|
||||
|
||||
# Tests need docker
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "sql_exporter";
|
||||
version = "0.4.5";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "justwatchcom";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A3hMSnfxiEgFYueARuldEHT/5ROCIwWjqQj2FdkVYqo=";
|
||||
sha256 = "sha256-aSygfs5jVc1CTb+uj16U//99ypP4kixz7gqDvxIxxfM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
ldflags = let t = "github.com/prometheus/common/version"; in
|
||||
[
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ with lib;
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nats-streaming-server";
|
||||
version = "0.25.4";
|
||||
version = "0.25.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
sha256 = "sha256-/uPkcJOUDPVcdNBo6PxbJEvrrbElQ8lzMERZv6lOZwQ=";
|
||||
sha256 = "sha256-rx6H3YXyg53th81w1SsKg5h9wj2vswnArDO0TNUlvpE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ah7F4+l1Bmr5j15x7fsEOzFIvxDR4OuJFTY95ZYyOYc=";
|
||||
vendorHash = "sha256-erTxz3YpE64muc9OgP38BrPNH5o3tStSYsCbBd++kFU=";
|
||||
|
||||
# tests fail and ask to `go install`
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "immudb";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codenotary";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G6Oy+veZGQYtRyeOSpFmQ3Ehro3Ra69iCQVl9YnerAk=";
|
||||
sha256 = "sha256-xvbks6dUiS14cntydAjSNTujxsSwYzmf+B4Zh4V/NwI=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -29,7 +29,7 @@ buildGoModule rec {
|
|||
go generate -tags webconsole ./webconsole
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-k2OwwGjuyfM3QIRz+/DgGD0xUYor4TDmfBmcQOkcA3A=";
|
||||
vendorHash = "sha256-7mMutYx2/jmTx+7h9S412fYCFXiJnTGz0qwDSO7BIzM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "questdb";
|
||||
version = "7.1.3";
|
||||
version = "7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/questdb/questdb/releases/download/${version}/questdb-${version}-no-jre-bin.tar.gz";
|
||||
sha256 = "lB3h8HRQaQwdTtxxjHNfYrDXY3UULSSrM74OCGgLoMc=";
|
||||
sha256 = "sha256-37pmNeN02sHt2Cpyjk3FpBFscBw2Zqm4nNmOlyiX6H0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "1.3.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fgppjXg7PcUmh57HrOvxnHy3Si23JeP2QedqWcxBiTY=";
|
||||
sha256 = "sha256-CSuHaQEnaBLGIMjJ6/8JzOEwQUrm9vI/a2cumyjTT8k=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-GbMjIoTZMJUJVU4McSayX8aWu7iFI6NBPcbQ5oj8xn0=";
|
||||
vendorHash = "sha256-jP6jm4yNx6wzbUsGDBaRSGcD62wpyvct/q4q4ryqvpY=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2023-06-19";
|
||||
version = "2023-06-20";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "c0e811c90df387eca4223c7d4dbb3f2d32a684c7";
|
||||
rev = "8a6fc5c16d49368dc8f9ddd965a9e25ef652e129";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "sha256-Kv6sA4ICKcLi4jU16fBwnCHbHbOyYUvjVA4Gl0WQAeI=";
|
||||
sha256 = "sha256-/t4BUntSWNES8c+ePFOPniqYp2edlgc4IWW4RKfDZsU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -95,18 +95,20 @@ rec {
|
|||
makeStaticDarwin = stdenv: stdenv.override (old: {
|
||||
# extraBuildInputs are dropped in cross.nix, but darwin still needs them
|
||||
extraBuildInputs = [ pkgs.buildPackages.darwin.CF ];
|
||||
mkDerivationFromStdenv = extendMkDerivationArgs old (args: {
|
||||
NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "")
|
||||
mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args:
|
||||
(mkDerivationSuper args).overrideAttrs (finalAttrs: {
|
||||
NIX_CFLAGS_LINK = toString (finalAttrs.NIX_CFLAGS_LINK or "")
|
||||
+ lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc";
|
||||
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [
|
||||
(pkgs.buildPackages.makeSetupHook {
|
||||
name = "darwin-portable-libSystem-hook";
|
||||
substitutions = {
|
||||
libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
|
||||
};
|
||||
} ./darwin/portable-libsystem.sh)
|
||||
];
|
||||
});
|
||||
nativeBuildInputs = (finalAttrs.nativeBuildInputs or [])
|
||||
++ lib.optional stdenv.hasCC [
|
||||
(pkgs.buildPackages.makeSetupHook {
|
||||
name = "darwin-portable-libSystem-hook";
|
||||
substitutions = {
|
||||
libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
|
||||
};
|
||||
} ./darwin/portable-libsystem.sh)
|
||||
];
|
||||
}));
|
||||
});
|
||||
|
||||
# Puts all the other ones together
|
||||
|
|
|
|||
|
|
@ -69,11 +69,11 @@ let
|
|||
'';
|
||||
in buildPythonApplication rec {
|
||||
pname = "xpra";
|
||||
version = "4.4.5";
|
||||
version = "4.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://xpra.org/src/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-o2vDPzZWgpEFe0yzNjwtuLPHO0GfWbSscKjvIfTi6Ro=";
|
||||
hash = "sha256-BWf3nypfSrYCzpJ0OfBkecoHGbG1lEgu5jLZhfkIejQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -40,13 +40,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpm-ostree";
|
||||
version = "2023.4";
|
||||
version = "2023.5";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-xk06T4A451o5C5rquCvQEpGKCw8AcBVf49Lg8VD0GdE=";
|
||||
hash = "sha256-vXl7NrTNc0p6wMEmsd7aHs5CjFXkWj8PwR7avZIqnCA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vtm";
|
||||
version = "0.9.9m";
|
||||
version = "0.9.9n";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netxs-group";
|
||||
repo = "vtm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l9EMoUUM4pH+YwzdrTXhBawiW1l2OzX9ou18U5kM36c=";
|
||||
sha256 = "sha256-THsIA8+yfMXM+WLVL8TCnD1CEZy1iB4hA7SzhdVT4hA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "i2pd";
|
||||
version = "2.47.0";
|
||||
version = "2.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PurpleI2P";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-sgaNrRRAINMI0utLQ6o6zcI5ImaDrYho9WeFiJg7WuE=";
|
||||
sha256 = "sha256-MqkpzNUd2FZgt9TZPtEp+jIq7r3sr+EeTpHlqNCgatU=";
|
||||
};
|
||||
|
||||
buildInputs = [ boost zlib openssl ]
|
||||
|
|
|
|||
|
|
@ -12,21 +12,28 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "innernet";
|
||||
version = "1.5.5";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tonarino";
|
||||
repo = "innernet";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jUL7/jHjfgpLg6728JQETbBcC2Q3G8d31oiwhkS+FD0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eAiYXE8kSfuhBgrIo6rbtE2YH9JcLJwA/vXA5IWNYG8=";
|
||||
};
|
||||
cargoSha256 = "sha256-qQ6yRI0rNxV/TRZHCR69h6kx6L2Wp75ziw+B2P8LZmE=";
|
||||
|
||||
cargoHash = "sha256-F+VvVF+5I53IF4Vur0SkUQXoqo8EE3XWirm88gu/GI4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
installShellFiles
|
||||
];
|
||||
buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
buildInputs = [
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
libiconv
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/innernet-server.8.gz
|
||||
|
|
@ -46,6 +53,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A private network system that uses WireGuard under the hood";
|
||||
homepage = "https://github.com/tonarino/innernet";
|
||||
changelog = "https://github.com/tonarino/innernet/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tomberek _0x4A6F ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oapi-codegen";
|
||||
version = "1.12.4";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmap";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VbaGFTDfe/bm4EP3chiG4FPEna+uC4HnfGG4C7YUWHc=";
|
||||
hash = "sha256-xanS2oPh+f+cmiTrfbMvFKcFVQ5DsWDe3KOZzhOl370=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-o9pEeM8WgGVopnfBccWZHwFR420mQAA4K/HV2RcU2wU=";
|
||||
vendorHash = "sha256-8qjS0BdBwnRjs3GrWHZOnxIJCiiGzgX2mqlmWLWzDuA=";
|
||||
|
||||
# Tests use network
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -111,6 +111,13 @@ let
|
|||
hash = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
};
|
||||
|
||||
patch-fix-aarch64-darwin-static = fetchpatch {
|
||||
# https://github.com/NixOS/nix/pull/8068
|
||||
name = "fix-aarch64-darwin-static.patch";
|
||||
url = "https://github.com/NixOS/nix/commit/220aa8e0ac9d17de2c9f356a68be43b673d851a1.patch";
|
||||
hash = "sha256-YrmFkVpwPreiig1/BsP+DInpTdQrPmS7bEY0WUGpw+c=";
|
||||
};
|
||||
|
||||
in lib.makeExtensible (self: {
|
||||
nix_2_3 = (common rec {
|
||||
version = "2.3.16";
|
||||
|
|
@ -170,6 +177,9 @@ in lib.makeExtensible (self: {
|
|||
nix_2_13 = common {
|
||||
version = "2.13.3";
|
||||
hash = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=";
|
||||
patches = [
|
||||
patch-fix-aarch64-darwin-static
|
||||
];
|
||||
};
|
||||
|
||||
nix_2_14 = common {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfox";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BishopFox";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-46w0/Da5sJkw2jLEGiFICEaX9bvCs0sbad1RyDCxINw=";
|
||||
hash = "sha256-EqL5/PVQm/lfviojKoYKDnzilx7KQZ7T3EEx/or6y7E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lgccNq1cSg8rrHW0aMLcC5HrZXf8TvdFSmk6pbGXNqQ=";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jwx";
|
||||
version = "2.0.9";
|
||||
version = "2.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lestrrat-go";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0Ha16moHpPt7IwSmSLSf3ExKlp2TDkssPppNIPHrsJw=";
|
||||
hash = "sha256-8ZzDVCJERf9T9Tlth+9imVJPZIAwffR03S/8UflKjZc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RyAQh1uXw3bEZ6vuh8+mEf8T4l3ZIFAaFJ6dGMoANys=";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jsvc";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz";
|
||||
sha256 = "sha256-J5Gzd6R8CMqhsgRPrrHhD//LdpcVEQKnBB7i/pLL8ns=";
|
||||
sha256 = "sha256-30hJ0F5YFmEOZ4IYg/T8HhFySgu4t4uEsh7dUDns674=";
|
||||
};
|
||||
|
||||
buildInputs = [ commonsDaemon ];
|
||||
|
|
|
|||
|
|
@ -1677,6 +1677,7 @@ mapAliases ({
|
|||
timescale-prometheus = promscale; # Added 2020-09-29
|
||||
timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09
|
||||
timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05
|
||||
tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25
|
||||
tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17
|
||||
tkcvs = tkrev; # Added 2022-03-07
|
||||
togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30
|
||||
|
|
|
|||
|
|
@ -13211,8 +13211,6 @@ with pkgs;
|
|||
|
||||
tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { };
|
||||
|
||||
tinygltf = callPackage ../development/libraries/tinygltf { };
|
||||
|
||||
tinyobjloader = callPackage ../development/libraries/tinyobjloader { };
|
||||
|
||||
tinyprog = callPackage ../development/embedded/fpga/tinyprog { };
|
||||
|
|
@ -20416,7 +20414,9 @@ with pkgs;
|
|||
|
||||
dotconf = callPackage ../development/libraries/dotconf { };
|
||||
|
||||
draco = callPackage ../development/libraries/draco { };
|
||||
draco = callPackage ../development/libraries/draco {
|
||||
tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { };
|
||||
};
|
||||
|
||||
# Multi-arch "drivers" which we want to build for i686.
|
||||
driversi686Linux = recurseIntoAttrs {
|
||||
|
|
|
|||
|
|
@ -259,10 +259,12 @@ let
|
|||
overlays = [ (self': super': {
|
||||
pkgsStatic = super';
|
||||
})] ++ overlays;
|
||||
} // lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
crossSystem = {
|
||||
isStatic = true;
|
||||
parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed;
|
||||
parsed =
|
||||
if stdenv.isLinux
|
||||
then makeMuslParsedPlatform stdenv.hostPlatform.parsed
|
||||
else stdenv.hostPlatform.parsed;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") {
|
||||
gcc.abi = "elfv2";
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue