mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
899adc3017
@ -123,12 +123,23 @@ in
|
||||
# Import the most important environment variables into the D-Bus and systemd
|
||||
# user environments (e.g. required for screen sharing and Pinentry prompts):
|
||||
exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
|
||||
# enable systemd-integration
|
||||
exec "systemctl --user import-environment {,WAYLAND_}DISPLAY SWAYSOCK; systemctl --user start sway-session.target"
|
||||
exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.target
|
||||
'';
|
||||
} // lib.optionalAttrs (cfg.package != null) {
|
||||
"sway/config".source = lib.mkOptionDefault "${cfg.package}/etc/sway/config";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.targets.sway-session = {
|
||||
description = "sway compositor session";
|
||||
documentation = [ "man:systemd.special(7)" ];
|
||||
bindsTo = [ "graphical-session.target" ];
|
||||
wants = [ "graphical-session-pre.target" ];
|
||||
after = [ "graphical-session-pre.target" ];
|
||||
};
|
||||
|
||||
# To make a Sway session available if a display manager like SDDM is enabled:
|
||||
services.displayManager.sessionPackages = lib.optional (cfg.package != null) cfg.package;
|
||||
|
||||
|
||||
@ -106,8 +106,14 @@ in {
|
||||
|
||||
createDatabaseLocally = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Create the database and database user locally, and run installation.";
|
||||
default = false;
|
||||
description = ''
|
||||
Create the database and database user locally, and run installation.
|
||||
|
||||
WARNING: Due to https://github.com/flarum/framework/issues/4018, this option is set
|
||||
to false by default. The 'flarum install' command may delete existing database tables.
|
||||
Only set this to true if you are certain you are working with a fresh, empty database.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@ -116,6 +122,7 @@ in {
|
||||
isSystemUser = true;
|
||||
home = cfg.stateDir;
|
||||
createHome = true;
|
||||
homeMode = "755";
|
||||
group = cfg.group;
|
||||
};
|
||||
users.groups.${cfg.group} = {};
|
||||
@ -194,8 +201,6 @@ in {
|
||||
cp -f ${cfg.package}/share/php/flarum/{extend.php,site.php,flarum} .
|
||||
ln -sf ${cfg.package}/share/php/flarum/vendor .
|
||||
ln -sf ${cfg.package}/share/php/flarum/public/index.php public/
|
||||
chmod a+x . public
|
||||
chmod +x site.php extend.php flarum
|
||||
'' + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") ''
|
||||
if [ ! -f config.php ]; then
|
||||
php flarum install --file=${flarumInstallConfig}
|
||||
|
||||
@ -607,7 +607,7 @@ in
|
||||
$out/bin/zfs --help >/dev/null 2>&1
|
||||
$out/bin/zpool --help >/dev/null 2>&1
|
||||
'';
|
||||
postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable) (concatStringsSep "\n" ([''
|
||||
postResumeCommands = mkIf (!config.boot.initrd.systemd.enable) (concatStringsSep "\n" ([''
|
||||
ZFS_FORCE="${optionalString cfgZfs.forceImportRoot "-f"}"
|
||||
''] ++ [(importLib {
|
||||
# See comments at importLib definition.
|
||||
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tauon";
|
||||
version = "7.8.2";
|
||||
version = "7.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "Tauon";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-fVp3RWRNIBSeALbYNRIYjyWNH9An+YnS7neQt0x33yI=";
|
||||
hash = "sha256-A7JRJ0Eh0ynuwPYZFLEeqWLf6OKdN59jM2vozdpSZC8=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@ -55,10 +55,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-pce-libretro",
|
||||
"rev": "3260947537deb14c4b464fd80a132dc9d3f80a4f",
|
||||
"hash": "sha256-2RJnXdkcyCrNK6Y2sT9PHfXtNXB4KUdsWh43G3yZrGU="
|
||||
"rev": "3a75c7ce5fc62c524be8d0eb45cd4b39d08a885c",
|
||||
"hash": "sha256-y+M1hEv5o+gkMN00ZQjuRfJNqLnsTcbbcr+mVgmSSnc="
|
||||
},
|
||||
"version": "unstable-2024-08-30"
|
||||
"version": "unstable-2024-09-06"
|
||||
},
|
||||
"beetle-pce-fast": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -85,10 +85,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-psx-libretro",
|
||||
"rev": "3b6aa830f1345a588c6217f0bf8f5da2f8e08c29",
|
||||
"hash": "sha256-XrE9Ms6yypZWy1M0dfUD2O2zXR409or5VKLCVsiZW7U="
|
||||
"rev": "12a9895466fc1d895e3f4570494af7b398470975",
|
||||
"hash": "sha256-O0pdGapKKEcjHamEtRs88++L/HF+eppV7Z7GVQrV8ZM="
|
||||
},
|
||||
"version": "unstable-2024-08-30"
|
||||
"version": "unstable-2024-09-06"
|
||||
},
|
||||
"beetle-saturn": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -115,10 +115,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-supergrafx-libretro",
|
||||
"rev": "4376f838433134dbeaa14f4a7e926d68d6f89457",
|
||||
"hash": "sha256-gKVx9EBVQXiR6z9hhA+6DYm7zbHsoKMDG+v/tAK3c+I="
|
||||
"rev": "6c76ef9e83f7f3bed3aa747b01fd2d6c54687c65",
|
||||
"hash": "sha256-LapGHFPSM/I+73oRhxW+gfc1SrEZ1MxscmpGujr6p9Y="
|
||||
},
|
||||
"version": "unstable-2024-08-30"
|
||||
"version": "unstable-2024-09-06"
|
||||
},
|
||||
"beetle-vb": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -287,10 +287,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "fbneo",
|
||||
"rev": "5ea732a897919b9d4059a09146f45f4e91f5fe0d",
|
||||
"hash": "sha256-w8XTOQlffUKDvZSEQXQYsHDhE4/2bRHNwfJRHSfpnf4="
|
||||
"rev": "a03a6f526684067823de922f1b15d7eb27fd5394",
|
||||
"hash": "sha256-7J/RuBTpjqG306IsQe9PBnJnT+QzFVNgpG124XaAcRA="
|
||||
},
|
||||
"version": "unstable-2024-08-29"
|
||||
"version": "unstable-2024-09-03"
|
||||
},
|
||||
"fceumm": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -408,11 +408,11 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame",
|
||||
"rev": "dc299d16818b40f123ad9507e0244f608224f621",
|
||||
"hash": "sha256-XiZTL3umGKg4CbVCX6q4wA26JEvEPS5FyXJw6l0kDFQ=",
|
||||
"rev": "8b9b8f5f5b47161327d93522318c81fba2087b2f",
|
||||
"hash": "sha256-xnIYMvLsd4k4wdu3IvWBJy3V8l3NfZvUjYOISunHnwI=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-08-29"
|
||||
"version": "unstable-2024-08-31"
|
||||
},
|
||||
"mame2000": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -429,20 +429,20 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-libretro",
|
||||
"rev": "b2fbe7d4724d781572111f12176b5b38126bcf16",
|
||||
"hash": "sha256-E+ln1isbslzMhT8THZO9MDd6dGN/+mRj1oKzfMz0t5Y="
|
||||
"rev": "1a268a709d611f6a84d473754ee2dbcaf1c37a2e",
|
||||
"hash": "sha256-jFzFQVB0uiSRa82sq1fiMEXyzzDJqRANNgq5hj/ZAl4="
|
||||
},
|
||||
"version": "unstable-2024-08-22"
|
||||
"version": "unstable-2024-09-04"
|
||||
},
|
||||
"mame2003-plus": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-plus-libretro",
|
||||
"rev": "7d4e2ccc0143451969e0efbcb207acc690249d4c",
|
||||
"hash": "sha256-YMbCJNP//PKUsONfNMn80nGW+lTMHXpwBybdphWCaKU="
|
||||
"rev": "5f5e32598720cd795dbcf53c1400a122ef0fcd76",
|
||||
"hash": "sha256-TJUgDHDPPKGx4QnKOI6FpCYcLsY2j7GM1atEoq5zg8Y="
|
||||
},
|
||||
"version": "unstable-2024-08-28"
|
||||
"version": "unstable-2024-09-06"
|
||||
},
|
||||
"mame2010": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -631,53 +631,53 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "pcsx_rearmed",
|
||||
"rev": "8847df50c67c19c605f60a109d30556b74d08eee",
|
||||
"hash": "sha256-5Od39zhtkmWBbesHDLBcm2/7Oa91vhsqflDfUKFzST4="
|
||||
"rev": "237887e817e23800997466632deb8ba63797a4cb",
|
||||
"hash": "sha256-AhyCkQzgppCnwcX+qpKcSEJ58hosJwL9wwn80HOHpvg="
|
||||
},
|
||||
"version": "unstable-2024-08-22"
|
||||
"version": "unstable-2024-09-03"
|
||||
},
|
||||
"picodrive": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "picodrive",
|
||||
"rev": "479f120b928153815a4543b7c4104c0aa355a660",
|
||||
"hash": "sha256-FhixFmIPerXWLNzMDMRka5xWwN/pt0tKqvSbZpmLyPI=",
|
||||
"rev": "6508730c524420e05626b0b06dbc603e02d3af64",
|
||||
"hash": "sha256-iL6eKG2O6ePYo6NK0VsTVLaRKgwuapXotvSOy7KipgI=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-08-09"
|
||||
"version": "unstable-2024-09-06"
|
||||
},
|
||||
"play": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "jpd002",
|
||||
"repo": "Play-",
|
||||
"rev": "663a1d9a75f72c34befc304901ad6063f34dc9d3",
|
||||
"hash": "sha256-j3lqwp2qKkt2ytHQvs4IuzpFfA++uVwgz1mupOuCzH8=",
|
||||
"rev": "9752b303037186a2e2581b864bc25136402cdc79",
|
||||
"hash": "sha256-zJFgZjE9CvozH/5hFdnGsVL6q2Pb4QFvyipebzYjB3g=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-08-27"
|
||||
"version": "unstable-2024-09-04"
|
||||
},
|
||||
"ppsspp": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "5fd8fae8b5bedafc97487d7bc004533d9612a6c7",
|
||||
"hash": "sha256-bSbe9qVdrXU778fheqZuXENlJRBYD/k24BC2ZT2UnwM=",
|
||||
"rev": "4250bdc2a6cadbd450aa48f7e5fbc67b2df172bf",
|
||||
"hash": "sha256-4Vf7D7aUkZ+eL7Nz0fToDIGB35xi6vc+UJTM0rKpdXE=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-08-27"
|
||||
"version": "unstable-2024-09-06"
|
||||
},
|
||||
"prboom": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-prboom",
|
||||
"rev": "2972aa92e0490194a37c9fb849ffc420abeb0ce4",
|
||||
"hash": "sha256-VXrhSZpGNjfxU34b2gzxaPe0YKXv4K7+vB7MrC7/bkY="
|
||||
"rev": "2a96b2a22cf98bdd508b1efc31afceb78717f4ba",
|
||||
"hash": "sha256-Pf6U9RTkMUsRl2mOU6ooFPhVu0G9MZQjJYKVQ9WneIE="
|
||||
},
|
||||
"version": "unstable-2024-06-28"
|
||||
"version": "unstable-2024-09-05"
|
||||
},
|
||||
"prosystem": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -754,10 +754,10 @@
|
||||
"src": {
|
||||
"owner": "snes9xgit",
|
||||
"repo": "snes9x",
|
||||
"rev": "85591435763dede7ef111aab8070cdf2d5a7da49",
|
||||
"hash": "sha256-hF+k9OQX/MPF3DLo2qCvsmJ/9NbnuxBigE6iu0iG9E0="
|
||||
"rev": "645a4712e797486787e2a0521928dea7cca143fd",
|
||||
"hash": "sha256-2WgkouQZ6OW3mmPTMjioPikvg077Jx+bzIwV6Wz4blA="
|
||||
},
|
||||
"version": "unstable-2024-08-10"
|
||||
"version": "unstable-2024-09-05"
|
||||
},
|
||||
"snes9x2002": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -794,10 +794,10 @@
|
||||
"src": {
|
||||
"owner": "stella-emu",
|
||||
"repo": "stella",
|
||||
"rev": "59f82b1fe159a508528a0b40e541d2abdb15d67c",
|
||||
"hash": "sha256-GIkxwon6qnzQzy0TE2w0j5KAQmuEoRr7OvtFrcutuSo="
|
||||
"rev": "b1e297153b4e7013a28763253c425a6f4bf31f48",
|
||||
"hash": "sha256-6LPoFX9m6Ads/pZJcMOrJlllluAoCyzyTT6Ngrr84YI="
|
||||
},
|
||||
"version": "unstable-2024-08-29"
|
||||
"version": "unstable-2024-09-01"
|
||||
},
|
||||
"stella2014": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery-dl";
|
||||
version = "1.27.3";
|
||||
version = "1.27.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "gallery_dl";
|
||||
hash = "sha256-ILnnbnQiJnBBOV87mWw1xHU8DtCXIVVwRwz/PfzVSSI=";
|
||||
hash = "sha256-28y5sU9onPHIqlTIYzIQ+J2KElJocbuwKQN/E50JGI8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "transifex-cli";
|
||||
version = "1.6.16";
|
||||
version = "1.6.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "transifex";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4TYuWNpw1tc3igKe4ld6pN35W070fekCaxpHGb/ekuY=";
|
||||
sha256 = "sha256-jzAt/SalItGG0KI3GZb4/pT4T7oHwCji2bjNR1BTJXI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3gi2ysIb5256CdmtX38oIfeDwNCQojK+YB9aEm8H01Q=";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -35,11 +35,11 @@
|
||||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "130.0b2";
|
||||
version = "131.0b2";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "bfba17643923ec10686df7d0047e0fcba7716f96a645722869cc472f68bb42415e63ce37905a7d41f1bb3aa139ee7d336ac838bbbff105b3785eb522ebcb7eb0";
|
||||
sha512 = "1716b4189600d5eea9957c1ad2325a635f1f1178fb6e836bc9fe07d3ee2a71d5186af9511ad3e494403023834b58f7acb0b2716ee2acd5300797e2e8680b7cb8";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -64,13 +64,13 @@
|
||||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "130.0b2";
|
||||
version = "131.0b2";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "ef26fa3dad6fdafe8e8e2d9d88101b75244b3f21a499d0b61c4a2c9a0addbcd3184274096a34da958b0ab2489ecf6c3d7684a1f507ed687648b96f9e9e2b123c";
|
||||
sha512 = "704d30f4c5d2a7cddda53f572551cc5fe49bc380388bda5c0eceac121c7d91ee616f586231a33539bb277aa4ea4e963a0d7f4d40f9738d4d30e4a3da75233d97";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "129.0.2-1",
|
||||
"packageVersion": "130.0-1",
|
||||
"source": {
|
||||
"rev": "129.0.2-1",
|
||||
"sha256": "1zghj91bqy2746x4x6cwn503dkw1fmfv0wgq02wv2cwlp8mmd7j7"
|
||||
"rev": "130.0-1",
|
||||
"sha256": "1ynw6hzyvyv02a1y838w4jkq0a8yg95c0zs7q0bdxca5grw154qi"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "129.0.2",
|
||||
"sha512": "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13"
|
||||
"version": "130.0",
|
||||
"sha512": "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40"
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "quisk";
|
||||
version = "4.2.37";
|
||||
version = "4.2.38";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-S25pqHZUZp9yucVaYAQv7Pa/N1gKU4Sc9nPS7/AplqY=";
|
||||
hash = "sha256-IF7I+NgnqwU6c5R4caZslt7DJneI3fYk4KXl10dIsEw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "git-cola";
|
||||
version = "4.8.1";
|
||||
version = "4.8.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-cola";
|
||||
repo = "git-cola";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3SCfsLYB4qhvsVo0Ji4WPwIDGcMwQ4M4zKnCOsXGTS0=";
|
||||
hash = "sha256-8OErZ6uKTWE245BoBu9lQyTLA43DfWaYDv3wbPWaufg=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go2tv" + lib.optionalString (!withGui) "-lite";
|
||||
version = "1.16.1";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexballas";
|
||||
repo = "go2tv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7m5GikrdcrJyl+KYuSk1JWLW2SsHOcBJNJuq2BahxHc=";
|
||||
hash = "sha256-h0q2VhnU7CPCD0Co9rLPmGh4BK4eP5QUMep7AaJ3weY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-na79rF/9o+s6E4i08Ocs6u98IABc19sTGFvjI6yeJFo=";
|
||||
vendorHash = "sha256-+sASY+HosTMMVHHPwVw8nO+/72s2A1EpuTMHJXhHtnc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -10,15 +10,15 @@
|
||||
, stdenvNoCC
|
||||
, runtimeShell
|
||||
, bintools ? null, libc ? null, coreutils ? null, gnugrep ? null
|
||||
, netbsd ? null, netbsdCross ? null
|
||||
, netbsd ? null
|
||||
, sharedLibraryLoader ?
|
||||
if libc == null then
|
||||
null
|
||||
else if stdenvNoCC.targetPlatform.isNetBSD then
|
||||
if !(targetPackages ? netbsdCross) then
|
||||
if !(targetPackages ? netbsd) then
|
||||
netbsd.ld_elf_so
|
||||
else if libc != targetPackages.netbsdCross.headers then
|
||||
targetPackages.netbsdCross.ld_elf_so
|
||||
else if libc != targetPackages.netbsd.headers then
|
||||
targetPackages.netbsd.ld_elf_so
|
||||
else
|
||||
null
|
||||
else
|
||||
|
||||
3416
pkgs/by-name/br/browsers/Cargo.lock
generated
Normal file
3416
pkgs/by-name/br/browsers/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
73
pkgs/by-name/br/browsers/package.nix
Normal file
73
pkgs/by-name/br/browsers/package.nix
Normal file
@ -0,0 +1,73 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
atk,
|
||||
cairo,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
gtk3,
|
||||
pango,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "browsers";
|
||||
version = "0.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Browsers-software";
|
||||
repo = "browsers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-o9vyrHQsZQ3qywA4bviM+W4xx64IZL24VHErMFAEMFE=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"druid-0.8.3" = "sha256-s9csjZ0ZimOrPnjJpPjrrMdNKAXFfroWHBPeR369Phk=";
|
||||
"rolling-file-0.2.0" = "sha256-3xeOSXFVVgeKRE39gtzTURt0OkKScQ4uwtvLl4CE3R4=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atk
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
pango
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -m 444 \
|
||||
-D extra/linux/dist/software.Browsers.template.desktop \
|
||||
-t $out/share/applications
|
||||
mv $out/share/applications/software.Browsers.template.desktop $out/share/applications/software.Browsers.desktop
|
||||
substituteInPlace \
|
||||
$out/share/applications/software.Browsers.desktop \
|
||||
--replace-fail 'Exec=€ExecCommand€' 'Exec=${pname} %u'
|
||||
cp -r resources $out
|
||||
for size in 16 32 128 256 512; do
|
||||
install -m 444 \
|
||||
-D resources/icons/"$size"x"$size"/software.Browsers.png \
|
||||
-t $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open the right browser at the right time";
|
||||
homepage = "https://browsers.software";
|
||||
changelog = "https://github.com/Browsers-software/browsers/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ravenz46 ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "browsers";
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
import ./generic.nix {
|
||||
version = "7.0.8";
|
||||
hash = "sha256-m6yToQQFM+4g8xhs572O4n4r06xeS3DozYHtAKwMjUg=";
|
||||
npmDepsHash = "sha256-OqtYRjftwGxgW1JgMxyWd+9DndpEkd3LdQHSECc40yU=";
|
||||
version = "7.0.9";
|
||||
hash = "sha256-JoHF49n2HWMHl/LMWxQlj7utkmzyZ5pHEfeSU8gjyfU=";
|
||||
npmDepsHash = "sha256-9U2I+JzDGQlfjyvZRbfPbDMmoHxIJ/SOBhMdn1la0EI=";
|
||||
vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw=";
|
||||
lts = true;
|
||||
nixUpdateExtraArgs = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import ./generic.nix {
|
||||
version = "8.0.2";
|
||||
hash = "sha256-rjwZjwt0F9AhXgQ8CzOfsZ3acyBvzsDc/2LHRWieDzg=";
|
||||
npmDepsHash = "sha256-6AMaZadgcTvOBsIXJjZQB6Q1rkdn+R82pclXdVvtdWY=";
|
||||
version = "8.0.3";
|
||||
hash = "sha256-PvCWUiJIs9ktuJetPYZT0V8S8+OYahCDZiZQpvWWXhY=";
|
||||
npmDepsHash = "sha256-E4eq4OompY8e+722PbSFCmcarpYBpO/n9X6GVU9AhDU=";
|
||||
vendorHash = "sha256-4l4kscwesW/cR8mZjE3G9HcVm0d1ukxbtBY6RXYRi8k=";
|
||||
lts = false;
|
||||
nixUpdateExtraArgs = [
|
||||
|
||||
35
pkgs/by-name/gr/graphite-cli/package-lock.json
generated
35
pkgs/by-name/gr/graphite-cli/package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@withgraphite/graphite-cli",
|
||||
"version": "1.4.3",
|
||||
"version": "1.4.4",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@withgraphite/graphite-cli",
|
||||
"version": "1.4.3",
|
||||
"version": "1.4.4",
|
||||
"hasInstallScript": true,
|
||||
"license": "None",
|
||||
"dependencies": {
|
||||
@ -27,6 +27,7 @@
|
||||
"version": "5.0.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
|
||||
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
@ -35,6 +36,7 @@
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
||||
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"color-convert": "^2.0.1"
|
||||
},
|
||||
@ -49,6 +51,7 @@
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
|
||||
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ansi-styles": "^4.1.0",
|
||||
"supports-color": "^7.1.0"
|
||||
@ -64,6 +67,7 @@
|
||||
"version": "8.0.1",
|
||||
"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
|
||||
"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"string-width": "^4.2.0",
|
||||
"strip-ansi": "^6.0.1",
|
||||
@ -77,6 +81,7 @@
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
|
||||
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"color-name": "~1.1.4"
|
||||
},
|
||||
@ -87,17 +92,20 @@
|
||||
"node_modules/color-name": {
|
||||
"version": "1.1.4",
|
||||
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
|
||||
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
|
||||
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/emoji-regex": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
|
||||
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
|
||||
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/escalade": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
|
||||
"integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
|
||||
"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
}
|
||||
@ -106,6 +114,7 @@
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
|
||||
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": "6.* || 8.* || >= 10.*"
|
||||
}
|
||||
@ -114,6 +123,7 @@
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
|
||||
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
@ -122,6 +132,7 @@
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
|
||||
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
@ -130,6 +141,7 @@
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
|
||||
"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
@ -138,6 +150,7 @@
|
||||
"version": "7.6.3",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
|
||||
"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
|
||||
"license": "ISC",
|
||||
"bin": {
|
||||
"semver": "bin/semver.js"
|
||||
},
|
||||
@ -149,6 +162,7 @@
|
||||
"version": "4.2.3",
|
||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
|
||||
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"emoji-regex": "^8.0.0",
|
||||
"is-fullwidth-code-point": "^3.0.0",
|
||||
@ -162,6 +176,7 @@
|
||||
"version": "6.0.1",
|
||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
|
||||
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ansi-regex": "^5.0.1"
|
||||
},
|
||||
@ -173,6 +188,7 @@
|
||||
"version": "7.2.0",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
|
||||
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"has-flag": "^4.0.0"
|
||||
},
|
||||
@ -184,6 +200,7 @@
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
|
||||
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ansi-styles": "^4.0.0",
|
||||
"string-width": "^4.1.0",
|
||||
@ -200,6 +217,7 @@
|
||||
"version": "8.18.0",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
|
||||
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=10.0.0"
|
||||
},
|
||||
@ -220,6 +238,7 @@
|
||||
"version": "5.0.8",
|
||||
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
|
||||
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
}
|
||||
@ -228,6 +247,7 @@
|
||||
"version": "17.7.2",
|
||||
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
|
||||
"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"cliui": "^8.0.1",
|
||||
"escalade": "^3.1.1",
|
||||
@ -245,6 +265,7 @@
|
||||
"version": "21.1.1",
|
||||
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
|
||||
"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
}
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "graphite-cli";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
|
||||
hash = "sha256-ITROAsDlkNJx5z1DN41Y3kOQzlm2CmciPVn9IrtjCQc=";
|
||||
hash = "sha256-a/ouR93i887/QnIeSZX5zVgF194LCCc2hNmSGsH8aDY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-G2J0yu/loihlrgGSMEJmVK496bVwJehLwYAPh0f8UbM=";
|
||||
npmDepsHash = "sha256-MwJ7ALO0Ebh7K0LW4xJ79tL1FikNe5hiY06X1lwXlC4=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./package-lock.json} package-lock.json
|
||||
|
||||
57
pkgs/by-name/mo/modelscan/package.nix
Normal file
57
pkgs/by-name/mo/modelscan/package.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "modelscan";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protectai";
|
||||
repo = "modelscan";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-G+jBbDiDiQr3E5JuUdNvfIjVpoVCpsDQRoZ7L659BF0=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
poetry-core
|
||||
poetry-dynamic-versioning
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
click
|
||||
numpy
|
||||
rich
|
||||
tomlkit
|
||||
];
|
||||
|
||||
optional-dependencies = with python3.pkgs; {
|
||||
h5py = [ h5py ];
|
||||
# tensorflow = [ tensorflow ];
|
||||
};
|
||||
|
||||
nativeCheckInputs =
|
||||
with python3.pkgs;
|
||||
[
|
||||
dill
|
||||
pytestCheckHook
|
||||
]
|
||||
++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
# tensorflow doesn0t support Python 3.12
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "modelscan" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Protection against Model Serialization Attacks";
|
||||
homepage = "https://github.com/protectai/modelscan";
|
||||
changelog = "https://github.com/protectai/modelscan/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "modelscan";
|
||||
};
|
||||
}
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
pname = "mov-cli";
|
||||
version = "4.4.8";
|
||||
version = "4.4.12";
|
||||
in
|
||||
python3.pkgs.buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -18,7 +18,7 @@ python3.pkgs.buildPythonPackage {
|
||||
owner = "mov-cli";
|
||||
repo = "mov-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MpSwSYsHsrG7ceXXJnFMg1bgadOhe23eNVCNMxlY0pQ=";
|
||||
hash = "sha256-S8IB2TRmzoSKKeTKhESWstPPbSIL8LwqV5Y2+9F0KMo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -18,6 +18,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
pythonRelaxDeps = [ "setuptools" ];
|
||||
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proto";
|
||||
version = "0.40.2";
|
||||
version = "0.40.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = "proto";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GpTNU/kaxo9BgMh5FdeJghpENIuC7Tdy+K1uXcPIQuY=";
|
||||
hash = "sha256-heckDmKG6gQYNzK0kRQKYXdgZLRiZB/b+x7Xr/4axX0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CjdIjJ6Nvckihp3mo86lzmqJD1aXSwKoyrLWMhOVy8w=";
|
||||
cargoHash = "sha256-yPXf6f4dwCaT0nKDWiZ+FIvOyWB/WqiwKi1b/rBtNIQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
renode.overrideAttrs (finalAttrs: _: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.15.2+20240829gitfedcdbdaf";
|
||||
version = "1.15.2+20240905git62115c2c3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
|
||||
hash = "sha256-pZ8+wxu7357jXGhFFgG9RQ0Jy8a3CfKpe3x31VbsgfQ=";
|
||||
hash = "sha256-gPtaE0Y5bRcLNA9JVq2LWmDdV4OUGg/X6iQgEnr8b7Y=";
|
||||
};
|
||||
|
||||
passthru.updateScript =
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
|
||||
# nativeCheckInputs
|
||||
ruff,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
testers,
|
||||
ruff-lsp,
|
||||
@ -11,15 +15,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ruff-lsp";
|
||||
version = "0.0.55";
|
||||
version = "0.0.56";
|
||||
pyproject = true;
|
||||
disabled = python3.pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff-lsp";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FFIZ8fDAPK03tnkjd2AUrz7iL8S9FziJQJKOxAisu48=";
|
||||
hash = "sha256-L5bfGW5R9kDCK8zcFh+a/zquJefwKxOB0JdYDTyPFuQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
15
pkgs/by-name/ru/ruff/Cargo.lock
generated
15
pkgs/by-name/ru/ruff/Cargo.lock
generated
@ -1803,9 +1803,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quick-junit"
|
||||
version = "0.4.0"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cfc1a6a5406a114913df2df8507998c755311b55b78584bed5f6e88f6417c4d4"
|
||||
checksum = "62ffd2f9a162cfae131bed6d9d1ed60adced33be340a94f96952897d7cb0c240"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"indexmap",
|
||||
@ -1818,9 +1818,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quick-xml"
|
||||
version = "0.31.0"
|
||||
version = "0.36.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
|
||||
checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@ -1997,6 +1997,7 @@ dependencies = [
|
||||
"ruff_text_size",
|
||||
"rustc-hash 2.0.0",
|
||||
"salsa",
|
||||
"tempfile",
|
||||
"tracing",
|
||||
]
|
||||
|
||||
@ -2090,7 +2091,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff"
|
||||
version = "0.6.3"
|
||||
version = "0.6.4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"argfile",
|
||||
@ -2283,7 +2284,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff_linter"
|
||||
version = "0.6.3"
|
||||
version = "0.6.4"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"annotate-snippets 0.9.2",
|
||||
@ -2603,7 +2604,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff_wasm"
|
||||
version = "0.6.3"
|
||||
version = "0.6.4"
|
||||
dependencies = [
|
||||
"console_error_panic_hook",
|
||||
"console_log",
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5jS2NCl01kgUAd8hFtjJCOwRxi0XMM2x7VMpJLEgbOQ=";
|
||||
hash = "sha256-AldYWbLtkVtM1sWBCgNym9RZ0QszIh59vQhoysl5/3I=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "tparse";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@ -14,10 +14,16 @@ buildGoModule {
|
||||
owner = "mfridman";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-siw9GihPo6f+OWKvSx0kqC919BuL/YoUI2dUBwTF19U=";
|
||||
hash = "sha256-CxoVu3WH2I/1wT5o/RGIrGFrGCQOC4vcUKMiH/Gv3aY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-j+1B2zWONjFEGoyesX0EW964kD33Jy3O1aB1WEwlESA=";
|
||||
vendorHash = "sha256-soIti6o8BUnarPf5/bcMJKdEG0oRpDLMkQM6RlbZQ5I=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "CLI tool for summarizing go test output. Pipe friendly. CI/CD friendly";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, stdenvNoLibc
|
||||
, buildPackages
|
||||
, fetchurl
|
||||
, gitUpdater
|
||||
@ -9,6 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv = stdenvNoLibc;
|
||||
isCross = (stdenv.buildPlatform != stdenv.hostPlatform);
|
||||
configParser = ''
|
||||
function parseconfig {
|
||||
|
||||
32
pkgs/by-name/ze/zed-editor/Cargo.lock
generated
32
pkgs/by-name/ze/zed-editor/Cargo.lock
generated
@ -1644,8 +1644,8 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "blade-graphics"
|
||||
version = "0.4.0"
|
||||
source = "git+https://github.com/kvark/blade?rev=b37a9a994709d256f4634efd29281c78ba89071a#b37a9a994709d256f4634efd29281c78ba89071a"
|
||||
version = "0.5.0"
|
||||
source = "git+https://github.com/kvark/blade?rev=bf40d4f91fb56031e8676376dba2fc021b3e8eaf#bf40d4f91fb56031e8676376dba2fc021b3e8eaf"
|
||||
dependencies = [
|
||||
"ash",
|
||||
"ash-window",
|
||||
@ -1674,8 +1674,8 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "blade-macros"
|
||||
version = "0.2.1"
|
||||
source = "git+https://github.com/kvark/blade?rev=b37a9a994709d256f4634efd29281c78ba89071a#b37a9a994709d256f4634efd29281c78ba89071a"
|
||||
version = "0.3.0"
|
||||
source = "git+https://github.com/kvark/blade?rev=bf40d4f91fb56031e8676376dba2fc021b3e8eaf#bf40d4f91fb56031e8676376dba2fc021b3e8eaf"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -1685,7 +1685,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "blade-util"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/kvark/blade?rev=b37a9a994709d256f4634efd29281c78ba89071a#b37a9a994709d256f4634efd29281c78ba89071a"
|
||||
source = "git+https://github.com/kvark/blade?rev=bf40d4f91fb56031e8676376dba2fc021b3e8eaf#bf40d4f91fb56031e8676376dba2fc021b3e8eaf"
|
||||
dependencies = [
|
||||
"blade-graphics",
|
||||
"bytemuck",
|
||||
@ -4784,9 +4784,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "glow"
|
||||
version = "0.13.1"
|
||||
version = "0.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
|
||||
checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"slotmap",
|
||||
@ -7780,21 +7780,6 @@ version = "2.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
|
||||
|
||||
[[package]]
|
||||
name = "performance"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"collections",
|
||||
"gpui",
|
||||
"log",
|
||||
"schemars",
|
||||
"serde",
|
||||
"settings",
|
||||
"util",
|
||||
"workspace",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "perplexity"
|
||||
version = "0.1.0"
|
||||
@ -14108,7 +14093,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zed"
|
||||
version = "0.151.1"
|
||||
version = "0.151.2"
|
||||
dependencies = [
|
||||
"activity_indicator",
|
||||
"anyhow",
|
||||
@ -14169,7 +14154,6 @@ dependencies = [
|
||||
"outline_panel",
|
||||
"parking_lot",
|
||||
"paths",
|
||||
"performance",
|
||||
"profiling",
|
||||
"project",
|
||||
"project_panel",
|
||||
|
||||
@ -85,13 +85,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zed";
|
||||
version = "0.151.1";
|
||||
version = "0.151.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9xvCElW1J3LMiNPUeVxaNIexx7a2rVEoAh4Ntrh1N6E=";
|
||||
hash = "sha256-wIozmr3GKi4VdP+P5J2j3Fa/rIjfzpPQDHv8X3WBHZA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -106,7 +106,7 @@ rustPlatform.buildRustPackage rec {
|
||||
outputHashes = {
|
||||
"alacritty_terminal-0.24.1-dev" = "sha256-b4oSDhsAAYjpYGfFgA1Q1642JoJQ9k5RTsPgFUpAFmc=";
|
||||
"async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";
|
||||
"blade-graphics-0.4.0" = "sha256-LmJ8f1VVzPfjpZp2T5WKxjEdzE/avfWmA3dq/V27eJc=";
|
||||
"blade-graphics-0.5.0" = "sha256-LDUxtl6qVYcZj/+ifc6aXKDriDL+AQ3gsEAL9Un9hec=";
|
||||
"cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM=";
|
||||
"font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo=";
|
||||
"lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js=";
|
||||
|
||||
@ -13,17 +13,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unison-code-manager";
|
||||
version = "0.5.25";
|
||||
version = "0.5.26";
|
||||
|
||||
src = if stdenv.isDarwin then
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz";
|
||||
hash = "sha256-Tc9XYWCap3N9KX5k6M83L1efwz2cG3bmv5tyY4zuFPQ=";
|
||||
hash = "sha256-RF2Q5sCxT9F3IGM/8UP6bEe9sOjtpMVYHREuAPOzh8g=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz";
|
||||
hash = "sha256-I1UIkwxw/ePv8dWFT4o/FSaYuBGbvoVURk5sHX7gtL4=";
|
||||
hash = "sha256-t0rc1f4PfjHRu/tzoW8sJ/6R0KBbYQPiWHqsIaqc+SY=";
|
||||
};
|
||||
|
||||
# The tarball is just the prebuilt binary, in the archive root.
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clojure";
|
||||
version = "1.11.4.1474";
|
||||
version = "1.12.0.1479";
|
||||
|
||||
src = fetchurl {
|
||||
# https://github.com/clojure/brew-install/releases
|
||||
url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-sNFDXvrHMrFgLrBHmbv3DKOXuNu6u1OqcmlqZNX/EAg=";
|
||||
hash = "sha256-KlFcRXVd8e3zeP36+zgCUcdzbeLbFffb5V7XKV8NKWw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apr";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-/GSN6YPzoqbJ543qHxgGOb0vrWwG1VbUNnpwH+XDVXc=";
|
||||
hash = "sha256-zQ9dUrmrFwTHIWDF7j7V09TKLfSn+KtWTjyzUrZyMvI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook3 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aravis";
|
||||
version = "0.8.31";
|
||||
version = "0.8.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AravisProject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CsXnwrZqBCS7JVAB/7JlAAvks5HnYxgrdc4Bmg68QdE=";
|
||||
sha256 = "sha256-D6zcTCaFJxJ2VhhsgEFu5+3Xx1MJov4ryrtA0VkjZlY=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "lib" ];
|
||||
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
It is not known if the issues can be exploited over the network in
|
||||
practical conditions. Upstream does not believe such an attack is
|
||||
feasible, but has stated that the library should not be used going
|
||||
forward, and there are no plans to move to a another cryptography
|
||||
forward, and there are no plans to move to another cryptography
|
||||
implementation or otherwise further maintain the library at all.
|
||||
|
||||
You should make an informed decision about whether to override this
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, crossLibcStdenv, buildPackages }:
|
||||
{ stdenv, fetchFromGitHub, stdenvNoLibc, buildPackages }:
|
||||
|
||||
crossLibcStdenv.mkDerivation {
|
||||
stdenvNoLibc.mkDerivation {
|
||||
name = "newlib";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openrisc";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, texinfo, flex, bison, fetchFromGitHub, crossLibcStdenv, buildPackages }:
|
||||
{ stdenv, texinfo, flex, bison, fetchFromGitHub, stdenvNoLibc, buildPackages }:
|
||||
|
||||
crossLibcStdenv.mkDerivation {
|
||||
stdenvNoLibc.mkDerivation {
|
||||
name = "newlib";
|
||||
src = fetchFromGitHub {
|
||||
owner = "itszor";
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.21.2";
|
||||
version = "0.21.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-N6zijQ16kfkIYt0plIcqFZYre08TduC3sBqCGVRhFQc=";
|
||||
hash = "sha256-pzvkFOB96OFLzdNmoB2uuIiTzyYOP10Lzjs0HF+ElGY=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "beanhub-cli";
|
||||
version = "1.2.3";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
owner = "LaunchPlatform";
|
||||
repo = "beanhub-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oHlI3hloquD86fHr3AgwW5SqKxUw2gphP76wi6mCy44=";
|
||||
hash = "sha256-P6XypAiMHaxOzGn+R7G6o/1c+lIOV/LqUmeRaMOVLNg=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "beanhub-import";
|
||||
version = "0.3.4";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "LaunchPlatform";
|
||||
repo = "beanhub-import";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-igaW8vFUYagBfVQXL1Ulo7uhGilbOxxuyZV9Eda/Gto=";
|
||||
hash = "sha256-jNwM+5On0BoCiqPfaWhHupXTQhinfobEkLbchP7OIHQ=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -2,13 +2,14 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-changelog-shortener,
|
||||
requests,
|
||||
tomli,
|
||||
pytestCheckHook,
|
||||
lazy,
|
||||
packaging-legacy,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools-changelog-shortener,
|
||||
setuptools,
|
||||
tomli,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -24,14 +25,15 @@ buildPythonPackage rec {
|
||||
hash = "sha256-I1oKmkXJblTGC6a6L3fYVs+Q8aacG+6UmIfp7cA6Qcw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-changelog-shortener
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
dependencies = [
|
||||
lazy
|
||||
packaging-legacy
|
||||
requests
|
||||
tomli
|
||||
];
|
||||
|
||||
|
||||
@ -2,15 +2,18 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
poetry-core,
|
||||
lxml,
|
||||
paragraphs,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "docx2python";
|
||||
version = "2.11.0";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,22 +22,29 @@ buildPythonPackage rec {
|
||||
owner = "ShayHill";
|
||||
repo = "docx2python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SavRYnNbESRQh9Elk8qCt/qdI2x+sYZJFMYy+Gojg2k=";
|
||||
hash = "sha256-ucLDdfmLAWcGunOKvh8tBQknXTPI1qOqyXgVGjQOGoQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ lxml ];
|
||||
dependencies = [
|
||||
lxml
|
||||
paragraphs
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "docx2python" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ShayHill/docx2python";
|
||||
description = "Extract docx headers, footers, (formatted) text, footnotes, endnotes, properties, and images";
|
||||
homepage = "https://github.com/ShayHill/docx2python";
|
||||
changelog = "https://github.com/ShayHill/docx2python/blob/${src.rev}/CHANGELOG.md";
|
||||
maintainers = [ ];
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,38 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
expiringdict,
|
||||
fetchPypi,
|
||||
google-api-python-client,
|
||||
google-auth-httplib2,
|
||||
google-auth-oauthlib,
|
||||
google-api-python-client,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
versioneer,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drivelib";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1bz3dn6wm9mlm2w8czwjmhvf3ws3iggr57hvd8z8acl1qafr2g4m";
|
||||
hash = "sha256-lTyRncKBMoU+ahuekt+LQ/PhNqySf4a4qLSmyo1t468=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-python-client
|
||||
google-auth-oauthlib
|
||||
google-auth-httplib2
|
||||
expiringdict
|
||||
postPatch = ''
|
||||
# Remove vendorized versioneer.py
|
||||
rm versioneer.py
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
versioneer
|
||||
];
|
||||
|
||||
# tests depend on a google auth token
|
||||
dependencies = [
|
||||
expiringdict
|
||||
google-api-python-client
|
||||
google-auth-httplib2
|
||||
google-auth-oauthlib
|
||||
];
|
||||
|
||||
# Tests depend on a google auth token
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "drivelib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easy access to the most common Google Drive API calls";
|
||||
homepage = "https://pypi.org/project/drivelib/";
|
||||
homepage = "https://github.com/Lykos153/python-drivelib";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ gravndal ];
|
||||
};
|
||||
|
||||
@ -6,32 +6,36 @@
|
||||
hatchling,
|
||||
jupyter-events,
|
||||
jupyter-server,
|
||||
click,
|
||||
pytest-jupyter,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-server-fileid";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
pyproject = true;
|
||||
|
||||
disables = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-server";
|
||||
repo = "jupyter_server_fileid";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ApCDBVjJqpkC5FGEjU/LxwWBunTkL6i5Ki85M6MMLE0=";
|
||||
hash = "sha256-ob7hnqU7GdaDHEPF7+gwkmsboKZgiiLzzwxbBUwYHYo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
jupyter-events
|
||||
jupyter-server
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
cli = [ click ];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "jupyter_server_fileid" ];
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -97,7 +97,9 @@ buildPythonPackage rec {
|
||||
#ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/
|
||||
'';
|
||||
|
||||
passthru.tests.kaleido = callPackage ./tests.nix { };
|
||||
passthru.tests = lib.optionalAttrs (!stdenv.isDarwin) {
|
||||
kaleido = callPackage ./tests.nix { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Fast static image export for web-based visualization libraries with zero dependencies";
|
||||
@ -112,6 +114,5 @@ buildPythonPackage rec {
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # Trust me, I'm not happy. But after literal hours of trying to reverse-engineer their build system and getting nowhere, I'll use the stupid binaries >:(
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ pandapip1 ];
|
||||
broken = stdenv.isDarwin; # Tests fail on darwin for some reason
|
||||
};
|
||||
}
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "labelbox";
|
||||
version = "3.77.1";
|
||||
version = "3.78.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "Labelbox";
|
||||
repo = "labelbox-python";
|
||||
rev = "refs/tags/v.${version}";
|
||||
hash = "sha256-sp0lgUnFRmQLix530xoR/qibYFjGwG7i7+mvEQX0x4k=";
|
||||
hash = "sha256-P/yhN1DdUWuQ4UtqRtvJxdjgTAh2IAs5oS0zxFLunuU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/labelbox";
|
||||
|
||||
@ -17,19 +17,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msldap";
|
||||
version = "0.5.10";
|
||||
version = "0.5.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Zb/g5QLJTSb0XTZvVnzbYkYvJ/ZVvQri8CKP48n5ibg=";
|
||||
hash = "sha256-RKKj0oUPkl5QtrgtRRXHTO6lSLfB/E09DT9t9loMxUA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
unicrypto
|
||||
asyauth
|
||||
asysocks
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
numpy,
|
||||
packaging,
|
||||
quantities,
|
||||
@ -14,14 +14,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "neo";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aYDZVC55XVNR/VtdnTlBBKR/MNDvfwUR+spqe14ncrw=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NeuralEnsemble";
|
||||
repo = "python-neo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7Q80vbQInVWxPCr6VvmI9tFfTIAzo9FPJ19q51Xd2KM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
43
pkgs/development/python-modules/packaging-legacy/default.nix
Normal file
43
pkgs/development/python-modules/packaging-legacy/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
packaging,
|
||||
pretend,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "packaging-legacy";
|
||||
version = "23.0.post0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "di";
|
||||
repo = "packaging_legacy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2TnJjxasC8+c+qHY60e6Jyqhf1nQJfj/tmIA/LvUsT8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ packaging ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pretend
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "packaging_legacy" ];
|
||||
|
||||
meta = {
|
||||
description = "Module to support for legacy Python Packaging functionality";
|
||||
homepage = "https://github.com/di/packaging_legacy";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
42
pkgs/development/python-modules/paragraphs/default.nix
Normal file
42
pkgs/development/python-modules/paragraphs/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools-scm,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "paragraphs";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShayHill";
|
||||
repo = "paragraphs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-u5/oNOCLdvfQVEIEpraeNLjTUoh3eJQ6qSExnkzTmNw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"paragraphs"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Module to incorporate long strings";
|
||||
homepage = "https://github.com/ShayHill/paragraphs";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "1.0.2.20240905";
|
||||
version = "1.0.2.20240906";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qDT+ksSwJkgyeVJl3hqc2p4uPux8Gjsq6cnW/SQ4NDE=";
|
||||
hash = "sha256-AHvj0eyJKPGXEIk6Cu/q2cDDiGCDH/QvBPGm9Cfy2w8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatv";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
owner = "postlund";
|
||||
repo = "pyatv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-59XDh+TA4UYzfLJtbTiMC6Wz7EvUW22ONM4JQw5t/5o=";
|
||||
hash = "sha256-8ODhDuc4jaLtrLZYd1yJlpYygO6KaguyR/yLWb/rMR4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylink-square";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "square";
|
||||
repo = "pylink";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WMpb/b9kF1rFlegDYxNGJbZ2Nz8nuG21tyjgUFLs5mg=";
|
||||
hash = "sha256-4tdtyb0AjsAmFOPdkxbbro8PH3akC5uihN59lgijhkc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
boto3,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
poetry-core,
|
||||
pyhumps,
|
||||
pytest-asyncio,
|
||||
@ -18,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.13.14";
|
||||
version = "1.14.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -27,24 +26,9 @@ buildPythonPackage rec {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HlDydPreHe/O+fqVwjkwQlQx0o9UxI/fwA+idB02Gng=";
|
||||
hash = "sha256-mpD8seRGZZ+1Rgg1ADFiFgYZ1JmLRNdscRwfXIK6Pr4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/iMicknl/python-overkiz-api/pull/1309
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/iMicknl/python-overkiz-api/commit/9e5bbec3fc88faac9dae0c0c001ed7582c4933e2.patch";
|
||||
excludes = [ "poetry.lock" ];
|
||||
hash = "sha256-KzagDvljkKoUJT+41o7Jv5OPLpPXQDeGmz3O/HOk1YQ=";
|
||||
})
|
||||
# https://github.com/iMicknl/python-overkiz-api/pull/1326
|
||||
(fetchpatch2 {
|
||||
name = "aiohttp-3.10-compat.patch";
|
||||
url = "https://github.com/iMicknl/python-overkiz-api/commit/f745c0a9cd654579135624aa472723f85d301aed.patch";
|
||||
hash = "sha256-FXyWLnbu0Kqe/dWrWdi4cvyttDQqexhHo0nTumfUo4g=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyprosegur";
|
||||
version = "0.0.11";
|
||||
version = "0.0.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,12 +21,12 @@ buildPythonPackage rec {
|
||||
owner = "dgomes";
|
||||
repo = "pyprosegur";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-DBr/MtomB7MlZlK8YBvtY1MIstLxotOkv07zZNNuRtM=";
|
||||
hash = "sha256-A223aafa0eXNBVd2cVVV7p2wXg4Z2rcoggM3czmRsOE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiofiles
|
||||
aiohttp
|
||||
backoff
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmlight";
|
||||
version = "0.0.13";
|
||||
version = "0.0.14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smlight-tech";
|
||||
repo = "pysmlight";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yNTNcJGcTA7EN1JfbDaySCSfBx99vRKLQWqMG4OkC5k=";
|
||||
hash = "sha256-23MDNsN7eAhDYKmsSciChCe6sJVdrL4VuEJixoczVsk=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -9,52 +9,50 @@
|
||||
|
||||
# dependencies
|
||||
astroid,
|
||||
anyascii,
|
||||
jinja2,
|
||||
pyyaml,
|
||||
sphinx,
|
||||
stdlib-list,
|
||||
|
||||
# tests
|
||||
beautifulsoup4,
|
||||
mock,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-autoapi";
|
||||
version = "3.2.1";
|
||||
version = "3.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "sphinx_autoapi";
|
||||
inherit version;
|
||||
hash = "sha256-H51Ws6mNVlPR+tVkSr7tLAQs7DBKEm73LCNtrkrxa5A=";
|
||||
hash = "sha256-5EoiWCfQ73F4dIIlpm8wyVRU39AO48Iq+9+4BW99/7U=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
anyascii
|
||||
astroid
|
||||
jinja2
|
||||
pyyaml
|
||||
sphinx
|
||||
];
|
||||
dependencies =
|
||||
[
|
||||
astroid
|
||||
jinja2
|
||||
pyyaml
|
||||
sphinx
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.10") [
|
||||
stdlib-list
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
beautifulsoup4
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# failing typing assertions
|
||||
# require network access
|
||||
"test_integration"
|
||||
"test_annotations"
|
||||
# sphinx.errors.SphinxWarning: cannot cache unpickable configuration value: 'autoapi_prepare_jinja_env' (because it contains a function, class, or module object)
|
||||
"test_custom_jinja_filters"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "autoapi" ];
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "whenever";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "ariebovenberg";
|
||||
repo = "whenever";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-aQ6mE9UZg/wa+N2kErDo3edXVvjL/4Bhjmi6//CCmJw=";
|
||||
hash = "sha256-0p2btgFLabXtW+Jaebt59KHFd63PeKwLH1YfBycL+6E=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "moon";
|
||||
version = "1.27.10";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonrepo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RAOPF47uUgF8ORECr04YcngWacaKQrMlQaG9YnECVdc=";
|
||||
hash = "sha256-RqL7C+0AZ9iqJ8j09ToGE7gWItMM0c2qf99yh4SPQj4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pQvto1G0XptEaAStbOKd2q4nlt4sKpIYu7K9lqakkTk=";
|
||||
cargoHash = "sha256-1chIr0cAUrXR4cfzSBq0omKcizHb8nL6lcdeNaRKGdU=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "-C strip=symbols";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fission";
|
||||
version = "1.20.3";
|
||||
version = "1.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fission";
|
||||
repo = "fission";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q1wyyzkqEMEYmgmj11YaZYl3lTtJKfPM8fxjTmh7cT4=";
|
||||
hash = "sha256-zI8OBjmV7pnFe18sChRNdC2RQGfCif/5IG9sn/yHE94=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Vi6eEQR3DQupn3CnasKxknaSk7Hs7C7v2yUGtxhsovQ=";
|
||||
vendorHash = "sha256-W5fPa02rpWhGwYJzRkn8umqdMHG72Ym8+S0f+Id/mcM=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X info.Version=${version}" ];
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "gci";
|
||||
version = "0.13.4";
|
||||
version = "0.13.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daixiang0";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nJyRgvMVmNmmxigsdDcKzUuTQg5lXa8JnmwVyQwyWxA=";
|
||||
sha256 = "sha256-jtDqaUko0So/VwY3NF5NyPFu1jxt4nIbUkJxILc+iTs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/8fggERlHySyimrGOHkDERbCPZJWqojycaifNPF6MjE=";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kafkactl";
|
||||
version = "5.0.6";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deviceinsight";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pAi60t0mtRlAL+z6s5moWwxw0hC6CeiljjjFyzyN+nI=";
|
||||
hash = "sha256-OPXSajfR/eHSL0nHOIYPYvML2PsxtflBt7aTLPT1i0M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7ibev9Po8is+PXH0BC8ZLiTMJsPMR6VUwjNA/c1y/g0=";
|
||||
vendorHash = "sha256-VY1pm1RSfNGswuVoD73Mrpq+yMtenbjfpV7q72x/z7o=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,81 +1,108 @@
|
||||
{ stdenv, lib, callPackage }:
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
common = arch: callPackage (
|
||||
{ bison
|
||||
, callPackage
|
||||
, curl
|
||||
, fetchgit
|
||||
, flex
|
||||
, getopt
|
||||
, git
|
||||
, gnat
|
||||
, gcc
|
||||
, lib
|
||||
, perl
|
||||
, stdenvNoCC
|
||||
, zlib
|
||||
, withAda ? true
|
||||
}:
|
||||
common =
|
||||
arch:
|
||||
callPackage (
|
||||
{
|
||||
bison,
|
||||
callPackage,
|
||||
curl,
|
||||
fetchgit,
|
||||
flex,
|
||||
getopt,
|
||||
git,
|
||||
gnat,
|
||||
gcc,
|
||||
lib,
|
||||
perl,
|
||||
stdenvNoCC,
|
||||
zlib,
|
||||
withAda ? true,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "coreboot-toolchain-${arch}";
|
||||
version = "24.05";
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "coreboot-toolchain-${arch}";
|
||||
version = "24.08";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://review.coreboot.org/coreboot";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-jTfMFvl3sG3BIVVkpZ81BQ20Bs+2ESE6RMh0fW86rKE=";
|
||||
fetchSubmodules = false;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
PATH=${lib.makeBinPath [ getopt ]}:$PATH ${stdenv.shell} $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version
|
||||
rm -rf $out/.git
|
||||
src = fetchgit {
|
||||
url = "https://review.coreboot.org/coreboot";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-G/O8wN7moawiG4nAWsYSfiU3gpYxMvPtyvkgkrTL62E=";
|
||||
fetchSubmodules = false;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
PATH=${lib.makeBinPath [ getopt ]}:$PATH ${stdenv.shell} $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
allowedRequisites = [ ];
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
curl
|
||||
git
|
||||
perl
|
||||
];
|
||||
buildInputs = [
|
||||
flex
|
||||
zlib
|
||||
(if withAda then gnat else gcc)
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
dontConfigure = true;
|
||||
dontInstall = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs util/crossgcc/buildgcc
|
||||
|
||||
mkdir -p util/crossgcc/tarballs
|
||||
|
||||
${lib.concatMapStringsSep "\n" (file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}") (
|
||||
callPackage ./stable.nix { }
|
||||
)}
|
||||
|
||||
patchShebangs util/genbuild_h/genbuild_h.sh
|
||||
'';
|
||||
allowedRequisites = [ ];
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison curl git perl ];
|
||||
buildInputs = [ flex zlib (if withAda then gnat else gcc) ];
|
||||
buildPhase = ''
|
||||
export CROSSGCC_VERSION=$(cat .crossgcc_version)
|
||||
make crossgcc-${arch} CPUS=$NIX_BUILD_CORES DEST=$out
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
dontConfigure = true;
|
||||
dontInstall = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs util/crossgcc/buildgcc
|
||||
|
||||
mkdir -p util/crossgcc/tarballs
|
||||
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
file: "ln -s ${file.archive} util/crossgcc/tarballs/${file.name}"
|
||||
) (callPackage ./stable.nix { })
|
||||
}
|
||||
|
||||
patchShebangs util/genbuild_h/genbuild_h.sh
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
export CROSSGCC_VERSION=$(cat .crossgcc_version)
|
||||
make crossgcc-${arch} CPUS=$NIX_BUILD_CORES DEST=$out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.coreboot.org";
|
||||
description = "coreboot toolchain for ${arch} targets";
|
||||
license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ];
|
||||
maintainers = with maintainers; [ felixsinger jmbaur ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
);
|
||||
meta = with lib; {
|
||||
homepage = "https://www.coreboot.org";
|
||||
description = "coreboot toolchain for ${arch} targets";
|
||||
license = with licenses; [
|
||||
bsd2
|
||||
bsd3
|
||||
gpl2
|
||||
lgpl2Plus
|
||||
gpl3Plus
|
||||
];
|
||||
maintainers = with maintainers; [
|
||||
felixsinger
|
||||
jmbaur
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
);
|
||||
in
|
||||
|
||||
lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch { })) [
|
||||
"i386"
|
||||
"x64"
|
||||
"arm"
|
||||
"aarch64"
|
||||
"riscv"
|
||||
"ppc64"
|
||||
"nds32le"
|
||||
])
|
||||
lib.listToAttrs (
|
||||
map (arch: lib.nameValuePair arch (common arch { })) [
|
||||
"i386"
|
||||
"x64"
|
||||
"arm"
|
||||
"aarch64"
|
||||
"riscv"
|
||||
"ppc64"
|
||||
"nds32le"
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ fetchurl }: [
|
||||
{ fetchurl }:
|
||||
[
|
||||
{
|
||||
name = "gmp-6.3.0.tar.xz";
|
||||
archive = fetchurl {
|
||||
@ -21,10 +22,10 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "gcc-13.2.0.tar.xz";
|
||||
name = "gcc-14.1.0.tar.xz";
|
||||
archive = fetchurl {
|
||||
sha256 = "1nj3qyswcgc650sl3h0480a171ixp33ca13zl90p61m689jffxg2";
|
||||
url = "mirror://gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz";
|
||||
sha256 = "0h3889kkfp9bzw8km9w1ssh5qjskg6yw02q8v3lkvzksk1acd0z2";
|
||||
url = "mirror://gnu/gcc/gcc-14.1.0/gcc-14.1.0.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -42,10 +43,10 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "nasm-2.16.01.tar.bz2";
|
||||
name = "nasm-2.16.03.tar.bz2";
|
||||
archive = fetchurl {
|
||||
sha256 = "0bmv8xbzck7jim7fzm6jnwiahqkprbpz6wzhg53irm28w0pavdim";
|
||||
url = "https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/nasm-2.16.01.tar.bz2";
|
||||
sha256 = "0mwynbnn7c4ay4rpcsyp99j49sa6j3p8gk5pigwssqfdkcaxxwxy";
|
||||
url = "https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/nasm-2.16.03.tar.bz2";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "package-project-cmake";
|
||||
version = "1.11.2";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheLartians";
|
||||
repo = "PackageProject.cmake";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-2u7H2ZR7eQ6eoRIVZ1WBxw9K93E8BVYErZNDe1Jl8rg=";
|
||||
hash = "sha256-TMf9nA0V1qTXpzEJ0A6b3mIVN0MIogn5WlZeVY+Q2bg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -46,6 +46,8 @@
|
||||
yq
|
||||
];
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
stdenvNoLibs,
|
||||
stdenvNoLibc,
|
||||
overrideCC,
|
||||
buildPackages,
|
||||
stdenvNoLibcxx ? overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx,
|
||||
@ -28,7 +28,7 @@ lib.makeOverridable (
|
||||
if attrs.noCC or false then
|
||||
stdenvNoCC
|
||||
else if attrs.noLibc or false then
|
||||
stdenvNoLibs
|
||||
stdenvNoLibc
|
||||
else if attrs.noLibcxx or false then
|
||||
stdenvNoLibcxx
|
||||
else
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
crossLibcStdenv,
|
||||
stdenvNoLibc,
|
||||
stdenvNoCC,
|
||||
makeScopeWithSplicing',
|
||||
generateSplicesForMkScope,
|
||||
@ -37,7 +37,7 @@ makeScopeWithSplicing' {
|
||||
|
||||
compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isNetBSD) self.compat;
|
||||
|
||||
stdenvLibcMinimal = crossLibcStdenv.override (old: {
|
||||
stdenvLibcMinimal = stdenvNoLibc.override (old: {
|
||||
cc = old.cc.override {
|
||||
libc = self.libcMinimal;
|
||||
noLibc = false;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
crossLibcStdenv,
|
||||
stdenvNoLibc,
|
||||
stdenvLibcMinimal,
|
||||
runCommand,
|
||||
rsync,
|
||||
@ -28,7 +28,7 @@ lib.makeOverridable (
|
||||
if attrs.noCC or false then
|
||||
stdenvNoCC
|
||||
else if attrs.noLibc or false then
|
||||
crossLibcStdenv
|
||||
stdenvNoLibc
|
||||
else if attrs.libcMinimal or false then
|
||||
stdenvLibcMinimal
|
||||
else
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
crossLibcStdenv,
|
||||
stdenvNoLibc,
|
||||
makeScopeWithSplicing',
|
||||
generateSplicesForMkScope,
|
||||
buildPackages,
|
||||
@ -22,7 +22,7 @@ makeScopeWithSplicing' {
|
||||
// {
|
||||
version = "7.5";
|
||||
|
||||
stdenvLibcMinimal = crossLibcStdenv.override (old: {
|
||||
stdenvLibcMinimal = stdenvNoLibc.override (old: {
|
||||
cc = old.cc.override {
|
||||
libc = self.libcMinimal;
|
||||
noLibc = false;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
crossLibcStdenv,
|
||||
stdenvNoLibc,
|
||||
mkDerivation,
|
||||
fetchpatch,
|
||||
bsdSetupHook,
|
||||
@ -65,7 +65,7 @@ mkDerivation {
|
||||
# Suppress lld >= 16 undefined version errors
|
||||
# https://github.com/freebsd/freebsd-src/commit/2ba84b4bcdd6012e8cfbf8a0d060a4438623a638
|
||||
env.NIX_LDFLAGS = lib.optionalString (
|
||||
crossLibcStdenv.hostPlatform.linker == "lld"
|
||||
stdenvNoLibc.hostPlatform.linker == "lld"
|
||||
) "--undefined-version";
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
crossLibcStdenv,
|
||||
stdenvNoLibc,
|
||||
stdenvLibcMinimal,
|
||||
runCommand,
|
||||
rsync,
|
||||
@ -22,7 +22,7 @@ lib.makeOverridable (
|
||||
if attrs.noCC or false then
|
||||
stdenvNoCC
|
||||
else if attrs.noLibc or false then
|
||||
crossLibcStdenv
|
||||
stdenvNoLibc
|
||||
else if attrs.libcMinimal or false then
|
||||
stdenvLibcMinimal
|
||||
else
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
# NOTE: this should be updated with linux_rpi
|
||||
pname = "raspberrypi-firmware";
|
||||
version = "1.20240529";
|
||||
version = "1.20240902";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "firmware";
|
||||
rev = version;
|
||||
hash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
|
||||
hash = "sha256-DN+NlesZ8YfuVwLKQSHckvpNZxqsbKRflOcS3ShO3Ss=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, buildPackages
|
||||
, newScope, overrideCC, crossLibcStdenv, libcCross
|
||||
, newScope, overrideCC, stdenvNoLibc, libcCross
|
||||
}:
|
||||
|
||||
lib.makeScope newScope (self: with self; {
|
||||
@ -14,11 +14,11 @@ lib.makeScope newScope (self: with self; {
|
||||
mingw_runtime = mingwrt;
|
||||
|
||||
mingw_w64 = callPackage ./mingw-w64 {
|
||||
stdenv = crossLibcStdenv;
|
||||
stdenv = stdenvNoLibc;
|
||||
};
|
||||
|
||||
# FIXME untested with llvmPackages_16 was using llvmPackages_8
|
||||
crossThreadsStdenv = overrideCC crossLibcStdenv
|
||||
crossThreadsStdenv = overrideCC stdenvNoLibc
|
||||
(if stdenv.hostPlatform.useLLVM or false
|
||||
then buildPackages.llvmPackages.clangNoLibcxx
|
||||
else buildPackages.gccWithoutTargetLibc.override (old: {
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix-synapse-s3-storage-provider";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse-s3-storage-provider";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LOkSsgxHoABiiVtqssBaWYUroQBzzaJ3SclYcEMm2Mk=";
|
||||
hash = "sha256-Nv8NkzOcUDX17N7Lyx/NT1vXztiRNaTYIAWNPHxgxJ4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -21,15 +21,15 @@ let
|
||||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
hash = {
|
||||
aarch64-darwin = "sha256-AIec1ac3BKDI3Qw6v93yCrIfgF9vU4p5EhOABdCjWyE=";
|
||||
aarch64-linux = "sha256-1Ew2XHkjllK3gl0JjsnxdpecpX8ehxrHE8txAvQBVx4=";
|
||||
x86_64-darwin = "sha256-5qk/dioGpgUi9Ck+/X++s/dxxBoezEGwu6iD8e+cXYk=";
|
||||
x86_64-linux = "sha256-KjulbI36KQr5qpHrwPevG+DI16/sTsbU1/Wprfp05J4=";
|
||||
aarch64-darwin = "sha256-ZvkuScsFGlt6Cd6wTtikygCSYAzOuHmJLJa9Bos8VvM=";
|
||||
aarch64-linux = "sha256-Ojf2PjoN+Vcxc0N0durgQOM9aumyggOtYr2rc7+IaZI=";
|
||||
x86_64-darwin = "sha256-Uv4wunz/flGFzxeneW9NRmKLF831HR0Kjfkz6lnmhfA=";
|
||||
x86_64-linux = "sha256-7LdJvJYArfpYMKdAt98jxW08p8a+o5OTjoTRRX74ds8=";
|
||||
}.${stdenv.hostPlatform.system} or unsupported;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "1.22.0.4670";
|
||||
version = "1.23.1.4708";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snac2";
|
||||
version = "2.57";
|
||||
version = "2.58";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "grunfink";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ZszPHGEIcZEzFWSJ7jioQvLn5dwn9yjOvMMskMQKv8Y=";
|
||||
hash = "sha256-+cn3wX8usOW1D0frjeW4fA+Gg6YU975ROXpMi52N4qU=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl openssl ];
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "1.42.17";
|
||||
version = "1.42.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DXi81DkD/YgMWfwwruheGYXqs+5f/2eX8sTYzj8HzKw=";
|
||||
sha256 = "sha256-TL7b76NEAHxq2oFd3gVykU5lAf1v/zYZe4BHqpaPRnw=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-qzCk9Ze4Ss0Ks2FeLw3BMpW6WnQA+owweL+5ZxFR2pI=";
|
||||
vendorHash = "sha256-Ksl1WUiJ4HD6Wa6QYjbog9W9zFu/q9HaOjmC9cff2ZI=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -41,25 +41,44 @@ in lib.init bootStages ++ [
|
||||
if crossSystem.isStatic
|
||||
then buildPackages.stdenvAdapters.makeStatic
|
||||
else lib.id;
|
||||
stdenvNoCC = adaptStdenv (buildPackages.stdenv.override (old: rec {
|
||||
buildPlatform = localSystem;
|
||||
hostPlatform = crossSystem;
|
||||
targetPlatform = crossSystem;
|
||||
|
||||
# Prior overrides are surely not valid as packages built with this run on
|
||||
# a different platform, and so are disabled.
|
||||
overrides = _: _: {};
|
||||
extraBuildInputs = [ ]; # Old ones run on wrong platform
|
||||
allowedRequisites = null;
|
||||
|
||||
cc = null;
|
||||
hasCC = false;
|
||||
|
||||
extraNativeBuildInputs = old.extraNativeBuildInputs
|
||||
++ lib.optionals
|
||||
(hostPlatform.isLinux && !buildPlatform.isLinux)
|
||||
[ buildPackages.patchelf ]
|
||||
++ lib.optional
|
||||
(let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS || p.isGenode;
|
||||
in f hostPlatform && !(f buildPlatform) )
|
||||
buildPackages.updateAutotoolsGnuConfigScriptsHook
|
||||
;
|
||||
}));
|
||||
in {
|
||||
inherit config;
|
||||
overlays = overlays ++ crossOverlays;
|
||||
selfBuild = false;
|
||||
inherit stdenvNoCC;
|
||||
stdenv = let
|
||||
baseStdenv = adaptStdenv (buildPackages.stdenv.override (old: rec {
|
||||
buildPlatform = localSystem;
|
||||
hostPlatform = crossSystem;
|
||||
targetPlatform = crossSystem;
|
||||
inherit (stdenvNoCC) hostPlatform targetPlatform;
|
||||
baseStdenv = stdenvNoCC.override {
|
||||
# Old ones run on wrong platform
|
||||
extraBuildInputs = lib.optionals hostPlatform.isDarwin [
|
||||
buildPackages.targetPackages.darwin.apple_sdk.frameworks.CoreFoundation
|
||||
];
|
||||
|
||||
# Prior overrides are surely not valid as packages built with this run on
|
||||
# a different platform, and so are disabled.
|
||||
overrides = _: _: {};
|
||||
extraBuildInputs = [ ] # Old ones run on wrong platform
|
||||
++ lib.optionals hostPlatform.isDarwin [ buildPackages.targetPackages.darwin.apple_sdk.frameworks.CoreFoundation ]
|
||||
;
|
||||
allowedRequisites = null;
|
||||
|
||||
hasCC = !targetPlatform.isGhcjs;
|
||||
hasCC = !stdenvNoCC.targetPlatform.isGhcjs;
|
||||
|
||||
cc = if crossSystem.useiOSPrebuilt or false
|
||||
then buildPackages.darwin.iosSdkPkgs.clang
|
||||
@ -81,16 +100,7 @@ in lib.init bootStages ++ [
|
||||
then buildPackages.arocc
|
||||
else buildPackages.gcc;
|
||||
|
||||
extraNativeBuildInputs = old.extraNativeBuildInputs
|
||||
++ lib.optionals
|
||||
(hostPlatform.isLinux && !buildPlatform.isLinux)
|
||||
[ buildPackages.patchelf ]
|
||||
++ lib.optional
|
||||
(let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS || p.isGenode;
|
||||
in f hostPlatform && !(f buildPlatform) )
|
||||
buildPackages.updateAutotoolsGnuConfigScriptsHook
|
||||
;
|
||||
}));
|
||||
};
|
||||
in if config ? replaceCrossStdenv then config.replaceCrossStdenv { inherit buildPackages baseStdenv; } else baseStdenv;
|
||||
})
|
||||
|
||||
|
||||
@ -1226,6 +1226,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
|
||||
|
||||
# libc++, and libc++abi do not need CoreFoundation. Avoid propagating the CF from prior
|
||||
# stages to the final stdenv via rpath by dropping it from `extraBuildInputs`.
|
||||
stdenvNoCC = super.stdenvNoCC.override { extraBuildInputs = [ ]; };
|
||||
stdenvNoCF = self.stdenv.override { extraBuildInputs = [ ]; };
|
||||
|
||||
libcxxBootstrapStdenv = self.overrideCC stdenvNoCF (
|
||||
@ -1544,6 +1545,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
|
||||
|
||||
# Don’t link anything in this stage against CF to prevent propagating CF from prior stages to
|
||||
# the final stdenv, which happens because of the rpath hook.
|
||||
stdenvNoCC = super.stdenvNoCC.override { extraBuildInputs = [ ]; };
|
||||
stdenv =
|
||||
let
|
||||
stdenvNoCF = super.stdenv.override { extraBuildInputs = [ ]; };
|
||||
|
||||
@ -66,6 +66,12 @@ let
|
||||
original = pkgs.darwin.apple_sdk.Libsystem;
|
||||
replacement = sdk.Libsystem;
|
||||
}
|
||||
# This is different to `pkgs.darwin.apple_sdk.Libsystem` on `aarch64-darwin`.
|
||||
# Isn’t that neat? I think that’s neat. Don’t do macOS SDKs like this.
|
||||
{
|
||||
original = pkgs.darwin.Libsystem;
|
||||
replacement = sdk.Libsystem;
|
||||
}
|
||||
# Make sure darwin.CF is mapped to the correct version for the SDK.
|
||||
{
|
||||
original = pkgs.darwin.CF;
|
||||
|
||||
@ -1,47 +1,83 @@
|
||||
{ lib, stdenv, fetchgit, pkg-config, zlib, pciutils, openssl, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
pkg-config,
|
||||
zlib,
|
||||
pciutils,
|
||||
openssl,
|
||||
coreutils,
|
||||
acpica-tools,
|
||||
makeWrapper,
|
||||
gnugrep,
|
||||
gnused,
|
||||
file,
|
||||
buildEnv,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "24.05";
|
||||
version = "24.08";
|
||||
|
||||
commonMeta = {
|
||||
description = "Various coreboot-related tools";
|
||||
homepage = "https://www.coreboot.org";
|
||||
license = with lib.licenses; [ gpl2Only gpl2Plus ];
|
||||
maintainers = with lib.maintainers; [ felixsinger jmbaur ];
|
||||
license = with lib.licenses; [
|
||||
gpl2Only
|
||||
gpl2Plus
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
felixsinger
|
||||
jmbaur
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation ({
|
||||
inherit pname version;
|
||||
generic =
|
||||
{
|
||||
pname,
|
||||
path ? "util/${pname}",
|
||||
...
|
||||
}@args:
|
||||
stdenv.mkDerivation (
|
||||
{
|
||||
inherit pname version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://review.coreboot.org/coreboot";
|
||||
rev = version;
|
||||
hash = "sha256-Fq3tZje6QoMskxqWd61OstgI9Sj25yijf8S3LiTJuYc=";
|
||||
};
|
||||
src = fetchgit {
|
||||
url = "https://review.coreboot.org/coreboot";
|
||||
rev = version;
|
||||
hash = "sha256-BwuoBuWKHTnSwV8ubm5NqcddgxP5OMXuTl3zmwwKEsg=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace 3rdparty/vboot/Makefile --replace 'ar qc ' '$$AR qc '
|
||||
cd ${path}
|
||||
patchShebangs .
|
||||
'';
|
||||
postPatch = ''
|
||||
substituteInPlace 3rdparty/vboot/Makefile --replace 'ar qc ' '$$AR qc '
|
||||
cd ${path}
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"INSTALL=install"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
makeFlags = [
|
||||
"INSTALL=install"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
meta = commonMeta // args.meta;
|
||||
} // (removeAttrs args [ "meta" ]));
|
||||
meta = commonMeta // args.meta;
|
||||
}
|
||||
// (removeAttrs args [ "meta" ])
|
||||
);
|
||||
|
||||
utils = {
|
||||
msrtool = generic {
|
||||
pname = "msrtool";
|
||||
meta.description = "Dump chipset-specific MSR registers";
|
||||
meta.platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
buildInputs = [ pciutils zlib ];
|
||||
meta.platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
buildInputs = [
|
||||
pciutils
|
||||
zlib
|
||||
];
|
||||
preConfigure = "export INSTALL=install";
|
||||
};
|
||||
cbmem = generic {
|
||||
@ -55,8 +91,14 @@ let
|
||||
intelmetool = generic {
|
||||
pname = "intelmetool";
|
||||
meta.description = "Dump interesting things about Management Engine";
|
||||
meta.platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
buildInputs = [ pciutils zlib ];
|
||||
meta.platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
buildInputs = [
|
||||
pciutils
|
||||
zlib
|
||||
];
|
||||
};
|
||||
cbfstool = generic {
|
||||
pname = "cbfstool";
|
||||
@ -70,20 +112,35 @@ let
|
||||
superiotool = generic {
|
||||
pname = "superiotool";
|
||||
meta.description = "User-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O";
|
||||
meta.platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
buildInputs = [ pciutils zlib ];
|
||||
meta.platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
buildInputs = [
|
||||
pciutils
|
||||
zlib
|
||||
];
|
||||
};
|
||||
ectool = generic {
|
||||
pname = "ectool";
|
||||
meta.description = "Dump the RAM of a laptop's Embedded/Environmental Controller (EC)";
|
||||
meta.platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
meta.platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
preInstall = "mkdir -p $out/sbin";
|
||||
};
|
||||
inteltool = generic {
|
||||
pname = "inteltool";
|
||||
meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)";
|
||||
meta.platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
buildInputs = [ pciutils zlib ];
|
||||
meta.platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
buildInputs = [
|
||||
pciutils
|
||||
zlib
|
||||
];
|
||||
};
|
||||
amdfwtool = generic {
|
||||
pname = "amdfwtool";
|
||||
@ -113,19 +170,30 @@ let
|
||||
'';
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/acpidump-all \
|
||||
--set PATH ${lib.makeBinPath [ coreutils acpica-tools gnugrep gnused file ]}
|
||||
--set PATH ${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
acpica-tools
|
||||
gnugrep
|
||||
gnused
|
||||
file
|
||||
]
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
utils // {
|
||||
coreboot-utils = (buildEnv {
|
||||
name = "coreboot-utils-${version}";
|
||||
paths = lib.filter (lib.meta.availableOn stdenv.hostPlatform) (lib.attrValues utils);
|
||||
postBuild = "rm -rf $out/sbin";
|
||||
}) // {
|
||||
inherit version;
|
||||
meta = commonMeta;
|
||||
};
|
||||
utils
|
||||
// {
|
||||
coreboot-utils =
|
||||
(buildEnv {
|
||||
name = "coreboot-utils-${version}";
|
||||
paths = lib.filter (lib.meta.availableOn stdenv.hostPlatform) (lib.attrValues utils);
|
||||
postBuild = "rm -rf $out/sbin";
|
||||
})
|
||||
// {
|
||||
inherit version;
|
||||
meta = commonMeta;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ripdrag";
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nik012003";
|
||||
repo = "ripdrag";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fsCIyaGCLwf1T8xyVCTjg51TXS8v0l9dBHRB8wdyN5g=";
|
||||
hash = "sha256-aK/1f56sHspohbYO0z2Hf1NDJsN8Dbf1NoL/QadbVSY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZzD+WkmvZX4YXtOwWHw/7t9N/xgKWrMfCThcYFyHG/g=";
|
||||
cargoHash = "sha256-9POXKvbt1Xr1wKYHhfLb14puKorLIlT1ckzEVd6eWa0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "steampipe-plugin-aws";
|
||||
version = "0.145.0";
|
||||
version = "0.146.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbot";
|
||||
repo = "steampipe-plugin-aws";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Nh+GlnAA3dwRD0EFhUXqPXJtwUMmLzUtwFSJcaECpbc=";
|
||||
hash = "sha256-8TD00d4pV1NsFR2PqPuKg8rIdaaJjTdCGSbR2yvzg/c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-h0+ffKSyEU7lSqbL+LwqRZp563AlAGpzMbtg3qdOjrk=";
|
||||
vendorHash = "sha256-4MwISeCx/YbJSeQ5OJFIZf1SnK9aD2Eat6xKI7ZtYLk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -7,11 +7,11 @@ with python3.pkgs;
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wlc";
|
||||
version = "1.14";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-QMF41B6a2jMSdhjeFoRQq+K1YJAEz96msHLzX6wVqSc=";
|
||||
hash = "sha256-0T8cMq5Mrv/Ygo6BfYho3sjFuu8dYZyUMtJc5gabuG4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xcp";
|
||||
version = "0.21.2";
|
||||
version = "0.21.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarka";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dcNnj8j6eItDoP2K33nBPC8kvB9DuHc4/LxsoKF9H/g=";
|
||||
hash = "sha256-psxA4YgrO1zg1hVL93opxxQ4VgjdmLP7KI2nkhEYmaE=";
|
||||
};
|
||||
|
||||
# no such file or directory errors
|
||||
doCheck = false;
|
||||
|
||||
cargoHash = "sha256-CT3vo5ctgB6kVOGPjMI/tLCvdWvXEFdOWip5nH9fxfo=";
|
||||
cargoHash = "sha256-o29DesCKOtl4aQysFOVZUm2BghkFbxBOQi02KrUJRGM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extended cp(1)";
|
||||
|
||||
@ -139,6 +139,7 @@ mapAliases ({
|
||||
auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02
|
||||
authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19
|
||||
avldrums-lv2 = x42-avldrums; # Added 2020-03-29
|
||||
avrlibcCross = avrlibc; # Added 2024-09-06
|
||||
awesome-4-0 = awesome; # Added 2022-05-05
|
||||
aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11
|
||||
aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31
|
||||
@ -254,6 +255,7 @@ mapAliases ({
|
||||
cosmic-tasks = tasks; # Added 2024-07-04
|
||||
cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
|
||||
crispyDoom = crispy-doom; # Added 2023-05-01
|
||||
crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06
|
||||
cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22
|
||||
clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10
|
||||
clasp = clingo; # added 2022-12-22
|
||||
@ -1007,6 +1009,7 @@ mapAliases ({
|
||||
mpd_clientlib = libmpdclient; # Added 2021-02-11
|
||||
mpdevil = plattenalbum; # Added 2024-05-22
|
||||
mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
|
||||
msp430NewlibCross = msp430Newlib; # Added 2024-09-06
|
||||
mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10
|
||||
mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22
|
||||
murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10
|
||||
@ -1039,6 +1042,8 @@ mapAliases ({
|
||||
nagiosPluginsOfficial = monitoring-plugins;
|
||||
neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
|
||||
neoload = throw "'neoload' has been removed as it is broken and unmaintained"; # Added 2024-03-02
|
||||
newlibCross = newlib; # Added 2024-09-06
|
||||
newlib-nanoCross = newlib-nano; # Added 2024-09-06
|
||||
nitrokey-udev-rules = libnitrokey; # Added 2023-03-25
|
||||
nix-direnv-flakes = nix-direnv;
|
||||
nix-ld-rs = nix-ld; # Added 2024-08-17
|
||||
@ -1539,6 +1544,8 @@ mapAliases ({
|
||||
uberwriter = apostrophe; # Added 2020-04-23
|
||||
ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21
|
||||
ubuntu_font_family = ubuntu-classic; # Added 2024-02-19
|
||||
uclibc = uclibc-ng; # Added 2022-06-16
|
||||
uclibcCross = uclibc-ng; # Added 2022-06-16
|
||||
ue4 = throw "ue4 has been removed, because the package was broken for years"; # Added 2023-11-22
|
||||
uefi-firmware-parser = throw "The uefi-firmware-parser package was dropped since it was unmaintained."; # Added 2024-06-21
|
||||
uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07
|
||||
@ -1689,9 +1696,9 @@ mapAliases ({
|
||||
inherit (stdenv.hostPlatform) system; # Added 2021-10-22
|
||||
inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09
|
||||
|
||||
freebsdCross = freebsd; # Added 2024-06-18
|
||||
netbsdCross = netbsd; # Added 2024-06-18
|
||||
openbsdCross = openbsd; # Added 2024-06-18
|
||||
freebsdCross = freebsd; # Added 2024-09-06
|
||||
netbsdCross = netbsd; # Added 2024-09-06
|
||||
openbsdCross = openbsd; # Added 2024-09-06
|
||||
|
||||
# LLVM packages for (integration) testing that should not be used inside Nixpkgs:
|
||||
llvmPackages_latest = llvmPackages_18;
|
||||
|
||||
@ -31,19 +31,6 @@ with pkgs;
|
||||
# it's just the plain stdenv.
|
||||
stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv);
|
||||
|
||||
stdenvNoCC = stdenv.override (
|
||||
{ cc = null; hasCC = false; }
|
||||
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.isDarwin && (stdenv.hostPlatform != stdenv.buildPlatform)) {
|
||||
# TODO: This is a hack to use stdenvNoCC to produce a CF when cross
|
||||
# compiling. It's not very sound. The cross stdenv has:
|
||||
# extraBuildInputs = [ targetPackages.darwin.apple_sdks.frameworks.CoreFoundation ]
|
||||
# and uses stdenvNoCC. In order to make this not infinitely recursive, we
|
||||
# need to exclude this extraBuildInput.
|
||||
extraBuildInputs = [];
|
||||
}
|
||||
);
|
||||
|
||||
mkStdenvNoLibs = stdenv: let
|
||||
bintools = stdenv.cc.bintools.override {
|
||||
libc = null;
|
||||
@ -61,7 +48,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
stdenvNoLibs =
|
||||
if stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform && (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.useLLVM or false)
|
||||
if stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform
|
||||
then
|
||||
# We cannot touch binutils or cc themselves, because that will cause
|
||||
# infinite recursion. So instead, we just choose a libc based on the
|
||||
@ -74,7 +61,17 @@ with pkgs;
|
||||
# thing to to create an earlier thing (leading to infinite recursion) and
|
||||
# we also would still respect the stage arguments choices for these
|
||||
# things.
|
||||
overrideCC stdenv buildPackages.llvmPackages.clangNoCompilerRt
|
||||
(if stdenvNoCC.hostPlatform.isDarwin || stdenvNoCC.hostPlatform.useLLVM or false
|
||||
then overrideCC stdenvNoCC buildPackages.llvmPackages.clangNoCompilerRt
|
||||
else gccCrossLibcStdenv)
|
||||
else mkStdenvNoLibs stdenv;
|
||||
|
||||
stdenvNoLibc =
|
||||
if stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform
|
||||
then
|
||||
(if stdenvNoCC.hostPlatform.isDarwin || stdenvNoCC.hostPlatform.useLLVM or false
|
||||
then overrideCC stdenvNoCC buildPackages.llvmPackages.clangNoLibc
|
||||
else gccCrossLibcStdenv)
|
||||
else mkStdenvNoLibs stdenv;
|
||||
|
||||
gccStdenvNoLibs = mkStdenvNoLibs gccStdenv;
|
||||
@ -14994,11 +14991,6 @@ with pkgs;
|
||||
|
||||
gccCrossLibcStdenv = overrideCC stdenvNoCC buildPackages.gccWithoutTargetLibc;
|
||||
|
||||
crossLibcStdenv =
|
||||
if stdenv.hostPlatform.useLLVM or false || stdenv.hostPlatform.isDarwin
|
||||
then overrideCC stdenv buildPackages.llvmPackages.clangNoLibc
|
||||
else gccCrossLibcStdenv;
|
||||
|
||||
# The GCC used to build libc for the target platform. Normal gccs will be
|
||||
# built with, and use, that cross-compiled libc.
|
||||
gccWithoutTargetLibc = assert stdenv.targetPlatform != stdenv.hostPlatform; let
|
||||
@ -17041,9 +17033,8 @@ with pkgs;
|
||||
|
||||
h3 = h3_3;
|
||||
|
||||
avrlibc = callPackage ../development/misc/avr/libc { };
|
||||
avrlibcCross = callPackage ../development/misc/avr/libc {
|
||||
stdenv = crossLibcStdenv;
|
||||
avrlibc = callPackage ../development/misc/avr/libc {
|
||||
stdenv = stdenvNoLibc;
|
||||
};
|
||||
|
||||
avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
|
||||
@ -17115,10 +17106,7 @@ with pkgs;
|
||||
|
||||
msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { };
|
||||
|
||||
msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };
|
||||
msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix {
|
||||
newlib = newlibCross;
|
||||
};
|
||||
msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };
|
||||
|
||||
mspds = callPackage ../development/misc/msp430/mspds { };
|
||||
mspds-bin = callPackage ../development/misc/msp430/mspds/binary.nix { };
|
||||
@ -20258,14 +20246,14 @@ with pkgs;
|
||||
};
|
||||
|
||||
muslCross = musl.override {
|
||||
stdenv = crossLibcStdenv;
|
||||
stdenv = stdenvNoLibc;
|
||||
};
|
||||
|
||||
# These are used when buiding compiler-rt / libgcc, prior to building libc.
|
||||
preLibcCrossHeaders = let
|
||||
inherit (stdenv.targetPlatform) libc;
|
||||
in if stdenv.targetPlatform.isMinGW then targetPackages.windows.mingw_w64_headers or windows.mingw_w64_headers
|
||||
else if libc == "nblibc" then targetPackages.netbsdCross.headers or netbsdCross.headers
|
||||
else if libc == "nblibc" then targetPackages.netbsd.headers or netbsd.headers
|
||||
else if libc == "libSystem" && stdenv.targetPlatform.isAarch64 then targetPackages.darwin.LibsystemCross or darwin.LibsystemCross
|
||||
else null;
|
||||
|
||||
@ -20276,13 +20264,13 @@ with pkgs;
|
||||
/**/ if name == null then null
|
||||
else if name == "glibc" then targetPackages.glibcCross or glibcCross
|
||||
else if name == "bionic" then targetPackages.bionic or bionic
|
||||
else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross
|
||||
else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross
|
||||
else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross
|
||||
else if name == "uclibc" then targetPackages.uclibc or uclibc
|
||||
else if name == "avrlibc" then targetPackages.avrlibc or avrlibc
|
||||
else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430Newlib or msp430Newlib
|
||||
else if name == "newlib" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib
|
||||
else if name == "newlib" && stdenv.targetPlatform.isOr1k then targetPackages.or1k-newlib or or1k-newlib
|
||||
else if name == "newlib" then targetPackages.newlibCross or newlibCross
|
||||
else if name == "newlib-nano" then targetPackages.newlib-nanoCross or newlib-nanoCross
|
||||
else if name == "newlib" then targetPackages.newlib or newlib
|
||||
else if name == "newlib-nano" then targetPackages.newlib-nano or newlib-nano
|
||||
else if name == "musl" then targetPackages.muslCross or muslCross
|
||||
else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
|
||||
else if name == "ucrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
|
||||
@ -20308,7 +20296,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
wasilibc = callPackage ../development/libraries/wasilibc {
|
||||
stdenv = crossLibcStdenv;
|
||||
stdenv = stdenvNoLibc;
|
||||
};
|
||||
|
||||
# Only supported on Linux and only on glibc
|
||||
@ -27221,14 +27209,6 @@ with pkgs;
|
||||
buildBarebox
|
||||
bareboxTools;
|
||||
|
||||
uclibc-ng-cross = uclibc-ng.override {
|
||||
stdenv = crossLibcStdenv;
|
||||
};
|
||||
|
||||
# Aliases
|
||||
uclibc = uclibc-ng;
|
||||
uclibcCross = uclibc-ng-cross;
|
||||
|
||||
eudev = callPackage ../by-name/eu/eudev/package.nix {
|
||||
util-linux = util-linuxMinimal;
|
||||
};
|
||||
@ -39485,18 +39465,14 @@ with pkgs;
|
||||
|
||||
new-session-manager = callPackage ../applications/audio/new-session-manager { };
|
||||
|
||||
newlib = callPackage ../development/misc/newlib { };
|
||||
newlibCross = callPackage ../development/misc/newlib {
|
||||
stdenv = crossLibcStdenv;
|
||||
newlib = callPackage ../development/misc/newlib {
|
||||
stdenv = stdenvNoLibc;
|
||||
};
|
||||
|
||||
newlib-nano = callPackage ../development/misc/newlib {
|
||||
stdenv = stdenvNoLibc;
|
||||
nanoizeNewlib = true;
|
||||
};
|
||||
newlib-nanoCross = callPackage ../development/misc/newlib {
|
||||
nanoizeNewlib = true;
|
||||
stdenv = crossLibcStdenv;
|
||||
};
|
||||
|
||||
omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { };
|
||||
|
||||
|
||||
@ -9461,6 +9461,8 @@ self: super: with self; {
|
||||
|
||||
packaging = callPackage ../development/python-modules/packaging { };
|
||||
|
||||
packaging-legacy = callPackage ../development/python-modules/packaging-legacy { };
|
||||
|
||||
packbits = callPackage ../development/python-modules/packbits { };
|
||||
|
||||
packet-python = callPackage ../development/python-modules/packet-python { };
|
||||
@ -9526,6 +9528,8 @@ self: super: with self; {
|
||||
|
||||
para = callPackage ../development/python-modules/para { };
|
||||
|
||||
paragraphs = callPackage ../development/python-modules/paragraphs { };
|
||||
|
||||
param = callPackage ../development/python-modules/param { };
|
||||
|
||||
parameter-expansion-patched = callPackage ../development/python-modules/parameter-expansion-patched { };
|
||||
|
||||
@ -49,6 +49,10 @@ in
|
||||
, # The standard environment to use for building packages.
|
||||
stdenv
|
||||
|
||||
, # `stdenv` without a C compiler. Passing in this helps avoid infinite
|
||||
# recursions, and may eventually replace passing in the full stdenv.
|
||||
stdenvNoCC ? stdenv.override { cc = null; hasCC = false; }
|
||||
|
||||
, # This is used because stdenv replacement and the stdenvCross do benefit from
|
||||
# the overridden configuration provided by the user, as opposed to the normal
|
||||
# bootstrapping stdenvs.
|
||||
@ -141,7 +145,7 @@ let
|
||||
pkgs = self.pkgsHostTarget;
|
||||
targetPackages = self.pkgsTargetTarget;
|
||||
|
||||
inherit stdenv;
|
||||
inherit stdenv stdenvNoCC;
|
||||
};
|
||||
|
||||
splice = self: super: import ./splice.nix lib self (adjacentPackages != null);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user