Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-08-10 00:02:11 +00:00
committed by GitHub
76 changed files with 3080 additions and 2396 deletions
@@ -84,6 +84,7 @@ luarepl,,,,,,
luarocks,,,,,,mrcjkb teto
luarocks-build-rust-mlua,,,,,,mrcjkb
luarocks-build-treesitter-parser,,,,,,mrcjkb
luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb
luasec,,,,,,flosse
luasnip,,,,,,
luasocket,,,,,,
1 name rockspec ref server version luaversion maintainers
84 luarocks mrcjkb teto
85 luarocks-build-rust-mlua mrcjkb
86 luarocks-build-treesitter-parser mrcjkb
87 luarocks-build-treesitter-parser-cpp mrcjkb
88 luasec flosse
89 luasnip
90 luasocket
@@ -517,8 +517,8 @@ in {
hardware.wirelessRegulatoryDatabase = true;
environment.systemPackages = [ package ];
services.dbus.packages = optional cfg.dbusControlled package;
environment.systemPackages = [ pkgs.wpa_supplicant ];
services.dbus.packages = optional cfg.dbusControlled pkgs.wpa_supplicant;
systemd.services =
if cfg.interfaces == []
@@ -2078,6 +2078,10 @@
sourceRoot = ".";
};
yazi-nvim = super.yazi-nvim.overrideAttrs {
dependencies = with self; [ plenary-nvim ];
};
YouCompleteMe = super.YouCompleteMe.overrideAttrs {
buildPhase = ''
substituteInPlace plugin/youcompleteme.vim \
-87
View File
@@ -1,87 +0,0 @@
# This file contains all runtime glue: Bindings to optional runtime dependencies
# for pdfSupport, presentationSupport, and media playback.
{ lib, mkDerivation, wrapGAppsHook3, python3Packages
# qt deps
, qtbase, qtmultimedia
# optional deps
, pdfSupport ? false, mupdf # alternatively could use ghostscript
, presentationSupport ? false, libreoffice-unwrapped
, vlcSupport ? false
, gstreamerSupport ? false, gst_all_1, gstPlugins ? (gst: [
gst.gst-plugins-base
gst.gst-plugins-good
gst.gst-plugins-bad
gst.gst-plugins-ugly
])
#, enableMySql ? false # Untested. If interested, contact maintainer.
#, enablePostgreSql ? false # Untested. If interested, contact maintainer.
#, enableJenkinsApi ? false # Untested. If interested, contact maintainer.
}:
let p = gstPlugins gst_all_1;
# If gstreamer is activated but no plugins are given, it will at runtime
# create the false illusion of being usable.
in assert gstreamerSupport -> (builtins.isList p && builtins.length p > 0);
let
# optional packages
libreofficePath = "${libreoffice-unwrapped}/lib/libreoffice/program";
# lib functions
inherit (lib.lists) optional optionals;
wrapSetVar = var: ''--set ${var} "''$${var}"'';
# base pkg/lib
baseLib = python3Packages.callPackage ./lib.nix { };
in mkDerivation {
pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full";
inherit (baseLib) version src;
nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook3 ];
buildInputs = [ qtbase ] ++ optionals gstreamerSupport
([ qtmultimedia.bin gst_all_1.gstreamer ] ++ gstPlugins gst_all_1);
propagatedBuildInputs = optional pdfSupport mupdf
++ optional presentationSupport libreoffice-unwrapped;
pythonPath = [ baseLib ] ++ optional vlcSupport python3Packages.python-vlc;
# ++ optional enableMySql mysql-connector # Untested. If interested, contact maintainer.
# ++ optional enablePostgreSql psycopg2 # Untested. If interested, contact maintainer.
# ++ optional enableJenkinsApi jenkinsapi # Untested. If interested, contact maintainer.
PYTHONPATH = libreofficePath;
URE_BOOTSTRAP = "vnd.sun.star.pathname:${libreofficePath}/fundamentalrc";
UNO_PATH = libreofficePath;
LD_LIBRARY_PATH = libreofficePath;
JAVA_HOME = "${libreoffice-unwrapped.jdk.home}";
dontWrapQtApps = true;
dontWrapGApps = true;
# defined in gappsWrapperHook
wrapPrefixVariables = optionals presentationSupport
[ "PYTHONPATH" "LD_LIBRARY_PATH" "JAVA_HOME" ];
makeWrapperArgs = [
"\${gappsWrapperArgs[@]}"
"\${qtWrapperArgs[@]}"
] ++ optionals presentationSupport
([ "--prefix PATH : ${libreoffice-unwrapped}/bin" ]
++ map wrapSetVar [ "URE_BOOTSTRAP" "UNO_PATH" ]);
installPhase = ''
install -D openlp.py $out/bin/openlp
'';
preFixup = ''
wrapPythonPrograms
'';
meta = baseLib.meta // {
hydraPlatforms = [ ]; # this is only the wrapper; baseLib gets built
};
passthru = {
inherit baseLib;
};
}
-103
View File
@@ -1,103 +0,0 @@
# This file contains the base package, some of which is compiled.
# Runtime glue to optinal runtime dependencies is in 'default.nix'.
{ fetchurl, lib, qt5
# python deps
, python, buildPythonPackage
, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant
, pyqt5-webkit, pyxdg, sip4, sqlalchemy, sqlalchemy-migrate
}:
buildPythonPackage rec {
pname = "openlp";
version = "2.4.6";
src = fetchurl {
url = "https://get.openlp.org/${version}/OpenLP-${version}.tar.gz";
sha256 = "f63dcf5f1f8a8199bf55e806b44066ad920d26c9cf67ae432eb8cdd1e761fc30";
};
doCheck = false;
# FIXME: checks must be disabled because they are lacking the qt env.
# They fail like this, even if built and wrapped with all Qt and
# runtime dependencies:
#
# running install tests
# qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
# This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
#
# Available platform plugins are: wayland-egl, wayland, wayland-xcomposite-egl, wayland-xcomposite-glx.
#
# See also https://discourse.nixos.org/t/qt-plugin-path-unset-in-test-phase/
#nativeCheckInputs = [ mock nose ];
nativeBuildInputs = [ qt5.qttools ];
propagatedBuildInputs = [
alembic
beautifulsoup4
chardet
lxml
mako
pyenchant
pyqt5-webkit
pyxdg
sip4
sqlalchemy
sqlalchemy-migrate
];
prePatch = ''
echo 'from vlc import *' > openlp/core/ui/media/vendor/vlc.py
'';
dontWrapQtApps = true;
dontWrapGApps = true;
postInstall = ''
( # use subshell because of cd
tdestdir="$out/i18n"
mkdir -p "$tdestdir"
cd ./resources/i18n
for file in *.ts; do
lconvert -i "$file" -o "$tdestdir/''${file%%ts}qm"
done
)
'';
preFixup = ''
rm -r $out/${python.sitePackages}/tests
rm -r $out/bin
'';
meta = with lib; {
description = "Free church presentation software";
homepage = "https://openlp.org/";
downloadPage = "https://openlp.org/#downloads";
platforms = platforms.unix;
license = licenses.gpl2Only;
maintainers = [ maintainers.jorsn ];
longDescription = ''
OpenLP is a free church presentation software.
Features:
* Cross platform between Linux, Windows, OS X and FreeBSD
* Display songs, Bible verses, presentations, images, audio and video
* Control OpenLP remotely via the Android remote, iOS remote or mobile web browser
* Quickly and easily import songs from other popular presentation packages
* Easy enough to use to get up and running in less than 10 minutes
Remark: This pkg only supports sqlite dbs. If you wish to have support for
mysql or postgresql dbs, or Jenkins, please contact the maintainer.
Bugs which affect this software packaged in Nixpkgs:
1. The package must disable checks, because they are lacking the qt env.
(see pkg source and https://discourse.nixos.org/t/qt-plugin-path-unset-in-test-phase/)
2. There is a segfault on exit. Not a real problem, according to debug log, everything
shuts down correctly. Maybe related to https://forums.openlp.org/discussion/3620/crash-on-exit.
Plan: Wait for OpenLP-3, since it is already in beta 1
(2021-02-09; news: https://openlp.org/blog/).
'';
};
}
@@ -8,7 +8,7 @@
((buildMozillaMach rec {
pname = "floorp";
packageVersion = "11.15.0";
packageVersion = "11.16.0";
applicationName = "Floorp";
binaryName = "floorp";
branding = "browser/branding/official";
@@ -16,14 +16,14 @@
allowAddonSideload = true;
# Must match the contents of `browser/config/version.txt` in the source tree
version = "115.13.0";
version = "115.15.0";
src = fetchFromGitHub {
owner = "Floorp-Projects";
repo = "Floorp";
fetchSubmodules = true;
rev = "v${packageVersion}";
hash = "sha256-LRuts3O3Rj5e6rT9gKTTwAIsY0oSziuiZ3rzE7wHa7o=";
hash = "sha256-bmB88EIc5S/EYZXiQ5Dc+LjcGB4dlwKRBBV0T0ln88E=";
};
extraConfigureFlags = [
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeshark";
version = "52.3.72";
version = "52.3.73";
src = fetchFromGitHub {
owner = "kubeshark";
repo = "kubeshark";
rev = "v${version}";
hash = "sha256-2c86/VeByTLBG3pwLfSiUw7V3WJZuwnVopLmM8njbkQ=";
hash = "sha256-fhdHgkIsvB7cR5kCkvfzJuxrAVYvB4Y6NCGJpHolriA=";
};
vendorHash = "sha256-b3Aq3970E19jOJPjw/e0ly1W9x9HiDN+bfuB4uP09BY=";
@@ -23,12 +23,12 @@
let
esbuild' = esbuild.override {
buildGoModule = args: buildGoModule (args // rec {
version = "0.19.8";
version = "0.19.12";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-f13YbgHFQk71g7twwQ2nSOGA0RG0YYM01opv6txRMuw=";
hash = "sha256-NQ06esCSU6YPvQ4cMsi3DEFGIQGl8Ff6fhdTxUAyGvo=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
@@ -36,28 +36,16 @@ let
in
buildNpmPackage rec {
pname = "deltachat-desktop";
version = "1.46.1";
version = "1.46.2";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-90/Wmh0h75i3kvqj3Wo+A3KlKW8LLDWfPza2gDrDY6E=";
hash = "sha256-5XGtyfc7Kak7qSQOQAH5gFtSaHeWclRhtsYSGPIQo6w=";
};
npmDepsHash = "sha256-UzWxMd+DYH5A8Zo1rzi8oIsoKbmzsVbGpr3uWtc02rY=";
postPatch = ''
test \
$(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \
= ${deltachat-rpc-server.version} \
|| (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
test \
$(jq -r '.packages."node_modules/electron".version' package-lock.json | grep -E -o "^[0-9]+") \
= ${lib.versions.major electron.version} \
|| (echo 'error: electron version doesn not match package-lock.json' && exit 1)
'';
npmDepsHash = "sha256-4UPDNz0aw4VH3bMT+s/7DE6+ZPNP5w1iGCRpZZMXzPc=";
nativeBuildInputs = [
jq
@@ -82,6 +70,16 @@ buildNpmPackage rec {
};
preBuild = ''
test \
$(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \
= ${deltachat-rpc-server.version} \
|| (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
test \
$(jq -r '.packages."node_modules/electron".version' package-lock.json | grep -E -o "^[0-9]+") \
= ${lib.versions.major electron.version} \
|| (echo 'error: electron version doesn not match package-lock.json' && exit 1)
rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server
ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-linux-*
'';
@@ -10,6 +10,7 @@
, expat
, fontconfig
, vulkan-loader
, wayland
, xorg
, darwin
}:
@@ -63,7 +64,7 @@ rustPlatform.buildRustPackage rec {
postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/sniffnet \
--add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 libxkbcommon ]}
--add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 libxkbcommon wayland ]}
'';
meta = with lib; {
@@ -244,8 +244,6 @@ fn main() -> anyhow::Result<()> {
cache.init()?;
packages.into_par_iter().try_for_each(|package| {
eprintln!("{}", package.name);
let tarball = package
.tarball()
.map_err(|e| anyhow!("couldn't fetch {} at {}: {e:?}", package.name, package.url))?;
File diff suppressed because it is too large Load Diff
@@ -4,6 +4,7 @@
, makeWrapper
, pkg-config
, openssl
, curl
, rustc
, stdenv
, darwin
@@ -11,19 +12,19 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-information";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "hi-rustin";
repo = "cargo-information";
rev = "v${version}";
hash = "sha256-5F8O8M8cz7sdXtqGYuDIeTolovZjx2BLEBCZuBIb9YA=";
hash = "sha256-gu1t0jMBJ+mJIVMGy1JlabzcOT4lbmTvO/VQfxLLsWM=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"cargo-test-macro-0.1.0" = "sha256-4u3Ium+WYBdyocuehDulRgUOR74JC6AUI2+A5xlnUGw=";
"cargo-test-macro-0.2.1" = "sha256-3sergm2T4VXT41ERCLL7p9+pJwIKzT54qdla8V58Psk=";
};
};
@@ -43,6 +44,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
openssl
curl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
+3 -3
View File
@@ -14,16 +14,16 @@ let
in
buildGoModule rec {
pname = "centrifugo";
version = "5.4.2";
version = "5.4.4";
src = fetchFromGitHub {
owner = "centrifugal";
repo = "centrifugo";
rev = "v${version}";
hash = "sha256-rFS4oBYUtuy+buCJjS7lN3W9BINjAZ/Cxc4UXCASrDU=";
hash = "sha256-lZ2EWXg4aWDwsvziI4+9ECv6SlsdkElWJzf8JrByrSI=";
};
vendorHash = "sha256-rFbYTPwuOn6VtJnPQC5eIIPcXvRTjmxrZzPdQsjRcSQ=";
vendorHash = "sha256-iS4ykyJfsKeQkEuTj5p243FZbULbGTYHEJ2JrATd7Vc=";
ldflags = [
"-s"
+3 -3
View File
@@ -16,13 +16,13 @@
stdenv.mkDerivation {
pname = "chawan";
version = "0-unstable-2024-07-14";
version = "0-unstable-2024-08-03";
src = fetchFromSourcehut {
owner = "~bptato";
repo = "chawan";
rev = "0e3d67f31df2c2d53aa0e578439852731e5f5af9";
hash = "sha256-eVoZisQyaebWO58a0a0KR7fwsL1kTmPX1SayqdnmSuk=";
rev = "4c64687290c908cd791a058dede9bd4f2a1c7757";
hash = "sha256-o0GMRNl5GiW0cJdaQYsL2JVp0CPs5VxQF8s0XEh/f7o=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -7,14 +7,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "clang-tidy-sarif";
version = "0.5.0";
version = "0.6.5";
src = fetchCrate {
inherit pname version;
hash = "sha256-lxZtuE6hvmeX2CCO8UeGDORnCV5N7ZNiVZR+9LOCrdk=";
hash = "sha256-pQbhLbDRcZJhXXY6bWGO/8mmQRwgM3tDEWKoqmsNr68=";
};
cargoHash = "sha256-R0IyXinUhIVqGal2Vt0EdU0EFyzs3KIbp/UIseWlj1Y=";
cargoHash = "sha256-K+Cle2eCH4jCLbYfOrlEXeBvFUr7dGmpKFQM1IJi7p4=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
+31
View File
@@ -0,0 +1,31 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "create-dmg";
version = "1.2.2";
src = fetchFromGitHub {
owner = "create-dmg";
repo = "create-dmg";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-oWrQT9nuFcJRwwXd5q4IqhG7M77aaazBG0+JSHAzPvw=";
};
dontBuild = true;
installFlags = [ "prefix=$(out)" ];
meta = {
description = "Shell script to build fancy DMGs";
homepage = "https://github.com/create-dmg/create-dmg";
license = lib.licenses.mit;
platforms = lib.platforms.darwin;
maintainers = with lib.maintainers; [ heywoodlh ];
changelog = "https://github.com/create-dmg/create-dmg/releases/tag/v${finalAttrs.version}";
mainProgram = "create-dmg";
};
})
+1113 -742
View File
File diff suppressed because it is too large Load Diff
+3 -4
View File
@@ -6,20 +6,19 @@
rustPlatform.buildRustPackage rec {
pname = "evebox";
version = "0.17.2";
version = "0.18.2";
src = fetchFromGitHub {
owner = "jasonish";
repo = "evebox";
rev = version;
hash = "sha256-djL5cdudJNPAWLMQPS2Dkcc9H/gouOuu8evcBDdY9wA=";
hash = "sha256-vakCBDyL/Su55tkn/SJ5ShZcYC8l+p2acpve/fTN0uI=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"libsqlite3-sys-0.25.2" = "sha256-+c7ong6ca4WkEHl7ynCNn3WW68jF3pSYbllRsaNFGLc=";
"suricatax-rule-parser-0.1.0" = "sha256-upWgOKSAuj0pYGTeYKANzwutoF/m4AQ7MkzGYXmPbEo=";
"suricatax-rule-parser-0.1.0" = "sha256-qwkZFmvgfXrH0zHPq/dVfxpWkulPDT+CzPQQHfeBotg=";
};
};
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fcitx5-pinyin-moegirl";
version = "20240709";
version = "20240809";
src = fetchurl {
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
hash = "sha256-1BNfyMM7T19glWsB9oOOMHEWc+SE/qrxx5rsAz386Os=";
hash = "sha256-2jSKzDgjxuz0/Agqefy4JrScmqM7SXnIuZlLMkqAGT0=";
};
dontUnpack = true;
+2 -1
View File
@@ -3,6 +3,7 @@
, hash
, npmDepsHash
, vendorHash
, nixUpdateExtraArgs ? [ ]
}:
{ bash
@@ -154,7 +155,7 @@ buildGoModule rec {
'';
tests = if lts then nixosTests.forgejo-lts else nixosTests.forgejo;
updateScript = nix-update-script { };
updateScript = nix-update-script { extraArgs = nixUpdateExtraArgs; };
};
meta = {
+8 -2
View File
@@ -1,7 +1,13 @@
import ./generic.nix {
version = "7.0.6";
hash = "sha256-Y8H85HMKnzNSXnrLOxhzOBSfedivGvcQ3MOAp31Kvno=";
version = "7.0.7";
hash = "sha256-Xk5ElAfTjbz77Jv5VMbSW7q8qJ5vhNd3daNilNzDsY4=";
npmDepsHash = "sha256-OqtYRjftwGxgW1JgMxyWd+9DndpEkd3LdQHSECc40yU=";
vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw=";
lts = true;
nixUpdateExtraArgs = [
"--version-regex"
"v(7\.[0-9.]+)"
"--override-filename"
"pkgs/by-name/fo/forgejo/lts.nix"
];
}
+6 -2
View File
@@ -1,7 +1,11 @@
import ./generic.nix {
version = "8.0.0";
hash = "sha256-ol/2D+zMieERVDHOKlu+wm3WKkQNjbIw0sc0KLUTwzI=";
version = "8.0.1";
hash = "sha256-0D2ntZVK4k5AwAMg4XnLyabnxAoHx9JjBoFAdkfrdAY=";
npmDepsHash = "sha256-6AMaZadgcTvOBsIXJjZQB6Q1rkdn+R82pclXdVvtdWY=";
vendorHash = "sha256-tNb0tCf+gjUmUqrjkzt7Wqqz21hW9WRh8CEdX8rv8Do=";
lts = false;
nixUpdateExtraArgs = [
"--override-filename"
"pkgs/by-name/fo/forgejo/package.nix"
];
}
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitu";
version = "0.23.1";
version = "0.24.0";
src = fetchFromGitHub {
owner = "altsem";
repo = "gitu";
rev = "v${version}";
hash = "sha256-PmZlK5pu5W+iiL0l1u1Z7YE0QABA6GqqetCXChdsf70=";
hash = "sha256-ERowsPJujsN27uKD0yW1kPADV9YOKH7KR3/4r1iISvc=";
};
cargoHash = "sha256-o+0bCzt/3G1UMewRJOgtjaD4NDHVDkSewD19rw3GCAI=";
cargoHash = "sha256-VhcCFh1seqanecRT3lER0ZSYFRoKn9V5sbGYlNg49DQ=";
nativeBuildInputs = [
pkg-config
+131 -97
View File
@@ -4,7 +4,7 @@
makeWrapper,
patchelf,
stdenv,
writeScript,
stdenvNoCC,
# Linked dynamic libraries.
alsa-lib,
@@ -91,9 +91,12 @@
# For Vulkan support (--enable-features=Vulkan)
addDriverRunpath,
undmg,
}:
let
pname = "google-chrome";
opusWithCustomModes = libopus.override { withCustomModes = true; };
deps =
@@ -159,116 +162,147 @@ let
gtk4
];
in
stdenv.mkDerivation (finalAttrs: {
pname = "google-chrome";
version = "127.0.6533.88";
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "127.0.6533.99";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-0l9cidNFO0dcyzWy4nDD/OGFQDBLXx9aPVq6ioDkqK0=";
};
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-pMGLSai4C/XifFkRmUoTRG/3dETGJXWhJbewtb/szVg=";
};
nativeBuildInputs = [
makeWrapper
patchelf
];
# With strictDeps on, some shebangs were not being patched correctly
# ie, $out/share/google/chrome/google-chrome
strictDeps = false;
buildInputs = [
# needed for XDG_ICON_DIRS
adwaita-icon-theme
glib
gtk3
gtk4
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas
];
nativeBuildInputs = [
makeWrapper
patchelf
];
unpackPhase = ''
ar x $src
tar xf data.tar.xz
'';
buildInputs = [
# needed for XDG_ICON_DIRS
adwaita-icon-theme
glib
gtk3
gtk4
# needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas
];
rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
binpath = lib.makeBinPath deps;
installPhase = ''
runHook preInstall
appname=chrome
dist=stable
exe=$out/bin/google-chrome-$dist
mkdir -p $out/bin $out/share
cp -a opt/* $out/share
cp -a usr/share/* $out/share
substituteInPlace $out/share/google/$appname/google-$appname \
--replace 'CHROME_WRAPPER' 'WRAPPER'
substituteInPlace $out/share/applications/google-$appname.desktop \
--replace /usr/bin/google-chrome-$dist $exe
substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
--replace /opt/google/$appname/google-$appname $exe
substituteInPlace $out/share/menu/google-$appname.menu \
--replace /opt $out/share \
--replace $out/share/google/$appname/google-$appname $exe
for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do
num_and_suffix="''${icon_file##*logo_}"
if [ $dist = "stable" ]; then
icon_size="''${num_and_suffix%.*}"
else
icon_size="''${num_and_suffix%_*}"
fi
logo_output_prefix="$out/share/icons/hicolor"
logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
mkdir -p "$logo_output_path"
mv "$icon_file" "$logo_output_path/google-$appname.png"
done
makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \
--prefix LD_LIBRARY_PATH : "$rpath" \
--prefix PATH : "$binpath" \
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
--set CHROME_WRAPPER "google-chrome-$dist" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags ${lib.escapeShellArg commandLineArgs}
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do
patchelf --set-rpath $rpath $elf
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
done
runHook postInstall
'';
passthru = {
updateScript = writeScript "update-google-chrome.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq common-updater-scripts
set -euo pipefail
url="https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/stable/versions/all/releases"
response="$(curl --silent --fail $url)"
version="$(jq ".releases[0].version" --raw-output <<< $response)"
update-source-version ${finalAttrs.pname} $version --ignore-same-hash
unpackPhase = ''
runHook preUnpack
ar x $src
tar xf data.tar.xz
runHook postUnpack
'';
};
rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
binpath = lib.makeBinPath deps;
installPhase = ''
runHook preInstall
appname=chrome
dist=stable
exe=$out/bin/google-chrome-$dist
mkdir -p $out/bin $out/share
cp -a opt/* $out/share
cp -a usr/share/* $out/share
substituteInPlace $out/share/google/$appname/google-$appname \
--replace-fail 'CHROME_WRAPPER' 'WRAPPER'
substituteInPlace $out/share/applications/google-$appname.desktop \
--replace-fail /usr/bin/google-chrome-$dist $exe
substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
--replace-fail /opt/google/$appname/google-$appname $exe
substituteInPlace $out/share/menu/google-$appname.menu \
--replace-fail /opt $out/share \
--replace-fail $out/share/google/$appname/google-$appname $exe
for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do
num_and_suffix="''${icon_file##*logo_}"
if [ $dist = "stable" ]; then
icon_size="''${num_and_suffix%.*}"
else
icon_size="''${num_and_suffix%_*}"
fi
logo_output_prefix="$out/share/icons/hicolor"
logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
mkdir -p "$logo_output_path"
mv "$icon_file" "$logo_output_path/google-$appname.png"
done
makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \
--prefix LD_LIBRARY_PATH : "$rpath" \
--prefix PATH : "$binpath" \
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
--set CHROME_WRAPPER "google-chrome-$dist" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags ${lib.escapeShellArg commandLineArgs}
for elf in $out/share/google/$appname/{chrome,chrome-sandbox,chrome_crashpad_handler}; do
patchelf --set-rpath $rpath $elf
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
done
runHook postInstall
'';
});
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
version = "127.0.6533.100";
src = fetchurl {
url = "http://dl.google.com/release2/chrome/knybzo7stwsgi7z5xw6krwtnym_127.0.6533.100/GoogleChrome-127.0.6533.100.dmg";
hash = "sha256-slZ1FHXZqCCgWEStfnVTU4ykQBqa3H35KTVuqTXSHQs=";
};
dontPatch = true;
dontConfigure = true;
dontBuild = true;
dontFixup = true;
nativeBuildInputs = [
makeWrapper
undmg
];
sourceRoot = ".";
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r *.app $out/Applications
mkdir -p $out/bin
makeWrapper $out/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome $out/bin/google-chrome-stable \
--add-flags ${lib.escapeShellArg commandLineArgs}
runHook postInstall
'';
});
passthru.updateScript = ./update.sh;
meta = {
changelog = "https://chromereleases.googleblog.com/";
description = "Freeware web browser developed by Google";
homepage = "https://www.google.com/chrome/browser/";
changelog = "https://chromereleases.googleblog.com/";
license = lib.licenses.unfree;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [
jnsgruk
johnrtitor
];
platforms = [ "x86_64-linux" ];
platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
mainProgram = "google-chrome-stable";
};
})
in
if stdenvNoCC.isDarwin then darwin else linux
+100
View File
@@ -0,0 +1,100 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=./. -i bash -p curl jq gawk libossp_uuid libxml2 nix
set -euo pipefail
DEFAULT_NIX="$(realpath "./pkgs/by-name/go/google-chrome/package.nix")"
get_version_info() {
local platform="$1"
local start_pattern="$2"
local end_pattern="$3"
local url="https://versionhistory.googleapis.com/v1/chrome/platforms/${platform}/channels/stable/versions/all/releases"
local response
local version
local current_version
response="$(curl --silent --fail "$url")"
version="$(jq ".releases[0].version" --raw-output <<< "$response")"
current_version="$(awk "/${start_pattern}/,/${end_pattern}/ { if (\$0 ~ /version = \"/) { match(\$0, /version = \"([^\"]+)\"/, arr); print arr[1]; exit } }" "$DEFAULT_NIX")"
echo "$version" "$current_version"
}
update_linux() {
local version_info
local version
local current_version
local new_hash
local new_sri_hash
read -ra version_info <<< "$(get_version_info "linux" "linux = stdenv.mkDerivation" "});")"
version="${version_info[0]}"
current_version="${version_info[1]}"
if [[ "$current_version" = "$version" ]]; then
echo "[Nix] Linux google chrome: same version"
return 0
fi
local download_url="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${version}-1_amd64.deb"
new_hash="$(nix-prefetch-url "$download_url" 2>/dev/null)"
new_sri_hash="$(nix hash to-sri --type sha256 "$new_hash")"
sed -i "/^ linux = stdenv.mkDerivation/,/^ });/s/version = \".*\"/version = \"$version\"/" "$DEFAULT_NIX"
sed -i "/^ linux = stdenv.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX"
echo "[Nix] Linux google-chrome: $current_version -> $version with hash $new_hash"
}
update_darwin() {
local version_info
local version
local current_version
local uuid
local url
local pkg
local manifest_version
local new_hash
local new_sri_hash
read -ra version_info <<< "$(get_version_info "mac" "darwin = stdenvNoCC.mkDerivation" "});")"
version="${version_info[0]}"
current_version="${version_info[1]}"
uuid="$(uuidgen)"
if [[ "$current_version" = "$version" ]]; then
echo "[Nix] Darwin google chrome: same version"
exit 0
fi
local post_data="<?xml version='1.0' encoding='UTF-8'?>
<request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='1'
sessionid='$uuid' installsource='ondemandcheckforupdate'
requestid='$uuid' dedup='cr'>
<hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
<os platform='mac' version='$version' arch='arm64'/>
<app appid='com.google.Chrome' ap=' ' version=' ' nextversion=' ' lang=' ' brand='GGLS' client=' '>
<updatecheck/>
</app>
</request>"
response="$(curl -s -X POST -H "Content-Type: text/xml" --data "$post_data" "https://tools.google.com/service/update2")"
url="$(echo "$response" | xmllint --xpath "string(//url[contains(@codebase, 'http://dl.google.com/release2')]/@codebase)" -)"
pkg="$(echo "$response" | xmllint --xpath "string(//package/@name)" -)"
manifest_version="$(echo "$response" | xmllint --xpath "string(//manifest/@version)" -)"
local download_url="$url$pkg"
new_hash="$(nix hash to-sri --type sha256 "$(nix-prefetch-url "$download_url" 2>/dev/null)")"
new_sri_hash="$(nix hash to-sri --type sha256 "$new_hash")"
sed -i "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s/version = \".*\"/version = \"$manifest_version\"/" "$DEFAULT_NIX"
sed -i "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX"
sed -i "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s|url = \".*\"|url = \"$download_url\"|" "$DEFAULT_NIX"
echo "[Nix] Darwin google-chrome: $current_version -> $manifest_version with hash $new_hash"
}
update_linux
update_darwin
+3 -3
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
hash = "sha256-qRx2l677OAo8or/form1fTgL3vjM/kz3RA/8umkAP80=";
version = "6.3.0";
vendorHash = "sha256-VlJyq+PzToBicKCF3EMqzDsnIWuPhbk4JS4ASyhfiss=";
hash = "sha256-fWc+qUAFlqMuiDhZzEY99rXHjKq40GPzplSN8ggId9g=";
version = "6.4.0";
vendorHash = "sha256-j+ywLnN+/6HvMKOEr1FuXTLxUMX7VtU4eG3GGx3yAOo=";
patches = [ ];
}
+3 -3
View File
@@ -11,16 +11,16 @@
}:
buildGoModule rec {
pname = "kcl";
version = "0.9.3";
version = "0.9.7";
src = fetchFromGitHub {
owner = "kcl-lang";
repo = "cli";
rev = "v${version}";
hash = "sha256-QUVTRlzG8hT+iQx5dSycbRDAyeknjwGOWynCRw3oxlo=";
hash = "sha256-97iUmrdZzA2OD6K+WSkDv8JNcFaaHmD/D9J/BHOUvzw=";
};
vendorHash = "sha256-AP1MOlnoTnD7luNR+1QtAdMiJL8tEEwJocT+9wBRgAo=";
vendorHash = "sha256-+SWcbkcShPCzxGfZmlMPaTZLp0tGGViPM99xXrXzVQ0=";
# By default, libs and bins are stripped. KCL will crash on darwin if they are.
dontStrip = stdenv.isDarwin;
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "misconfig-mapper";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "intigriti";
repo = "misconfig-mapper";
rev = "refs/tags/v${version}";
hash = "sha256-rHEtjbvb907G8RJWLnvrw2xscdWPHQOYSBgYk4yk6ng=";
hash = "sha256-jCW1HmL/IAktQ3DncR4CZ3msSWKkz6u9UmmkIjaXS3Y=";
};
vendorHash = "sha256-rpDzsUGtYIIUKf8P8Qkd16fuMbwKhKQMATYPVeNhstk=";
vendorHash = "sha256-UGV//c2ArXB9g2voN+UWnRaEsrKluIk5CZz82YQhhik=";
ldflags = [
"-s"
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "payme";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = "jovandeginste";
repo = "payme";
rev = "v${version}";
hash = "sha256-LZyTwi4VCetIF39yc7WU3VR20DfFxfhDr3FvVQo7b/Q=";
hash = "sha256-jkJGR6i68kNzA60T5ZOu2u+fPvZht4ssEtr8aYocGUk=";
leaveDotGit = true;
postFetch = ''
cd "$out"
+4 -4
View File
@@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "speakersafetyd";
version = "0.1.9";
version = "1.0.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-I1fL1U4vqKxPS1t6vujMTdi/JAAOCcPkvUqv6FqkId4=";
hash = "sha256-I1RTtD5V4Z8R8zed/b4FitHyE7gFAja5YcA+z0VvSX0=";
};
cargoHash = "sha256-Adwct+qFhUsOIao8XqNK2zcn13DBlQNA+X4aRFeIAXM=";
cargoHash = "sha256-8Dmts6SCRrZqyI+pdfgqsXfJy9Hqspbdb6EpQChMKDA=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib ];
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
description = "Userspace daemon written in Rust that implements an analogue of the Texas Instruments Smart Amp speaker protection model";
mainProgram = "speakersafetyd";
homepage = "https://github.com/AsahiLinux/speakersafetyd";
maintainers = with maintainers; [ yuka ];
maintainers = with maintainers; [ flokli yuka ];
license = licenses.mit;
platforms = platforms.linux;
};
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.36.15";
version = "2.37.0";
src = fetchFromGitHub {
owner = "spicetify";
repo = "cli";
rev = "v${version}";
hash = "sha256-K3lhPeW6L9N9OljNn8e6iQqx4k4HX5A9mX7SUlv2IRw=";
hash = "sha256-72HxZnx5TcupTU6bCzuVRXUzR82dA+93WDatbJCsVYM=";
};
vendorHash = "sha256-i3xnf440lslzeDJ4pLLONqw8ACbdkKgPIhlPSuC1Vng=";
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "virtio-win";
version = "0.1.248-1";
version = "0.1.262-2";
src = fetchurl {
url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso";
hash = "sha256-1bVznPKX8FONJj4wZ41aCbukcKfGvL2N/3TkQVPxZUk=";
hash = "sha256-vcKtFyegi22KWdQOES2TD1Ois1S974WQOrqtiWIU8KM=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -18,12 +18,12 @@ let
in
stdenv.mkDerivation rec {
pname = "circt";
version = "1.80";
version = "1.80.1";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
hash = "sha256-87LsCJrx6LEJCkiBq/c2RWqenmX9KViGBqKMdmMYRMw=";
hash = "sha256-Vqucix0hil9isi4/+DLC4tq8XLVeiFUEMBeJfkZMEpI=";
fetchSubmodules = true;
};
@@ -5,15 +5,15 @@
, lldb
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "llef";
version = "unstable-2023-10-18";
version = "1.1.0";
src = fetchFromGitHub {
owner = "foundryzero";
repo = "llef";
rev = "629bd75f44c356f7a3576a6436d3919ce111240d";
hash = "sha256-JtCHG89s436Di/6+V7Le4CZnkIPh/RYIllfXEO/B7+8";
rev = "v${finalAttrs.version}";
hash = "sha256-tta99ncWJdnnSkVdnOwx36utEcefMy7fb5NDN2aZ5F0=";
};
dontBuild = true;
@@ -40,4 +40,4 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nrabulinski ];
mainProgram = "llef";
};
}
})
File diff suppressed because it is too large Load Diff
@@ -31,13 +31,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "1.140.2";
version = "1.142.1";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
hash = "sha256-BSbvgKiI89B+nxp5McBKTJAwgePt27C1QvSQLhTL7pQ=";
hash = "sha256-ea0OKQWZareqgE1C8lYem3BKaNmqJgYLItOHdPWqz6M=";
};
patches = [
@@ -2086,6 +2086,30 @@ buildLuarocksPackage {
};
}) {};
luarocks-build-treesitter-parser-cpp = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }:
buildLuarocksPackage {
pname = "luarocks-build-treesitter-parser-cpp";
version = "1.0.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-1.0.0-1.rockspec";
sha256 = "0vvw3ai42jif2z2ir6l14jkjq138djbn04wnjblm3vilaz5k0sfv";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v1.0.0.zip";
sha256 = "0j1f3wq19zng8ay6pniphb7m0xp131i9alqpdf0szpyq8y00w2s1";
};
disabled = luaOlder "5.1";
propagatedBuildInputs = [ luafilesystem ];
meta = {
homepage = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp";
description = "A luarocks build backend for tree-sitter parsers written in C++.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
};
}) {};
luasec = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luasocket }:
buildLuarocksPackage {
pname = "luasec";
@@ -7,11 +7,11 @@
buildOctavePackage rec {
pname = "dicom";
version = "0.6.0";
version = "0.6.1";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "sha256-CFspqPJDSU1Pg+o6dub1/+g+mPDps9sPlus6keDj6h0=";
sha256 = "sha256-erUZudOknymgGprqUhCaSvN/WlmWZ1qgH8HDYrNOg2I=";
};
nativeBuildInputs = [
@@ -6,38 +6,42 @@
protobuf,
pytestCheckHook,
setuptools-scm,
pythonOlder,
}:
buildPythonPackage rec {
pname = "axisregistry";
version = "0.4.10";
format = "setuptools";
version = "0.4.11";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-/N67VDr1ZFDRmZsxYCFT+KdUmc2ElgGNd8ljGWC5V0U=";
hash = "sha256-p1/ocmWqrCJ4CylRgen/DR0LeqcwIxB1jAauJbw8ygY=";
};
propagatedBuildInputs = [
fonttools
protobuf
];
nativeBuildInputs = [
setuptools-scm
];
doCheck = true;
nativeCheckInputs = [ pytestCheckHook ];
# Relax the dependency on protobuf 3. Other packages in the Google Fonts
# ecosystem have begun upgrading from protobuf 3 to protobuf 4,
# so we need to use protobuf 4 here as well to avoid a conflict
# in the closure of fontbakery. It seems to be compatible enough.
pythonRelaxDeps = [ "protobuf" ];
build-system = [ setuptools-scm ];
dependencies = [
fonttools
protobuf
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "axisregistry" ];
meta = with lib; {
description = "Google Fonts registry of OpenType variation axis tags";
homepage = "https://github.com/googlefonts/axisregistry";
changelog = "https://github.com/googlefonts/axisregistry/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ danc86 ];
};
@@ -2,38 +2,50 @@
lib,
fetchFromGitHub,
buildPythonPackage,
pythonOlder,
numpy,
cython,
zlib,
python-lzo,
nose,
pytestCheckHook,
setuptools,
oldest-supported-numpy,
}:
buildPythonPackage rec {
pname = "bx-python";
version = "0.11.0";
format = "setuptools";
disabled = pythonOlder "3.8";
version = "0.12.0";
pyproject = true;
src = fetchFromGitHub {
owner = "bxlab";
repo = "bx-python";
rev = "refs/tags/v${version}";
hash = "sha256-evhxh/cCZFSK6EgMu7fC9/ZrPd2S1fZz89ItGYrHQck=";
hash = "sha256-ZpZjh7OXdUY7rd692h7VYHzC3qCrDKFme6r+wuG7GP4=";
};
nativeBuildInputs = [ cython ];
postPatch = ''
# pytest-cython, which provides this option, isn't packaged
substituteInPlace pytest.ini \
--replace-fail "--doctest-cython" ""
'';
build-system = [
setuptools
cython
oldest-supported-numpy
];
buildInputs = [ zlib ];
propagatedBuildInputs = [
numpy
dependencies = [ numpy ];
nativeCheckInputs = [
python-lzo
pytestCheckHook
];
nativeCheckInputs = [ nose ];
# https://github.com/bxlab/bx-python/issues/101
doCheck = false;
postInstall = ''
cp -r scripts/* $out/bin
@@ -45,12 +57,12 @@ buildPythonPackage rec {
ln -s $out/bin scripts
'';
meta = with lib; {
meta = {
description = "Tools for manipulating biological data, particularly multiple sequence alignments";
homepage = "https://github.com/bxlab/bx-python";
changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ jbedo ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jbedo ];
platforms = [ "x86_64-linux" ];
};
}
@@ -3,33 +3,31 @@
stdenv,
buildPythonPackage,
cryptography,
cython_0,
cython,
eventlet,
fetchFromGitHub,
fetchpatch2,
geomet,
gevent,
gremlinpython,
iana-etc,
libev,
libredirect,
mock,
nose,
pytestCheckHook,
pythonOlder,
pytz,
pyyaml,
scales,
six,
sure,
twisted,
setuptools,
distutils,
}:
buildPythonPackage rec {
pname = "cassandra-driver";
version = "3.29.1";
format = "setuptools";
disabled = pythonOlder "3.7";
pyproject = true;
src = fetchFromGitHub {
owner = "datastax";
@@ -38,29 +36,53 @@ buildPythonPackage rec {
hash = "sha256-pnNm5Pd5k4bt+s3GrUUDWRpSdqNSM89GiX8DZKYzW1E=";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'geomet>=0.1,<0.3' 'geomet'
'';
patches = [
# https://github.com/datastax/python-driver/pull/1201
# Also needed for below patch to apply
(fetchpatch2 {
name = "remove-mock-dependency.patch";
url = "https://github.com/datastax/python-driver/commit/9aca00be33d96559f0eabc1c8a26bb439dcebbd7.patch";
hash = "sha256-ZN95V8ebbjahzqBat2oKBJLfu0fqbWMvAu0DzfVGw8I=";
})
# https://github.com/datastax/python-driver/pull/1215
(fetchpatch2 {
name = "convert-to-pytest.patch";
url = "https://github.com/datastax/python-driver/commit/9952e2ab22c7e034b96cc89330791d73c221546b.patch";
hash = "sha256-xa2aV6drBcgkQT05kt44vwupg3oMHLbcbZSQ7EHKnko=";
})
# https://github.com/datastax/python-driver/pull/1195
(fetchpatch2 {
name = "remove-assertRaisesRegexp.patch";
url = "https://github.com/datastax/python-driver/commit/622523b83971e8a181eb4853b7d877420c0351ef.patch";
hash = "sha256-Q8pRhHBLKyenMfrITf8kDv3BbsSCDAmVisTr4jSAIvA=";
})
];
nativeBuildInputs = [ cython_0 ];
pythonRelaxDeps = [ "geomet" ];
build-system = [
distutils
setuptools
cython
];
buildInputs = [ libev ];
propagatedBuildInputs = [
dependencies = [
six
geomet
];
nativeCheckInputs = [
pytestCheckHook
mock
nose
pytz
pyyaml
sure
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
# This is used to determine the version of cython that can be used
CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version;
# Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox,
# also /etc/resolv.conf is referenced by some tests
preCheck =
@@ -92,6 +114,8 @@ buildPythonPackage rec {
disabledTestPaths = [
# requires puresasl
"tests/unit/advanced/test_auth.py"
# Uses asyncore, which is deprecated in python 3.12+
"tests/unit/io/test_asyncorereactor.py"
];
disabledTests = [
@@ -112,11 +136,11 @@ buildPythonPackage rec {
twisted = [ twisted ];
};
meta = with lib; {
meta = {
description = "Python client driver for Apache Cassandra";
homepage = "http://datastax.github.io/python-driver";
changelog = "https://github.com/datastax/python-driver/blob/${version}/CHANGELOG.rst";
license = licenses.asl20;
maintainers = with maintainers; [ ris ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ris ];
};
}
@@ -32,6 +32,7 @@
toml,
tqdm,
uproot,
vector,
# checks
distributed,
@@ -41,7 +42,7 @@
buildPythonPackage rec {
pname = "coffea";
version = "2024.6.1";
version = "2024.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -50,7 +51,7 @@ buildPythonPackage rec {
owner = "CoffeaTeam";
repo = "coffea";
rev = "refs/tags/v${version}";
hash = "sha256-Z6c8R8B8IrDkXVDx89XVtg3eRgORuHPfUyAPRGwAlrg=";
hash = "sha256-ghqJHTvCKAbbHPPwMVGxGqOV3fc25Gocs5VKebcb074=";
};
build-system = [
@@ -82,6 +83,7 @@ buildPythonPackage rec {
toml
tqdm
uproot
vector
] ++ dask.optional-dependencies.array;
nativeCheckInputs = [
@@ -2,7 +2,6 @@
, fetchFromGitHub
, buildPythonPackage
, deltachat-rpc-server
, libdeltachat
, setuptools-scm
, substituteAll
}:
@@ -37,6 +36,6 @@ buildPythonPackage rec {
homepage = "https://github.com/adbenitez/deltachat2";
license = lib.licenses.mpl20;
mainProgram = "deltachat2";
inherit (libdeltachat.meta) maintainers;
inherit (deltachat-rpc-server.meta) maintainers;
};
}
@@ -4,10 +4,8 @@
click,
fetchPypi,
jinja2,
mock,
nose,
pytestCheckHook,
poetry-core,
pythonOlder,
terminaltables,
}:
@@ -16,44 +14,32 @@ buildPythonPackage rec {
version = "1.4";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nYQ1xphdHN1oKZ4ExY4r24rmz2ayWWqAeeb5qT8qA5g=";
};
nativeBuildInputs = [ poetry-core ];
build-system = [ poetry-core ];
propagatedBuildInputs = [
dependencies = [
click
jinja2
terminaltables
];
# test rely on nose
doCheck = pythonOlder "3.12";
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
mock
nose
];
pytestFlagsArray = [ "envs/tests.py" ];
checkPhase = ''
runHook preCheck
nosetests --with-isolation
runHook postCheck
'';
disabledTests = [ "test_list_envs" ];
pythonImportsCheck = [ "envs" ];
meta = with lib; {
meta = {
description = "Easy access to environment variables from Python";
mainProgram = "envs";
homepage = "https://github.com/capless/envs";
license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ peterhoeg ];
};
}
@@ -29,18 +29,20 @@
buildPythonPackage rec {
pname = "exchangelib";
version = "5.4.1";
version = "5.4.2";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ecederstrand";
repo = "exchangelib";
rev = "refs/tags/v${version}";
hash = "sha256-FPn2l+PkTXFqzjqF4kQ8KE49BXZUzDDIcFI3UqoxqQM=";
hash = "sha256-UAc8Aju2+AM7m8XbWliVNzfWlL5fdPDa2q6Fsw04nHQ=";
};
pythonRelaxDeps = [ "defusedxml" ];
build-system = [ setuptools ];
dependencies = [
@@ -1,94 +0,0 @@
{
stdenv,
lib,
addDriverRunpath,
buildPythonPackage,
fetchFromGitHub,
cmake,
cython_0,
numpy,
six,
nose,
mako,
config,
cudaSupport ? config.cudaSupport,
cudaPackages ? { },
openclSupport ? true,
ocl-icd,
clblas,
}:
buildPythonPackage rec {
pname = "libgpuarray";
version = "0.7.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "Theano";
repo = "libgpuarray";
rev = "v${version}";
sha256 = "0ksil18c9ign4xrv5k323flhvdy6wdxh8szdd3nivv31jc3zsdri";
};
# requires a GPU
doCheck = false;
configurePhase = "cmakeConfigurePhase";
libraryPath = lib.makeLibraryPath (
lib.optionals cudaSupport (
with cudaPackages;
[
cudatoolkit.lib
cudatoolkit.out
]
)
++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd)
);
preBuild = ''
make -j$NIX_BUILD_CORES
make install
export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE"
cd ..
'';
postFixup =
''
rm $out/lib/libgpuarray-static.a
''
+ lib.optionalString (!stdenv.isDarwin) ''
function fixRunPath {
p=$(patchelf --print-rpath $1)
patchelf --set-rpath "$p:$libraryPath" $1
}
fixRunPath $out/lib/libgpuarray.so
''
+ lib.optionalString cudaSupport ''
addDriverRunpath $out/lib/libgpuarray.so
'';
propagatedBuildInputs = [
numpy
six
mako
];
nativeBuildInputs = [
cmake
cython_0
] ++ lib.optionals cudaSupport [ addDriverRunpath ];
buildInputs = [ nose ];
meta = with lib; {
homepage = "https://github.com/Theano/libgpuarray";
description = "Library to manipulate tensors on GPU";
license = licenses.free;
maintainers = with maintainers; [ artuuge ];
platforms = platforms.unix;
};
}
@@ -2,33 +2,38 @@
lib,
buildPythonPackage,
fetchPypi,
mock,
nose,
pytest,
fetchpatch2,
pytestCheckHook,
six,
setuptools,
}:
buildPythonPackage rec {
pname = "mohawk";
version = "1.1.0";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "08wppsv65yd0gdxy5zwq37yp6jmxakfz4a2yx5wwq2d222my786j";
hash = "sha256-0qDjqxCiCcx56V4o8t1UvUpz/RmY/+J7e6D5Yra+lyM=";
};
propagatedBuildInputs = [ six ];
nativeCheckInputs = [
mock
nose
pytest
patches = [
(fetchpatch2 {
# https://github.com/kumar303/mohawk/pull/59
name = "nose-to-pytest.patch";
url = "https://github.com/kumar303/mohawk/compare/b7899166880e890f01cf2531b5686094ba08df8f...66157c7efbf6b0d18c30a9ffe5dfd84bef27bd3a.patch";
hash = "sha256-w3sP5XeBqOwoPGsWzYET4djYwuKPaS4OOlC3HBPD0NI=";
})
];
checkPhase = ''
pytest mohawk/tests.py
'';
build-system = [ setuptools ];
dependencies = [ six ];
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "mohawk/tests.py" ];
meta = {
description = "Python library for Hawk HTTP authorization";
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "monzopy";
version = "1.3.1";
version = "1.3.2";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "JakeMartin-ICL";
repo = "monzopy";
rev = "refs/tags/v${version}";
hash = "sha256-AoBfcQ0rilUPMvLCjU2Y+P/wVnb+I40vmq+5lS5eSto=";
hash = "sha256-9Gj0312NOumoIWN/ES+dgPL3IblgvBSCPZA97OKuhZQ=";
};
build-system = [ setuptools ];
@@ -5,74 +5,86 @@
pythonOlder,
poetry-core,
appdirs,
setuptools,
astor,
inquirer,
litellm,
pyyaml,
rich,
six,
tiktoken,
tokentrim,
wget,
psutil,
html2image,
send2trash,
ipykernel,
jupyter-client,
matplotlib,
toml,
posthog,
openai,
setuptools,
tiktoken,
platformdirs,
pydantic,
google-generativeai,
pynput,
pyperclip,
yaspin,
shortuuid,
litellm,
nltk,
}:
buildPythonPackage rec {
pname = "open-interpreter";
version = "0.2.0";
version = "0.3.6";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "KillianLucas";
repo = pname;
repo = "open-interpreter";
rev = "v${version}";
hash = "sha256-XeJ6cADtyXtqoTXwYJu+i9d3NYbJCLpYOeZYmdImtwI=";
hash = "sha256-TeBiRylrq5CrAG9XS47Z9GlruAv7V7Nsl4QbSV55isM=";
};
# Remove unused dependency
postPatch = ''
substituteInPlace pyproject.toml --replace 'git-python = "^1.0.3"' ""
'';
pythonRemoveDeps = [ "git-python" ];
pythonRelaxDeps = [ "tiktoken" ];
nativeBuildInputs = [
poetry-core
pythonRelaxDeps = [
"psutil"
"pynput"
"yaspin"
];
propagatedBuildInputs = [
appdirs
build-system = [ poetry-core ];
dependencies = [
setuptools
astor
inquirer
litellm
pyyaml
rich
six
tiktoken
tokentrim
wget
psutil
html2image
send2trash
ipykernel
jupyter-client
matplotlib
toml
posthog
openai
tiktoken
platformdirs
pydantic
google-generativeai
pynput
pyperclip
yaspin
shortuuid
litellm
# Not explicitly in pyproject.toml but required due to use of `pkgs_resources`
setuptools
# marked optional in pyproject.toml but still required?
nltk
];
pythonImportsCheck = [ "interpreter" ];
@@ -33,7 +33,7 @@ in
buildPythonPackage rec {
pname = "python-arango";
version = "8.0.0";
version = "8.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
owner = "arangodb";
repo = "python-arango";
rev = "refs/tags/${version}";
hash = "sha256-SoqrmQ4owXsaZ5NgfTGfxPbFhS17+2zv5iOjXKJe3lI=";
hash = "sha256-bMCzuqKLOQYmBGhdfHaff+0ZIVmZ4iy5jFtmV7X0pIM=";
};
nativeBuildInputs = [
@@ -1,83 +0,0 @@
{
lib,
stdenv,
buildPythonPackage,
fetchPypi,
fetchpatch,
python,
scripttest,
pytz,
pbr,
tempita,
decorator,
sqlalchemy,
six,
sqlparse,
testrepository,
}:
buildPythonPackage rec {
pname = "sqlalchemy-migrate";
version = "0.13.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1y0lcqii7b4vp7yh9dyxrl4i77hi8jkkw7d06mgdw2h458ljxh0b";
};
patches = [
# See: https://review.openstack.org/#/c/608382/
# https://github.com/openstack/sqlalchemy-migrate/pull/18
(fetchpatch {
url = "https://github.com/openstack/sqlalchemy-migrate/commit/a5d69a17d9354ec1a792493280f96484740cf7ff.patch";
sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07";
})
./python3.11-comp.diff
];
postPatch = ''
substituteInPlace test-requirements.txt \
--replace "ibm_db_sa>=0.3.0;python_version<'3.0'" "" \
--replace "ibm-db-sa-py3;python_version>='3.0'" "" \
--replace "tempest-lib>=0.1.0" "" \
--replace "testtools>=0.9.34,<0.9.36" "" \
--replace "pylint" ""
'';
nativeCheckInputs = [
scripttest
pytz
testrepository
];
propagatedBuildInputs = [
pbr
tempita
decorator
sqlalchemy
six
sqlparse
];
doCheck = !stdenv.isDarwin;
checkPhase = ''
export PATH=$PATH:$out/bin
echo sqlite:///__tmp__ > test_db.cfg
# depends on ibm_db_sa
rm migrate/tests/changeset/databases/test_ibmdb2.py
# wants very old testtools
rm migrate/tests/versioning/test_schema.py
# transient failures on py27
substituteInPlace migrate/tests/versioning/test_util.py --replace "test_load_model" "noop"
${python.interpreter} setup.py test
'';
meta = with lib; {
homepage = "https://opendev.org/x/sqlalchemy-migrate";
description = "Schema migration tools for SQLAlchemy";
license = licenses.asl20;
maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]);
broken = lib.versionAtLeast sqlalchemy.version "2.0.0";
};
}
@@ -1,13 +0,0 @@
diff --git a/migrate/versioning/shell.py b/migrate/versioning/shell.py
index 5fb86b1..fae0ce4 100644
--- a/migrate/versioning/shell.py
+++ b/migrate/versioning/shell.py
@@ -108,7 +108,7 @@ def main(argv=None, **kwargs):
parser.error("Invalid command %s" % command)
parser.set_usage(inspect.getdoc(command_func))
- f_args, f_varargs, f_kwargs, f_defaults = inspect.getargspec(command_func)
+ f_args, f_varargs, f_kwargs, f_defaults, _, _, _ = inspect.getfullargspec(command_func)
for arg in f_args:
parser.add_option(
"--%s" % arg,
@@ -1,27 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
nose,
}:
buildPythonPackage {
version = "0.5.3-2016-09-28";
format = "setuptools";
pname = "tempita";
src = fetchFromGitHub {
owner = "agramfort";
repo = "tempita";
rev = "47414a7c6e46a9a9afe78f0bce2ea299fa84d10";
sha256 = "0f33jjjs5rvp7ar2j6ggyfykcrsrn04jaqcq71qfvycf6b7nw3rn";
};
buildInputs = [ nose ];
meta = {
homepage = "https://github.com/agramfort/tempita";
description = "Very small text templating language";
license = lib.licenses.mit;
};
}
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1207";
version = "3.0.1208";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-TBN3k1FGoeTeQTTf73oF/Cva6iiMOq6HYAV8513ysFI=";
hash = "sha256-AwkzoGJm+lI853Riq4VACU18nUn0jvUCFmMRJdFhcJM=";
};
build-system = [ setuptools ];
@@ -2,11 +2,11 @@
let
pname = "altair";
version = "7.2.4";
version = "7.3.4";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-o3yc24z9O9oUhEseZKYZGUq823P4JgedrZcuVUUKdkA=";
sha256 = "sha256-wl5qlUhnwqqYM830m6KWNQBY2jVMh715HahLngyiL+I=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
@@ -7,17 +7,17 @@
}:
rustPlatform.buildRustPackage rec {
version = "0.34.0";
version = "0.35.0";
pname = "geckodriver";
src = fetchFromGitHub {
owner = "mozilla";
repo = "geckodriver";
rev = "refs/tags/v${version}";
sha256 = "sha256-jrF55j3/WKpGl7sJzRmPyaNMbxPqAoXWiuQJsxfIYgc=";
sha256 = "sha256-3EJP+y+Egz0kj5e+1FRHPGWfneB/tCCVggmgmylMyDE=";
};
cargoHash = "sha256-4on4aBkRI9PiPgNcxVktTDX28qRy3hvV9+glNB6hT1k=";
cargoHash = "sha256-gopI5iOCSzD23mvOues76WIiBtpNf9A6X9NoOULm6Qo=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gqlgenc";
version = "0.23.2";
version = "0.24.0";
src = fetchFromGitHub {
owner = "yamashou";
repo = "gqlgenc";
rev = "v${version}";
sha256 = "sha256-a+/X2q9Rii/8odXGICNOB7uWXd6vfqquP+wGvT/tRUo=";
sha256 = "sha256-tKEHqo7drOwHIRCgKEXbELi0u9uRpXSwB9R1fPhv/PE=";
};
excludedPackages = [ "example" ];
@@ -15,13 +15,13 @@ in
buildDunePackage rec {
pname = "opam-publish";
version = "2.3.1";
version = "2.4.0";
src = fetchFromGitHub {
owner = "ocaml-opam";
repo = pname;
rev = version;
hash = "sha256-ll6G9L7zAw53R7FxvZDBL300b+YElzpBygbiIWB3FUU=";
hash = "sha256-7TIBLHpLVzI8Ex01wiQqVPllMZuiiUQsbuGtsNmrW3Q=";
};
buildInputs = [
@@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "paging-calculator";
version = "0.3.0";
version = "0.4.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-uoijIA9xmifxHlMRo5Rh/Qy1wxiiCNLJnDysI01uPvk=";
hash = "sha256-mTHBARrcq8cJxzh80v/fGr5vACAMyy/DhN8zpQTV0jM=";
};
cargoHash = "sha256-RbBlZCRVXZLXvz+/olkh2MqJiWq63AwLvo+/5UGRuyM=";
cargoHash = "sha256-oQQA+AGsuMKaFhoZRuv3BASCLJwfgbrdK+2noxBLm7k=";
meta = {
description = "CLI utility that helps calculating page table indices from a virtual address";
File diff suppressed because it is too large Load Diff
@@ -12,19 +12,19 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-release";
version = "0.25.0";
version = "0.25.10";
src = fetchFromGitHub {
owner = "crate-ci";
repo = "cargo-release";
rev = "refs/tags/v${version}";
hash = "sha256-UJdGbuQfvlZHjCKyHCXPDJ5AdUWJCRUS/vNeTKAwyYI=";
hash = "sha256-eMPwbcMIjYxM5gJm3HSdwzxN7WYOOtzj/Wf7rwuJfWs=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"cargo-test-macro-0.1.0" = "sha256-jXWdCc3wxcF02uL2OyMepJ+DmINAHRYtAUH6L16bCjI=";
"cargo-test-macro-0.1.0" = "sha256-5EHfvuwbI14DBkbLWyXepmn9m4Qn2ah2+9J9FHrSOgU=";
};
};
+2 -2
View File
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }:
stdenv.mkDerivation rec {
version="1.38";
version="1.40";
pname = "mxt-app";
src = fetchFromGitHub {
owner = "atmel-maxtouch";
repo = "mxt-app";
rev = "v${version}";
sha256 = "sha256-/0wua0rIpAQAq+ZgmQu/0vHGPgn7pNwAo1theTMG0PA=";
sha256 = "sha256-ZquD1aZu/TJQdr7QwKHTbCwSCFxt4drVBm4D1FLlzF0=";
};
nativeBuildInputs = [ autoreconfHook ];
+14 -3
View File
@@ -1,9 +1,10 @@
{ lib, stdenv, fetchurl, bison, cmake, pkg-config
, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2
, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
, coreutils, procps, gnused, gnugrep, hostname, makeWrapper
, systemd
# Percona-specific deps
, coreutils, cyrus_sasl, gnumake, openldap
, cyrus_sasl, gnumake, openldap
# optional: different malloc implementations
, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools
}:
@@ -20,8 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg";
};
nativeBuildInputs = [ bison cmake pkg-config ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
nativeBuildInputs = [
bison cmake pkg-config makeWrapper
# required for scripts/CMakeLists.txt
coreutils gnugrep procps
] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
patches = [
./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
@@ -88,6 +92,13 @@ stdenv.mkDerivation (finalAttrs: {
moveToOutput "lib/*.a" $static
so=${stdenv.hostPlatform.extensions.sharedLibrary}
ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]}
wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]}
wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
'' + lib.optionalString stdenv.isDarwin ''
wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
'';
passthru = {
+13 -3
View File
@@ -1,8 +1,9 @@
{ lib, stdenv, fetchurl, bison, cmake, pkg-config
, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2
, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
, coreutils, procps, gnused, gnugrep, hostname, makeWrapper
# Percona-specific deps
, coreutils, cyrus_sasl, gnumake, openldap
, cyrus_sasl, gnumake, openldap
}:
stdenv.mkDerivation (finalAttrs: {
@@ -14,8 +15,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-iktEvZz3mjjmJ16PX51OjSwwiFS3H9W/XRco//Q6aEQ=";
};
nativeBuildInputs = [ bison cmake pkg-config ]
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
nativeBuildInputs = [
bison cmake pkg-config makeWrapper
# required for scripts/CMakeLists.txt
coreutils gnugrep procps
] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
patches = [
./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
@@ -73,6 +77,12 @@ stdenv.mkDerivation (finalAttrs: {
moveToOutput "lib/*.a" $static
so=${stdenv.hostPlatform.extensions.sharedLibrary}
ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]}
wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]}
wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
'';
passthru = {
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "onefetch";
version = "2.20.0";
version = "2.21.0";
src = fetchFromGitHub {
owner = "o2sh";
repo = pname;
rev = version;
hash = "sha256-aQeKzOxRlSGuVewh3HEx1M12vmaxhy6ImnqMDc5b0DI=";
hash = "sha256-KQs7b+skXQhHbfHIJkgowNY2FB6oS2V8TQFdkmElC/k=";
};
cargoHash = "sha256-g+fTmZGyPkQLgnJ9Bb4sLTfDMPPBRA+s6f3OxXTKwsM=";
cargoHash = "sha256-gKA1MMahoaDFia8LR33GG3jRttZzHwpUpFawlCQcy7g=";
cargoPatches = [
# enable pkg-config feature of zstd
@@ -1,22 +1,22 @@
diff --git a/Cargo.lock b/Cargo.lock
index f6d5b6c..a631bbf 100644
index dd0e3e1..5738ec1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2544,6 +2544,7 @@ dependencies = [
@@ -2829,6 +2829,7 @@ dependencies = [
"tokei",
"typetag",
"winres",
"yaml-rust",
+ "zstd",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index b77f70d..861f1ac 100644
index a0a2777..ad146cb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -65,6 +65,7 @@ tokei = "12.1.2"
@@ -65,6 +65,7 @@ time-humanize = { version = "0.1.3", features = ["time"] }
tokei = "12.1.2"
typetag = "0.2"
yaml-rust = "0.4.5"
parking_lot = "0.12"
+zstd = { version = "*", features = ["pkg-config"] }
+2 -2
View File
@@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "scdl";
version = "2.11.3";
version = "2.11.4";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-3GmmGZ2uTE2T0GagWzBdbtFsTU3pcRxh0uh6/V16cUw=";
hash = "sha256-2hw9nVKShRAY6K0xXhVuce/dAu4w/BE2cKKKndzPJ3s=";
};
build-system = [ python3Packages.setuptools ];
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cloudfox";
version = "1.14.1";
version = "1.14.2";
src = fetchFromGitHub {
owner = "BishopFox";
repo = "cloudfox";
rev = "refs/tags/v${version}";
hash = "sha256-4LOKCdnNiJdnLsCsoME5CZSFog5W+8IA7HwTe+QfHGY=";
hash = "sha256-8z/j1bJT5xccSlyBnx32Dqqg6J9iazTaJgUmjN3Jc8c=";
};
vendorHash = "sha256-2+UiaU4S64afH8Y8uz5ZclO5NxTi4YlUZ87ZN1MnLj0=";
vendorHash = "sha256-MQ1yoJjAWNx95Eafcarp/JNYq06xu9P05sF2QTW03NY=";
ldflags = [
"-w"
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "osv-scanner";
version = "1.8.2";
version = "1.8.3";
src = fetchFromGitHub {
owner = "google";
repo = "osv-scanner";
rev = "refs/tags/v${version}";
hash = "sha256-kgrKJJxTaKfZyln0t9gKJgpTbrh5d1j1Ax25Y9JK05w=";
hash = "sha256-RaTDhA9aowSCUFgH2JwkrV1TjYQW3P8o1Xd3e977AkM=";
};
vendorHash = "sha256-FeLxMmq1BwbDYc+FGXjn8n8YaechTpn9XwODLDOnuTo=";
vendorHash = "sha256-mSBgnG7WJqrB/CAYi9wGtB7PL4/whsCv7WA3Im2/PZg=";
subPackages = [
"cmd/osv-scanner"
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.80.2";
version = "3.81.7";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-FiwUkBKh1g4NifF0O4hhZSnZExOw99R9ZX8ANaG9Ym8=";
hash = "sha256-JEDZw116AYcR6Skh/Pu5eZrV04EOMhA8uH3LX3neoDs=";
};
vendorHash = "sha256-uZ57v1yYH955zDKE7nfXkmroAzUPbO/7MVn9u9M5DKU=";
vendorHash = "sha256-L46tKB6zcwB4jxfEGq7/LveJoWHlOg2QtzO082w2/A8=";
proxyVendor = true;
+3 -3
View File
@@ -13,20 +13,20 @@
rustPlatform.buildRustPackage rec {
pname = "mdcat";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "swsnr";
repo = "mdcat";
rev = "mdcat-${version}";
hash = "sha256-OgqWlWORLbohok9gJWiVUf0EdFP7Duk0Iw1PiSl4350=";
hash = "sha256-Geq4I4QjWg2dBfGw0j68gG5butWFLXynLC5c9AQTfPs=";
};
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
cargoHash = "sha256-jLKqJQ+T2KaS1bZ6MSQ6l/1iXvfLoyeI68WvO5smuwU=";
cargoHash = "sha256-G+vTW3hYNjZN3V5svltbKEeeUEolAVVbTOaAKVHEcUI=";
nativeCheckInputs = [ ansi2html ];
# Skip tests that use the network and that include files.
+1
View File
@@ -1095,6 +1095,7 @@ mapAliases ({
openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
openjpeg_2 = openjpeg; # Added 2021-01-25
openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29
openmpt123 = libopenmpt; # Added 2021-09-05
openssl_3_0 = openssl_3; # Added 2022-06-27
openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23
-8
View File
@@ -36868,14 +36868,6 @@ with pkgs;
octopus = callPackage ../applications/science/chemistry/octopus { };
openlp = libsForQt5.callPackage ../applications/misc/openlp { };
openlpFull = openlp.override {
pdfSupport = true;
presentationSupport = true;
vlcSupport = true;
gstreamerSupport = true;
};
autodock-vina = callPackage ../applications/science/chemistry/autodock-vina { };
dkh = callPackage ../applications/science/chemistry/dkh { };
+3
View File
@@ -291,6 +291,7 @@ mapAliases ({
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
libgpuarray = throw "libgpuarray has been removed, as it was unmaintained."; # added 2024-08-03
line_profiler = line-profiler; # added 2023-11-04
linear_operator = linear-operator; # added 2024-01-07
livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14
@@ -562,6 +563,7 @@ mapAliases ({
sphinxcontrib_newsfeed = sphinxcontrib-newsfeed; # added 2023-07-20
sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02
sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03
sqlalchemy-migrate = throw "sqlalchemy-migrate has been removed because it is abandoned upstream and incompatible with SQLAlchemy 2"; # added 2024-07-29
sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23
sqlsoup = throw "sqlsoup has been removed as it is incompatible with modern SQLAlchemy and unmaintained"; # added 2024-05-13
@@ -571,6 +573,7 @@ mapAliases ({
suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27
synologydsm-api = py-synologydsm-api; # added 2024-07-29
sysv_ipc = sysv-ipc; # added 2024-01-07
tempita = throw "tempita has been removed because it is unmaintained and the upstream repository is gone"; # added 2024-07-29
tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25
tensorflow-build_2 = tensorflow-build; # added 2021-11-25
tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17
-9
View File
@@ -6896,11 +6896,6 @@ self: super: with self; {
inherit (pkgs) libgpiod;
};
libgpuarray = callPackage ../development/python-modules/libgpuarray {
clblas = pkgs.clblas.override { inherit (self) boost; };
inherit (pkgs.config) cudaSupport;
};
libgravatar = callPackage ../development/python-modules/libgravatar { };
libiio = (toPythonModule (pkgs.libiio.override {
@@ -14900,8 +14895,6 @@ self: super: with self; {
sqlalchemy-jsonfield = callPackage ../development/python-modules/sqlalchemy-jsonfield { };
sqlalchemy-migrate = callPackage ../development/python-modules/sqlalchemy-migrate { };
sqlalchemy-mixins = callPackage ../development/python-modules/sqlalchemy-mixins { };
sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { };
@@ -15328,8 +15321,6 @@ self: super: with self; {
tempest = callPackage ../development/python-modules/tempest { };
tempita = callPackage ../development/python-modules/tempita { };
templateflow = callPackage ../development/python-modules/templateflow { };
tempora = callPackage ../development/python-modules/tempora { };
-1
View File
@@ -127,7 +127,6 @@ let
jax = linux;
Keras = linux;
kornia = linux;
libgpuarray = linux;
mmcv = linux;
mxnet = linux;
numpy = linux; # Only affected by MKL?