mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-07 04:57:26 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
1f54473d6b
@ -10350,6 +10350,12 @@
|
||||
github = "k3a";
|
||||
githubId = 966992;
|
||||
};
|
||||
k3yss = {
|
||||
email = "rsi.dev17@gmail.com";
|
||||
name = "Rishi Kumar";
|
||||
github = "k3yss";
|
||||
githubId = 96657880;
|
||||
};
|
||||
k900 = {
|
||||
name = "Ilya K.";
|
||||
email = "me@0upti.me";
|
||||
|
||||
@ -12,7 +12,7 @@ with lib;
|
||||
system.nssModules = mkOption {
|
||||
type = types.listOf types.path;
|
||||
internal = true;
|
||||
default = [];
|
||||
default = [ ];
|
||||
description = ''
|
||||
Search path for NSS (Name Service Switch) modules. This allows
|
||||
several DNS resolution methods to be specified via
|
||||
@ -35,7 +35,7 @@ with lib;
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
@ -47,7 +47,7 @@ with lib;
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
shadow = mkOption {
|
||||
@ -59,7 +59,19 @@ with lib;
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
sudoers = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
List of sudoers entries to configure in {file}`/etc/nsswitch.conf`.
|
||||
|
||||
Note that "files" is always prepended.
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
hosts = mkOption {
|
||||
@ -71,7 +83,7 @@ with lib;
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
services = mkOption {
|
||||
@ -83,7 +95,7 @@ with lib;
|
||||
|
||||
This option only takes effect if nscd is enabled.
|
||||
'';
|
||||
default = [];
|
||||
default = [ ];
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -112,6 +124,7 @@ with lib;
|
||||
passwd: ${concatStringsSep " " config.system.nssDatabases.passwd}
|
||||
group: ${concatStringsSep " " config.system.nssDatabases.group}
|
||||
shadow: ${concatStringsSep " " config.system.nssDatabases.shadow}
|
||||
sudoers: ${concatStringsSep " " config.system.nssDatabases.sudoers}
|
||||
|
||||
hosts: ${concatStringsSep " " config.system.nssDatabases.hosts}
|
||||
networks: files
|
||||
@ -126,6 +139,7 @@ with lib;
|
||||
passwd = mkBefore [ "files" ];
|
||||
group = mkBefore [ "files" ];
|
||||
shadow = mkBefore [ "files" ];
|
||||
sudoers = mkBefore [ "files" ];
|
||||
hosts = mkMerge [
|
||||
(mkOrder 998 [ "files" ])
|
||||
(mkOrder 1499 [ "dns" ])
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildDotnetModule
|
||||
, dotnetCorePackages
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, ffmpeg
|
||||
@ -22,13 +23,13 @@ let
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
pname = "famistudio";
|
||||
version = "4.1.3";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BleuBleu";
|
||||
repo = "FamiStudio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bryxhminkrTVe5qhGeMStZp3NTHBREXrsUlyQkfPkao=";
|
||||
hash = "sha256-ydEWLL05B86672j3MVo/90tgDHg8FJ2EZaesqrBZy4A=";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
@ -85,6 +86,8 @@ buildDotnetModule rec {
|
||||
|
||||
projectFile = "FamiStudio/${csprojName}.csproj";
|
||||
nugetDeps = ./deps.nix;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_7_0;
|
||||
|
||||
executables = [ "FamiStudio" ];
|
||||
|
||||
|
||||
@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
||||
if stdenv.isAarch64 then
|
||||
{
|
||||
pname = "brave";
|
||||
version = "1.65.126";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.65.126/brave-browser_1.65.126_arm64.deb";
|
||||
hash = "sha256-v2PbixM9g+AhvR6tJ9QDbaXF7ERlBBrNMIsLofFbAfU=";
|
||||
version = "1.66.110";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.66.110/brave-browser_1.66.110_arm64.deb";
|
||||
hash = "sha256-yElWlzGdI+mopmPgXTABXncoufojHngRX88TCy3AE+E=";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.isx86_64 then
|
||||
{
|
||||
pname = "brave";
|
||||
version = "1.65.126";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.65.126/brave-browser_1.65.126_amd64.deb";
|
||||
hash = "sha256-DbdwCu9LwCeoH46egVY4AsOxcJDWilD2MdpyNdyJizw=";
|
||||
version = "1.66.110";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.66.110/brave-browser_1.66.110_amd64.deb";
|
||||
hash = "sha256-2KtTI9QODfQR25YzXJMXJspuzCS11FpDx2L1B8DWmmc=";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
else
|
||||
|
||||
@ -6,14 +6,14 @@ let
|
||||
aarch64-linux = "arm64";
|
||||
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
hash = {
|
||||
amd64-linux_hash = "sha256-Q5fUMQQTQKgUkakmsiBFH2UwJdk/XV8wpQi6uRHi90U=";
|
||||
arm64-linux_hash = "sha256-axFIwz1AtzxO1+XkmCflHqi/CdsmeqD6QAxepATMqm4=";
|
||||
amd64-linux_hash = "sha256-4yMaW1ByEQaQHdn99TGpUez2jVi5Ad4ODpugzW6kTm8=";
|
||||
arm64-linux_hash = "sha256-oIkHF1l7Un4W6/zufa+DOLi9oujQ2Zaq8AaKoHDAMRc=";
|
||||
}."${arch}-linux_hash";
|
||||
in
|
||||
mkFranzDerivation rec {
|
||||
pname = "ferdium";
|
||||
name = "Ferdium";
|
||||
version = "6.7.3";
|
||||
version = "6.7.4";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb";
|
||||
inherit hash;
|
||||
|
||||
@ -5,13 +5,13 @@ rec {
|
||||
|
||||
thunderbird-115 = (buildMozillaMach rec {
|
||||
pname = "thunderbird";
|
||||
version = "115.10.2";
|
||||
version = "115.11.0";
|
||||
application = "comm/mail";
|
||||
applicationName = "Mozilla Thunderbird";
|
||||
binaryName = pname;
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||
sha512 = "e893cba882fe3fba516758b8822fa16a6c5b1f633cd2877a91357255f956be32b55ee671ab8ebc4372f116848d4fb67a2220a673c8d5f3c95952ba266d99cd67";
|
||||
sha512 = "002f783cff7f2b50d9a29f20061fe55a1f64487b38a18dcb49217c3d7b99c2852af842decbd0347939aaf4c4c73ae66a8b04527ccd1b6db7f87aab402cb84ca1";
|
||||
};
|
||||
extraPatches = [
|
||||
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
|
||||
|
||||
43
pkgs/by-name/be/bend/package.nix
Normal file
43
pkgs/by-name/be/bend/package.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{
|
||||
rustPlatform,
|
||||
fetchCrate,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
makeWrapper,
|
||||
hvm,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "Bend";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HigherOrderCO";
|
||||
repo = "Bend";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MEfB2SBJN7uEwfZGoEL7DQXsr1fccdZyGyzHtNv9wow=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+i+Y3MgCBVN3REmPwAjm2SiF9FJ0i05czmPKB8JtAFM=";
|
||||
|
||||
RUSTC_BOOTSTRAP = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
hvm
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/bend \
|
||||
--prefix PATH : ${lib.makeBinPath [ hvm ]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Bend is a massively parallel, high-level programming language";
|
||||
homepage = "https://higherorderco.com/";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "bend";
|
||||
maintainers = with lib.maintainers; [ k3yss ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cadzinho";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zecruel";
|
||||
repo = "CadZinho";
|
||||
rev = version;
|
||||
hash = "sha256-s2+k1TcmY3xwxXccHP7au71e0l3Qrso5XxmGGVvyIo0=";
|
||||
hash = "sha256-AHojy6lYLEyeBaYiIzo6MdQCM3jX5ENNTKgU+PGSD00=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,11 +1,21 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, openjdk17
|
||||
, gnused
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "dbeaver-bin";
|
||||
version = "24.0.4";
|
||||
version = "24.0.5";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
gnused
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
src =
|
||||
let
|
||||
@ -16,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
aarch64-linux = "linux.gtk.aarch64-nojdk.tar.gz";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-sRXfEXTZNHJqBIwHGvYJUoa20qH7KLjygGP7uoaxT1M=";
|
||||
x86_64-linux = "sha256-q6VIr55hXn47kZrE2i6McEOfp2FBOvwB0CcUnRHFMZs=";
|
||||
aarch64-linux = "sha256-CQg2+p1P+Bg1uFM1PMTWtweS0TNElXTP7tI7D5WxixM=";
|
||||
};
|
||||
in
|
||||
@ -30,9 +40,24 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/usr/share/dbeaver $out/bin
|
||||
cp -r * $out/usr/share/dbeaver
|
||||
ln -s $out/usr/share/dbeaver/dbeaver $out/bin/dbeaver
|
||||
mkdir -p $out/opt/dbeaver $out/bin
|
||||
cp -r * $out/opt/dbeaver
|
||||
makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \
|
||||
--prefix PATH : "${openjdk17}/bin" \
|
||||
--set JAVA_HOME "${openjdk17.home}"
|
||||
|
||||
mkdir -p $out/share/icons/hicolor/256x256/apps
|
||||
ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop
|
||||
|
||||
substituteInPlace $out/opt/dbeaver/dbeaver-ce.desktop \
|
||||
--replace-fail "/usr/share/dbeaver-ce/dbeaver.png" "dbeaver" \
|
||||
--replace-fail "/usr/share/dbeaver-ce/dbeaver" "$out/bin/dbeaver"
|
||||
|
||||
sed -i '/^Path=/d' $out/share/applications/dbeaver.desktop
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -1,26 +1,22 @@
|
||||
{ lib
|
||||
, cimg
|
||||
, cmake
|
||||
, coreutils
|
||||
, curl
|
||||
, fetchzip
|
||||
, fetchFromGitHub
|
||||
, fftw
|
||||
, gimp
|
||||
, gimpPlugins
|
||||
, gmic
|
||||
, gnugrep
|
||||
, gnused
|
||||
, graphicsmagick
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libsForQt5
|
||||
, libtiff
|
||||
, ninja
|
||||
, nix-update
|
||||
, nix-update-script
|
||||
, openexr
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, writeShellScript
|
||||
, zlib
|
||||
, variant ? "standalone"
|
||||
}:
|
||||
@ -53,15 +49,15 @@ assert lib.assertMsg
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
|
||||
version = "3.3.6";
|
||||
version = "3.3.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-LZwAMLvQ+X6xkvnL+7LA/UmwDBGgapUtFHNJuV04F+Y=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "c-koi";
|
||||
repo = "gmic-qt";
|
||||
rev = "v.${finalAttrs.version}";
|
||||
hash = "sha256-WApuIWqVgVJAM2WdfOiqoQ2U+9kIuq8fy6wvJ55KoIc=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/gmic-qt";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
@ -70,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cimg
|
||||
curl
|
||||
fftw
|
||||
gmic
|
||||
@ -88,6 +85,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patchShebangs \
|
||||
translations/filters/csv2ts.sh \
|
||||
translations/lrelease.sh
|
||||
|
||||
mkdir ../src
|
||||
ln -s ${gmic.src}/src/gmic.cpp ../src/gmic.cpp
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
@ -108,23 +108,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit cimg gmic;
|
||||
};
|
||||
|
||||
updateScript = writeShellScript "gmic-qt-update-script" ''
|
||||
set -euo pipefail
|
||||
|
||||
export PATH="${lib.makeBinPath [ coreutils curl gnugrep gnused nix-update ]}:$PATH"
|
||||
|
||||
latestVersion=$(curl 'https://gmic.eu/files/source/' \
|
||||
| grep -E 'gmic_[^"]+\.tar\.gz' \
|
||||
| sed -E 's/.+<a href="gmic_([^"]+)\.tar\.gz".+/\1/g' \
|
||||
| sort --numeric-sort --reverse | head -n1)
|
||||
|
||||
if [[ '${finalAttrs.version}' = "$latestVersion" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
nix-update --version "$latestVersion"
|
||||
'';
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex" "^v\\.(.*)" ];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
|
||||
let
|
||||
pname = "jan";
|
||||
version = "0.4.12";
|
||||
version = "0.4.13";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
|
||||
hash = "sha256-IMqTQGuMuivUq8UTpgNRSHwskxvA/2XWA1bp38MDJdI=";
|
||||
hash = "sha256-6RjpkIMYScgJ2xTS7b2w90ixEm4ZHw8Izecjho93sRE=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@ -20,16 +20,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanidm";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Clg9jQgKvWP9LniHmNq+WjRmEOzJGfuCU2K9ActZhzo=";
|
||||
hash = "sha256-nDAHlpQefCbmz4jw/1cDGQWkfvn/vIqpsOCPjn6yQ6s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-m3H2mQm+k6vFH+nP+hWl07Z7NJKJlt1E4eRDRA2Z0+o=";
|
||||
cargoHash = "sha256-+lKWpBz9e4DFVg+A2wH17hHg9HPZNKmM4pM7KMndQ8U=";
|
||||
|
||||
KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "redka";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nalgeon";
|
||||
repo = "redka";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Dm+QMmCYoYJWv+Crot0bwcSPHuUYQzhRgTO65jRjLLE=";
|
||||
hash = "sha256-PlEZMOrAPQh9RxJBw3zhaUoAH44lor7SFSpmODxUM4U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aX0X6TWVEouo884LunCt+UzLyvDHgmvuxdV0wh0r7Ro=";
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${passthru.prettyName}-unwrapped";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0-unstable-2023-11-24";
|
||||
version = "0-unstable-2024-05-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "7976a5c7ca4e856907ccd378c17c71578ad51cb7";
|
||||
hash = "sha256-u9ljy4dZRoXKyUqdolxZijpc99TuhKPPlL6xlV3xJXA=";
|
||||
rev = "d3733a7fca1d02ad91b58b377ecb38e1293889db";
|
||||
hash = "sha256-gDrmm7hd07lv0KhkP7Bys5qCuCCH+t/XvlftCYlCyI8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dotconf";
|
||||
version = "1.3";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "williamh";
|
||||
repo = "dotconf";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sc95hw5k2xagpafny0v35filmcn05k1ds5ghkldfpf6xw4hakp7";
|
||||
sha256 = "sha256-6Du26Ffz08DLGg6uIiPi8Sgjf691MM2kn0qXe3oFeTw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
(opencv4.override { inherit ffmpeg; })
|
||||
ffmpeg
|
||||
fftw
|
||||
frei0r
|
||||
@ -73,7 +74,6 @@ stdenv.mkDerivation rec {
|
||||
libvorbis
|
||||
libxml2
|
||||
movit
|
||||
opencv4
|
||||
rtaudio
|
||||
rubberband
|
||||
sox
|
||||
|
||||
@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery";
|
||||
version = "3.22.0";
|
||||
version = "3.23.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lXWR5vlI18tKoPeo5OR7RhfNfwJp4opxw3lTw5tuikw=";
|
||||
hash = "sha256-fs2yB3J9UTsbzh8hPbuSbtLh1PASJ3jeAPDlbRnUegE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pytest-forked
|
||||
, py
|
||||
, python
|
||||
, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lazy-import";
|
||||
version = "0.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "lazy_import";
|
||||
inherit version;
|
||||
sha256 = "0gca9xj60qr3aprj9qdc66crr4r7hl8wzv6gc9y40nclazwawj91";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-forked
|
||||
py
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# avoid AttributeError: module 'py' has no attribute 'process'
|
||||
export PYTHONPATH=${py}/${python.sitePackages}:$PYTHONPATH
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--forked"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of functions that load modules, and related attributes, in a lazy fashion";
|
||||
homepage = "https://github.com/mnmelo/lazy_import";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdoc";
|
||||
version = "14.4.0";
|
||||
version = "14.5.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
pyproject = true;
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "mitmproxy";
|
||||
repo = "pdoc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2k9uIK6TvoGtVqnh97g9f5QvjhyZlznRvYdw5sPaeVE=";
|
||||
hash = "sha256-lie+lPUVWVgbSGC09gMmy4Z2BdC2CHFYQ60isExvhSk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,9 +3,7 @@
|
||||
, cached-property
|
||||
, click
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, packaging
|
||||
, pydantic
|
||||
, pytest-timeout
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
@ -21,20 +19,11 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sarugaku";
|
||||
repo = pname;
|
||||
repo = "pythonfinder";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CbaKXD7Sde8euRqvc/IHoXoSMF+dNd7vT9LkLWq4/IU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/sarugaku/pythonfinder/issues/142
|
||||
(fetchpatch {
|
||||
name = "pydantic_2-compatibility.patch";
|
||||
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/python-pythonfinder/-/raw/2.0.6-1/python-pythonfinder-2.0.6-pydantic2.patch";
|
||||
hash = "sha256-mON1MeA+pj6VTB3zpBjF3LfB30wG0QH9nU4bD1djWwg=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov" ""
|
||||
@ -46,7 +35,6 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
pydantic
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
cached-property
|
||||
];
|
||||
@ -66,13 +54,6 @@ buildPythonPackage rec {
|
||||
"pythonfinder"
|
||||
];
|
||||
|
||||
# these tests invoke git in a subprocess and
|
||||
# for some reason git can't be found even if included in nativeCheckInputs
|
||||
# disabledTests = [
|
||||
# "test_shims_are_kept"
|
||||
# "test_shims_are_removed"
|
||||
# ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross platform search tool for finding Python";
|
||||
mainProgram = "pyfinder";
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "4.3.2";
|
||||
version = "4.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FFDb0aro3YJe3dVsWn19GzXK1+/Cxj1TXhlWlXfCWRY=";
|
||||
hash = "sha256-2vblZxXeLpPdkF6Sb5uxDSPcQVf5ckqnyqtdDiiWPlY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -34,24 +34,24 @@
|
||||
},
|
||||
"29": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "838cc0f125b3d481c12fc59c37c941b8230770eb2f45529d33718ab2a09b2c51",
|
||||
"aarch64-linux": "c2216bb8c90b6f971b180f2162a874e8838cc4e4e24cd7444b19ebb091a90222",
|
||||
"armv7l-linux": "9fc8ddb64c8741cf37eac9a98f32313fa373bf4159ebbb0329c7eb5508863efd",
|
||||
"headers": "0d4ncjwgi916jzb2cf0wp4hdp5q87bk5jq91s3x3crrcl1i6y1q8",
|
||||
"x86_64-darwin": "f188f44a9bb900b583afed7de6a9268681f7872e5f0b57991cbfe530deda48d1",
|
||||
"x86_64-linux": "a9eaa03e9b926938c118fd59c3810531c40bdc0da4582229be1da20f36c161e3"
|
||||
"aarch64-darwin": "c16d05f1231bb3c77da05ab236b454b3a2b6a642403be51e7c9b16cd2c421a19",
|
||||
"aarch64-linux": "c3764d6c3799950e3418e8e5a5a5b2c41abe421dd8bcdebf054c7c85798d9860",
|
||||
"armv7l-linux": "c5e92943ad78b4e41a32ae53c679e148ea2ae09f95f914b1834dbdbae578ba91",
|
||||
"headers": "0macff2ir515szp2nd6jimnpg9ig87whhfi08h2hwaxp4xn9j5hn",
|
||||
"x86_64-darwin": "8ed7924f77a5c43c137a57097c5c47c2e8e9a78197e18af11a767c98035c123e",
|
||||
"x86_64-linux": "91e5eb374c2c85a07c2d4e99a89eb18515ff0169a49c3fa75289800e1225729e"
|
||||
},
|
||||
"version": "29.3.3"
|
||||
"version": "29.4.0"
|
||||
},
|
||||
"30": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "e082df9ed071ec82358a805c739ca602de083ea953bedab6af619db6537d0628",
|
||||
"aarch64-linux": "0275107afdf820309fd9b0fe09a621a7a53266998c123140cab25cb7ba5d5813",
|
||||
"armv7l-linux": "2bd466054806c67c73774d9b7005b51580b19effcc7e993e53cef2458d0bb0af",
|
||||
"headers": "0prhxzaaaagbr6bnis38y5iljx7rz24x62wbps1nby96p8gqh4sa",
|
||||
"x86_64-darwin": "a4d8c8e161d53933fa3a104a0ca8fab3c914b3517114f209d8b927eedd6a7765",
|
||||
"x86_64-linux": "585cb89f3f11ae11e70d60c47b8ece8833bd176760a3fda47dfa3fe1c4e7c34b"
|
||||
"aarch64-darwin": "9189d4a8d69175d94edafa4cb29a47389ebaff22c9baf0dd67a448e7a5240129",
|
||||
"aarch64-linux": "37b520604e319f86f372cc1da8244b27d24708a4bdc1cc07a6f1d793f37e96c3",
|
||||
"armv7l-linux": "6202a7ccde4ca344c01c124bd997bcfad06d475dd2e35bba70379cf2d93b5268",
|
||||
"headers": "15nzay60m1v720243n3iizbcldn6ka9vcphh050pih8rnh74ds5p",
|
||||
"x86_64-darwin": "7d9e81712a4b0ab209d03d0eef08ee9c4da1f5293fb169ff08766356a2e65fbb",
|
||||
"x86_64-linux": "5a2bfd0f6a8703dd1b408675c9349732c4713b378d9ae0f64ea4661f6b5c7fd4"
|
||||
},
|
||||
"version": "30.0.3"
|
||||
"version": "30.0.6"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1831,10 +1831,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"hash": "sha256-u9o+2M3dURfZkKSzb+bjZcvHygXDbt2IjaYLoSjWeBw=",
|
||||
"hash": "sha256-YTuHUvqbVVq3gwfDFOzlRIlmfnm74u3soHem1jCVVaA=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"rev": "v29.3.3"
|
||||
"rev": "v29.4.0"
|
||||
},
|
||||
"src/media/cdm/api": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
@ -2686,10 +2686,10 @@
|
||||
"electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf",
|
||||
"modules": "121",
|
||||
"node": "20.9.0",
|
||||
"version": "29.3.3"
|
||||
"version": "29.4.0"
|
||||
},
|
||||
"30": {
|
||||
"chrome": "124.0.6367.119",
|
||||
"chrome": "124.0.6367.207",
|
||||
"chromium": {
|
||||
"deps": {
|
||||
"gn": {
|
||||
@ -2699,15 +2699,15 @@
|
||||
"version": "2024-03-14"
|
||||
}
|
||||
},
|
||||
"version": "124.0.6367.119"
|
||||
"version": "124.0.6367.207"
|
||||
},
|
||||
"chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=",
|
||||
"deps": {
|
||||
"src": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
"hash": "sha256-mhH2pQskQw39PUCociK/g7QLjI/cDh2GXk9PJIeJ7HU=",
|
||||
"hash": "sha256-mMc1mWre9XeeR4jPn30RxAXadjyqcyVyHDjSVrI5lpI=",
|
||||
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"rev": "124.0.6367.119",
|
||||
"rev": "124.0.6367.207",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
"src/chrome/test/data/perf/canvas_bench": {
|
||||
@ -2736,10 +2736,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"hash": "sha256-tW9LODdKT8W6UYmpqh1bwGTk5wQYJ3TSxSvxfAqc4uQ=",
|
||||
"hash": "sha256-6f/6Deqysv8MubMjyxjiDM55DXG/9wTqBWW+zC+9OBE=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"rev": "v30.0.3"
|
||||
"rev": "v30.0.6"
|
||||
},
|
||||
"src/media/cdm/api": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
@ -2761,8 +2761,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
"hash": "sha256-O89W5dE97eUKpOnSuoBbl2BCigsDYK609Hq9pqd25CQ=",
|
||||
"rev": "0b776d32f69a932acb61963d9daad9e13f610944",
|
||||
"hash": "sha256-zEDHotJ6OSQlgq3nkVMhLll4j5iYl5sA1JFv854EIdM=",
|
||||
"rev": "c67f290ef0f0433acb766c024d28c6f59f48b909",
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git"
|
||||
},
|
||||
"src/third_party/angle/third_party/VK-GL-CTS/src": {
|
||||
@ -3595,14 +3595,14 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
"hash": "sha256-rwEdjWYJz7shrwLWRyzOgbRvmIR0C9aZXn0vhcBLF50=",
|
||||
"rev": "c6b8b43c3042d99f07d5cc0771e58511afaa66a3",
|
||||
"hash": "sha256-8/XD/LwnCXDiVWeZvZsgvmSWpfVLILlaTtqw87V0Pgk=",
|
||||
"rev": "ac8da461a20281ff8c30507cbdd7e6fed39fd183",
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf",
|
||||
"modules": "123",
|
||||
"node": "20.11.1",
|
||||
"version": "30.0.3"
|
||||
"version": "30.0.6"
|
||||
}
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@ let
|
||||
sourceData = versions.${self.branch} or (throw (badBranchError self.branch));
|
||||
versionData = self.sourceData.version;
|
||||
buildFreebsd = otherSplices.selfBuildHost;
|
||||
patchesRoot = ./patches/${self.versionData.revision};
|
||||
patchesRoot = ./patches + "/${self.versionData.revision}";
|
||||
}
|
||||
// extraArgs
|
||||
) self;
|
||||
|
||||
@ -17,7 +17,7 @@ lib.packagesFromDirectoryRecursive {
|
||||
}
|
||||
// {
|
||||
inherit sourceData patchesRoot versionData;
|
||||
patches = ./patches/${self.versionData.revision};
|
||||
patches = ./patches + "/${self.versionData.revision}";
|
||||
|
||||
# Keep the crawled portion of Nixpkgs finite.
|
||||
buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd;
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "24.13.29138.7";
|
||||
version = "24.17.29377.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
rev = version;
|
||||
hash = "sha256-AMIuA1AMrSX0xpdGSfye8iUJTk5s9HDiRy9Yy3kZss8=";
|
||||
hash = "sha256-+bx6P1vZlgolHrINzkH4ukXT+hgAtH18DOX6vb9vPVs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roundcube";
|
||||
version = "1.6.6";
|
||||
version = "1.6.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
|
||||
sha256 = "sha256-wbk6Ptvil0VzlrCgMdixPIpdwwyTcHBN+5ssEiUBfVI=";
|
||||
sha256 = "sha256-z1JRXmWygYywL9eiAsdmNnuMVNi3/qJ92pyBqnzh06Y=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wiki-js";
|
||||
version = "2.5.302";
|
||||
version = "2.5.303";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
|
||||
sha256 = "sha256-hz6pfiObVgoVAkYx0Js6Dc310mNMC9QT2D+sNqsl4LA=";
|
||||
sha256 = "sha256-Jpv4D+ldGPvJz+8cwNhrmC+Ii5dG0UOTC5JIWPwUzvk=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -172,12 +172,12 @@ in lib.makeExtensible (self: ({
|
||||
|
||||
git = common rec {
|
||||
version = "2.23.0";
|
||||
suffix = "pre20240510_${lib.substring 0 8 src.rev}";
|
||||
suffix = "pre20240520_${lib.substring 0 8 src.rev}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "87ab3c0ea4e6f85e7b902050365bb75cf2836fbb";
|
||||
hash = "sha256-j/PLYYGs+Gjge4JGYxMjOhWQEp+GB4Fdicetbpmp6n0=";
|
||||
rev = "b7709d14a5b3a76d1c5b35b48ea3ed2de6c3dc28";
|
||||
hash = "sha256-v+M9oeOcfgFXVoXqdpaskTHNA0T3Pr/8IOJtCggh+To=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -259,6 +259,7 @@ mapAliases ({
|
||||
lazr_config = lazr-config; # added 2023-11-03
|
||||
lazr_delegates = lazr-delegates; # added 2023-11-03
|
||||
lazy_import = lazy-import; # added 2024-01-07
|
||||
lazy-import = throw "lazy-import has been removed because it was unused."; # added 2024-05-20
|
||||
lazy_imports = lazy-imports; # added 2023-10-13
|
||||
ledger_agent = ledger-agent; # Added 2024-01-07
|
||||
lektor = throw "lektor has been promoted to a top-level attribute name: `pkgs.lektor`"; # added 2023-08-01
|
||||
|
||||
@ -6527,8 +6527,6 @@ self: super: with self; {
|
||||
|
||||
lazy = callPackage ../development/python-modules/lazy { };
|
||||
|
||||
lazy-import = callPackage ../development/python-modules/lazy-import { };
|
||||
|
||||
lazy-imports = callPackage ../development/python-modules/lazy-imports { };
|
||||
|
||||
lazy-loader = callPackage ../development/python-modules/lazy-loader { };
|
||||
@ -12496,6 +12494,7 @@ self: super: with self; {
|
||||
inherit (pkgs) fontconfig rapidjson;
|
||||
inherit (pkgs.xorg) libX11 libXi libXmu libXext;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
|
||||
opencascade-occt = pkgs.opencascade-occt_7_6;
|
||||
});
|
||||
|
||||
python-olm = callPackage ../development/python-modules/python-olm { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user