Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
1153f50c55
@ -4440,6 +4440,12 @@
|
||||
githubId = 14032;
|
||||
name = "Daniel Brockman";
|
||||
};
|
||||
DCsunset = {
|
||||
email = "DCsunset@protonmail.com";
|
||||
github = "DCsunset";
|
||||
githubId = 23468812;
|
||||
name = "DCsunset";
|
||||
};
|
||||
ddelabru = {
|
||||
email = "ddelabru@redhat.com";
|
||||
github = "ddelabru";
|
||||
|
||||
@ -339,7 +339,6 @@ with lib.maintainers; {
|
||||
|
||||
geospatial = {
|
||||
members = [
|
||||
das-g
|
||||
imincik
|
||||
nh2
|
||||
nialov
|
||||
|
||||
@ -174,7 +174,7 @@ in
|
||||
'')
|
||||
(optionalString cfg.genCfsslAPIToken ''
|
||||
if [ ! -f "${cfsslAPITokenPath}" ]; then
|
||||
install -u cfssl -m 400 <(head -c ${toString (cfsslAPITokenLength / 2)} /dev/urandom | od -An -t x | tr -d ' ') "${cfsslAPITokenPath}"
|
||||
install -o cfssl -m 400 <(head -c ${toString (cfsslAPITokenLength / 2)} /dev/urandom | od -An -t x | tr -d ' ') "${cfsslAPITokenPath}"
|
||||
fi
|
||||
'')]);
|
||||
|
||||
|
||||
@ -123,6 +123,7 @@ in {
|
||||
};
|
||||
|
||||
TestDevices = mkOption {
|
||||
internal = true;
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
@ -155,6 +156,7 @@ in {
|
||||
(mkRenamedOptionModule [ "services" "fwupd" "blacklistPlugins"] [ "services" "fwupd" "daemonSettings" "DisabledPlugins" ])
|
||||
(mkRenamedOptionModule [ "services" "fwupd" "disabledDevices" ] [ "services" "fwupd" "daemonSettings" "DisabledDevices" ])
|
||||
(mkRenamedOptionModule [ "services" "fwupd" "disabledPlugins" ] [ "services" "fwupd" "daemonSettings" "DisabledPlugins" ])
|
||||
(mkRemovedOptionModule [ "services" "fwupd" "enableTestRemote" ] "This option was removed after being removed upstream. It only provided a method for testing fwupd functionality, and should not have been exposed for use outside of nix tests.")
|
||||
];
|
||||
|
||||
###### implementation
|
||||
|
||||
@ -32,11 +32,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calibre";
|
||||
version = "7.4.0";
|
||||
version = "7.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-xYMz0V3eBKAZNtV/8TqRmaaTQK6LeVRjZ1fakCoUSB8=";
|
||||
hash = "sha256-pGo9fWyeX5hpw5YOV05tWy/0YxHShStKN96LMPnqIiA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -3,15 +3,15 @@
|
||||
}:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "18940";
|
||||
version = "18969";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
hash = "sha256-NfSTwh0SabdVQwh7tA5Xx80Qbp+V/ZcurKkr+AhPoz8=";
|
||||
hash = "sha256-a8muRwE4+9WdYVz7lYE9dRnqVIGQxL8cFmIdBr2R65U=";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
|
||||
hash = "sha256-b/8vSEy3qXmRjRZ43MMISB6qZHne7nuZ+tFy8Dmbp18=";
|
||||
hash = "sha256-npXY7WJM1+9ygeAw102UtimnI/yXqs5vgPnatm4AIrI=";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
{ lib, fetchurl, fetchFromGitLab, fetchFromGitea }:
|
||||
{ lib, fetchurl, fetchFromGitea }:
|
||||
let src = lib.importJSON ./src.json;
|
||||
in
|
||||
{
|
||||
inherit (src) packageVersion;
|
||||
source = fetchFromGitLab {
|
||||
owner = "librewolf-community";
|
||||
repo = "browser/source";
|
||||
source = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "librewolf";
|
||||
repo = "source";
|
||||
fetchSubmodules = true;
|
||||
inherit (src.source) rev sha256;
|
||||
};
|
||||
|
||||
@ -17,7 +17,7 @@ writeScript "update-librewolf" ''
|
||||
PATH=${lib.makeBinPath [ coreutils curl gnugrep gnupg gnused jq moreutils nix-prefetch-git ]}
|
||||
set -euo pipefail
|
||||
|
||||
latestTag=$(curl https://gitlab.com/api/v4/projects/librewolf-community%2Fbrowser%2Fsource/repository/tags?per_page=1 | jq -r .[0].name)
|
||||
latestTag=$(curl "https://codeberg.org/api/v1/repos/librewolf/source/tags?page=1&limit=1" | jq -r .[0].name)
|
||||
echo "latestTag=$latestTag"
|
||||
|
||||
srcJson=pkgs/applications/networking/browsers/librewolf/src.json
|
||||
@ -29,7 +29,7 @@ writeScript "update-librewolf" ''
|
||||
fi
|
||||
|
||||
prefetchOut=$(mktemp)
|
||||
repoUrl=https://gitlab.com/librewolf-community/browser/source.git/
|
||||
repoUrl=https://codeberg.org/librewolf/source.git
|
||||
nix-prefetch-git $repoUrl --quiet --rev $latestTag --fetch-submodules > $prefetchOut
|
||||
srcDir=$(jq -r .path < $prefetchOut)
|
||||
srcHash=$(jq -r .sha256 < $prefetchOut)
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudfoundry-cli";
|
||||
version = "8.7.7";
|
||||
version = "8.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WPZLINtjH+VuWlXX1XNeSuasxn+UI89Klrehg806kvI=";
|
||||
sha256 = "sha256-86FY7SfVZ9aEC72VP7KWj3p+wbAyLXLYtugP+Iv0G80=";
|
||||
};
|
||||
vendorHash = "sha256-ZQSbupcY+Uc8tYWZY/hYBaeaNxYuSOOIo0v9e5Ax0m0=";
|
||||
vendorHash = "sha256-Y46d8g4KoS5DjMMnX8YjgJYg6ax891vlgH9INZZflJI=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.9.7.2";
|
||||
version = "1.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "-Wl,-ld_classic" ""
|
||||
--replace-fail "-Wl,-ld_classic" ""
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler"
|
||||
--replace-fail "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler"
|
||||
sed -i "/codesign/d;/hdiutil/d" src/CMakeLists.txt
|
||||
'';
|
||||
|
||||
|
||||
75
pkgs/applications/science/electronics/degate/default.nix
Normal file
75
pkgs/applications/science/electronics/degate/default.nix
Normal file
@ -0,0 +1,75 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, boost
|
||||
, qtbase
|
||||
, qtimageformats
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
boost_static = boost.override { enableStatic = true; };
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "degate";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DegateCommunity";
|
||||
repo = "Degate";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-INoA3Z6ya03ZMn6E+nOCkXZLoxoo2WgPDw9v5miI09A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# bump bundled catch2 to avoid incompatibility with modern glibc
|
||||
(fetchpatch {
|
||||
name = "catch2-2.13.9.patch";
|
||||
url = "https://github.com/DegateCommunity/Degate/commit/06346dde4312cbb867854899eacf58679d6ac7e2.patch";
|
||||
includes = [ "tests/catch2/catch.hpp" ];
|
||||
hash = "sha256-SbSA813QI8RRVy1lvAOGMGAC2KUQKjwYR2imqX40pvU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -E '/(_OUTPUT_DIRECTORY|DESTINATION)/s|\bout/||g' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost_static
|
||||
qtbase
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
(
|
||||
cd tests/out/bin
|
||||
|
||||
# provide qtimageformats plugin to allow tests to read tiff files
|
||||
export QT_PLUGIN_PATH="${qtimageformats}/${qtbase.qtPluginPrefix}"
|
||||
|
||||
./DegateTests
|
||||
)
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern and open-source cross-platform software for chips reverse engineering";
|
||||
homepage = "https://degate.readthedocs.io/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ris ];
|
||||
};
|
||||
}
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "magic-vlsi";
|
||||
version = "8.3.459";
|
||||
version = "8.3.460";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
|
||||
sha256 = "sha256-ErNFZHZiJ+Cw8QOQREY9ps5/8WoZYEUwj8aIu42dT9Q=";
|
||||
sha256 = "sha256-MiwwCVpbmEuGwY36/ctfD0xK4RL5tolM/YPSHLIzrgk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, gmp, coreutils }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gmp, coreutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lean";
|
||||
@ -15,6 +15,15 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-Vcsph4dTNLafeaTtVwJS8tWoWCgcP6pxF0ssZDE/YfM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gcc-13 build failure
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/leanprover-community/lean/commit/21d264a66d53b0a910178ae7d9529cb5886a39b6.patch";
|
||||
hash = "sha256-hBm2QNFS1jdoR6LUQHLReKxMKv7kbkrkrTGJ43YnvfA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ gmp ];
|
||||
|
||||
|
||||
@ -15,12 +15,12 @@ let
|
||||
inherit jdk;
|
||||
};
|
||||
|
||||
version = "3.7.7";
|
||||
version = "3.7.9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openrefine";
|
||||
repo = "openrefine";
|
||||
rev = version;
|
||||
hash = "sha256-/Txx+r+eFizxaTV5u/nOJwum8nJW6jsR6kYA0YbRsJs=";
|
||||
hash = "sha256-wtg0BOGr/aJPZeFQbJSBHtTVfpcSCSHP++8AnpS8pgQ=";
|
||||
};
|
||||
|
||||
npmPkg = buildNpmPackage {
|
||||
|
||||
13
pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch
Normal file
13
pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/TOOLS/osxbundle.py b/TOOLS/osxbundle.py
|
||||
index 98699e478b..d02ecf610e 100755
|
||||
--- a/TOOLS/osxbundle.py
|
||||
+++ b/TOOLS/osxbundle.py
|
||||
@@ -39,7 +39,7 @@ def apply_plist_template(plist_file, version):
|
||||
print(line.rstrip().replace('${VERSION}', version))
|
||||
|
||||
def sign_bundle(binary_name):
|
||||
- sh('codesign --force --deep -s - ' + bundle_path(binary_name))
|
||||
+ sh('rcodesign sign ' + bundle_path(binary_name))
|
||||
|
||||
def bundle_version():
|
||||
if os.path.exists('VERSION'):
|
||||
@ -1,5 +1,5 @@
|
||||
{ config
|
||||
, lib
|
||||
{ lib
|
||||
, config
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
@ -20,7 +20,7 @@
|
||||
, libuchardet
|
||||
, libiconv
|
||||
, xcbuild
|
||||
, sigtool
|
||||
, rcodesign
|
||||
|
||||
, waylandSupport ? stdenv.isLinux
|
||||
, wayland
|
||||
@ -82,7 +82,8 @@
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk_11_0.frameworks)
|
||||
AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer Accelerate;
|
||||
AVFoundation Accelerate Cocoa CoreAudio CoreFoundation CoreMedia
|
||||
MediaPlayer VideoToolbox;
|
||||
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
|
||||
|
||||
overrideSDK = platform: version:
|
||||
@ -99,36 +100,40 @@ let
|
||||
else stdenv;
|
||||
in stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "mpv";
|
||||
version = "0.36.0";
|
||||
version = "0.37.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
outputs = [ "out" "dev" "doc" "man" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpv-player";
|
||||
repo = "mpv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-82moFbWvfc1awXih0d0D+dHqYbIoGNZ77RmafQ80IOY=";
|
||||
hash = "sha256-izAz9Iiam7tJAWIQkmn2cKOfoaog8oPKq4sOUtp1nvU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Revert "meson: use the new build_options method" to avoid a
|
||||
# cycle between the out and dev outputs.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mpv-player/mpv/commit/3c1686488b48bd2760e9b19f42e7d3be1363d00a.patch";
|
||||
hash = "sha256-eYXfX8Y08q4Bl41VHBpwbxYRMZgm/iziXeK6AOp8O6I=";
|
||||
revert = true;
|
||||
})
|
||||
patches = [ ./darwin-sigtool-no-deep.patch ];
|
||||
|
||||
postPatch = lib.concatStringsSep "\n" [
|
||||
# Don't reference compile time dependencies or create a build outputs cycle
|
||||
# between out and dev
|
||||
''
|
||||
substituteInPlace meson.build \
|
||||
--replace-fail "conf_data.set_quoted('CONFIGURATION', configuration)" \
|
||||
"conf_data.set_quoted('CONFIGURATION', '<ommited>')"
|
||||
''
|
||||
# A trick to patchShebang everything except mpv_identify.sh
|
||||
''
|
||||
pushd TOOLS
|
||||
mv mpv_identify.sh mpv_identify
|
||||
patchShebangs *.py *.sh
|
||||
mv mpv_identify mpv_identify.sh
|
||||
popd
|
||||
''
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs version.* ./TOOLS/
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext ";
|
||||
|
||||
# Ensure we reference 'lib' (not 'out') of Swift.
|
||||
preConfigure = lib.optionalString swiftSupport ''
|
||||
# Ensure we reference 'lib' (not 'out') of Swift.
|
||||
export SWIFT_LIB_DYNAMIC=${lib.getLib swift.swift}/lib/swift/macosx
|
||||
export SWIFT_LIB_DYNAMIC="${lib.getLib swift.swift}/lib/swift/macosx"
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
@ -144,6 +149,9 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
# Disable whilst Swift isn't supported
|
||||
(lib.mesonEnable "swift-build" swiftSupport)
|
||||
(lib.mesonEnable "macos-cocoa-cb" swiftSupport)
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Toggle explicitly because it fails on darwin
|
||||
(lib.mesonEnable "videotoolbox-pl" vulkanSupport)
|
||||
];
|
||||
|
||||
mesonAutoFeatures = "auto";
|
||||
@ -155,7 +163,7 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]
|
||||
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun rcodesign ]
|
||||
++ lib.optionals swiftSupport [ swift ]
|
||||
++ lib.optionals waylandSupport [ wayland-scanner ];
|
||||
|
||||
@ -164,6 +172,7 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
ffmpeg
|
||||
freetype
|
||||
libass
|
||||
libplacebo
|
||||
libpthreadstubs
|
||||
libuchardet
|
||||
luaEnv
|
||||
@ -192,7 +201,7 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals vaapiSupport [ libva ]
|
||||
++ lib.optionals vapoursynthSupport [ vapoursynth ]
|
||||
++ lib.optionals vdpauSupport [ libvdpau ]
|
||||
++ lib.optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ]
|
||||
++ lib.optionals vulkanSupport [ shaderc vulkan-headers vulkan-loader ]
|
||||
++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
|
||||
++ lib.optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr libXpresent ]
|
||||
++ lib.optionals xineramaSupport [ libXinerama ]
|
||||
@ -200,17 +209,12 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals zimgSupport [ zimg ]
|
||||
++ lib.optionals stdenv.isLinux [ nv-codec-headers-11 ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer Accelerate ]
|
||||
++ lib.optionals stdenv.isDarwin [ Accelerate CoreFoundation Cocoa CoreAudio MediaPlayer VideoToolbox ]
|
||||
++ lib.optionals (stdenv.isDarwin && swiftSupport) [ AVFoundation CoreMedia ];
|
||||
|
||||
postBuild = lib.optionalString stdenv.isDarwin ''
|
||||
pushd .. # Must be run from the source dir because it uses relative paths
|
||||
python3 TOOLS/osxbundle.py -s build/mpv
|
||||
# Swap binary and bundle symlink to sign bundle executable as symlinks cannot be signed
|
||||
rm build/mpv.app/Contents/MacOS/mpv-bundle
|
||||
mv build/mpv.app/Contents/MacOS/mpv build/mpv.app/Contents/MacOS/mpv-bundle
|
||||
ln -s mpv-bundle build/mpv.app/Contents/MacOS/mpv
|
||||
codesign --force --sign - build/mpv.app/Contents/MacOS/mpv-bundle
|
||||
popd
|
||||
'';
|
||||
|
||||
@ -219,11 +223,14 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
mkdir -p $out/share/mpv
|
||||
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
|
||||
|
||||
cp ../TOOLS/mpv_identify.sh $out/bin
|
||||
cp ../TOOLS/umpv $out/bin
|
||||
cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop
|
||||
sed -i '/Icon=/ ! s/mpv/umpv/g; s/^Exec=.*/Exec=umpv %U/' $out/share/applications/umpv.desktop
|
||||
printf "NoDisplay=true\n" >> $out/share/applications/umpv.desktop
|
||||
pushd ../TOOLS
|
||||
cp mpv_identify.sh umpv $out/bin/
|
||||
popd
|
||||
pushd $out/share/applications
|
||||
sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \
|
||||
mpv.desktop > umpv.desktop
|
||||
printf "NoDisplay=true\n" >> umpv.desktop
|
||||
popd
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r mpv.app $out/Applications
|
||||
@ -250,7 +257,7 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://mpv.io";
|
||||
description = "General-purpose media player, fork of MPlayer and mplayer2";
|
||||
longDescription = ''
|
||||
@ -258,9 +265,11 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
MPlayer and mplayer2 projects, with great improvements above both.
|
||||
'';
|
||||
changelog = "https://github.com/mpv-player/mpv/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.gpl2Plus;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "mpv";
|
||||
maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
AndersonTorres fpletz globin ma27 tadeokondrak
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@ -97,7 +97,7 @@ let
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# wrapProgram can't operate on symlinks
|
||||
rm "$out/Applications/mpv.app/Contents/MacOS/mpv"
|
||||
makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv-bundle" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
|
||||
makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,35 +1,48 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, rustPlatform
|
||||
, libiconv
|
||||
, AppKit
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
, darwin
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "atuin";
|
||||
version = "17.2.1";
|
||||
version = "18.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atuinsh";
|
||||
repo = "atuin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nXIYy8rE5FbXxg2EvZ02okpd+BIEI79Mk9W5YcroPGA=";
|
||||
hash = "sha256-2nBaGoaTd1TGm8aZnrNA66HkW7+OrD6gOmj+uSFz020=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/atuinsh/atuin/pull/1694
|
||||
(fetchpatch {
|
||||
name = "0001-atuin_src_command_client_search_interactive.rs.patch";
|
||||
url = "https://github.com/atuinsh/atuin/commit/6bc38f4cf3c8d2b6fbd135998a4e64e6abfb2566.patch";
|
||||
hash = "sha256-pUiuECiAmq7nmKO/cOHZ1V5Iy3zDzZyBNNCH7Czo/NA=";
|
||||
})
|
||||
];
|
||||
|
||||
# TODO: unify this to one hash because updater do not support this
|
||||
cargoHash =
|
||||
if stdenv.isLinux
|
||||
then "sha256-KKG3cJYX3lQfXY8wTdQFrdfAhlzeDuR2PYF4NWn7Swk="
|
||||
else "sha256-VzLcMC79JYZ87ZnO0lQ/mL/5Wrnl2/6E5GblhCvh1FA=";
|
||||
then "sha256-Y+49R/foid+V83tY3bqf644OkMPukJxg2/ZVfJxDaFg="
|
||||
else "sha256-gT2JRzBAF4IsXVv1Hvo6kr9qrNE/3bojtULCx6YawhA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv AppKit Security SystemConfiguration ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd atuin \
|
||||
@ -47,6 +60,9 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=registration"
|
||||
# No such file or directory (os error 2)
|
||||
"--skip=sync"
|
||||
# further failing tests
|
||||
"--skip=change_password"
|
||||
"--skip=multi_user_test"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
30
pkgs/by-name/dm/dmitry/package.nix
Normal file
30
pkgs/by-name/dm/dmitry/package.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "dmitry";
|
||||
version = "1.3a-unstable-2020-06-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaygreig86";
|
||||
repo = "dmitry";
|
||||
rev = "f3ae08d4242e3e178271c827b86ff0d655972280";
|
||||
hash = "sha256-cYFeBM8xFMaLXYk6Rg+5JvfbbIJI9F3mefzCX3+XbB0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deepmagic Information Gathering Tool";
|
||||
mainProgram = "dmitry";
|
||||
homepage = "https://github.com/jaygreig86/dmitry";
|
||||
maintainers = with maintainers; [ d3vil0p3r ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, ocamlPackages, fetchFromGitHub, python3, dune_3, makeWrapper, poppler_utils }:
|
||||
{ lib, ocamlPackages, fetchFromGitHub, python3, dune_3, makeWrapper, poppler_utils, fzf }:
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "docfd";
|
||||
@ -14,26 +14,23 @@ ocamlPackages.buildDunePackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 dune_3 makeWrapper ];
|
||||
buildInputs = [ poppler_utils ] ++
|
||||
(with ocamlPackages; [ oseq spelll notty nottui lwd cmdliner domainslib digestif yojson eio_main containers-data timedesc ]);
|
||||
buildInputs = with ocamlPackages; [ oseq spelll notty nottui lwd cmdliner domainslib digestif yojson eio_main containers-data timedesc ];
|
||||
|
||||
postInstall = ''
|
||||
# docfd needs pdftotext from popler_utils to allow pdf search
|
||||
wrapProgram $out/bin/docfd --prefix PATH : "${lib.getBin poppler_utils}/bin/"
|
||||
# also fzf for "docfd ?" usage
|
||||
wrapProgram $out/bin/docfd --prefix PATH : "${lib.makeBinPath [ poppler_utils fzf ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "TUI multiline fuzzy document finder";
|
||||
longDescription = ''
|
||||
Interactive grep, but word/token/phrase based rather than regex
|
||||
and line based, so you can search across multiple lines (simlar to
|
||||
Recoll but TUI).
|
||||
Aims to provide a good UX via text editor and PDF viewer integration.
|
||||
When opening a text file, Docfd opens file at first line of search
|
||||
result. If PDF, then Docfd opens file at first page of the search
|
||||
result and starts a text search of the most unique word of the matched
|
||||
phrase within the same page.
|
||||
Main intended use case: navigating directories of notes and PDFs.
|
||||
TUI multiline fuzzy document finder.
|
||||
Think interactive grep for both text files and PDFs, but word/token based
|
||||
instead of regex and line based, so you can search across lines easily.
|
||||
Docfd aims to provide good UX via integration with common text editors
|
||||
and PDF viewers, so you can jump directly to a search result with a
|
||||
single key press.
|
||||
'';
|
||||
homepage = "https://github.com/darrenldl/docfd";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
Don't use timing as there is a type conflict.
|
||||
|
||||
--- nix-build-fastcap-2.0-18Sep92.drv-1/src/mulGlobal.h.orig 2015-07-21 15:58:49.199101566 +0200
|
||||
+++ nix-build-fastcap-2.0-18Sep92.drv-1/src/mulGlobal.h 2015-07-21 16:18:39.456751313 +0200
|
||||
@@ -57,7 +57,7 @@
|
||||
/* time variables/structs */
|
||||
#ifndef _TIME_ /* if not on a Sun4 */
|
||||
#ifndef NEWS /* if not on a NWS-38XX */
|
||||
-#include <time.h>
|
||||
+//#include <time.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
Add forward declarations.
|
||||
|
||||
--- fastcap/src/mulSetup.c.orig 2015-07-22 13:55:21.592119775 +0200
|
||||
+++ fastcap/src/mulSetup.c 2015-07-22 14:08:50.157688209 +0200
|
||||
@@ -35,6 +35,14 @@
|
||||
|
||||
#include "mulGlobal.h"
|
||||
|
||||
+static getnbrs(ssystem*);
|
||||
+static linkcubes(ssystem*);
|
||||
+static setMaxq(ssystem*);
|
||||
+static getAllInter(ssystem*);
|
||||
+static set_vector_masks(ssystem*);
|
||||
+static indexkid(ssystem*, cube*, int*, int*);
|
||||
+static int placeq(int, ssystem*, charge*);
|
||||
+
|
||||
cube *cstack[1024]; /* Stack used in several routines. */
|
||||
|
||||
/*
|
||||
94
pkgs/by-name/fa/fastcap/package.nix
Normal file
94
pkgs/by-name/fa/fastcap/package.nix
Normal file
@ -0,0 +1,94 @@
|
||||
{ stdenv
|
||||
, fetchzip
|
||||
, ghostscript
|
||||
, lib
|
||||
, texliveMedium
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fastcap";
|
||||
version = "2.0-18Sep92";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.rle.mit.edu/cpg/codes/fastcap-${version}.tgz";
|
||||
hash = "sha256-fnmC6WNd7xk8fphxkMZUq2+Qz+2mWIP2lvBUBAmUvHI";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fastcap-mulglobal-drop-conflicting-lib.patch
|
||||
./fastcap-mulsetup-add-forward-declarations.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
ghostscript
|
||||
texliveMedium
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./doc/Makefile \
|
||||
--replace '/bin/rm' 'rm'
|
||||
|
||||
for f in "doc/*.tex" ; do
|
||||
sed -i -E $f \
|
||||
-e 's/\\special\{psfile=([^,]*),.*scale=([#0-9.]*).*\}/\\includegraphics[scale=\2]{\1}/' \
|
||||
-e 's/\\psfig\{figure=([^,]*),.*width=([#0-9.]*in).*\}/\\includegraphics[width=\2]{\1}/' \
|
||||
-e 's/\\psfig\{figure=([^,]*),.*height=([#0-9.]*in).*\}/\\includegraphics[height=\2]{\1}/' \
|
||||
-e 's/\\psfig\{figure=([^,]*)\}/\\includegraphics{\1}/'
|
||||
done
|
||||
|
||||
for f in "doc/mtt.tex" "doc/tcad.tex" "doc/ug.tex"; do
|
||||
sed -i -E $f \
|
||||
-e 's/^\\documentstyle\[(.*)\]\{(.*)\}/\\documentclass[\1]{\2}\n\\usepackage{graphicx}\n\\usepackage{robinspace}/' \
|
||||
-e 's/\\setlength\{\\footheight\}\{.*\}/%/' \
|
||||
-e 's/\\setstretch\{.*\}/%/'
|
||||
done
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = [
|
||||
"RM=rm"
|
||||
"SHELL=sh"
|
||||
"all"
|
||||
];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
postBuild = ''
|
||||
make manual
|
||||
pushd doc
|
||||
find -name '*.dvi' -exec dvipdf {} \;
|
||||
popd
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/
|
||||
mv bin $out/bin
|
||||
rm $out/bin/README
|
||||
|
||||
mkdir -p $doc/share/doc/fastcap-${version}
|
||||
cp doc/*.pdf $doc/share/doc/fastcap-${version}
|
||||
|
||||
mkdir -p $out/share/fastcap
|
||||
mv examples $out/share/fastcap
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multipole-accelerated capacitance extraction program";
|
||||
longDescription = ''
|
||||
Fastcap is a three dimensional capacitance extraction program that
|
||||
compute self and mutual capacitances between conductors of arbitrary
|
||||
shapes, sizes and orientations.
|
||||
'';
|
||||
homepage = "https://www.rle.mit.edu/cpg/research_codes.htm";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fbeffa ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "fastcap";
|
||||
};
|
||||
}
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gtt";
|
||||
version = "8";
|
||||
version = "9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eeeXun";
|
||||
repo = "gtt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HC1cz2CAjyuirzhn720RD9P0gFjtP+Dh1jTniDCWBz8=";
|
||||
hash = "sha256-WDuQ8daKA8Skto4soG9L4ChkYzV18BwVZh+AbyDyXYs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5Uwi1apowHoUtvkSgmUV9WbfpVQFTqJ9GA2sRnC5nFw=";
|
||||
|
||||
28
pkgs/by-name/md/mdformat/package.nix
Normal file
28
pkgs/by-name/md/mdformat/package.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, python3
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3;
|
||||
|
||||
# selector is a function mapping pythonPackages to a list of plugins
|
||||
# e.g. `mdformat.withPlugins (ps: with ps; [ mdformat-footnote ])`
|
||||
withPlugins = selector: runCommand "mdformat-wrapped" {
|
||||
inherit (python.pkgs.mdformat) pname version meta;
|
||||
|
||||
nativeBuildInputs = [
|
||||
python.pkgs.wrapPython
|
||||
];
|
||||
|
||||
plugins = selector python.pkgs;
|
||||
|
||||
passthru = {
|
||||
inherit withPlugins;
|
||||
};
|
||||
} ''
|
||||
buildPythonPath $plugins
|
||||
makeWrapper ${lib.getExe python.pkgs.mdformat} $out/bin/mdformat \
|
||||
--suffix PYTHONPATH : "$program_PYTHONPATH"
|
||||
'';
|
||||
in withPlugins (ps: [ ])
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "msolve";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "algebraic-solving";
|
||||
repo = "msolve";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hdrNqZjTGhGFrshswJGPVgBjOUfHh93aQUfBKLlk5Es=";
|
||||
hash = "sha256-XSV279cw1svAF+uyVmkUodX4FkltDesXsge4QKHqM1o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -65,11 +65,11 @@ let
|
||||
|
||||
derivation = stdenv.mkDerivation rec {
|
||||
pname = "onlyoffice-desktopeditors";
|
||||
version = "7.5.1";
|
||||
version = "8.0.0";
|
||||
minor = null;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
|
||||
sha256 = "sha256-Hf5CNbUUMuHZHDY3fgD4qpF4UASevscK8DTZlauyHhY=";
|
||||
sha256 = "sha256-YtR2fiARMKw8dOgAPXYM+WFwmhKZRsIIBQYTxppu3F0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -156,8 +156,6 @@ let
|
||||
# the bundled version of qt does not support wayland
|
||||
)
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
in
|
||||
@ -185,6 +183,8 @@ buildFHSEnv {
|
||||
--replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors"
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents";
|
||||
longDescription = ''
|
||||
5
pkgs/by-name/on/onlyoffice-bin_latest/update.sh
Normal file
5
pkgs/by-name/on/onlyoffice-bin_latest/update.sh
Normal file
@ -0,0 +1,5 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq common-updater-scripts
|
||||
|
||||
version="$(curl -sL "https://api.github.com/repos/ONLYOFFICE/DesktopEditors/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')"
|
||||
update-source-version onlyoffice-bin "$version"
|
||||
1850
pkgs/by-name/pa/paper-plane/Cargo.lock
generated
Normal file
1850
pkgs/by-name/pa/paper-plane/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
133
pkgs/by-name/pa/paper-plane/package.nix
Normal file
133
pkgs/by-name/pa/paper-plane/package.nix
Normal file
@ -0,0 +1,133 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, gtk4
|
||||
, wrapGAppsHook
|
||||
, libadwaita
|
||||
, tdlib
|
||||
, rlottie
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustc
|
||||
, cargo
|
||||
, desktop-file-utils
|
||||
, blueprint-compiler
|
||||
, libxml2
|
||||
, libshumate
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "paper-plane";
|
||||
version = "0.1.0-beta.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paper-plane-developers";
|
||||
repo = "paper-plane";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qcAHxNnF980BHMqLF86M06YQnEN5L/8nkyrX6HQjpBA=";
|
||||
};
|
||||
|
||||
# Paper Plane requires a patch to the gtk4, but may be removed later
|
||||
# https://github.com/paper-plane-developers/paper-plane/tree/main?tab=readme-ov-file#prerequisites
|
||||
gtk4-paperplane = gtk4.overrideAttrs (prev: {
|
||||
patches = prev.patches ++ [ "${src}/build-aux/gtk-reversed-list.patch" ];
|
||||
});
|
||||
wrapPaperPlaneHook = wrapGAppsHook.override {
|
||||
gtk3 = gtk4-paperplane;
|
||||
};
|
||||
# libadwaita has gtk4 in propagatedBuildInputs so it must be overrided
|
||||
# to avoid linking two libraries, while libshumate doesn't
|
||||
libadwaita-paperplane = libadwaita.override {
|
||||
gtk4 = gtk4-paperplane;
|
||||
};
|
||||
tdlib-paperplane = tdlib.overrideAttrs (prev: {
|
||||
pname = "tdlib-paperplane";
|
||||
version = "1.8.19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdlib";
|
||||
repo = "td";
|
||||
rev = "2589c3fd46925f5d57e4ec79233cd1bd0f5d0c09";
|
||||
hash = "sha256-mbhxuJjrV3nC8Ja7N0WWF9ByHovJLmoLLuuzoU4khjU=";
|
||||
};
|
||||
});
|
||||
rlottie-paperplane = rlottie.overrideAttrs (prev: {
|
||||
pname = "rlottie-paperplane";
|
||||
version = "0-unstable-2022-09-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "paper-plane-developers";
|
||||
repo = "rlottie";
|
||||
rev = "1dd47cec7eb8e1f657f02dce9c497ae60f7cf8c5";
|
||||
hash = "sha256-OIKnDikuJuRIR9Jvl1PnUA9UAV09EmgGdDTeWoVi7jk=";
|
||||
};
|
||||
patches = [ ];
|
||||
env.NIX_CFLAGS_COMPILE = prev.env.NIX_CFLAGS_COMPILE + " -Wno-error";
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"gtk-rlottie-0.1.0" = "sha256-/F0VSXU0Z59QyFYXrB8NLe/Nw/uVjGY68BriOySSXyI=";
|
||||
"origami-0.1.0" = "sha256-xh7eBjumqCOoAEvRkivs/fgvsKXt7UU67FCFt20oh5s=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.bindgenHook
|
||||
rustc
|
||||
cargo
|
||||
wrapPaperPlaneHook
|
||||
desktop-file-utils
|
||||
blueprint-compiler
|
||||
libxml2.bin
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libshumate
|
||||
libadwaita-paperplane
|
||||
tdlib-paperplane
|
||||
rlottie-paperplane
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
# The API ID and hash provided here are for use with Paper Plane only.
|
||||
# Redistribution of the key in Nixpkgs has been explicitly permitted
|
||||
# by Paper Plane developers. Please do not use it in other projects.
|
||||
"-Dtg_api_id=22303002"
|
||||
"-Dtg_api_hash=3cc0969992690f032197e6609b296599"
|
||||
];
|
||||
|
||||
# Workaround for the gettext-sys issue
|
||||
# https://github.com/Koka/gettext-rs/issues/114
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString
|
||||
(
|
||||
stdenv.cc.isClang &&
|
||||
lib.versionAtLeast stdenv.cc.version "16"
|
||||
)
|
||||
"-Wno-error=incompatible-function-pointer-types";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/paper-plane-developers/paper-plane";
|
||||
description = "Chat over Telegram on a modern and elegant client";
|
||||
longDescription = ''
|
||||
Paper Plane is an alternative Telegram client. It uses libadwaita
|
||||
for its user interface and strives to meet the design principles
|
||||
of the GNOME desktop.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
mainProgram = "paper-plane";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
68
pkgs/by-name/sm/smile/package.nix
Normal file
68
pkgs/by-name/sm/smile/package.nix
Normal file
@ -0,0 +1,68 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk4
|
||||
, meson
|
||||
, ninja
|
||||
, wrapGAppsHook4
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "smile";
|
||||
version = "2.9.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mijorus";
|
||||
repo = "smile";
|
||||
rev = version;
|
||||
hash = "sha256-tXbRel+rtaE2zPO8NOc4X+Ktk4PdRHBMtpsGLbvuHZk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace-fail gtk-update-icon-cache gtk4-update-icon-cache
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils # for update-desktop-database
|
||||
glib # for glib-compile-resources
|
||||
gobject-introspection
|
||||
gtk4 # for gtk4-update-icon-cache
|
||||
meson
|
||||
ninja
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dbus-python
|
||||
manimpango
|
||||
pygobject3
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://smile.mijorus.it/changelog";
|
||||
description = "An emoji picker for linux, with custom tags support and localization";
|
||||
downloadPage = "https://github.com/mijorus/smile";
|
||||
homepage = "https://mijorus.it/projects/smile/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "smile";
|
||||
maintainers = with lib.maintainers; [ koppor ];
|
||||
};
|
||||
}
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "libvibrant";
|
||||
repo = "vibrantLinux";
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rvJiVId6221hTrfEIvVO9HTMhaZ6KY44Bu3a5MinPHI=";
|
||||
};
|
||||
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20240131105845";
|
||||
version = "20240208184303";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-aoHcRrZOFHagFNieJf9LtWHd1JDisPb3cpu9x5rMizE=";
|
||||
hash = "sha256-pKijinMAnDIjOtLYJ8jcsIc5W1tEw6RA/inDm7Lqa1Q=";
|
||||
};
|
||||
vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY=";
|
||||
meta = with lib; {
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation {
|
||||
inherit (generator) pname version src meta;
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
${generator}/bin/domain-list-community -datapath $src/data --exportlists=category-ads-all,tld-cn,cn,tld-\!cn,geolocation-\!cn,apple,icloud
|
||||
${generator}/bin/domain-list-community -datapath $src/data
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "opencomposite";
|
||||
version = "unstable-2024-01-14";
|
||||
version = "unstable-2024-02-05";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "znixian";
|
||||
repo = "OpenOVR";
|
||||
rev = "57ecdd2675fd1baeab7d9cf55b6e827f19a65530";
|
||||
hash = "sha256-OOJNQzFRPSdLrIaDrGke12ubIiSjdD/vvHBz0WjGf3c=";
|
||||
rev = "c1649b0e4f3c4f51c12904c0b818263006d56f00";
|
||||
hash = "sha256-K8Vtd60cKmhEKMBrlNZxoC73m1BY0014ejJM2mWkwsA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -84,6 +84,10 @@ buildBazelPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
rm .bazelversion
|
||||
|
||||
# Fix gcc-13 build failure by including missing include headers
|
||||
sed -e '1i #include <cstdint>' -i \
|
||||
tensorflow/lite/kernels/internal/spectrogram.cc
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -6,12 +6,13 @@
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopegelonline";
|
||||
version = "0.0.7";
|
||||
format = "setuptools";
|
||||
version = "0.0.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
@ -19,9 +20,13 @@ buildPythonPackage rec {
|
||||
owner = "mib1185";
|
||||
repo = "aiopegelonline";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-r+5b52N/vliKHx6qOLJ4lWcQt1TPEcn5Dz7cZNhRbNg=";
|
||||
hash = "sha256-Z/3IF5AwiNB+h8wug+57OVdLpFxGoiUe2xG4euHT1Bw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, fsspec
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
@ -10,7 +11,6 @@
|
||||
, numpy
|
||||
, packaging
|
||||
, typing-extensions
|
||||
, fsspec
|
||||
, jax
|
||||
, jaxlib
|
||||
, numba
|
||||
@ -43,6 +43,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
awkward-cpp
|
||||
fsspec
|
||||
importlib-metadata
|
||||
numpy
|
||||
packaging
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, starlette
|
||||
, brotli
|
||||
# check inputs
|
||||
, httpx
|
||||
, requests
|
||||
, mypy
|
||||
, brotlipy
|
||||
@ -35,6 +36,7 @@ buildPythonPackage {
|
||||
pythonImportsCheck = [ "brotli_asgi" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
httpx
|
||||
requests
|
||||
mypy
|
||||
brotlipy
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, wheel
|
||||
, packaging
|
||||
, pybind11
|
||||
, pydantic
|
||||
, rich
|
||||
@ -28,11 +29,9 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
numpy
|
||||
scikit-build
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
pybind11
|
||||
];
|
||||
|
||||
@ -41,6 +40,8 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
packaging
|
||||
pydantic
|
||||
rich
|
||||
];
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, buildPythonPackage
|
||||
, defusedxml
|
||||
, fetchFromGitHub
|
||||
, ftfy
|
||||
, httpx
|
||||
, netifaces
|
||||
, pytest-asyncio
|
||||
@ -17,16 +18,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "denonavr";
|
||||
version = "0.11.4";
|
||||
format = "pyproject";
|
||||
version = "0.11.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ol-iver";
|
||||
repo = pname;
|
||||
repo = "denonavr";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0+BjakGGnCbmiSHSipRifPkasfP1vvAWGvzyRufpsOk=";
|
||||
hash = "sha256-VxoRK1qeGrIunsiCzeZJUHxW/sxk+PFpntInL+G/yI8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -37,6 +38,7 @@ buildPythonPackage rec {
|
||||
asyncstdlib
|
||||
attrs
|
||||
defusedxml
|
||||
ftfy
|
||||
httpx
|
||||
netifaces
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "evohome-async";
|
||||
version = "0.4.18";
|
||||
version = "0.4.19";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "zxdavb";
|
||||
repo = "evohome-async";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-EXgq74/RfQ9AHlyZlDLfXtKFgYg37WA1Q3x3g+W9lz0=";
|
||||
hash = "sha256-B7LvGXAZO1pd9iCuZjW/bRWdB5PEzfcQjZWokGzMN70=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,23 +7,25 @@
|
||||
, pygments
|
||||
, pytestCheckHook
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "explorerscript";
|
||||
version = "0.1.4";
|
||||
format = "setuptools";
|
||||
version = "0.1.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-oa9q5k3OREGn6pQiyLy22MNJTiY6Pm+xrwA4DBUhxp0=";
|
||||
hash = "sha256-dGbzZYEFEWE5bUz+647pPzP4Z/XmrJU82jNT4ZBRNHk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
antlr4
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-ai-generativelanguage";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Nf5XTdQbfkA28hd0E0VAexZXCQR6MR9oQnsG7Ipz7h8=";
|
||||
hash = "sha256-njzyaFPXTRvZmWfB0uYufMNqhTBBN7fkKtS7bUyA8ME=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-artifact-registry";
|
||||
version = "1.10.0";
|
||||
version = "1.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JrW6lkaRiVsisuOCHLNTxh6LF44PO/RhRfTkORDSIt4=";
|
||||
hash = "sha256-EjwBVYq7V39ab/VQEmysfiuwEbMkjCXq5o+jM31NrwI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-resource-manager";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wsSuU+X5/2EuTPlh8brD+RAK5UpRIsGxzUI26ITREsU=";
|
||||
hash = "sha256-JbMRLJhO9qJWnKcEcWCyNBxSjHDh0uct65loaqLhZ90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wZKuMeXio7CINEm752+2QYd8TONejQ7RNi4ij0LtFVY=";
|
||||
hash = "sha256-oZWY7n/8638/WkIG9s/9LN4NKWSfhnrQp+9Pydq103E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,17 +11,19 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "gvm-tools";
|
||||
version = "24.1.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
repo = "gvm-tools";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4uYOhsnprYybt5EB/b4LW8/9cn0Nahc1lYQ+DwPNlOU=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "vacanza";
|
||||
repo = "python-holidays";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BVmH3LO0VjIcpS8HoQmP6mHv7zDK0Aw3pS4oiZWhF/4=";
|
||||
hash = "sha256-oVuzX/H5jj/c4dbPGmXUnZeDbgSd9v9qP2dXe6+PaUQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "httpx-auth";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Colin-b";
|
||||
repo = "httpx_auth";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kK31jpS9Ax5kNkvUSbWWIC6CKdZKVJ28kLS0iuntWqg=";
|
||||
hash = "sha256-ptxM0gabr+NmfkXqYlWd+G0c0yClJawRNKjbtPKSGFY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "httpx-socks";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "romis2012";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3Dj+rrH5Pil5xQE6sAAD5RTycwlKq+TVsAeB2NVqGjY=";
|
||||
hash = "sha256-L2nyVADDjPrHwhZRm+RAvfBdpP9sIvc9cakDiLVA7xw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,23 +4,28 @@
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, ukkonen
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.5.33";
|
||||
format = "setuptools";
|
||||
version = "2.5.34";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
repo = "identify";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-v0k+N/E1xzhL2iWM0HQzYCxHfzuP8Za4eupkofN7bAA=";
|
||||
hash = "sha256-q1RVFdDFUkKGaKpcbasXHks+OZhVRZUy3ufuruBZiPA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
editdistance-s
|
||||
pytestCheckHook
|
||||
|
||||
@ -1,54 +1,42 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, mdformat
|
||||
, python3
|
||||
, mdit-py-plugins
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
mdit-py-plugins = super.mdit-py-plugins.overridePythonAttrs (_prev: rec {
|
||||
version = "0.4.0";
|
||||
doCheck = false;
|
||||
src = fetchFromGitHub {
|
||||
owner = "executablebooks";
|
||||
repo = "mdit-py-plugins";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YBJu0vIOD747DrJLcqiZMHq34+gHdXeGLCw1OxxzIJ0=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in python.pkgs.buildPythonPackage rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-admon";
|
||||
version = "1.0.2";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KyleKing";
|
||||
repo = pname;
|
||||
repo = "mdformat-admon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
buildInputs = with python.pkgs; [
|
||||
propagatedBuildInputs = [
|
||||
mdformat
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
mdit-py-plugins
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "mdformat plugin for admonitions";
|
||||
description = "Mdformat plugin for admonitions";
|
||||
homepage = "https://github.com/KyleKing/mdformat-admon";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aldoborrero ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-beautysh";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -28,16 +28,13 @@ buildPythonPackage rec {
|
||||
poetry-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
beautysh
|
||||
mdformat
|
||||
mdformat-gfm
|
||||
mdit-py-plugins
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautysh
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-footnote";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
flit-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
mdformat
|
||||
mdit-py-plugins
|
||||
];
|
||||
|
||||
@ -28,12 +28,9 @@ buildPythonPackage rec {
|
||||
flit-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
mdformat
|
||||
mdit-py-plugins
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ruamel-yaml
|
||||
];
|
||||
|
||||
@ -42,7 +39,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "mdformat plugin to ensure frontmatter is respected";
|
||||
description = "Mdformat plugin to ensure frontmatter is respected";
|
||||
homepage = "https://github.com/butler54/mdformat-frontmatter";
|
||||
changelog = "https://github.com/butler54/mdformat-frontmatter/blob/v{version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -29,14 +29,11 @@ buildPythonPackage rec {
|
||||
poetry-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
mdformat
|
||||
markdown-it-py
|
||||
mdit-py-plugins
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
markdown-it-py
|
||||
mdformat
|
||||
mdformat-tables
|
||||
mdit-py-plugins
|
||||
linkify-it-py
|
||||
];
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
flit-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
mdformat
|
||||
mdformat-gfm
|
||||
mdit-py-plugins
|
||||
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "mdformat plugin for MkDocs";
|
||||
description = "Mdformat plugin for MkDocs";
|
||||
homepage = "https://github.com/KyleKing/mdformat-mkdocs";
|
||||
changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -1,30 +1,37 @@
|
||||
{ lib
|
||||
, alejandra
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mdformat
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-nix-alejandra";
|
||||
version = "0.1.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aldoborrero";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
repo = "mdformat-nix-alejandra";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-jUXApGsxCA+pRm4m4ZiHWlxmVkqCPx3A46oQdtyKz5g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace mdformat_nix_alejandra/__init__.py \
|
||||
--replace-fail '"alejandra"' '"${lib.getExe alejandra}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
mdformat
|
||||
];
|
||||
|
||||
@ -32,6 +39,10 @@ buildPythonPackage rec {
|
||||
"mdformat_nix_alejandra"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mdformat plugin format Nix code blocks with alejandra";
|
||||
homepage = "https://github.com/aldoborrero/mdformat-nix-alejandra";
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-simple-breaks";
|
||||
version = "0.0.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
flit-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
mdformat
|
||||
];
|
||||
|
||||
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "mdformat plugin to render thematic breaks using three dashes";
|
||||
description = "Mdformat plugin to render thematic breaks using three dashes";
|
||||
homepage = "https://github.com/csala/mdformat-simple-breaks";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aldoborrero ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-tables";
|
||||
version = "0.4.1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
flit-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
mdformat
|
||||
];
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-toc";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
poetry-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
propagatedBuildInputs = [
|
||||
mdformat
|
||||
];
|
||||
|
||||
|
||||
@ -5,99 +5,57 @@
|
||||
, importlib-metadata
|
||||
, makeWrapper
|
||||
, markdown-it-py
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, python3
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, tomli
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
let
|
||||
withPlugins = plugins: buildPythonApplication {
|
||||
pname = "${package.pname}";
|
||||
inherit (package) version;
|
||||
format = "other";
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat";
|
||||
version = "0.7.17";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
dontUnpack = true;
|
||||
dontBuild = true;
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
makeWrapper ${package}/bin/mdformat $out/bin/mdformat \
|
||||
--prefix PYTHONPATH : "${package}/${python3.sitePackages}:$PYTHONPATH"
|
||||
ln -sfv ${package}/lib $out/lib
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = package.propagatedBuildInputs ++ plugins;
|
||||
|
||||
passthru = package.passthru // {
|
||||
withPlugins = morePlugins: withPlugins (morePlugins ++ plugins);
|
||||
};
|
||||
|
||||
meta.mainProgram = "mdformat";
|
||||
src = fetchFromGitHub {
|
||||
owner = "executablebooks";
|
||||
repo = "mdformat";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s=";
|
||||
};
|
||||
|
||||
package = buildPythonPackage rec {
|
||||
pname = "mdformat";
|
||||
version = "0.7.17";
|
||||
format = "pyproject";
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
propagatedBuildInputs = [
|
||||
markdown-it-py
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "executablebooks";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s=";
|
||||
};
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
setuptools
|
||||
];
|
||||
pythonImportsCheck = [
|
||||
"mdformat"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
markdown-it-py
|
||||
tomli
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
importlib-metadata
|
||||
] ++ lib.optionals (pythonOlder "3.7") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError
|
||||
"test_no_codeblock_trailing_newline"
|
||||
# Issue with upper/lower case
|
||||
"default_style.md-options0"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mdformat"
|
||||
];
|
||||
|
||||
passthru = { inherit withPlugins; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "CommonMark compliant Markdown formatter";
|
||||
homepage = "https://mdformat.rtfd.io/";
|
||||
changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab aldoborrero ];
|
||||
mainProgram = "mdformat";
|
||||
};
|
||||
passthru = {
|
||||
withPlugins = throw "Use pkgs.mdformat.withPlugins, i.e. the top-level attribute.";
|
||||
};
|
||||
in
|
||||
package
|
||||
|
||||
meta = with lib; {
|
||||
description = "CommonMark compliant Markdown formatter";
|
||||
homepage = "https://mdformat.rtfd.io/";
|
||||
changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab aldoborrero ];
|
||||
mainProgram = "mdformat";
|
||||
};
|
||||
}
|
||||
|
||||
64
pkgs/development/python-modules/medpy/default.nix
Normal file
64
pkgs/development/python-modules/medpy/default.nix
Normal file
@ -0,0 +1,64 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, unittestCheckHook
|
||||
, boost
|
||||
, numpy
|
||||
, scipy
|
||||
, simpleitk
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "medpy";
|
||||
version = "0.5.0rc1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loli";
|
||||
repo = "medpy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-W62LjstH42OzNG+vMkuApUWczTNugJGKuuoeeS5ok4U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boost
|
||||
numpy
|
||||
scipy
|
||||
simpleitk
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
];
|
||||
preCheck = ''
|
||||
rm -r medpy/ # prevent importing from build directory at test time
|
||||
rm -r tests/graphcut_ # SIGILL at test time
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"medpy"
|
||||
"medpy.core"
|
||||
"medpy.features"
|
||||
"medpy.filter"
|
||||
"medpy.graphcut"
|
||||
"medpy.io"
|
||||
"medpy.metric"
|
||||
"medpy.utilities"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Medical image processing library";
|
||||
homepage = "https://loli.github.io/medpy";
|
||||
changelog = "https://github.com/loli/medpy/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.44.1";
|
||||
version = "0.45.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-i3OQ2QOBMaiNTyq44wbnHZ2iqAXEYB16NWKWzOza1Jo=";
|
||||
hash = "sha256-lQVUHZvAZ4J0DLlUl30dSz2wwXKb9MK5prkXvub0yNI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
45
pkgs/development/python-modules/python-bring-api/default.nix
Normal file
45
pkgs/development/python-modules/python-bring-api/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-bring-api";
|
||||
version = "3.0.0-unstable-2024-02-03";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eliasball";
|
||||
repo = "python-bring-api";
|
||||
# https://github.com/eliasball/python-bring-api/issues/16
|
||||
rev = "8043562b22be1f6421a8771774868b105b6ca375";
|
||||
hash = "sha256-VCGCm9N6pMhEYT9WuWh7qKacZEf6bcIpEsILfCC6his=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"python_bring_api"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to access the Bring! shopping lists API";
|
||||
homepage = "https://github.com/eliasball/python-bring-api";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -3,24 +3,29 @@
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, text-unidecode
|
||||
, unidecode
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-slugify";
|
||||
version = "8.0.1";
|
||||
format = "setuptools";
|
||||
version = "8.0.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "un33k";
|
||||
repo = pname;
|
||||
repo = "python-slugify";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MJac63XjgWdUQdyyEm8O7gAGVszmHxZzRF4frJtR0BU=";
|
||||
hash = "sha256-zReUMIkItnDot3XyYCoPUNHrrAllbClWFYcxdTy3A30=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
text-unidecode
|
||||
];
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, nunavut
|
||||
, pyserial , pytest, ruamel-yaml}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyuavcan";
|
||||
version = "1.1.0.dev1";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.7"; # only python>=3.7 is supported
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UAVCAN";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ChNoYHuZulPLrxYvxeVO9Tyt8rymlk3p/OkYaG2rqzo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
nunavut
|
||||
pyserial
|
||||
pytest
|
||||
ruamel-yaml
|
||||
];
|
||||
|
||||
# allow for writable directory for darwin
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
export PYTHONASYNCIODEBUG=1
|
||||
'';
|
||||
|
||||
# tests fail ATM.
|
||||
doCheck = false;
|
||||
|
||||
# check at least that import works, as tests fail
|
||||
pythonImportsCheck = [
|
||||
"pyuavcan"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A full-featured implementation of the UAVCAN protocol stack";
|
||||
longDescription = ''
|
||||
It is intended for non-embedded, user-facing applications such as GUI
|
||||
software, diagnostic tools, automation scripts, prototypes, and various
|
||||
R&D cases. PyUAVCAN consists of a Python library (package) and a simple
|
||||
CLI tool for basic diagnostics and shell script automation.
|
||||
'';
|
||||
homepage = "https://pyuavcan.readthedocs.io";
|
||||
maintainers = with maintainers; [ wucke13 ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-dtef";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ngIjM8DW9HQJpa/U2f1sy+6CeWdccayp60vbJmos+A8=";
|
||||
hash = "sha256-vVh4WRjx/iFJnTZC7D/OCi0gOwKaXs/waVXUEu5Cda8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-files";
|
||||
version = "1.6.1";
|
||||
version = "1.6.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-P0VME1keazqcyb0JuQ4iXPyJH7/gTmYE7uASpjvhqUo=";
|
||||
hash = "sha256-OkokbVD8j+Sgypj25demzSZdiAEf8TJrnl0QRIM2HsI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,18 +13,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-rust";
|
||||
version = "1.6.1";
|
||||
version = "1.6.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Qg2KAzjSV7yQTpRHmNMkHRwOJSbfsgcdT0RHQru2lBI=";
|
||||
hash = "sha256-z9Vu9mj82hwuPva56tmav4jN9RCoNIZxL+C3GYtYsOo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-ZJ5eYof9RZ07iP0YowIBorHuNUntQVW9JWcSVe2emig=";
|
||||
hash = "sha256-2or419evNxi99HIvL2TlSWFFh4BCky8qI/dVQbq/X38=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-ssb-debugger";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Zqp/NSF3uoxktycg+Q3BLFUMzbHFKUkYCg+DvEcRydU=";
|
||||
hash = "sha256-lMlBCAmmenEwxzt4ft5jwwvqedzu2omeoNx5g6lA+PE=";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk3 gtksourceview4 ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tesla-fleet-api";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Teslemetry";
|
||||
repo = "python-tesla-fleet-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XAgZxvN6j3p607Yox5omDDOm3n8YSJFAmui8+5jqY5c=";
|
||||
hash = "sha256-iKA2PuKEytF9ko4D+eHf+Nu+MzRDytz9Kc0zAPyOQ88=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, wheel
|
||||
, aiohttp
|
||||
, python-dateutil
|
||||
, typing-extensions
|
||||
@ -11,22 +10,21 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twitchapi";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Teekeks";
|
||||
repo = "pyTwitchAPI";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aYYuHyILd3nT0jG59wJcRgSeri26YsC3NpwuQ9dsI1I=";
|
||||
hash = "sha256-QAxLYujnsudaiz9UepwrBA835Pct5h4VcE9ZrbkwMmg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,18 +1,23 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pytz";
|
||||
version = "2023.3.1.1";
|
||||
format = "setuptools";
|
||||
version = "2023.4.0.20240130";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zCPQGSzUnI9rukTuDIHkWGqPMCBJcPwIlNIJprCNq5o=";
|
||||
hash = "sha256-M2dqkL8EsZ+Swz7shYETa+ovNd3RJ1nleaYkoAb9OHo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# Modules doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -39,6 +39,12 @@ in stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
postPatch = lib.optionalString (!stdenv.isDarwin) ''
|
||||
# Fix build on gcc-13 due to missing includes
|
||||
sed -e '1i #include <cstdint>' -i \
|
||||
Libraries/libutil/Headers/libutil/Permissions.h \
|
||||
Libraries/pbxbuild/Headers/pbxbuild/Tool/AuxiliaryFile.h \
|
||||
Libraries/pbxbuild/Headers/pbxbuild/Tool/Invocation.h
|
||||
|
||||
# Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
|
||||
sed 1i'#include <sys/sysmacros.h>' \
|
||||
-i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
|
||||
|
||||
@ -1,20 +1,28 @@
|
||||
{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, SDL_mixer, freepats }:
|
||||
{ lib, stdenv, fetchzip, fetchFromGitHub
|
||||
, makeDesktopItem, copyDesktopItems
|
||||
, cmake
|
||||
, SDL2, SDL2_mixer, freepats
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abuse";
|
||||
version = "0.8";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://abuse.zoy.org/raw-attachment/wiki/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xenoveritas";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eneu0HxEoM//Ju2XMHnDMZ/igeVMPSLg7IaxR2cnJrk=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--with-x"
|
||||
"--with-assetdir=$(out)/orig"
|
||||
# The "--enable-debug" is to work around a segfault on start, see https://bugs.archlinux.org/task/52915.
|
||||
"--enable-debug"
|
||||
];
|
||||
data = fetchzip {
|
||||
url = "http://abuse.zoy.org/raw-attachment/wiki/download/abuse-0.8.tar.gz";
|
||||
hash = "sha256-SOrtBNLWskN7Tqa0B3+KjlZlqPjC64Jp02Pk7to2hFg=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
cp --reflink=auto -r ${data}/data/sfx ${data}/data/music data/
|
||||
'';
|
||||
|
||||
desktopItems = [ (makeDesktopItem {
|
||||
name = "abuse";
|
||||
@ -33,11 +41,13 @@ stdenv.mkDerivation rec {
|
||||
substituteAll "${./abuse.sh}" $out/bin/abuse
|
||||
chmod +x $out/bin/abuse
|
||||
|
||||
install -Dm644 doc/abuse.png $out/share/pixmaps/abuse.png
|
||||
install -Dm644 ${data}/doc/abuse.png $out/share/pixmaps/abuse.png
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
buildInputs = [ SDL SDL_mixer freepats ];
|
||||
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2";
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems cmake ];
|
||||
buildInputs = [ SDL2 SDL2_mixer freepats ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Side-scroller action game that pits you against ruthless alien killers";
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, lib
|
||||
, curl
|
||||
, nlohmann_json
|
||||
@ -43,6 +44,16 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-q0dI4WdA1ue4sw+QfSherh31Ldf9gnhoft66o3E9gnU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix gcc-13 build:
|
||||
# https://github.com/microsoft/Azure-DCAP-Client/pull/197
|
||||
(fetchpatch {
|
||||
name = "gcc-13.patch";
|
||||
url = "https://github.com/microsoft/Azure-DCAP-Client/commit/fbcae7b3c8f1155998248cf5b5f4c1df979483f5.patch";
|
||||
hash = "sha256-ezEuQql3stn58N1ZPKMlhPpUOBkDpCcENpGwFAmWtHc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
@ -9,7 +9,7 @@ sgx-azure-dcap-client.overrideAttrs (old: {
|
||||
gtest
|
||||
];
|
||||
|
||||
patches = [
|
||||
patches = (old.patches or []) ++ [
|
||||
./tests-missing-includes.patch
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
@ -36,6 +37,7 @@ stdenvNoCC.mkDerivation {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc.lib
|
||||
libusb1
|
||||
];
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
# PostgreSQL's request for a shared memory segment exceeded your kernel's SHMALL parameter
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isx86_64);
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dendrite;
|
||||
|
||||
@ -46,24 +46,6 @@ let
|
||||
];
|
||||
});
|
||||
|
||||
aiohttp = super.aiohttp.overridePythonAttrs (old: rec {
|
||||
version = "3.9.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = "aiohttp";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dEeMHruFJ1o0J6VUJcpUk7LhEC8sV8hUKXoKcd618lE=";
|
||||
};
|
||||
nativeCheckInputs = with self; [
|
||||
freezegun
|
||||
gunicorn
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
python-on-whales
|
||||
re-assert
|
||||
];
|
||||
});
|
||||
|
||||
aionotion = super.aionotion.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2023.05.5";
|
||||
src = fetchFromGitHub {
|
||||
@ -342,6 +324,16 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "8.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "un33k";
|
||||
repo = "python-slugify";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MJac63XjgWdUQdyyEm8O7gAGVszmHxZzRF4frJtR0BU=";
|
||||
};
|
||||
});
|
||||
|
||||
pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "9.0.1";
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pg_squeeze";
|
||||
version = "1.5.2";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cybertec-postgresql";
|
||||
repo = "pg_squeeze";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Sa5mVaUhuRHUjbcORVXe+3uwI1RxfsL6zaZixtU0BcU=";
|
||||
rev = "REL${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
|
||||
hash = "sha256-YS13iIpQ4NJe0N6bRVa2RDxEMwEzBc2mjNYM5/Vqjn8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,244 +0,0 @@
|
||||
# This file originates from composer2nix
|
||||
|
||||
{ stdenv, lib, writeTextFile, fetchurl, php, unzip, phpPackages }:
|
||||
|
||||
let
|
||||
inherit (phpPackages) composer;
|
||||
|
||||
filterSrc = src:
|
||||
builtins.filterSource (path: type: type != "directory" || (baseNameOf path != ".git" && baseNameOf path != ".git" && baseNameOf path != ".svn")) src;
|
||||
|
||||
buildZipPackage = { name, src }:
|
||||
stdenv.mkDerivation {
|
||||
inherit name src;
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildCommand = ''
|
||||
shopt -s dotglob
|
||||
unzip $src
|
||||
baseDir=$(find . -type d -mindepth 1 -maxdepth 1)
|
||||
cd $baseDir
|
||||
mkdir -p $out
|
||||
mv * $out
|
||||
'';
|
||||
};
|
||||
|
||||
buildPackage =
|
||||
{ name
|
||||
, src
|
||||
, packages ? {}
|
||||
, devPackages ? {}
|
||||
, buildInputs ? []
|
||||
, symlinkDependencies ? false
|
||||
, executable ? false
|
||||
, removeComposerArtifacts ? false
|
||||
, postInstall ? ""
|
||||
, noDev ? false
|
||||
, composerExtraArgs ? ""
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, ...}@args:
|
||||
|
||||
let
|
||||
reconstructInstalled = writeTextFile {
|
||||
name = "reconstructinstalled.php";
|
||||
executable = true;
|
||||
text = ''
|
||||
#! ${php}/bin/php
|
||||
<?php
|
||||
if(file_exists($argv[1]))
|
||||
{
|
||||
$composerLockStr = file_get_contents($argv[1]);
|
||||
|
||||
if($composerLockStr === false)
|
||||
{
|
||||
fwrite(STDERR, "Cannot open composer.lock contents\n");
|
||||
exit(1);
|
||||
}
|
||||
else
|
||||
{
|
||||
$config = json_decode($composerLockStr, true);
|
||||
|
||||
if(array_key_exists("packages", $config))
|
||||
$allPackages = $config["packages"];
|
||||
else
|
||||
$allPackages = array();
|
||||
|
||||
${lib.optionalString (!noDev) ''
|
||||
if(array_key_exists("packages-dev", $config))
|
||||
$allPackages = array_merge($allPackages, $config["packages-dev"]);
|
||||
''}
|
||||
|
||||
$packagesStr = json_encode($allPackages, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
|
||||
print($packagesStr);
|
||||
}
|
||||
}
|
||||
else
|
||||
print("[]");
|
||||
?>
|
||||
'';
|
||||
};
|
||||
|
||||
constructBin = writeTextFile {
|
||||
name = "constructbin.php";
|
||||
executable = true;
|
||||
text = ''
|
||||
#! ${php}/bin/php
|
||||
<?php
|
||||
$composerJSONStr = file_get_contents($argv[1]);
|
||||
|
||||
if($composerJSONStr === false)
|
||||
{
|
||||
fwrite(STDERR, "Cannot open composer.json contents\n");
|
||||
exit(1);
|
||||
}
|
||||
else
|
||||
{
|
||||
$config = json_decode($composerJSONStr, true);
|
||||
|
||||
if(array_key_exists("bin-dir", $config))
|
||||
$binDir = $config["bin-dir"];
|
||||
else
|
||||
$binDir = "bin";
|
||||
|
||||
if(array_key_exists("bin", $config))
|
||||
{
|
||||
if(!file_exists("vendor/".$binDir))
|
||||
mkdir("vendor/".$binDir);
|
||||
|
||||
foreach($config["bin"] as $bin)
|
||||
symlink("../../".$bin, "vendor/".$binDir."/".basename($bin));
|
||||
}
|
||||
}
|
||||
?>
|
||||
'';
|
||||
};
|
||||
|
||||
bundleDependencies = dependencies:
|
||||
lib.concatMapStrings (dependencyName:
|
||||
let
|
||||
dependency = dependencies.${dependencyName};
|
||||
in
|
||||
''
|
||||
${if dependency.targetDir == "" then ''
|
||||
vendorDir="$(dirname ${dependencyName})"
|
||||
mkdir -p "$vendorDir"
|
||||
${if symlinkDependencies then
|
||||
''ln -s "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
|
||||
else
|
||||
''cp -av "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"''
|
||||
}
|
||||
'' else ''
|
||||
namespaceDir="${dependencyName}/$(dirname "${dependency.targetDir}")"
|
||||
mkdir -p "$namespaceDir"
|
||||
${if symlinkDependencies then
|
||||
''ln -s "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
|
||||
else
|
||||
''cp -av "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"''
|
||||
}
|
||||
''}
|
||||
'') (builtins.attrNames dependencies);
|
||||
|
||||
extraArgs = removeAttrs args [ "packages" "devPackages" "buildInputs" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
buildInputs = [ php composer ] ++ buildInputs;
|
||||
|
||||
inherit unpackPhase buildPhase;
|
||||
|
||||
installPhase = ''
|
||||
${if executable then ''
|
||||
mkdir -p $out/share/php
|
||||
cp -av $src $out/share/php/$name
|
||||
chmod -R u+w $out/share/php/$name
|
||||
cd $out/share/php/$name
|
||||
'' else ''
|
||||
cp -av $src $out
|
||||
chmod -R u+w $out
|
||||
cd $out
|
||||
''}
|
||||
|
||||
# Remove unwanted files
|
||||
rm -f *.nix
|
||||
|
||||
export HOME=$TMPDIR
|
||||
|
||||
# Remove the provided vendor folder if it exists
|
||||
rm -Rf vendor
|
||||
|
||||
# If there is no composer.lock file, compose a dummy file.
|
||||
# Otherwise, composer attempts to download the package.json file from
|
||||
# the registry which we do not want.
|
||||
if [ ! -f composer.lock ]
|
||||
then
|
||||
cat > composer.lock <<EOF
|
||||
{
|
||||
"packages": []
|
||||
}
|
||||
EOF
|
||||
fi
|
||||
|
||||
# Reconstruct the installed.json file from the lock file
|
||||
mkdir -p vendor/composer
|
||||
${php}/bin/php ${reconstructInstalled} composer.lock > vendor/composer/installed.json
|
||||
|
||||
# Copy or symlink the provided dependencies
|
||||
cd vendor
|
||||
${bundleDependencies packages}
|
||||
${lib.optionalString (!noDev) (bundleDependencies devPackages)}
|
||||
cd ..
|
||||
|
||||
# Reconstruct autoload scripts
|
||||
# We use the optimize feature because Nix packages cannot change after they have been built
|
||||
# Using the dynamic loader for a Nix package is useless since there is nothing to dynamically reload.
|
||||
composer dump-autoload --optimize ${lib.optionalString noDev "--no-dev"} ${composerExtraArgs}
|
||||
|
||||
# Run the install step as a validation to confirm that everything works out as expected
|
||||
composer install --optimize-autoloader ${lib.optionalString noDev "--no-dev"} ${composerExtraArgs}
|
||||
|
||||
${lib.optionalString executable ''
|
||||
# Reconstruct the bin/ folder if we deploy an executable project
|
||||
${php}/bin/php ${constructBin} composer.json
|
||||
ln -s $(pwd)/vendor/bin $out/bin
|
||||
''}
|
||||
|
||||
${lib.optionalString (!symlinkDependencies) ''
|
||||
# Patch the shebangs if possible
|
||||
if [ -d $(pwd)/vendor/bin ]
|
||||
then
|
||||
# Look for all executables in bin/
|
||||
for i in $(pwd)/vendor/bin/*
|
||||
do
|
||||
# Look for their location
|
||||
realFile=$(readlink -f "$i")
|
||||
|
||||
# Restore write permissions
|
||||
chmod u+wx "$(dirname "$realFile")"
|
||||
chmod u+w "$realFile"
|
||||
|
||||
# Patch shebang
|
||||
sed -e "s|#!/usr/bin/php|#!${php}/bin/php|" \
|
||||
-e "s|#!/usr/bin/env php|#!${php}/bin/php|" \
|
||||
"$realFile" > tmp
|
||||
mv tmp "$realFile"
|
||||
chmod u+x "$realFile"
|
||||
done
|
||||
fi
|
||||
''}
|
||||
|
||||
if [ "$removeComposerArtifacts" = "1" ]
|
||||
then
|
||||
# Remove composer stuff
|
||||
rm -f composer.json composer.lock
|
||||
fi
|
||||
|
||||
# Execute post install hook
|
||||
runHook postInstall
|
||||
'';
|
||||
} // extraArgs);
|
||||
in
|
||||
{
|
||||
inherit filterSrc;
|
||||
composer = lib.makeOverridable composer;
|
||||
buildZipPackage = lib.makeOverridable buildZipPackage;
|
||||
buildPackage = lib.makeOverridable buildPackage;
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, noDev ? false, php ? pkgs.php, phpPackages ? pkgs.phpPackages}:
|
||||
|
||||
let
|
||||
composerEnv = import ./composer-env.nix {
|
||||
inherit (pkgs) stdenv lib writeTextFile fetchurl unzip;
|
||||
inherit php phpPackages;
|
||||
};
|
||||
in
|
||||
import ./php-packages.nix {
|
||||
inherit composerEnv noDev;
|
||||
inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
|
||||
}
|
||||
@ -2,44 +2,43 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, php
|
||||
, pkgs
|
||||
, nixosTests
|
||||
, nix-update-script
|
||||
, dataDir ? "/var/lib/pixelfed"
|
||||
, runtimeDir ? "/run/pixelfed"
|
||||
}:
|
||||
|
||||
let
|
||||
package = (import ./composition.nix {
|
||||
inherit pkgs;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
noDev = true; # Disable development dependencies
|
||||
}).overrideAttrs (attrs : {
|
||||
installPhase = attrs.installPhase + ''
|
||||
rm -R $out/bootstrap/cache
|
||||
# Move static contents for the NixOS module to pick it up, if needed.
|
||||
mv $out/bootstrap $out/bootstrap-static
|
||||
mv $out/storage $out/storage-static
|
||||
ln -s ${dataDir}/.env $out/.env
|
||||
ln -s ${dataDir}/storage $out/
|
||||
ln -s ${dataDir}/storage/app/public $out/public/storage
|
||||
ln -s ${runtimeDir} $out/bootstrap
|
||||
chmod +x $out/artisan
|
||||
'';
|
||||
});
|
||||
in package.override rec {
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "pixelfed";
|
||||
version = "0.11.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pixelfed";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ytE1ZCKQvoigC8jKPfQ/17jYA0XYOzospq7wY18o2Nk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nRCrmF1p+fZI+iyrM5I3bVCSwjQdn8BSW8Jj62lpn8E=";
|
||||
# Needed because buzz/laravel-h-captcha is pinned to 1.0.4 in composer.json
|
||||
composerStrictValidation = false;
|
||||
|
||||
postInstall = ''
|
||||
mv "$out/share/php/${finalAttrs.pname}"/* $out
|
||||
rm -R $out/bootstrap/cache
|
||||
# Move static contents for the NixOS module to pick it up, if needed.
|
||||
mv $out/bootstrap $out/bootstrap-static
|
||||
mv $out/storage $out/storage-static
|
||||
ln -s ${dataDir}/.env $out/.env
|
||||
ln -s ${dataDir}/storage $out/
|
||||
ln -s ${dataDir}/storage/app/public $out/public/storage
|
||||
ln -s ${runtimeDir} $out/bootstrap
|
||||
chmod +x $out/artisan
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) pixelfed; };
|
||||
updateScript = ./update.sh;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@ -49,4 +48,4 @@ in package.override rec {
|
||||
maintainers = with maintainers; [ raitobezarius ];
|
||||
platforms = php.meta.platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,36 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=../../../.. -i bash -p nix curl jq nix-update
|
||||
|
||||
# check if composer2nix is installed
|
||||
if ! command -v composer2nix &> /dev/null; then
|
||||
echo "Please install composer2nix (https://github.com/svanderburg/composer2nix) to run this script."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
CURRENT_VERSION=$(nix eval -f ../../../.. --raw pixelfed.version)
|
||||
TARGET_VERSION_REMOTE=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/pixelfed/pixelfed/releases/latest | jq -r ".tag_name")
|
||||
TARGET_VERSION=${TARGET_VERSION_REMOTE:1}
|
||||
PIXELFED=https://github.com/pixelfed/pixelfed/raw/$TARGET_VERSION_REMOTE
|
||||
SHA256=$(nix-prefetch-url --unpack "https://github.com/pixelfed/pixelfed/archive/v$TARGET_VERSION/pixelfed.tar.gz")
|
||||
SRI_HASH=$(nix hash to-sri --type sha256 "$SHA256")
|
||||
|
||||
if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then
|
||||
echo "pixelfed is up-to-date: ${CURRENT_VERSION}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
curl -LO "$PIXELFED/composer.json"
|
||||
curl -LO "$PIXELFED/composer.lock"
|
||||
|
||||
composer2nix --name "pixelfed" \
|
||||
--composition=composition.nix \
|
||||
--no-dev
|
||||
rm composer.json composer.lock
|
||||
|
||||
# change version number
|
||||
sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \
|
||||
-e "s/hash =.*;/hash = \"$SRI_HASH\";/g" \
|
||||
-i ./default.nix
|
||||
|
||||
cd ../../../..
|
||||
nix-build -A pixelfed
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.83.1";
|
||||
version = "0.84.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = "qovery-cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nsPXohmOkWeYYfJWgkwJmy6ulpH+Bnag7hyuS4JZLro=";
|
||||
hash = "sha256-2cG/aG1WXNmXqoJ+N2vmq2SBfIeCI1hac8y2vLy7Dyk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XG0dOEpu+NoQmklsukxev1gc2OsZc7fLEkv0AGwkh7o=";
|
||||
|
||||
@ -3,26 +3,27 @@
|
||||
, lib
|
||||
, natsort
|
||||
, panflute
|
||||
, lxml
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pandoc-include";
|
||||
version = "1.2.1";
|
||||
format = "pyproject";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DCsunset";
|
||||
repo = pname;
|
||||
repo = "pandoc-include";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-BDMg3zxNoVtO4dI1t4Msi1UwH+D8uZjBIezsER5KWHA=";
|
||||
hash = "sha256-aqewWSPxl3BpUIise/rPgBQPsyCOxU6gBlzT1u2mHY0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ natsort panflute ];
|
||||
propagatedBuildInputs = [ natsort panflute lxml ];
|
||||
|
||||
pythonImportsCheck = [ "pandoc_include.main" ];
|
||||
|
||||
@ -30,7 +31,7 @@ buildPythonApplication rec {
|
||||
description = "Pandoc filter to allow file and header includes";
|
||||
homepage = "https://github.com/DCsunset/pandoc-include";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ppenguin ];
|
||||
maintainers = with maintainers; [ ppenguin DCsunset ];
|
||||
mainProgram = "pandoc-include";
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "axel";
|
||||
version = "2.17.11";
|
||||
version = "2.17.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axel-download-accelerator";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yC4TL8IXWGEwRXAyeon6QnQa+rT1xL/McLsghjZ4ky4=";
|
||||
sha256 = "sha256-iCxKQsymTE8ppOAilQtFeQUS+Fpdjhkcw4jaa9TEv3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive txt2man ];
|
||||
|
||||
@ -10,18 +10,18 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bitwarden-cli";
|
||||
version = "2024.1.0";
|
||||
version = "2024.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "cli-v${version}";
|
||||
hash = "sha256-lDDy1b1yfw3nZrwEEkpvh6xYucgn20XHsGACc45eb2w=";
|
||||
hash = "sha256-nCjcwe+7Riml/J0hAVv/t6/oHIDPhwFD5A3iQ/LNR5Y=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_18;
|
||||
|
||||
npmDepsHash = "sha256-RR8Ua41D9SXymiPuabOnIab3byu8DR63rOfdeTaQpy4=";
|
||||
npmDepsHash = "sha256-GJl9pVwFWEg9yku9IXLcu2XMJZz+ZoQOxCf1TrW715Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
||||
@ -795,6 +795,8 @@ mapAliases ({
|
||||
optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12
|
||||
orchis = orchis-theme; # Added 2021-06-09
|
||||
oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15
|
||||
onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been renamed to onlyoffice-bin"; # Added 2024-02-05
|
||||
onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been renamed to onlyoffice-bin_latest (and updated from 7.5.x)"; # Added 2024-02-05
|
||||
oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10
|
||||
osxfuse = macfuse-stubs; # Added 2021-03-20
|
||||
oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09
|
||||
|
||||
@ -290,10 +290,6 @@ with pkgs;
|
||||
|
||||
_0x = callPackage ../tools/misc/0x { };
|
||||
|
||||
atuin = callPackage ../tools/misc/atuin {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Security SystemConfiguration;
|
||||
};
|
||||
|
||||
automatic-timezoned = callPackage ../tools/system/automatic-timezoned { };
|
||||
|
||||
cve = with python3Packages; toPythonApplication cvelib;
|
||||
@ -33771,7 +33767,6 @@ with pkgs;
|
||||
mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv {
|
||||
stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv;
|
||||
inherit lua;
|
||||
inherit (darwin) sigtool;
|
||||
};
|
||||
|
||||
shaka-packager = callPackage ../applications/video/shaka-packager { };
|
||||
@ -33906,11 +33901,6 @@ with pkgs;
|
||||
|
||||
okteto = callPackage ../development/tools/okteto { };
|
||||
|
||||
onlyoffice-bin_7_2 = callPackage ../applications/office/onlyoffice-bin/7_2.nix { };
|
||||
onlyoffice-bin_7_5 = callPackage ../applications/office/onlyoffice-bin/7_5.nix { };
|
||||
onlyoffice-bin = onlyoffice-bin_7_2;
|
||||
onlyoffice-bin_latest = onlyoffice-bin_7_5;
|
||||
|
||||
onmetal-image = callPackage ../tools/virtualization/onmetal-image { };
|
||||
|
||||
opcr-policy = callPackage ../development/tools/opcr-policy { };
|
||||
@ -39584,6 +39574,8 @@ with pkgs;
|
||||
jdk = jdk17;
|
||||
};
|
||||
|
||||
degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
|
||||
|
||||
diylc = callPackage ../applications/science/electronics/diylc { };
|
||||
|
||||
flatcam = python39.pkgs.callPackage ../applications/science/electronics/flatcam { };
|
||||
|
||||
@ -413,6 +413,7 @@ mapAliases ({
|
||||
pytorchWithCuda = torchWithCuda; # added 2022-09-30
|
||||
pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30
|
||||
pytwitchapi = twitchapi; # added 2022-03-07
|
||||
pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09
|
||||
pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19
|
||||
PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19
|
||||
pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01
|
||||
|
||||
@ -6977,6 +6977,8 @@ self: super: with self; {
|
||||
|
||||
mediapy = callPackage ../development/python-modules/mediapy { };
|
||||
|
||||
medpy = callPackage ../development/python-modules/medpy { };
|
||||
|
||||
meeko = callPackage ../development/python-modules/meeko { };
|
||||
|
||||
meep = callPackage ../development/python-modules/meep { };
|
||||
@ -11771,6 +11773,8 @@ self: super: with self; {
|
||||
|
||||
python-box = callPackage ../development/python-modules/python-box { };
|
||||
|
||||
python-bring-api = callPackage ../development/python-modules/python-bring-api { };
|
||||
|
||||
python-bsblan = callPackage ../development/python-modules/python-bsblan { };
|
||||
|
||||
python-cinderclient = callPackage ../development/python-modules/python-cinderclient { };
|
||||
@ -12128,17 +12132,6 @@ self: super: with self; {
|
||||
|
||||
pyu2f = callPackage ../development/python-modules/pyu2f { };
|
||||
|
||||
pyuavcan = callPackage
|
||||
../development/python-modules/pyuavcan { # this version pinpoint to anold version is necessary due to a regression
|
||||
nunavut = self.nunavut.overridePythonAttrs (old: rec {
|
||||
version = "0.2.3";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-pZtRUvQMpqrnW5+8umsRcNhF9NJZJZ3I9yILVglMCnU=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
pyudev = callPackage ../development/python-modules/pyudev {
|
||||
inherit (pkgs) udev;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user