Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
637a1f98b5
55 changed files with 787 additions and 196 deletions
|
|
@ -6508,6 +6508,13 @@
|
|||
githubId = 221929;
|
||||
name = "Jean-Baptiste Giraudeau";
|
||||
};
|
||||
jboy = {
|
||||
email = "jboy+nixos@bius.moe";
|
||||
githubId = 2187261;
|
||||
github = "jboynyc";
|
||||
matrix = "@jboy:utwente.io";
|
||||
name = "John Boy";
|
||||
};
|
||||
jc = {
|
||||
name = "Josh Cooper";
|
||||
email = "josh@cooper.is";
|
||||
|
|
@ -11463,6 +11470,12 @@
|
|||
githubId = 138074;
|
||||
name = "Pedro Pombeiro";
|
||||
};
|
||||
pongo1231 = {
|
||||
email = "pongo1999712@gmail.com";
|
||||
github = "pongo1231";
|
||||
githubId = 4201956;
|
||||
name = "pongo1231";
|
||||
};
|
||||
poscat = {
|
||||
email = "poscat@mail.poscat.moe";
|
||||
github = "poscat0x04";
|
||||
|
|
|
|||
|
|
@ -1307,8 +1307,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot";
|
||||
version = "1.56.7152";
|
||||
sha256 = "sha256-9WEvTcVY/yMF00GJVj4h57aWhfBYTSatbw10DjjAaAM=";
|
||||
version = "1.70.8099";
|
||||
sha256 = "sha256-+jlLM9UC1DZFBrtiiri4jvpuc/Rf9PcSVP8D8pmQC2s=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor.";
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
, soqt
|
||||
, spaceNavSupport ? stdenv.isLinux
|
||||
, swig
|
||||
, vtk
|
||||
, vtk_8
|
||||
, wrapQtAppsHook
|
||||
, wrapGAppsHook
|
||||
, xercesc
|
||||
|
|
@ -97,7 +97,7 @@ mkDerivation rec {
|
|||
shiboken2
|
||||
soqt
|
||||
swig
|
||||
vtk
|
||||
vtk_8
|
||||
xercesc
|
||||
zlib
|
||||
] ++ lib.optionals spaceNavSupport [
|
||||
|
|
|
|||
|
|
@ -1,32 +1,50 @@
|
|||
{ lib, stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext
|
||||
, libXt, zlib, gettext, intltool, perl }:
|
||||
{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qttools, wrapQtAppsHook, copyDesktopItems }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let datapath = "$out/share/XaoS";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xaos";
|
||||
version = "3.6";
|
||||
version = "4.2.1";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz";
|
||||
sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xaos-project";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
hash = "sha256-JLF8Mz/OHZEEJG/aryKQuJ6B5R8hPJdvln7mbKoqXFU=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
nativeBuildInputs = [ qmake qttools wrapQtAppsHook copyDesktopItems ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [
|
||||
aalib gsl libpng libX11 xorgproto libXext
|
||||
libXt zlib gettext perl
|
||||
];
|
||||
QMAKE_LRELEASE = "lrelease";
|
||||
DEFINES = [ "USE_OPENGL" "USE_FLOAT128" ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*')
|
||||
mkdir -p $out/share/locale
|
||||
postPatch = ''
|
||||
substituteInPlace src/include/config.h \
|
||||
--replace "/usr/share/XaoS" "${datapath}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://xaos.sourceforge.net/";
|
||||
description = "Fractal viewer";
|
||||
desktopItems = [ "xdg/xaos.desktop" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D bin/xaos "$out/bin/xaos"
|
||||
|
||||
mkdir -p "${datapath}"
|
||||
cp -r tutorial examples catalogs "${datapath}"
|
||||
|
||||
install -D "xdg/${pname}.png" "$out/share/icons/${pname}.png"
|
||||
|
||||
install -D doc/xaos.6 "$man/man6/xaos.6"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = src.meta // {
|
||||
description = "Real-time interactive fractal zoomer";
|
||||
homepage = "https://xaos-project.github.io/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,24 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, darwin }:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diswall";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dis-works";
|
||||
repo = "diswall-rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zT8RRg+Ver7dYtJL9htrZ8nXoD0V7IvdIqHTKDmbZ7c=";
|
||||
sha256 = "sha256-3FTqT3IL48lYmGoB9u76RQSgZPbaq7IkOyQjyxwpkWA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-N+w1OiCy3scahFdYI49GpL301t1qNd/X4fdLMoQE/2s=";
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-sb6s4Oc3W+I9DB0SGyZINxyWHCSpkakiEeQUatEpeEU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,81 @@
|
|||
{ lib, stdenv, buildNpmPackage, fetchFromGitHub, copyDesktopItems
|
||||
, python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
name = "webcord";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpacingBat3";
|
||||
repo = "WebCord";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Buu7eKmI0UGV/9Kfj+urmDcjBtR9HSwW+mlHaYhfUa4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-PeoOoEljbkHynjZwocCWCTyYvIvSE1gQiABUzIiXEdM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
python3
|
||||
];
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
pipewire
|
||||
libpulseaudio
|
||||
];
|
||||
|
||||
binPath = lib.makeBinPath [
|
||||
xdg-utils
|
||||
];
|
||||
|
||||
# npm install will error when electron tries to download its binary
|
||||
# we don't need it anyways since we wrap the program with our nixpkgs electron
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
# remove husky commit hooks, errors and aren't needed for packaging
|
||||
postPatch = ''
|
||||
rm -rf .husky
|
||||
'';
|
||||
|
||||
# override installPhase so we can copy the only folders that matter
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# Remove dev deps that aren't necessary for running the app
|
||||
npm prune --omit=dev
|
||||
|
||||
mkdir -p $out/lib/node_modules/webcord
|
||||
cp -r app node_modules sources package.json $out/lib/node_modules/webcord/
|
||||
|
||||
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
|
||||
|
||||
makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
|
||||
--prefix PATH : "${binPath}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
|
||||
--add-flags $out/lib/node_modules/webcord/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "webcord";
|
||||
exec = "webcord";
|
||||
icon = "webcord";
|
||||
desktopName = "WebCord";
|
||||
comment = meta.description;
|
||||
categories = [ "Network" "InstantMessaging" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Discord and Fosscord electron-based client implemented without Discord API";
|
||||
homepage = "https://github.com/SpacingBat3/WebCord";
|
||||
downloadPage = "https://github.com/SpacingBat3/WebCord/releases";
|
||||
changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ huantian ];
|
||||
platforms = electron_22.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
, libxkbcommon
|
||||
, udev
|
||||
, zlib
|
||||
, krb5
|
||||
, libkrb5
|
||||
# Runtime
|
||||
, coreutils
|
||||
, pciutils
|
||||
|
|
@ -103,11 +103,13 @@ let
|
|||
xorg.libxshmfence
|
||||
xorg.xcbutilimage
|
||||
xorg.xcbutilkeysyms
|
||||
xorg.xcbutilrenderutil
|
||||
xorg.xcbutilwm
|
||||
xorg.libXfixes
|
||||
xorg.libXtst
|
||||
udev
|
||||
zlib
|
||||
krb5
|
||||
libkrb5
|
||||
] ++ lib.optional (pulseaudioSupport) libpulseaudio);
|
||||
|
||||
in
|
||||
|
|
|
|||
65
pkgs/applications/networking/wgnord/default.nix
Normal file
65
pkgs/applications/networking/wgnord/default.nix
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
{ bash
|
||||
, coreutils
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, gnugrep
|
||||
, gnused
|
||||
, iproute2
|
||||
, jq
|
||||
, lib
|
||||
, resholve
|
||||
, wireguard-tools
|
||||
}:
|
||||
|
||||
resholve.mkDerivation rec {
|
||||
pname = "wgnord";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phirecc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-T7dAEgi4tGvrzBABGLzKHhpCx0bxSCtTVI5iJJqJGlE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace wgnord \
|
||||
--replace '$conf_dir/countries.txt' "$out/share/countries.txt" \
|
||||
--replace '$conf_dir/countries_iso31662.txt' "$out/share/countries_iso31662.txt"
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm 755 wgnord -t $out/bin/
|
||||
install -Dm 644 countries.txt -t $out/share/
|
||||
install -Dm 644 countries_iso31662.txt -t $out/share/
|
||||
'';
|
||||
|
||||
solutions.default = {
|
||||
scripts = [ "bin/wgnord" ];
|
||||
interpreter = "${bash}/bin/sh";
|
||||
inputs = [
|
||||
coreutils
|
||||
curl
|
||||
gnugrep
|
||||
gnused
|
||||
iproute2
|
||||
jq
|
||||
wireguard-tools
|
||||
];
|
||||
fix.aliases = true; # curl command in an alias
|
||||
execer = [
|
||||
"cannot:${iproute2}/bin/ip"
|
||||
"cannot:${wireguard-tools}/bin/wg-quick"
|
||||
];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A NordVPN Wireguard (NordLynx) client in POSIX shell";
|
||||
homepage = "https://github.com/phirecc/wgnord";
|
||||
changelog = "https://github.com/phirecc/wgnord/releases/tag/v${version}";
|
||||
maintainers = with lib.maintainers; [ urandom ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,35 @@
|
|||
{ lib, stdenv, fetchFromGitLab, unzip, zlib, python3, parallel }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, unzip
|
||||
, zlib
|
||||
, python3
|
||||
, parallel
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "last";
|
||||
version = "1422";
|
||||
version = "1445";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mcfrith";
|
||||
repo = "last";
|
||||
rev = version;
|
||||
sha256 = "sha256-3OhttOd6qgO6d+sbVkZj8i/K6bJTvlMyfa3E4mIpt24=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-E3D9KmCIVcwXblwJ0wePk0wKoXwKA2UsSGqfMmRsw2A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ zlib python3 ];
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
];
|
||||
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
buildInputs = [
|
||||
zlib
|
||||
python3
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for f in $out/bin/parallel-* ; do
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, csxcad
|
||||
, qcsxcad
|
||||
, hdf5
|
||||
, vtkWithQt5
|
||||
, vtk_8_withQt5
|
||||
, qtbase
|
||||
, fparser
|
||||
, tinyxml
|
||||
|
|
@ -32,7 +32,7 @@ mkDerivation {
|
|||
csxcad
|
||||
qcsxcad
|
||||
hdf5
|
||||
vtkWithQt5
|
||||
vtk_8_withQt5
|
||||
qtbase
|
||||
fparser
|
||||
tinyxml
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, tinyxml
|
||||
, hdf5
|
||||
, cgal_5
|
||||
, vtk
|
||||
, vtk_8
|
||||
, boost
|
||||
, gmp
|
||||
, mpfr
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
boost
|
||||
gmp
|
||||
mpfr
|
||||
vtk
|
||||
vtk_8
|
||||
fparser
|
||||
tinyxml
|
||||
hdf5
|
||||
|
|
|
|||
|
|
@ -8,19 +8,20 @@
|
|||
, which
|
||||
, elfutils
|
||||
, libelf
|
||||
, libffi
|
||||
, llvm
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.7.2";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = pname;
|
||||
rev = "r${version}";
|
||||
sha256 = "sha256-7N11S7OiAogyuNqrf7R5NZyVbiXgXxJ5t6lwBzL0YAU=";
|
||||
hash = "sha256-9ziGNAZgUYnBofx7YwSzAgL4zIAwoPYMsGWBYs+xtg0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
libffi
|
||||
llvm
|
||||
zlib
|
||||
] ++ [
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, fparser
|
||||
, tinyxml
|
||||
, hdf5
|
||||
, vtk
|
||||
, vtk_8
|
||||
, boost
|
||||
, zlib
|
||||
, cmake
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
|||
fparser
|
||||
tinyxml
|
||||
hdf5
|
||||
vtk
|
||||
vtk_8
|
||||
boost
|
||||
zlib
|
||||
csxcad
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtkWithQt5}:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtk_8_withQt5}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elmerfem";
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
libGL
|
||||
libGLU
|
||||
opencascade
|
||||
vtkWithQt5
|
||||
vtk_8_withQt5
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen
|
||||
, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect
|
||||
, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook, liblapack
|
||||
, libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack
|
||||
, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
qtbase
|
||||
libGL
|
||||
libGLU
|
||||
vtkWithQt5
|
||||
vtk_8_withQt5
|
||||
];
|
||||
|
||||
# Disable warnings that are irrelevant to us as packagers
|
||||
|
|
|
|||
|
|
@ -1,56 +1,40 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, glib
|
||||
, meson
|
||||
, ninja
|
||||
, libevdev
|
||||
, json-glib
|
||||
, cairo
|
||||
, pango
|
||||
, libinput
|
||||
, gtk4
|
||||
, wrapGAppsHook4
|
||||
, libxkbcommon
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "showmethekey";
|
||||
version = "1.7.3";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlynxZhou";
|
||||
repo = "showmethekey";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA=";
|
||||
hash = "sha256-iWZjOhugGD7GikcIKaJimfLrTDaGQeYgmp17N03Meb8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "use-gtk4-update-icon-cache.patch";
|
||||
url = "https://github.com/alynxzhou/showmethekey/commit/c73102dc2825d00cbaf323fcfc96736381dc67ae.patch";
|
||||
sha256 = "sha256-6QDY5eQ9A8q3LZeD7v6WI/4vYXc/XXVY/WENA1nvIKo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
meson
|
||||
ninja
|
||||
cairo
|
||||
pango
|
||||
json-glib
|
||||
pkg-config
|
||||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "23.01.12";
|
||||
version = "23.01.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DqinupNkjAzjiLkuPCw9IaKRCHtwGnvUQbPNLUeqtRs=";
|
||||
sha256 = "sha256-ZScDymdtrDTCrLB9Fp3zxBQt0A3qz0vN1OhBCK5K/HQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
54
pkgs/desktops/deepin/apps/deepin-calculator/default.nix
Normal file
54
pkgs/desktops/deepin/apps/deepin-calculator/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, cmake
|
||||
, qtbase
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, gtest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-calculator";
|
||||
version = "5.8.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-MczQWYIQfpSkyA3144y3zly66N0vgcVvTYR6B7Hq1aw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
dde-qt-dbus-factory
|
||||
gtest
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
"--prefix QT_QPA_PLATFORM_PLUGIN_PATH : ${qt5platform-plugins}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An easy to use calculator for ordinary users";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-calculator";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -19,6 +19,9 @@ let
|
|||
gio-qt = callPackage ./library/gio-qt { };
|
||||
image-editor = callPackage ./library/image-editor { };
|
||||
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
|
||||
|
||||
#### Dtk Application
|
||||
deepin-calculator = callPackage ./apps/deepin-calculator { };
|
||||
};
|
||||
in
|
||||
lib.makeScope libsForQt5.newScope packages
|
||||
|
|
|
|||
73
pkgs/development/compilers/minimacy/default.nix
Normal file
73
pkgs/development/compilers/minimacy/default.nix
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeBinaryWrapper
|
||||
, alsaLib, libX11, libXext, libGL, libGLU
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minimacy";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ambermind";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "i0Z1UKApX+elHmFgujwjiF7k6OmtFF37HJim464OMfU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsaLib libX11 libXext ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-unused-result";
|
||||
|
||||
preBuild = ''
|
||||
pushd ${if stdenv.isDarwin then "macos/cmdline" else "unix"}
|
||||
'';
|
||||
|
||||
# TODO: build graphic version for darwin
|
||||
buildFlags = (if stdenv.isDarwin then [ "nox" ] else [ "all" ]) ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
postBuild = ''
|
||||
popd
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
bin/${if stdenv.isDarwin then "minimacyMac" else "minimacy"} system/demo/demo.fun.mandelbrot.mcy
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/minimacy
|
||||
cp -r {README.md,LICENSE,system,rom,topLevel.mcy} $out/lib/minimacy
|
||||
install bin/minimacy* -Dt $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
for prog in $out/bin/minimacy*;
|
||||
do wrapProgram $prog \
|
||||
--set MINIMACY $out/lib/minimacy
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An open-source minimalist computing technology";
|
||||
longDescription = ''
|
||||
Minimacy is an open-source minimalist computation system based on the principle "Less is more".
|
||||
It is designed and programmed by Sylvain Huet.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ jboy ];
|
||||
homepage = "https://minimacy.net";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
, libdaemon
|
||||
, dbus
|
||||
, perlPackages
|
||||
, libpcap
|
||||
, expat
|
||||
, gettext
|
||||
, glib
|
||||
|
|
@ -63,7 +64,9 @@ stdenv.mkDerivation rec {
|
|||
] ++ (with perlPackages; [
|
||||
perl
|
||||
XMLParser
|
||||
]) ++ lib.optionals gtk3Support [
|
||||
]) ++ lib.optionals stdenv.isFreeBSD [
|
||||
libpcap
|
||||
] ++ lib.optionals gtk3Support [
|
||||
gtk3
|
||||
] ++ lib.optionals qt5Support [
|
||||
qt5
|
||||
|
|
@ -86,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||
"--localstatedir=/var"
|
||||
"--runstatedir=/run"
|
||||
"--sysconfdir=/etc"
|
||||
"--with-distro=none"
|
||||
"--with-distro=${with stdenv.hostPlatform; if isBSD then parsed.kernel.name else "none"}"
|
||||
# A systemd unit is provided by the avahi-daemon NixOS module
|
||||
"--with-systemdsystemunitdir=no"
|
||||
] ++ lib.optionals withLibdnssdCompat [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, enableVTK ? true
|
||||
, vtk
|
||||
, vtk_8
|
||||
, ApplicationServices
|
||||
, Cocoa
|
||||
, enablePython ? false
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optionals enableVTK [
|
||||
vtk
|
||||
vtk_8
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
ApplicationServices
|
||||
Cocoa
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ version, rev, sourceSha256 }:
|
||||
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper
|
||||
, pkg-config, libX11, libuuid, xz, vtk, Cocoa }:
|
||||
, pkg-config, libX11, libuuid, xz, vtk_8, Cocoa }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "itk";
|
||||
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ cmake xz makeWrapper ];
|
||||
buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
buildInputs = [ libX11 libuuid vtk_8 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
|
||||
pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb,
|
||||
pkg-config, fontconfig, freetype, expat, freeimage, vtk_8, gl2ps, tbb,
|
||||
OpenCL, Cocoa
|
||||
}:
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
buildInputs = [
|
||||
libGL libGLU libXmu freetype fontconfig expat freeimage vtk
|
||||
libGL libGLU libXmu freetype fontconfig expat freeimage vtk_8
|
||||
gl2ps tbb
|
||||
]
|
||||
++ optionals stdenv.isDarwin [OpenCL Cocoa]
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
, enablePython ? false, pythonPackages ? null
|
||||
, enableGtk2 ? false, gtk2
|
||||
, enableGtk3 ? false, gtk3
|
||||
, enableVtk ? false, vtk
|
||||
, enableVtk ? false, vtk_8
|
||||
, enableFfmpeg ? false, ffmpeg
|
||||
, enableGStreamer ? false, gst_all_1
|
||||
, enableTesseract ? false, tesseract, leptonica
|
||||
|
|
@ -188,7 +188,7 @@ stdenv.mkDerivation {
|
|||
++ lib.optional enablePython pythonPackages.python
|
||||
++ lib.optional enableGtk2 gtk2
|
||||
++ lib.optional enableGtk3 gtk3
|
||||
++ lib.optional enableVtk vtk
|
||||
++ lib.optional enableVtk vtk_8
|
||||
++ lib.optional enableJPEG libjpeg
|
||||
++ lib.optional enablePNG libpng
|
||||
++ lib.optional enableTIFF libtiff
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
, enableGtk3 ? false
|
||||
, gtk3
|
||||
, enableVtk ? false
|
||||
, vtk
|
||||
, vtk_8
|
||||
, enableFfmpeg ? true
|
||||
, ffmpeg
|
||||
, enableGStreamer ? true
|
||||
|
|
@ -253,7 +253,7 @@ stdenv.mkDerivation {
|
|||
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
|
||||
++ lib.optional enableGtk2 gtk2
|
||||
++ lib.optional enableGtk3 gtk3
|
||||
++ lib.optional enableVtk vtk
|
||||
++ lib.optional enableVtk vtk_8
|
||||
++ lib.optional enableJPEG libjpeg
|
||||
++ lib.optional enablePNG libpng
|
||||
++ lib.optional enableTIFF libtiff
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, qhull
|
||||
, flann
|
||||
, boost
|
||||
, vtk
|
||||
, vtk_8
|
||||
, eigen
|
||||
, pkg-config
|
||||
, qtbase
|
||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
libpng
|
||||
libtiff
|
||||
qhull
|
||||
vtk
|
||||
vtk_8
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk, zlib, tbb }:
|
||||
{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk_8, zlib, tbb }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.0";
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake gtest ];
|
||||
buildInputs = [ boost eigen python3 vtk zlib tbb ];
|
||||
buildInputs = [ boost eigen python3 vtk_8 zlib tbb ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/BioMedIA/MIRTK";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, cmake
|
||||
, csxcad
|
||||
, tinyxml
|
||||
, vtkWithQt5
|
||||
, vtk_8_withQt5
|
||||
, qtbase
|
||||
}:
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ mkDerivation {
|
|||
buildInputs = [
|
||||
csxcad
|
||||
tinyxml
|
||||
vtkWithQt5
|
||||
vtk_8_withQt5
|
||||
qtbase
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,19 +9,21 @@
|
|||
, inkscape
|
||||
, imagemagick
|
||||
, pytestCheckHook
|
||||
, typed-ast
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "diagrams";
|
||||
version = "0.23.1";
|
||||
version = "0.23.3";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mingrammer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-gVUlP3offTgHUBTTIzTBf7b2NpBjGlAHYQQxe6ks0v8=";
|
||||
hash = "sha256-4b+jmR56y2VV0XxD6FCmNpDB0UKH9+FqcTQuU2jRCXo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -40,20 +42,33 @@ buildPythonPackage rec {
|
|||
./remove-black-requirement.patch
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
# Despite living in 'tool.poetry.dependencies',
|
||||
# these are only used at build time to process the image resource files
|
||||
nativeBuildInputs = [ inkscape imagemagick jinja2 poetry-core round ];
|
||||
nativeBuildInputs = [
|
||||
inkscape imagemagick
|
||||
jinja2
|
||||
poetry-core
|
||||
round
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ graphviz ];
|
||||
propagatedBuildInputs = [
|
||||
graphviz
|
||||
typed-ast
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "diagrams" ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"diagrams"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Diagram as Code";
|
||||
homepage = "https://diagrams.mingrammer.com/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ addict3d ];
|
||||
homepage = "https://diagrams.mingrammer.com/";
|
||||
changelog = "https://github.com/mingrammer/diagrams/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ addict3d ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,17 @@
|
|||
From bf081e60a7f604d2e71cf5c315dd90c48dd96808 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Affolter <mail@fabian-affolter.ch>
|
||||
Date: Thu, 26 Jan 2023 15:35:47 +0100
|
||||
Subject: [PATCH] Update autogen.sh
|
||||
|
||||
---
|
||||
autogen.sh | 9 ---------
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/autogen.sh b/autogen.sh
|
||||
index acbcacb..1f60b83 100755
|
||||
index f5e065b35..b6cef5bf9 100755
|
||||
--- a/autogen.sh
|
||||
+++ b/autogen.sh
|
||||
@@ -21,11 +21,6 @@
|
||||
@@ -37,11 +37,6 @@ if ! [ -x "$(command -v convert)" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -14,10 +23,10 @@ index acbcacb..1f60b83 100755
|
|||
# preprocess the resources
|
||||
for pvd in "${providers[@]}"; do
|
||||
# convert the svg to png for azure provider
|
||||
@@ -55,7 +50,3 @@
|
||||
# Generate doc for custom module
|
||||
echo "generating the docs for custom"
|
||||
python -m scripts.generate "custom"
|
||||
@@ -75,7 +70,3 @@ python -m scripts.generate "custom"
|
||||
# copy icons across to website
|
||||
echo "copying icons to website static folder"
|
||||
cp -r resources website/static/img/
|
||||
-
|
||||
-# run black
|
||||
-echo "linting the all the diagram modules"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, pythonOlder
|
||||
, packaging
|
||||
, pytest
|
||||
, cython
|
||||
|
|
@ -14,15 +14,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dipy";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
disabled = isPy27;
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dipy";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0zaqsiq73vprbqbzvzswjfmqgappl5vhpl2fwjrrda33c27klpzj";
|
||||
owner = "dipy";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-kJ8JbnNpjTqGJXwwMTqZdgeN8fOEuxarycunDCRLB74=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython packaging ];
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-os-config";
|
||||
version = "1.14.0";
|
||||
version = "1.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CLZC9Iub3LWvDPhetxlHorccRUritd+YzTI/MF1hHrY=";
|
||||
hash = "sha256-wDb1vy1rj0yBOk7Q1pMzNw3foOXHk18YwIbY4ZcYCxM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, tzlocal
|
||||
, six
|
||||
|
|
@ -8,13 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "js2py";
|
||||
version = "0.71";
|
||||
version = "0.74";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PiotrDabkowski";
|
||||
repo = "Js2Py";
|
||||
rev = "5f665f60083a9796ec33861240ce31d6d2b844b6";
|
||||
sha256 = "sha256-1omTV7zkYSQfxhkNgI4gtXTenWt9J1r3VARRHoRsSfc=";
|
||||
src = fetchPypi {
|
||||
pname = "Js2Py";
|
||||
inherit version;
|
||||
hash = "sha256-OfOmqoRpGA77o8hncnHfJ8MTMv0bRx3xryr1i4e4ly8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openapi-core";
|
||||
version = "0.16.4";
|
||||
version = "0.16.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
|||
owner = "p1c2u";
|
||||
repo = "openapi-core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-16DM9HrptQmj95OOM5XSGIEKzxrCkN3sU/7o8Yh0l6s=";
|
||||
hash = "sha256-xXSZ9qxjmeIyYIWQubJbJxkXUdOu/WSSBddIWsVaH8k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
let
|
||||
pname = "pydicom";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydicom";
|
||||
repo = "pydicom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CAQWaBkzecJ1VXQ5BnAUjmBMjh0I8y+gT7I4P4o2gqI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xt0aK908lLgNlpcI86OSxy96Z/PZnQh7+GXzJ0VMQGA=";
|
||||
};
|
||||
|
||||
# Pydicom needs pydicom-data to run some tests. If these files aren't downloaded
|
||||
|
|
|
|||
|
|
@ -1,24 +1,55 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, cmake, python
|
||||
, libosmium, protozero, boost, expat, bzip2, zlib, pybind11
|
||||
, shapely, pythonOlder, isPyPy, lz4, requests, pytestCheckHook
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, python
|
||||
, libosmium
|
||||
, protozero
|
||||
, boost
|
||||
, expat
|
||||
, bzip2
|
||||
, zlib
|
||||
, pybind11
|
||||
, shapely
|
||||
, pythonOlder
|
||||
, isPyPy
|
||||
, lz4
|
||||
, requests
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyosmium";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.4" || isPyPy;
|
||||
disabled = pythonOlder "3.6" || isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmcode";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-dumTyca1nLPa6B3p5fmUGWa6jReHOeFPc9heTz/2zao=";
|
||||
hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ];
|
||||
propagatedBuildInputs = [ requests ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libosmium
|
||||
protozero
|
||||
boost
|
||||
expat
|
||||
bzip2
|
||||
zlib
|
||||
pybind11
|
||||
lz4
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
preBuild = "cd ..";
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, numpy
|
||||
, py
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
|
|
@ -45,6 +46,11 @@ buildPythonPackage rec {
|
|||
"pypytools"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.11") [
|
||||
# https://github.com/antocuni/pypytools/issues/4
|
||||
"test_clonefunc"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of tools to use PyPy-specific features";
|
||||
homepage = "https://github.com/antocuni/pypytools";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.36.4";
|
||||
version = "0.37.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3n3TtyzosWsdnzT2m2s55hnY45Yjj7kJS3rv/5LTSSg=";
|
||||
hash = "sha256-+bkEaXIvIX67D8b3CIhNM/rz2DjUbpjsshImoUopjlA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
62
pkgs/development/python-modules/siuba/default.nix
Normal file
62
pkgs/development/python-modules/siuba/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, hypothesis
|
||||
, numpy
|
||||
, pandas
|
||||
, psycopg2
|
||||
, pymysql
|
||||
, python-dateutil
|
||||
, pytz
|
||||
, pyyaml
|
||||
, six
|
||||
, sqlalchemy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "siuba";
|
||||
version = "0.4.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "machow";
|
||||
repo = "siuba";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Q2nkK51bmIO2OcBuWu+u7yB8UmaqiZJXpuxXcytTlUY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pandas
|
||||
psycopg2
|
||||
pymysql
|
||||
python-dateutil
|
||||
pytz
|
||||
pyyaml
|
||||
six
|
||||
sqlalchemy
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
];
|
||||
doCheck = false;
|
||||
# requires running mysql and postgres instances; see docker-compose.yml
|
||||
|
||||
pythonImportsCheck = [
|
||||
"siuba"
|
||||
"siuba.data"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Use dplyr-like syntax with pandas and SQL";
|
||||
homepage = "https://siuba.org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,12 +19,12 @@ let
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "coreboot-toolchain-${arch}";
|
||||
version = "4.16";
|
||||
version = "4.19";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://review.coreboot.org/coreboot";
|
||||
rev = version;
|
||||
sha256 = "sha256-PCum+IvJ136eZQLovUi9u4xTLLs17MkMP5Oc0/2mMY4=";
|
||||
sha256 = "sha256-pGS+bfX2k/ot7sHL9aiaQpA0wtbHHZEObJ/h2JGF5/4=";
|
||||
fetchSubmodules = false;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
|
@ -70,7 +70,7 @@ let
|
|||
);
|
||||
in
|
||||
|
||||
lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch {})) [
|
||||
lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch { })) [
|
||||
"i386"
|
||||
"x64"
|
||||
"arm"
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "mpfr-4.1.0.tar.xz";
|
||||
name = "mpfr-4.1.1.tar.xz";
|
||||
archive = fetchurl {
|
||||
sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c";
|
||||
url = "mirror://gnu/mpfr/mpfr-4.1.0.tar.xz";
|
||||
sha256 = "0gf3ibi7kzz39zj72qc9r607clyhm80gs8wbp71zzfkxasyrblgz";
|
||||
url = "mirror://gnu/mpfr/mpfr-4.1.1.tar.xz";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -35,10 +35,10 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "acpica-unix2-20211217.tar.gz";
|
||||
name = "R10_20_22.tar.gz";
|
||||
archive = fetchurl {
|
||||
sha256 = "0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194";
|
||||
url = "https://acpica.org/sites/acpica/files/acpica-unix2-20211217.tar.gz";
|
||||
sha256 = "11iv3jrz27g7bv7ffyxsrgm4cq60cld2gkkl008p3lcwfyqpx88s";
|
||||
url = "https://github.com/acpica/acpica/archive/refs/tags//R10_20_22.tar.gz";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,24 +1,26 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell --pure -i bash -p nix cacert git getopt
|
||||
|
||||
# shellcheck shell=bash
|
||||
|
||||
if [ ! -d .git ]; then
|
||||
echo "This script needs to be run from the root directory of nixpkgs. Exiting."
|
||||
exit 1
|
||||
echo "This script needs to be run from the root directory of nixpkgs. Exiting."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
pkg_dir="$(dirname "$0")"
|
||||
|
||||
src="$(nix-build . --no-out-link -A coreboot-toolchain.i386.src)"
|
||||
urls=$($src/util/crossgcc/buildgcc -u)
|
||||
urls=$("${src}/util/crossgcc/buildgcc" -u)
|
||||
|
||||
tmp=$(mktemp)
|
||||
echo '{ fetchurl }: [' > $tmp
|
||||
echo '{ fetchurl }: [' >"$tmp"
|
||||
|
||||
for url in $urls; do
|
||||
name="$(basename $url)"
|
||||
hash="$(nix-prefetch-url "$url")"
|
||||
name="$(basename "$url")"
|
||||
hash="$(nix-prefetch-url "$url")"
|
||||
|
||||
cat << EOF >> $tmp
|
||||
cat <<EOF >>"$tmp"
|
||||
{
|
||||
name = "$name";
|
||||
archive = fetchurl {
|
||||
|
|
@ -29,8 +31,8 @@ for url in $urls; do
|
|||
EOF
|
||||
done
|
||||
|
||||
echo ']' >> $tmp
|
||||
echo ']' >>"$tmp"
|
||||
|
||||
sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' $tmp
|
||||
sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' "$tmp"
|
||||
|
||||
mv $tmp $pkg_dir/sources.nix
|
||||
mv "$tmp" "${pkg_dir}/sources.nix"
|
||||
|
|
|
|||
38
pkgs/development/tools/misc/n98-magerun/default.nix
Normal file
38
pkgs/development/tools/misc/n98-magerun/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php80 }:
|
||||
|
||||
let
|
||||
pname = "n98-magerun";
|
||||
version = "2.3.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netz98";
|
||||
repo = "n98-magerun1-dist";
|
||||
rev = version;
|
||||
sha256 = "sha256-T7wQmEEYMG0J6+9nRt+tiMuihjnjjQ7UWy1C0vKoQY4=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src/n98-magerun $out/libexec/n98-magerun/n98-magerun-${version}.phar
|
||||
makeWrapper ${php80}/bin/php $out/bin/n98-magerun \
|
||||
--add-flags "$out/libexec/n98-magerun/n98-magerun-${version}.phar" \
|
||||
--prefix PATH : ${lib.makeBinPath [ unzip ]}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The swiss army knife for Magento1/OpenMage developers";
|
||||
license = licenses.mit;
|
||||
homepage = "https://magerun.net/";
|
||||
changelog = "https://magerun.net/category/magerun/";
|
||||
maintainers = teams.php.members;
|
||||
};
|
||||
}
|
||||
38
pkgs/development/tools/misc/n98-magerun2/default.nix
Normal file
38
pkgs/development/tools/misc/n98-magerun2/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php }:
|
||||
|
||||
let
|
||||
pname = "n98-magerun2";
|
||||
version = "6.1.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netz98";
|
||||
repo = "n98-magerun2-dist";
|
||||
rev = version;
|
||||
sha256 = "sha256-D2U1kLG6sOpBHDzNQ/LbiFUknvFhK+rkOPgWvW0pNmY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src/n98-magerun2 $out/libexec/n98-magerun2/n98-magerun2-${version}.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/n98-magerun2 \
|
||||
--add-flags "$out/libexec/n98-magerun2/n98-magerun2-${version}.phar" \
|
||||
--prefix PATH : ${lib.makeBinPath [ unzip ]}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The swiss army knife for Magento2 developers";
|
||||
license = licenses.mit;
|
||||
homepage = "https://magerun.net/";
|
||||
changelog = "https://magerun.net/category/magerun/";
|
||||
maintainers = teams.php.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.38";
|
||||
version = "1.0.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-n7GDvniwkyCYiu7/qw0TQsVsTZfjcSpkF2Qo/uO60e4=";
|
||||
sha256 = "sha256-wJyCRg6qvkjjaFuFK6hTqt3u7ugFKAc9K4M/BojND6o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oA+8bceow7Cdao9FhkXkfFyrCpgvR4NJHddevbhUFkA=";
|
||||
cargoHash = "sha256-n4fraxlMtkVNNmteVBoS6BlS0qE6bpFL/fKRp2pjxIs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";
|
||||
|
|
|
|||
|
|
@ -1,20 +1,24 @@
|
|||
{ lib, buildGoPackage, fetchFromSourcehut, nixosTests }:
|
||||
{ lib, buildGoModule, fetchFromSourcehut, nixosTests }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "phylactery";
|
||||
version = "0.1.2";
|
||||
|
||||
goPackagePath = "git.sr.ht/~cnx/phylactery";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~cnx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ=";
|
||||
hash = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ=";
|
||||
};
|
||||
|
||||
# Upstream repo doesn't provide any test.
|
||||
doCheck = false;
|
||||
vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
|
||||
preBuild = ''
|
||||
cp ${./go.mod} go.mod
|
||||
'';
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
passthru.tests.phylactery = nixosTests.phylactery;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
3
pkgs/servers/web-apps/phylactery/go.mod
Normal file
3
pkgs/servers/web-apps/phylactery/go.mod
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
module git.sr.ht/~cnx/phylactery
|
||||
|
||||
go 1.18
|
||||
|
|
@ -3372,11 +3372,11 @@ self: with self; {
|
|||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
|
||||
pname = "xprop";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/xprop-1.2.5.tar.bz2";
|
||||
sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv";
|
||||
url = "mirror://xorg/individual/app/xprop-1.2.6.tar.xz";
|
||||
sha256 = "0vjqnn42gscw1z2wdj24kdwjwvd7mw58pj0nm9203k1fn4jqa2sq";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2
|
|||
mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2
|
||||
mirror://xorg/individual/app/xmore-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/app/xpr-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/xprop-1.2.5.tar.bz2
|
||||
mirror://xorg/individual/app/xprop-1.2.6.tar.xz
|
||||
mirror://xorg/individual/app/xrandr-1.5.1.tar.xz
|
||||
mirror://xorg/individual/app/xrdb-1.2.1.tar.bz2
|
||||
mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2
|
||||
|
|
|
|||
54
pkgs/tools/misc/krunner-translator/default.nix
Normal file
54
pkgs/tools/misc/krunner-translator/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, krunner
|
||||
, kconfigwidgets
|
||||
, ktextwidgets
|
||||
, kservice
|
||||
, ki18n
|
||||
, translate-shell
|
||||
, qtbase
|
||||
, qtdeclarative
|
||||
, qtlocation
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "krunner-translator";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "naraesk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "8MusGvNhTxa8Sm8WiSwRaVIfZOeXmgcO4T6H9LqFGLs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
krunner
|
||||
kconfigwidgets
|
||||
ktextwidgets
|
||||
kservice
|
||||
ki18n
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtlocation
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/translateShellProcess.cpp --replace "start(\"trans\", arguments);" "start(\"${translate-shell}/bin/trans\", arguments);"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A plugin for KRunner which integrates a translator, supports Google Translate, Bing Translator, youdao and Baidu Fanyi";
|
||||
homepage = "https://github.com/naraesk/krunner-translator";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ pongo1231 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -39,6 +39,13 @@ let
|
|||
aws-sdk-cpp = aws-sdk-cpp-nix;
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nix/pull/7585
|
||||
patch-monitorfdhup = fetchpatch2 {
|
||||
name = "nix-7585-monitor-fd-hup.patch";
|
||||
url = "https://github.com/NixOS/nix/commit/1df3d62c769dc68c279e89f68fdd3723ed3bcb5a.patch";
|
||||
sha256 = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk=";
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nix/pull/7473
|
||||
patch-sqlite-exception = fetchpatch2 {
|
||||
name = "nix-7473-sqlite-exception-add-message.patch";
|
||||
|
|
@ -53,6 +60,9 @@ in lib.makeExtensible (self: {
|
|||
url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz";
|
||||
sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";
|
||||
};
|
||||
patches = [
|
||||
patch-monitorfdhup
|
||||
];
|
||||
}).override { boehmgc = boehmgc-nix_2_3; };
|
||||
|
||||
nix_2_4 = throw "nixVersions.nix_2_4 has been removed";
|
||||
|
|
@ -78,6 +88,7 @@ in lib.makeExtensible (self: {
|
|||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
patch-monitorfdhup
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
|
|
@ -93,6 +104,7 @@ in lib.makeExtensible (self: {
|
|||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
patch-monitorfdhup
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
|
|
@ -102,6 +114,7 @@ in lib.makeExtensible (self: {
|
|||
sha256 = "sha256-sQ9C101CL/eVN5JgH91ozHFWU4+bXr8/Fi/8NQk6xRI=";
|
||||
patches = [
|
||||
./patches/flaky-tests.patch
|
||||
patch-monitorfdhup
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,38 +2,23 @@
|
|||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hck";
|
||||
version = "0.8.2";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sstadick";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-66wunZuRAJ6QVWgBUy2+HGaow33F5+16LitGSQC4kCE=";
|
||||
sha256 = "sha256-wsuXEHwnTP+vl8Gn1mfH+cKoasDdZ+ILiAaJ7510lsI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4CAj94wm9qxr9wejD2ffKSdRV1UeofMhxNxLi++At+I=";
|
||||
cargoSha256 = "sha256-qWat0QIMLmMrbK/QCr3dSyWP27wFFQ+IDQAzLngThQE=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
# link System as a dylib instead of a framework on macos
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
core_affinity=../$(stripHash $cargoDeps)/core_affinity
|
||||
oldHash=$(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1)
|
||||
substituteInPlace $core_affinity/src/lib.rs --replace framework dylib
|
||||
substituteInPlace $core_affinity/.cargo-checksum.json \
|
||||
--replace $oldHash $(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A close to drop in replacement for cut that can use a regex delimiter instead of a fixed string";
|
||||
homepage = "https://github.com/sstadick/hck";
|
||||
|
|
|
|||
|
|
@ -534,6 +534,10 @@ with pkgs;
|
|||
|
||||
mix2nix = callPackage ../development/tools/mix2nix { };
|
||||
|
||||
n98-magerun = callPackage ../development/tools/misc/n98-magerun { };
|
||||
|
||||
n98-magerun2 = callPackage ../development/tools/misc/n98-magerun2 { };
|
||||
|
||||
prisma-engines = callPackage ../development/tools/database/prisma-engines {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
@ -8762,6 +8766,8 @@ with pkgs;
|
|||
|
||||
krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };
|
||||
|
||||
krunner-translator = libsForQt5.callPackage ../tools/misc/krunner-translator { };
|
||||
|
||||
krunvm = callPackage ../applications/virtualization/krunvm {
|
||||
inherit (darwin) sigtool;
|
||||
};
|
||||
|
|
@ -11120,7 +11126,7 @@ with pkgs;
|
|||
rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
|
||||
|
||||
rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix {
|
||||
pcl = pcl.override { vtk = vtkWithQt5; };
|
||||
pcl = pcl.override { vtk_8 = vtk_8_withQt5; };
|
||||
};
|
||||
|
||||
rtaudio = callPackage ../development/libraries/audio/rtaudio {
|
||||
|
|
@ -15168,6 +15174,8 @@ with pkgs;
|
|||
|
||||
microscheme = callPackage ../development/compilers/microscheme { };
|
||||
|
||||
minimacy = callPackage ../development/compilers/minimacy { };
|
||||
|
||||
mint = callPackage ../development/compilers/mint { crystal = crystal_1_2; };
|
||||
|
||||
mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { };
|
||||
|
|
@ -23525,8 +23533,8 @@ with pkgs;
|
|||
|
||||
vtk_9_withQt5 = vtk_9.override { enableQt = true; };
|
||||
|
||||
vtk = vtk_8;
|
||||
vtkWithQt5 = vtk_8_withQt5;
|
||||
vtk = vtk_9;
|
||||
vtkWithQt5 = vtk_9_withQt5;
|
||||
|
||||
vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { };
|
||||
|
||||
|
|
@ -33647,6 +33655,8 @@ with pkgs;
|
|||
|
||||
webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { };
|
||||
|
||||
webcord = callPackage ../applications/networking/instant-messengers/webcord {};
|
||||
|
||||
webex = callPackage ../applications/networking/instant-messengers/webex {};
|
||||
|
||||
webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
|
||||
|
|
@ -33684,6 +33694,8 @@ with pkgs;
|
|||
|
||||
weston = callPackage ../applications/window-managers/weston { };
|
||||
|
||||
wgnord = callPackage ../applications/networking/wgnord/default.nix {};
|
||||
|
||||
whalebird = callPackage ../applications/misc/whalebird {
|
||||
electron = electron_19;
|
||||
};
|
||||
|
|
@ -33792,9 +33804,7 @@ with pkgs;
|
|||
|
||||
xannotate = callPackage ../tools/X11/xannotate {};
|
||||
|
||||
xaos = callPackage ../applications/graphics/xaos {
|
||||
libpng = libpng12;
|
||||
};
|
||||
xaos = libsForQt5.callPackage ../applications/graphics/xaos { };
|
||||
|
||||
xastir = callPackage ../applications/misc/xastir {
|
||||
rastermagick = imagemagick6;
|
||||
|
|
|
|||
|
|
@ -10515,6 +10515,8 @@ self: super: with self; {
|
|||
|
||||
sip_4 = callPackage ../development/python-modules/sip/4.x.nix { };
|
||||
|
||||
siuba = callPackage ../development/python-modules/siuba { };
|
||||
|
||||
six = callPackage ../development/python-modules/six { };
|
||||
|
||||
sjcl = callPackage ../development/python-modules/sjcl { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue