mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
sternenseemann
commit
bbe6402eca
@ -137,7 +137,12 @@ set the default version to a version older than the newest on Hackage. We do
|
||||
this to get them or their reverse dependencies to compile in our package set.
|
||||
4. For all packages, for which the newest Hackage version is not the default
|
||||
version, there will also be a `haskellPackages.foo_x_y_z` package with the
|
||||
newest version.
|
||||
newest version. The `x_y_z` part encodes the version with dots replaced by
|
||||
underscores. When the newest version changes by a new release to Hackage the
|
||||
old package will disappear under that name and be replaced by a newer one under
|
||||
the name with the new version. The package name including the version will
|
||||
also disappear when the default version e.g. from Stackage catches up with the
|
||||
newest version from Hackage.
|
||||
5. For some packages, we also manually add other `haskellPackages.foo_x_y_z`
|
||||
versions, if they are required for a certain build.
|
||||
|
||||
@ -161,12 +166,14 @@ given in the `.cabal` file of your package and all its dependencies.
|
||||
|
||||
The [Haskell builder in nixpkgs](#haskell-mkderivation) does no such thing.
|
||||
It will simply take as input packages with names off the desired dependencies
|
||||
and just check whether they fulfill the version bounds and (by default, see
|
||||
`jailbreak`) fail if they don’t.
|
||||
and just check whether they fulfill the version bounds and fail if they don’t
|
||||
(by default, see `jailbreak` to circumvent this).
|
||||
|
||||
The package resolution is done by the `haskellPackages.callPackage` function
|
||||
which will, e.g., use `haskellPackages.aeson` for a package input of name
|
||||
`aeson`.
|
||||
The `haskellPackages.callPackage` function does the package resolution.
|
||||
It will, e.g., use `haskellPackages.aeson`which has the default version as
|
||||
described above for a package input of name `aeson`. (More general:
|
||||
`<packages>.callPackage f` will call `f` with named inputs provided from the
|
||||
package set `<packages>`.)
|
||||
While this is the default behavior, it is possible to override the dependencies
|
||||
for a specific package, see
|
||||
[`override` and `overrideScope`](#haskell-overriding-haskell-packages).
|
||||
|
||||
@ -7293,6 +7293,12 @@
|
||||
github = "jorsn";
|
||||
githubId = 4646725;
|
||||
};
|
||||
joshniemela = {
|
||||
name = "Joshua Niemelä";
|
||||
email = "josh@jniemela.dk";
|
||||
github = "joshniemela";
|
||||
githubId = 88747315;
|
||||
};
|
||||
joshuafern = {
|
||||
name = "Joshua Fern";
|
||||
email = "joshuafern@protonmail.com";
|
||||
|
||||
@ -158,7 +158,7 @@ let
|
||||
'@NIXOS_TEST_OPTIONS_JSON@' \
|
||||
${testOptionsDoc.optionsJSON}/share/doc/nixos/options.json
|
||||
|
||||
nixos-render-docs manual docbook \
|
||||
nixos-render-docs -j $NIX_BUILD_CORES manual docbook \
|
||||
--manpage-urls ${manpageUrls} \
|
||||
--revision ${lib.escapeShellArg revision} \
|
||||
./manual.md \
|
||||
@ -285,7 +285,7 @@ in rec {
|
||||
''
|
||||
else ''
|
||||
mkdir -p $out/share/man/man5
|
||||
nixos-render-docs options manpage \
|
||||
nixos-render-docs -j $NIX_BUILD_CORES options manpage \
|
||||
--revision ${lib.escapeShellArg revision} \
|
||||
${optionsJSON}/share/doc/nixos/options.json \
|
||||
$out/share/man/man5/configuration.nix.5
|
||||
|
||||
@ -152,7 +152,7 @@ in rec {
|
||||
pkgs.nixos-render-docs
|
||||
];
|
||||
} ''
|
||||
nixos-render-docs options docbook \
|
||||
nixos-render-docs -j $NIX_BUILD_CORES options docbook \
|
||||
--manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \
|
||||
--revision ${lib.escapeShellArg revision} \
|
||||
--document-type ${lib.escapeShellArg documentType} \
|
||||
|
||||
@ -34,7 +34,7 @@ let
|
||||
text = if (cfg.configFile != null) then ''
|
||||
cp ${cfg.configFile} ${configPath}
|
||||
# make config file readable by service
|
||||
chown -R --reference=$HOME $(dirname ${configPath})
|
||||
chown -R --reference="$HOME" "$(dirname ${configPath})"
|
||||
'' else ''
|
||||
export CONFIG_FILE=${configPath}
|
||||
|
||||
|
||||
@ -316,11 +316,13 @@ in {
|
||||
mkdir -p -m 0755 /run/binfmt
|
||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)}
|
||||
'';
|
||||
systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) [
|
||||
"proc-sys-fs-binfmt_misc.automount"
|
||||
"proc-sys-fs-binfmt_misc.mount"
|
||||
"systemd-binfmt.service"
|
||||
];
|
||||
systemd.services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ];
|
||||
systemd = lib.mkIf (config.boot.binfmt.registrations != {}) {
|
||||
additionalUpstreamSystemUnits = [
|
||||
"proc-sys-fs-binfmt_misc.automount"
|
||||
"proc-sys-fs-binfmt_misc.mount"
|
||||
"systemd-binfmt.service"
|
||||
];
|
||||
services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,20 +19,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amberol";
|
||||
version = "0.9.2";
|
||||
version = "unstable-2023-01-12";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-L8yHKwtCAZC1myIouL0Oq3lj0QPWn5dVe0g3nkyAKI8=";
|
||||
rev = "0623386c813d0d68564002324958cef7217cec7f";
|
||||
hash = "sha256-nVL4ydTg4ncDCA9J9qWv+RPDC0Txr/qpo5XxIUiV0zQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-0XuWBUG37GNHRXgjz0/Vv6VSqaPG36xTj7oN0ukFIJY=";
|
||||
hash = "sha256-E0ivUWD3jP/T1GOJ11grDwcF+m92I+W2a2HhZX1bCso=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tauon";
|
||||
version = "7.4.7";
|
||||
version = "7.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "TauonMusicBox";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WUHMXsbnNaDlV/5bCOPMadJKWoF5i2UlFf9fcX6GCZ0=";
|
||||
hash = "sha256-9/mzh8lRBjd7d9oEyG1XGWmOdgPEFCVjHZxDnAhYDwc=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.7.7";
|
||||
version = "1.7.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bflQsVaCwV5zaU5k46wFQ45dIOg3dHmYfBVQHyw+EpM=";
|
||||
sha256 = "sha256-NRmpKr0lqe2NUlpyzkdtn7nN0rFrZakryNR1WAOzx9Q=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "nbxplorer";
|
||||
version = "2.3.60";
|
||||
version = "2.3.62";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgarage";
|
||||
repo = "NBXplorer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YUZvTs77dGhG7dpxbQyGhrOMMx+8LotdMJflPflMDAE=";
|
||||
sha256 = "sha256-FpAMkVgvl0SxJ59FjL4H3Fvqb1LKsET2I+A01TQlvFA=";
|
||||
};
|
||||
|
||||
projectFile = "NBXplorer/NBXplorer.csproj";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -115,12 +115,12 @@
|
||||
};
|
||||
c_sharp = buildGrammar {
|
||||
language = "c_sharp";
|
||||
version = "18e4343";
|
||||
version = "5b6c4d0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c-sharp";
|
||||
rev = "18e434383a4582b4fd183a30e55022c2923764e1";
|
||||
hash = "sha256-ggvCj2yGDINuGr8Jb+aOoRxlKa5LaXCoiQC/Y5Hrcn0=";
|
||||
rev = "5b6c4d0d19d79b05c69ad752e11829910e3b4610";
|
||||
hash = "sha256-Ax9AuxqQK9gSlkxM2k6E32CskudUmduWm0luC031P5U=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
|
||||
};
|
||||
@ -426,12 +426,12 @@
|
||||
};
|
||||
fortran = buildGrammar {
|
||||
language = "fortran";
|
||||
version = "069bd7c";
|
||||
version = "dd35c67";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stadelmanma";
|
||||
repo = "tree-sitter-fortran";
|
||||
rev = "069bd7c864fe2dee1115140cc2621d140b16a643";
|
||||
hash = "sha256-edvAcXKoVHIpOpVPROA9l97B4tFfuJYbjcSy9oE/dzw=";
|
||||
rev = "dd35c67b1653963d3b4cca7bfbceb6ec2e6f006f";
|
||||
hash = "sha256-AVImNPg2d/vavpg+IBholzKiH8Hod4m7V3aJxWTnMKk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
|
||||
};
|
||||
@ -481,12 +481,12 @@
|
||||
};
|
||||
git_rebase = buildGrammar {
|
||||
language = "git_rebase";
|
||||
version = "127f5b5";
|
||||
version = "d8a4207";
|
||||
src = fetchFromGitHub {
|
||||
owner = "the-mikedavis";
|
||||
repo = "tree-sitter-git-rebase";
|
||||
rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c";
|
||||
hash = "sha256-4XGQTrflV+txVjXbgaQSd6rFES8TkuiXEurJLBdg59E=";
|
||||
rev = "d8a4207ebbc47bd78bacdf48f883db58283f9fd8";
|
||||
hash = "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase";
|
||||
};
|
||||
@ -593,12 +593,12 @@
|
||||
};
|
||||
gosum = buildGrammar {
|
||||
language = "gosum";
|
||||
version = "68974b6";
|
||||
version = "bd0ec1f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-go-sum";
|
||||
rev = "68974b63c19dc6e27214a5c76b6e26c0c40fe5b7";
|
||||
hash = "sha256-Avk9nAICwy59VYIlLhp9FkozAna9kMwY60pAqKyJsK4=";
|
||||
rev = "bd0ec1fe9d68a5d4713d907417a43d489fa1b62a";
|
||||
hash = "sha256-BFwYKVbCBCC2ZvockKqiVFHOlTc3/YFIaZ2OqkO52yY=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-go-sum";
|
||||
};
|
||||
@ -901,12 +901,12 @@
|
||||
};
|
||||
ledger = buildGrammar {
|
||||
language = "ledger";
|
||||
version = "47b8971";
|
||||
version = "f787ae6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cbarrete";
|
||||
repo = "tree-sitter-ledger";
|
||||
rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9";
|
||||
hash = "sha256-Doz561oVrWkmUAL3VUTjraO+F0aDuahhBB+xXevTrkg=";
|
||||
rev = "f787ae635ca79589faa25477b94291a87e2d3e23";
|
||||
hash = "sha256-9Sc22IYWhUUzCslna3mzePd7bRbtWDwiWKvAzLYubOQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger";
|
||||
};
|
||||
@ -1445,12 +1445,12 @@
|
||||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "7be06f4";
|
||||
version = "0d7a121";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "7be06f4d5eabace883dd45959c13dc740f1f1b98";
|
||||
hash = "sha256-Hi/4/Aou85MYCMMFqf5xqAyKECTzfeiaksJxdv9MVCU=";
|
||||
rev = "0d7a121b2a08fb37109f7be1cc6654443cad661f";
|
||||
hash = "sha256-b3HtiAoknPgmivnN/GVHcFHbAgl1an41iSS13wTFyGA=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
@ -1549,12 +1549,12 @@
|
||||
};
|
||||
thrift = buildGrammar {
|
||||
language = "thrift";
|
||||
version = "d1f350b";
|
||||
version = "c5a9454";
|
||||
src = fetchFromGitHub {
|
||||
owner = "duskmoon314";
|
||||
repo = "tree-sitter-thrift";
|
||||
rev = "d1f350b19dd70ccdbd6d565dbea4879e4cef03da";
|
||||
hash = "sha256-RxrusaDiDjs25EcyrcnnjJIaeZaZhQdcxOWwtZ8Xe0U=";
|
||||
rev = "c5a94547f01eb51b26446f9b94ee8644fa791223";
|
||||
hash = "sha256-2RNS0raJ0sEbBECwtI8hMG4Dir8KAx9PENwlRb7lY8o=";
|
||||
};
|
||||
meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift";
|
||||
};
|
||||
|
||||
@ -531,6 +531,7 @@ https://github.com/smiteshp/nvim-navic/,HEAD,
|
||||
https://github.com/AckslD/nvim-neoclip.lua/,,
|
||||
https://github.com/yamatsum/nvim-nonicons/,,
|
||||
https://github.com/rcarriga/nvim-notify/,,
|
||||
https://github.com/LhKipp/nvim-nu/,HEAD,
|
||||
https://github.com/ojroques/nvim-osc52/,,
|
||||
https://github.com/gennaro-tedesco/nvim-peekup/,,
|
||||
https://github.com/olrtg/nvim-rename-state/,HEAD,
|
||||
@ -580,6 +581,7 @@ https://github.com/NLKNguyen/papercolor-theme/,,
|
||||
https://github.com/tmsvg/pear-tree/,,
|
||||
https://github.com/steelsojka/pears.nvim/,,
|
||||
https://github.com/andsild/peskcolor.vim/,,
|
||||
https://github.com/pest-parser/pest.vim/,HEAD,
|
||||
https://github.com/lifepillar/pgsql.vim/,,
|
||||
https://github.com/motus/pig.vim/,,
|
||||
https://github.com/aklt/plantuml-syntax/,,
|
||||
|
||||
131
pkgs/applications/emulators/xemu/default.nix
Normal file
131
pkgs/applications/emulators/xemu/default.nix
Normal file
@ -0,0 +1,131 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, pkg-config
|
||||
, python3
|
||||
, ninja
|
||||
, meson
|
||||
, which
|
||||
, perl
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, gtk3
|
||||
, libpcap
|
||||
, openssl
|
||||
, libepoxy
|
||||
, libsamplerate
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, mesa
|
||||
, libdrm
|
||||
, libGLU
|
||||
, gettext
|
||||
, vte
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xemu";
|
||||
version = "0.7.84";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xemu-project";
|
||||
repo = "xemu";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-pEXjwoQKbMmVNYCnh5nqP7k0acYOAp8SqxYZwPzVwDY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
python3
|
||||
python3.pkgs.pyyaml
|
||||
ninja
|
||||
which
|
||||
meson
|
||||
perl
|
||||
wrapGAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
openssl
|
||||
mesa
|
||||
libepoxy
|
||||
libdrm
|
||||
libpcap
|
||||
libsamplerate
|
||||
SDL2
|
||||
libGLU
|
||||
SDL2_image
|
||||
gettext
|
||||
vte
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
dontUseMesonConfigure = true;
|
||||
|
||||
setOutputFlags = false;
|
||||
|
||||
configureFlags = [
|
||||
"--disable-strip"
|
||||
"--meson=meson"
|
||||
"--target-list=i386-softmmu"
|
||||
"--disable-werror"
|
||||
];
|
||||
|
||||
buildFlags = [ "qemu-system-i386" ];
|
||||
|
||||
desktopItems = [(makeDesktopItem {
|
||||
name = "xemu";
|
||||
desktopName = "xemu";
|
||||
exec = "xemu";
|
||||
icon = "xemu";
|
||||
})] ;
|
||||
|
||||
preConfigure = let
|
||||
branch = "master";
|
||||
commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351";
|
||||
in ''
|
||||
patchShebangs .
|
||||
configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls")
|
||||
substituteInPlace ./scripts/xemu-version.sh \
|
||||
--replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'"
|
||||
# If the versions can't be obtained through git, the build process tries
|
||||
# to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar)
|
||||
echo '${commit}' > XEMU_COMMIT
|
||||
echo '${branch}' > XEMU_BRANCH
|
||||
echo '${version}' > XEMU_VERSION
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cd build
|
||||
substituteInPlace ./build.ninja --replace /usr/bin/env $(which env)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,share}
|
||||
cp qemu-system-i386 $out/bin/xemu
|
||||
|
||||
for RES in 16x16 24x24 32x32 48x48 128x128 256x256 512x512
|
||||
do
|
||||
mkdir -p $out/share/icons/hicolor/$RES/apps/
|
||||
cp ../ui/icons/xemu_$RES.png $out/share/icons/hicolor/$RES/apps/xemu.png
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://xemu.app/";
|
||||
description = "Original Xbox emulator";
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
@ -95,6 +95,8 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://hexler.net/kodelife";
|
||||
description = "Real-time GPU shader editor";
|
||||
|
||||
54
pkgs/applications/graphics/kodelife/update.sh
Executable file
54
pkgs/applications/graphics/kodelife/update.sh
Executable file
@ -0,0 +1,54 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix curl libxml2 jq
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))"
|
||||
|
||||
attr="${UPDATE_NIX_ATTR_PATH:-kodelife}"
|
||||
version="$(curl -sSL https://hexler.net/kodelife/appcast/linux | xmllint --xpath '/rss/channel/item/enclosure/@*[local-name()="version"]' - | cut -d= -f2- | tr -d '"' | head -n1)"
|
||||
|
||||
narhash() {
|
||||
nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash
|
||||
}
|
||||
|
||||
nixeval() {
|
||||
if [ "$#" -ge 2 ]; then
|
||||
systemargs=(--argstr system "$2")
|
||||
else
|
||||
systemargs=()
|
||||
fi
|
||||
|
||||
nix --extra-experimental-features nix-command eval --json --impure "${systemargs[@]}" -f "$nixpkgs" "$1" | jq -r .
|
||||
}
|
||||
|
||||
findpath() {
|
||||
path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
|
||||
outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
|
||||
|
||||
if [ -n "$outpath" ]; then
|
||||
path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
|
||||
fi
|
||||
|
||||
echo "$path"
|
||||
}
|
||||
|
||||
oldversion="${UPDATE_NIX_OLD_VERSION:-$(nixeval "$attr".version)}"
|
||||
|
||||
pkgpath="$(findpath "$attr")"
|
||||
|
||||
if [ "$version" = "$oldversion" ]; then
|
||||
echo 'update.sh: New version same as old version, nothing to do.'
|
||||
exit 0
|
||||
fi
|
||||
|
||||
sed -i -e "/version\s*=/ s|\"$oldversion\"|\"$version\"|" "$pkgpath"
|
||||
|
||||
for system in aarch64-linux armv7l-linux x86_64-linux; do
|
||||
url="$(nixeval "$attr".src.url "$system")"
|
||||
|
||||
curhash="$(nixeval "$attr".src.outputHash "$system")"
|
||||
newhash="$(narhash "$url")"
|
||||
|
||||
sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath"
|
||||
done
|
||||
59
pkgs/applications/misc/openrgb-plugins/effects/default.nix
Normal file
59
pkgs/applications/misc/openrgb-plugins/effects/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, qtbase
|
||||
, openrgb
|
||||
, glib
|
||||
, openal
|
||||
, qmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openrgb-plugin-effects";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "OpenRGBDevelopers";
|
||||
repo = "OpenRGBEffectsPlugin";
|
||||
rev = "release_${version}";
|
||||
hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Add install rule
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch";
|
||||
hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Use the source of openrgb from nixpkgs instead of the submodule
|
||||
rm -r OpenRGB
|
||||
ln -s ${openrgb.src} OpenRGB
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
glib
|
||||
openal
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin";
|
||||
description = "An effects plugin for OpenRGB";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, qtbase
|
||||
, openrgb
|
||||
, glib
|
||||
, libgtop
|
||||
, lm_sensors
|
||||
, qmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openrgb-plugin-hardwaresync";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "OpenRGBDevelopers";
|
||||
repo = "OpenRGBHardwareSyncPlugin";
|
||||
rev = "release_${version}";
|
||||
hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "use-pkgconfig";
|
||||
url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch";
|
||||
hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "add-install-rule";
|
||||
url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch";
|
||||
hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Use the source of openrgb from nixpkgs instead of the submodule
|
||||
rmdir OpenRGB
|
||||
ln -s ${openrgb.src} OpenRGB
|
||||
# Remove prebuilt stuff
|
||||
rm -r dependencies/lhwm-cpp-wrapper
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
glib
|
||||
libgtop
|
||||
lm_sensors
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin";
|
||||
description = "Sync your ARGB devices colors with hardware measures (CPU, GPU, fan speed, etc...)";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools }:
|
||||
{ lib, stdenv, fetchFromGitLab, qmake, wrapQtAppsHook, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, qtbase, qttools, symlinkJoin, openrgb }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openrgb";
|
||||
@ -25,6 +25,29 @@ stdenv.mkDerivation rec {
|
||||
HOME=$TMPDIR $out/bin/openrgb --help > /dev/null
|
||||
'';
|
||||
|
||||
passthru.withPlugins = plugins:
|
||||
let pluginsDir = symlinkJoin {
|
||||
name = "openrgb-plugins";
|
||||
paths = plugins;
|
||||
# Remove all library version symlinks except one,
|
||||
# or they will result in duplicates in the UI.
|
||||
# We leave the one pointing to the actual library, usually the most
|
||||
# qualified one (eg. libOpenRGBHardwareSyncPlugin.so.1.0.0).
|
||||
postBuild = ''
|
||||
for f in $out/lib/*; do
|
||||
if [ "$(dirname $(readlink "$f"))" == "." ]; then
|
||||
rm "$f"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
};
|
||||
in openrgb.overrideAttrs (old: {
|
||||
qmakeFlags = old.qmakeFlags or [] ++ [
|
||||
# Welcome to Escape Hell, we have backslashes
|
||||
''DEFINES+=OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\""${lib.escape ["\\" "\"" " "] (toString pluginsDir)}/lib\\\""''
|
||||
];
|
||||
});
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source RGB lighting control";
|
||||
homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB";
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgmodeler";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmodeler";
|
||||
repo = "pgmodeler";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aDmaKf3iLBFD28n2u/QOf/GkgE64Birn0x3Kj5Qx2sg=";
|
||||
sha256 = "sha256-SlAYl2x1qdBBwLboO59h1uifF7Q71oX3JyhWwUogdb0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
|
||||
|
||||
60
pkgs/applications/networking/cluster/kubeshark/default.nix
Normal file
60
pkgs/applications/networking/cluster/kubeshark/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubeshark, nix-update-script }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeshark";
|
||||
version = "38.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
rev = version;
|
||||
sha256 = "sha256-xu+IcmYNsFBYhb0Grnqyi31LCG/3XhSh1LH8XakQ3Yk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-o04XIUsHNqOBkvcejASHNz1HDnV6F9t+Q2Hg8eL/Uoc=";
|
||||
|
||||
ldflags = let t = "github.com/kubeshark/kubeshark"; in [
|
||||
"-s" "-w"
|
||||
"-X ${t}/misc.GitCommitHash=${src.rev}"
|
||||
"-X ${t}/misc.Branch=master"
|
||||
"-X ${t}/misc.BuildTimestamp=0"
|
||||
"-X ${t}/misc.Platform=unknown"
|
||||
"-X ${t}/misc.Ver=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
checkPhase = ''
|
||||
go test ./...
|
||||
'';
|
||||
doCheck = true;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
installShellCompletion --cmd kubeshark \
|
||||
--bash <($out/bin/kubeshark completion bash) \
|
||||
--fish <($out/bin/kubeshark completion fish) \
|
||||
--zsh <($out/bin/kubeshark completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = kubeshark;
|
||||
command = "kubeshark version";
|
||||
inherit version;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/kubeshark/kubeshark/releases/tag/${version}";
|
||||
description = "The API Traffic Viewer for Kubernetes";
|
||||
homepage = "https://kubeshark.co/";
|
||||
license = licenses.asl20;
|
||||
longDescription = ''
|
||||
The API traffic viewer for Kubernetes providing real-time, protocol-aware visibility into Kubernetes’ internal network,
|
||||
Think TCPDump and Wireshark re-invented for Kubernetes
|
||||
capturing, dissecting and monitoring all traffic and payloads going in, out and across containers, pods, nodes and clusters.
|
||||
'';
|
||||
maintainers = with maintainers; [ bryanasdev000 ];
|
||||
};
|
||||
}
|
||||
@ -119,20 +119,20 @@
|
||||
"vendorHash": "sha256-WndEg+n0hId7R35OeHamP+OxzzRee7f+qXIhWmos8WI="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-StoT7ujiJhEMpQ4wMN/qzILFxJ18ZkgLkY56LwxKY+Y=",
|
||||
"hash": "sha256-CTiYxmH39Jjh7wGKWmH0EoQa1H1bkV9hBNeHR+WVvF0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.34.0",
|
||||
"rev": "v2.34.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-40oarnfSdA2Sif40C1gi+SupY4bNsp78TBfgNDCFf7U=",
|
||||
"hash": "sha256-FPgq/BsciisMhdSYsYiHnMQJFaTAa/llQ1RVS/sOzhQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.44.0",
|
||||
"rev": "v3.44.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -420,11 +420,11 @@
|
||||
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
|
||||
},
|
||||
"github": {
|
||||
"hash": "sha256-QobAIpDDl5SXG9hmpdq8lDm8Sg5w2oK4A+e8WKw52Cc=",
|
||||
"hash": "sha256-GieysqBcXSgHuT13FqDtPPklFPRBREwMrTZZ7QH14pY=",
|
||||
"homepage": "https://registry.terraform.io/providers/integrations/github",
|
||||
"owner": "integrations",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v5.17.0",
|
||||
"rev": "v5.18.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -540,11 +540,11 @@
|
||||
"vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y="
|
||||
},
|
||||
"huaweicloud": {
|
||||
"hash": "sha256-8H9DgpZukJ6K78H6YITPgWai8lPPb8O1tITRTl/azHw=",
|
||||
"hash": "sha256-oZUPfhndpht9EuBiltLknblGaMX2M/dD1iOiwDJKgWY=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.44.1",
|
||||
"rev": "v1.44.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -1172,12 +1172,12 @@
|
||||
"vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U="
|
||||
},
|
||||
"vault": {
|
||||
"hash": "sha256-aNyCUDV1yjpmbPNYlxuJNaiXtG3fJySxRsDLJx/hZ04=",
|
||||
"hash": "sha256-cYSw5aN7TvVMUY+YnyyosB4HjiosXYB7kDiNDQ258Eg=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v3.12.0",
|
||||
"rev": "v3.13.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE="
|
||||
},
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.24";
|
||||
version = "3.5.25";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4RQBaqC3nmyEq9Kqg0n9KIN9Gw4Z+uCl6hQeqo/NTls=";
|
||||
hash = "sha256-Xb33/wz85RjBpRkKD09hfDr6txoB1ksKphbjrVt0QWg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kdeltachat";
|
||||
version = "unstable-2022-03-20";
|
||||
version = "unstable-2023-01-31";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~link2xt";
|
||||
repo = "kdeltachat";
|
||||
rev = "8cce6d20b49e917929521a13caed30e81037c868";
|
||||
hash = "sha256-1L45KodOmvy6pBbBzJwGWMAY7y3+lfxjeXtsH1SdipU=";
|
||||
rev = "0c9370cfe41ae7f99b4fceced896f66fb4e9195c";
|
||||
hash = "sha256-6KSzsPs8tSzVOxGUWj/AvSJihrSwamZgUNGvjnmNnag=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -75,7 +75,7 @@ let
|
||||
in
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.6.2";
|
||||
version = "4.6.3";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
@ -84,7 +84,7 @@ env.mkDerivation rec {
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0lrflhnlsajay8gbz1x91fqk2ckxwpqmm19hyjfqxkvi56nl7a0g";
|
||||
sha256 = "1kv7aqj4d85iz6vbgvfplyfr9y3rw31xhdgwiskrdfv8mqb0mr5v";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
76
pkgs/applications/office/iotas/default.nix
Normal file
76
pkgs/applications/office/iotas/default.nix
Normal file
@ -0,0 +1,76 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gtk4
|
||||
, librsvg
|
||||
, libsecret
|
||||
, libadwaita
|
||||
, gtksourceview5
|
||||
, webkitgtk_5_0
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "iotas";
|
||||
version = "0.1.9";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "cheywood";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-TdsqxpJq2+hoLHcJ58JQ20TWerZMXL3wkT9oIlVkrk4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
wrapGAppsHook4
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
librsvg
|
||||
libsecret
|
||||
libadwaita
|
||||
gtksourceview5
|
||||
webkitgtk_5_0
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pygobject3
|
||||
pygtkspellcheck
|
||||
requests
|
||||
markdown-it-py
|
||||
linkify-it-py
|
||||
mdit-py-plugins
|
||||
];
|
||||
|
||||
# prevent double wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple note taking with mobile-first design and Nextcloud sync";
|
||||
homepage = "https://gitlab.gnome.org/cheywood/iotas";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
let
|
||||
pname = "trilium-desktop";
|
||||
version = "0.58.7";
|
||||
version = "0.58.8";
|
||||
|
||||
linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
linuxSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c";
|
||||
linuxSource.sha256 = "03v4a135brj2z1gj2y611pi7szfhr62xxj0qhki0mychypvdfx7i";
|
||||
|
||||
darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip";
|
||||
darwinSource.sha256 = "1khywd77j4f745fvxln01li8qxnhlqqsirhm75kbi24bxlcpxfpa";
|
||||
darwinSource.sha256 = "0ncf2cl62hn2ja72fw10s40rzkgcwy77ggs29zpgjjlp9hkk3v8q";
|
||||
|
||||
meta = metaCommon // {
|
||||
mainProgram = "trilium";
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
|
||||
let
|
||||
serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||
serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka";
|
||||
version = "0.58.7";
|
||||
serverSource.sha256 = "0mkbmb26y99rc22bpxlc3gdgv84rj7wvsva741gw2z0cb3jh4ziv";
|
||||
version = "0.58.8";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "trilium-server";
|
||||
inherit version;
|
||||
|
||||
@ -7,8 +7,8 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
srcVersion = "oct22b";
|
||||
version = "20221001_b";
|
||||
srcVersion = "feb23a";
|
||||
version = "20230201_a";
|
||||
pname = "gildas";
|
||||
|
||||
src = fetchurl {
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
# source code of the previous release to a different directory
|
||||
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
|
||||
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
|
||||
sha256 = "sha256-MGfU2gzBbJ8ITpU7OiwCaHbi8s9Y6gvcAvSUuEZjfqk=";
|
||||
sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ];
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
|
||||
|
||||
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ];
|
||||
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
|
||||
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py
|
||||
--- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200
|
||||
+++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200
|
||||
@@ -32,7 +32,7 @@
|
||||
libs.insert(0, '-L' + getvar('LIBDIR'))
|
||||
|
||||
# Framework (specific for Mac)
|
||||
-if not getvar('PYTHONFRAMEWORK'):
|
||||
- libs.extend(getvar('LINKFORSHARED').split())
|
||||
+#if not getvar('PYTHONFRAMEWORK'):
|
||||
+# libs.extend(getvar('LINKFORSHARED').split())
|
||||
|
||||
print(' '.join(libs))
|
||||
@ -0,0 +1,39 @@
|
||||
Per https://bodhi.fedoraproject.org/updates/FEDORA-2022-dc47174c36:
|
||||
|
||||
This update fixes a failure to build with source with bash 5.2. Bash's
|
||||
`patsub_replacement` feature makes ampersand a special character when doing
|
||||
variable substitution, which was not previously the case. This update instructs
|
||||
bash to turn off the new behavior.
|
||||
|
||||
The patch itself is adapted from
|
||||
https://src.fedoraproject.org/rpms/cvc4/blob/f7c24c6ad72a8812d244313f13032fa23d393315/f/cvc4-bash-patsub-replacement.patch.
|
||||
--- a/src/expr/mkexpr 2020-06-19 10:59:27.000000000 -0600
|
||||
+++ b/src/expr/mkexpr 2022-10-11 14:28:31.120453409 -0600
|
||||
@@ -16,6 +16,7 @@
|
||||
#
|
||||
|
||||
copyright=2010-2014
|
||||
+shopt -u patsub_replacement
|
||||
|
||||
filename=`basename "$1" | sed 's,_template,,'`
|
||||
|
||||
--- a/src/expr/mkkind 2020-06-19 10:59:27.000000000 -0600
|
||||
+++ b/src/expr/mkkind 2022-10-11 14:34:17.008996126 -0600
|
||||
@@ -15,6 +15,7 @@
|
||||
#
|
||||
|
||||
copyright=2010-2014
|
||||
+shopt -u patsub_replacement
|
||||
|
||||
filename=`basename "$1" | sed 's,_template,,'`
|
||||
|
||||
--- a/src/expr/mkmetakind 2020-06-19 10:59:27.000000000 -0600
|
||||
+++ b/src/expr/mkmetakind 2022-10-11 14:34:32.248020036 -0600
|
||||
@@ -18,6 +18,7 @@
|
||||
#
|
||||
|
||||
copyright=2010-2014
|
||||
+shopt -u patsub_replacement
|
||||
|
||||
cat <<EOF
|
||||
/********************* */
|
||||
@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
|
||||
patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./cvc4-bash-patsub-replacement.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs ./src/
|
||||
'';
|
||||
|
||||
@ -19,7 +19,9 @@
|
||||
, libwpd
|
||||
, libxslt
|
||||
, lyx
|
||||
, makeWrapper
|
||||
, perl
|
||||
, perlPackages
|
||||
, pkg-config
|
||||
, poppler_utils
|
||||
, python3Packages
|
||||
@ -66,6 +68,7 @@ mkDerivation rec {
|
||||
file
|
||||
pkg-config
|
||||
python3Packages.setuptools
|
||||
makeWrapper
|
||||
which
|
||||
];
|
||||
|
||||
@ -73,6 +76,7 @@ mkDerivation rec {
|
||||
bison
|
||||
chmlib
|
||||
python3Packages.python
|
||||
python3Packages.mutagen
|
||||
xapian
|
||||
zlib
|
||||
] ++ lib.optional withGui [
|
||||
@ -111,6 +115,10 @@ mkDerivation rec {
|
||||
substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl
|
||||
fi
|
||||
done
|
||||
wrapProgram $out/share/recoll/filters/rclaudio.py \
|
||||
--prefix PYTHONPATH : $PYTHONPATH
|
||||
wrapProgram $out/share/recoll/filters/rclimg \
|
||||
--prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}"
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
|
||||
'' + lib.optionalString (stdenv.isDarwin && withGui) ''
|
||||
@ -130,6 +138,6 @@ mkDerivation rec {
|
||||
changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ jcumming ];
|
||||
maintainers = with maintainers; [ jcumming ehmry ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, fetchgit, vdr, fetchFromGitHub
|
||||
{ lib, stdenv, vdr, fetchFromGitHub
|
||||
, graphicsmagick, pcre, xorgserver, ffmpeg
|
||||
, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
|
||||
, callPackage
|
||||
}: let
|
||||
mkPlugin = name: stdenv.mkDerivation {
|
||||
name = "vdr-${vdr.version}-${name}";
|
||||
name = "vdr-${name}-${vdr.version}";
|
||||
inherit (vdr) src;
|
||||
buildInputs = [ vdr ];
|
||||
preConfigure = "cd PLUGINS/src/${name}";
|
||||
@ -55,13 +55,13 @@ in {
|
||||
|
||||
markad = stdenv.mkDerivation rec {
|
||||
pname = "vdr-markad";
|
||||
version = "3.0.26";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "vdr-plugin-markad";
|
||||
owner = "kfb77";
|
||||
sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M=";
|
||||
rev = "V${version}";
|
||||
};
|
||||
|
||||
buildInputs = [ vdr ffmpeg ];
|
||||
@ -101,12 +101,12 @@ in {
|
||||
|
||||
epgsearch = stdenv.mkDerivation rec {
|
||||
pname = "vdr-epgsearch";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "vdr-plugin-epgsearch";
|
||||
owner = "vdr-projects";
|
||||
sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U=";
|
||||
sha256 = "sha256-C+WSdGTnDBTWLvpjG5GBaK8pYbht431nL5iaL/a0H4Y=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
@ -150,7 +150,7 @@ in {
|
||||
|
||||
vnsiserver = stdenv.mkDerivation rec {
|
||||
pname = "vdr-vnsiserver";
|
||||
version = "1.8.1";
|
||||
version = "1.8.3";
|
||||
|
||||
buildInputs = [ vdr ];
|
||||
|
||||
@ -160,7 +160,7 @@ in {
|
||||
repo = "vdr-plugin-vnsiserver";
|
||||
owner = "vdr-projects";
|
||||
rev = version;
|
||||
sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E=";
|
||||
sha256 = "sha256-ivHdzX90ozMXSvIc5OrKC5qHeK5W3TK8zyrN8mY3IhE=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@ -173,14 +173,15 @@ in {
|
||||
|
||||
};
|
||||
|
||||
text2skin = stdenv.mkDerivation {
|
||||
text2skin = stdenv.mkDerivation rec {
|
||||
pname = "vdr-text2skin";
|
||||
version = "1.3.4-20170702";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git";
|
||||
sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa";
|
||||
src = fetchFromGitHub {
|
||||
repo = "vdr-plugin-text2skin";
|
||||
owner = "vdr-projects";
|
||||
rev = "8f7954da2488ced734c30e7c2704b92a44e6e1ad";
|
||||
sha256 = "19hkwmaw6nwak38bv6cm2vcjjkf4w5yjyxb98qq6zfjjh5wq54aa";
|
||||
};
|
||||
|
||||
buildInputs = [ vdr graphicsmagick ];
|
||||
@ -200,7 +201,7 @@ in {
|
||||
dontInstall = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://projects.vdr-developer.org/projects/plg-text2skin";
|
||||
inherit (src.meta) homepage;
|
||||
description = "VDR Text2Skin Plugin";
|
||||
maintainers = [ maintainers.ck3d ];
|
||||
license = licenses.gpl2;
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vdr-softhddevice";
|
||||
version = "1.9.3";
|
||||
version = "1.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ua0lnj";
|
||||
repo = "vdr-plugin-softhddevice";
|
||||
sha256 = "sha256-0jtA64RVlh57zjrGDJAR/tt8V6sSksAx9kBDRW1m+WM=";
|
||||
sha256 = "sha256-SviAuV+71pxnuEcmoLQkA1yti2jAAuG7yZZDlf3cODc=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "katriawm";
|
||||
version = "21.09";
|
||||
version = "22.12";
|
||||
|
||||
src = fetchzip {
|
||||
name = finalAttrs.pname + "-" + finalAttrs.version;
|
||||
url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-xt0sWEwTcCs5cwoB3wVbYcyAKL0jx7KyeCefEBVFhH8=";
|
||||
name = self.pname + "-" + self.version;
|
||||
url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${self.version}.tar.gz";
|
||||
hash = "sha256-xFKr4PxqvnQEAWplhRsaL5rhmSJpnImpk1eXFX0N1tc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
installFlags = [ "prefix=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://www.uninformativ.de/git/katriawm/file/README.html";
|
||||
description = "A non-reparenting, dynamic window manager with decorations";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
inherit (libX11.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
||||
@ -20,7 +20,11 @@ let
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
passthru = {
|
||||
unwrapped = Agda;
|
||||
tests = { inherit (nixosTests) agda; };
|
||||
inherit withPackages;
|
||||
tests = {
|
||||
inherit (nixosTests) agda;
|
||||
allPackages = withPackages (lib.filter self.lib.isUnbrokenAgdaPackage (lib.attrValues self));
|
||||
};
|
||||
};
|
||||
inherit (Agda) meta;
|
||||
} ''
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
{ lib, stdenv, graalvm-ce, glibcLocales }:
|
||||
|
||||
{ name ? "${args.pname}-${args.version}"
|
||||
# Final executable name
|
||||
{ lib
|
||||
, stdenv
|
||||
, glibcLocales
|
||||
# The GraalVM derivation to use
|
||||
, graalvmDrv
|
||||
, name ? "${args.pname}-${args.version}"
|
||||
, executable ? args.pname
|
||||
# JAR used as input for GraalVM derivation, defaults to src
|
||||
, jar ? args.src
|
||||
@ -9,7 +11,6 @@
|
||||
# Default native-image arguments. You probably don't want to set this,
|
||||
# except in special cases. In most cases, use extraNativeBuildArgs instead
|
||||
, nativeImageBuildArgs ? [
|
||||
"-jar" jar
|
||||
(lib.optionalString stdenv.isDarwin "-H:-CheckToolchain")
|
||||
"-H:Name=${executable}"
|
||||
"--verbose"
|
||||
@ -18,16 +19,25 @@
|
||||
, extraNativeImageBuildArgs ? [ ]
|
||||
# XMX size of GraalVM during build
|
||||
, graalvmXmx ? "-J-Xmx6g"
|
||||
# The GraalVM derivation to use
|
||||
, graalvmDrv ? graalvm-ce
|
||||
# Locale to be used by GraalVM compiler
|
||||
, LC_ALL ? "en_US.UTF-8"
|
||||
, meta ? { }
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
stdenv.mkDerivation (args // {
|
||||
inherit dontUnpack LC_ALL;
|
||||
let
|
||||
extraArgs = builtins.removeAttrs args [
|
||||
"lib"
|
||||
"stdenv"
|
||||
"glibcLocales"
|
||||
"jar"
|
||||
"dontUnpack"
|
||||
"LC_ALL"
|
||||
"meta"
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
inherit dontUnpack LC_ALL jar;
|
||||
|
||||
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvmDrv glibcLocales ];
|
||||
|
||||
@ -36,7 +46,7 @@ stdenv.mkDerivation (args // {
|
||||
buildPhase = args.buildPhase or ''
|
||||
runHook preBuild
|
||||
|
||||
native-image ''${nativeImageBuildArgs[@]}
|
||||
native-image -jar "$jar" ''${nativeImageBuildArgs[@]}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@ -61,4 +71,4 @@ stdenv.mkDerivation (args // {
|
||||
# need to have native-image-installable-svm available
|
||||
broken = !(builtins.any (p: (p.product or "") == "native-image-installable-svm") graalvmDrv.products);
|
||||
} // meta;
|
||||
})
|
||||
} // extraArgs)
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
, libgee
|
||||
, libhandy
|
||||
, gnome-settings-daemon
|
||||
, mesa
|
||||
, mutter
|
||||
, elementary-icon-theme
|
||||
, wingpanel-with-indicators
|
||||
@ -22,7 +23,6 @@
|
||||
, nixos-artwork
|
||||
, lightdm
|
||||
, gdk-pixbuf
|
||||
, clutter-gtk
|
||||
, dbus
|
||||
, accountsservice
|
||||
, wrapGAppsHook
|
||||
@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
accountsservice
|
||||
clutter-gtk # else we get could not generate cargs for mutter-clutter-2
|
||||
elementary-icon-theme
|
||||
gnome-settings-daemon
|
||||
gdk-pixbuf
|
||||
@ -68,6 +67,7 @@ stdenv.mkDerivation rec {
|
||||
libgee
|
||||
libhandy
|
||||
lightdm
|
||||
mesa # for libEGL
|
||||
mutter
|
||||
];
|
||||
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
, bamf
|
||||
, libcanberra-gtk3
|
||||
, gnome-desktop
|
||||
, mesa
|
||||
, mutter
|
||||
, clutter
|
||||
, gnome-settings-daemon
|
||||
, wrapGAppsHook
|
||||
, gexiv2
|
||||
@ -119,7 +119,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
bamf
|
||||
clutter
|
||||
gnome-settings-daemon
|
||||
gexiv2
|
||||
gnome-desktop
|
||||
@ -127,6 +126,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
libcanberra-gtk3
|
||||
libgee
|
||||
mesa # for libEGL
|
||||
mutter
|
||||
];
|
||||
|
||||
|
||||
@ -19,9 +19,18 @@ stdenv.mkDerivation ({
|
||||
};
|
||||
|
||||
unpackCmd = ''
|
||||
tar -xf $curSrc contents.tar.gz
|
||||
tar -xf $curSrc contents.tar.gz CHECKSUM metadata.config
|
||||
mkdir contents
|
||||
tar -C contents -xzf contents.tar.gz
|
||||
mv metadata.config contents/hex_metadata.config
|
||||
|
||||
# To make the extracted hex tarballs appear legitimate to mix, we need to
|
||||
# make sure they contain not just the contents of contents.tar.gz but also
|
||||
# a .hex file with some lock metadata.
|
||||
# We use an old version of .hex file per hex's mix_task_test.exs since it
|
||||
# is just plain-text instead of an encoded format.
|
||||
# See: https://github.com/hexpm/hex/blob/main/test/hex/mix_task_test.exs#L410
|
||||
echo -n "${pkg},${version},$(cat CHECKSUM | tr '[:upper:]' '[:lower:]'),hexpm" > contents/.hex
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "1.9.0-beta2";
|
||||
version = "1.9.0-beta4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||
hash = "sha256-LTQp5vBMOSlwThYpSIv/UNJ9eIU+WId/XWGFxsrQEzs=";
|
||||
hash = "sha256-Ipfps2wxPV30nbOxDZ0K39jFB1lNz16aXgFhIKBOquM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
|
||||
description = "High-level performance-oriented dynamical language for technical computing";
|
||||
homepage = "https://julialang.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
maintainers = with maintainers; [ nickcao joshniemela ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "25.2.2";
|
||||
sha256 = "HfEh2IhifFe/gQ4sK99uBnmUGvNCeJ2mlTQf7IzenEs=";
|
||||
version = "25.2.3";
|
||||
sha256 = "peTH8hDOEuMq18exbFhtEMrQQEqg2FPkapfNnnEfTYE=";
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
, pkg-config, alsa-lib, libjack2, libsndfile, fftw
|
||||
, curl, gcc, libXt, qtbase, qttools, qtwebengine
|
||||
, readline, qtwebsockets, useSCEL ? false, emacs
|
||||
, supercollider-with-plugins, supercolliderPlugins
|
||||
, writeText, runCommand
|
||||
, gitUpdater, supercollider-with-plugins
|
||||
, supercolliderPlugins, writeText, runCommand
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
@ -26,6 +26,8 @@ mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools ];
|
||||
|
||||
buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
|
||||
@ -39,24 +41,32 @@ mkDerivation rec {
|
||||
"-DSC_EL=${if useSCEL then "ON" else "OFF"}"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
# test to make sure sclang runs and included plugins are successfully found
|
||||
sclang-sc3-plugins = let
|
||||
supercollider-with-test-plugins = supercollider-with-plugins.override {
|
||||
plugins = with supercolliderPlugins; [ sc3-plugins ];
|
||||
};
|
||||
testsc = writeText "test.sc" ''
|
||||
var err = 0;
|
||||
try {
|
||||
MdaPiano.name.postln;
|
||||
} {
|
||||
err = 1;
|
||||
passthru = {
|
||||
updateScript = gitUpdater {
|
||||
url = "https://github.com/supercollider/supercollider.git";
|
||||
rev-prefix = "Version-";
|
||||
ignoredVersions = "rc|beta";
|
||||
};
|
||||
|
||||
tests = {
|
||||
# test to make sure sclang runs and included plugins are successfully found
|
||||
sclang-sc3-plugins = let
|
||||
supercollider-with-test-plugins = supercollider-with-plugins.override {
|
||||
plugins = with supercolliderPlugins; [ sc3-plugins ];
|
||||
};
|
||||
err.exit;
|
||||
testsc = writeText "test.sc" ''
|
||||
var err = 0;
|
||||
try {
|
||||
MdaPiano.name.postln;
|
||||
} {
|
||||
err = 1;
|
||||
};
|
||||
err.exit;
|
||||
'';
|
||||
in runCommand "sclang-sc3-plugins-test" { } ''
|
||||
timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out
|
||||
'';
|
||||
in runCommand "sclang-sc3-plugins-test" {} ''
|
||||
timeout 60s env XDG_CONFIG_HOME="$(mktemp -d)" QT_QPA_PLATFORM=minimal ${supercollider-with-test-plugins}/bin/sclang ${testsc} >$out
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, cmake, supercollider, fftw }:
|
||||
{ stdenv, lib, fetchurl, cmake, supercollider, fftw, gitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sc3-plugins";
|
||||
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-JjUmu7PJ+x3yRibr+Av2gTREng51fPo7Rk+B4y2JvkQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
@ -23,6 +25,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
stripDebugList = [ "lib" "share" ];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://github.com/supercollider/sc3-plugins.git";
|
||||
rev-prefix = "Version-";
|
||||
ignoredVersions = "rc|beta";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Community plugins for SuperCollider";
|
||||
homepage = "https://supercollider.github.io/sc3-plugins/";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libuuid }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libuuid, unstableGitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crossguid";
|
||||
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = lib.optional stdenv.isLinux libuuid;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight cross platform C++ GUID/UUID library";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 4534f88f676d9a07a227aed7b56255dd84d2b906 Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Bach <pascal.bach@nextrem.ch>
|
||||
Date: Mon, 3 Oct 2022 22:57:34 +0200
|
||||
Subject: [PATCH] Use full path in pkgconfig
|
||||
|
||||
Signed-off-by: Pascal Bach <pascal.bach@nextrem.ch>
|
||||
---
|
||||
PkgConfig.pc.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/PkgConfig.pc.in b/PkgConfig.pc.in
|
||||
index 381e2343..93860ff0 100644
|
||||
--- a/PkgConfig.pc.in
|
||||
+++ b/PkgConfig.pc.in
|
||||
@@ -1,6 +1,6 @@
|
||||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
|
||||
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
||||
|
||||
Name: @PROJECT_NAME@
|
||||
Description: Eclipse Cyclone DDS library
|
||||
--
|
||||
2.37.3
|
||||
|
||||
30
pkgs/development/libraries/cyclondds/default.nix
Normal file
30
pkgs/development/libraries/cyclondds/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cyclondds";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse-cyclonedds";
|
||||
repo = "cyclonedds";
|
||||
rev = version;
|
||||
sha256 = "sha256-xr9H9n+gyFMgEMHn59T6ELYVZJ1m8laG0d99SE9k268=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Use-full-path-in-pkgconfig.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Eclipse Cyclone DDS project";
|
||||
homepage = "https://cyclonedds.io/";
|
||||
license = with licenses; [ epl20 ];
|
||||
maintainers = with maintainers; [ bachp ];
|
||||
};
|
||||
}
|
||||
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DEMBREE_TUTORIALS=OFF"
|
||||
"-DEMBREE_RAY_MASK=ON"
|
||||
"-DTBB_ROOT=${tbb}"
|
||||
"-DTBB_INCLUDE_DIR=${tbb.dev}/include"
|
||||
];
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU, unstableGitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gl3w";
|
||||
@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
|
||||
cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple OpenGL core profile loading";
|
||||
homepage = "https://github.com/skaslev/gl3w";
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.107.1";
|
||||
version = "1.108.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = version;
|
||||
hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI=";
|
||||
hash = "sha256-6nEjSo0EuYJd9/0NyvTzfUON1OMJt5FBLx7Y8sjnb3I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4=";
|
||||
hash = "sha256-/tCEiPvoIPScpKcDmJ0t21AN+bOBH5/XzOBajQg+7ck=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
, SDL
|
||||
, glib
|
||||
, pkg-config
|
||||
# sdl-config is not available when crossing
|
||||
, withExamples ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -16,12 +18,9 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ SDL glib ];
|
||||
buildInputs = lib.optional withExamples SDL ++ [ glib ];
|
||||
|
||||
configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes"
|
||||
];
|
||||
configureFlags = lib.optional (!withExamples) "--disable-examples";
|
||||
|
||||
meta = {
|
||||
description = "An abstraction library for audio visualisations";
|
||||
|
||||
@ -10,21 +10,35 @@
|
||||
cyrus_sasl,
|
||||
libbson,
|
||||
snappy,
|
||||
darwin,
|
||||
}:
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mongoc";
|
||||
version = "1.23.1";
|
||||
version = "1.23.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
|
||||
sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8";
|
||||
sha256 = "08v7xc5m86apd338swd8g83ccvd6ni75xbdhqqwkrjbznljf8fjf";
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/25585
|
||||
preFixup = ''rm -rf "$(pwd)" '';
|
||||
# https://github.com/mongodb/mongo-c-driver/pull/1157
|
||||
# related:
|
||||
# https://github.com/NixOS/nixpkgs/issues/144170
|
||||
# mongoc's cmake incorrectly injects a prefix to library paths, breaking Nix. This removes the prefix from paths.
|
||||
postPatch = ''
|
||||
substituteInPlace src/libmongoc/CMakeLists.txt \
|
||||
--replace "\\\''${prefix}/" ""
|
||||
substituteInPlace src/libbson/CMakeLists.txt \
|
||||
--replace "\\\''${prefix}/" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [cmake pkg-config perl];
|
||||
buildInputs = [openssl zlib cyrus_sasl];
|
||||
buildInputs = [openssl zlib cyrus_sasl] ++ lib.optionals stdenv.isDarwin [Security];
|
||||
propagatedBuildInputs = [libbson snappy];
|
||||
|
||||
# -DMONGOC_TEST_USE_CRYPT_SHARED=OFF
|
||||
@ -35,6 +49,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
description = "The official C client library for MongoDB";
|
||||
homepage = "http://mongoc.org";
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake python3 ispc ];
|
||||
buildInputs = [ tbb ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DTBB_ROOT=${tbb}"
|
||||
"-DTBB_INCLUDE_DIR=${tbb.dev}/include"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://openimagedenoise.github.io";
|
||||
description = "High-Performance Denoising Library for Ray Tracing";
|
||||
|
||||
@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake python3 ispc ];
|
||||
buildInputs = [ tbb ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DTBB_ROOT=${tbb}"
|
||||
"-DTBB_INCLUDE_DIR=${tbb.dev}/include"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://openimagedenoise.github.io";
|
||||
description = "High-Performance Denoising Library for Ray Tracing";
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, buildPackages, perl, coreutils
|
||||
, withCryptodev ? false, cryptodev
|
||||
, withZlib ? false, zlib
|
||||
, enableSSL2 ? false
|
||||
, enableSSL3 ? false
|
||||
, static ? stdenv.hostPlatform.isStatic
|
||||
@ -75,7 +76,8 @@ let
|
||||
buildInputs = lib.optional withCryptodev cryptodev
|
||||
# perl is included to allow the interpreter path fixup hook to set the
|
||||
# correct interpreter in c_rehash.
|
||||
++ lib.optional withPerl perl;
|
||||
++ lib.optional withPerl perl
|
||||
++ lib.optional withZlib zlib;
|
||||
|
||||
# TODO(@Ericson2314): Improve with mass rebuild
|
||||
configurePlatforms = [];
|
||||
@ -142,6 +144,7 @@ let
|
||||
# This introduces a reference to the CTLOG_FILE which is undesired when
|
||||
# trying to build binaries statically.
|
||||
++ lib.optional static "no-ct"
|
||||
++ lib.optional withZlib "zlib"
|
||||
;
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, gitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "platform-folders";
|
||||
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A C++ library to look for standard platform directories so that you do not need to write platform-specific code";
|
||||
homepage = "https://github.com/sago007/PlatformFolders";
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtstyleplugin-kvantum";
|
||||
version = "1.0.7";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsujan";
|
||||
repo = "Kvantum";
|
||||
rev = "V${version}";
|
||||
sha256 = "Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs=";
|
||||
sha256 = "5/cScJpi5Z5Z/SjizKfMTGytuEo2uUT6QtpMnn7JhKc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -20,6 +20,8 @@ buildDunePackage {
|
||||
meta
|
||||
;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
nativeBuildInputs = [
|
||||
ppx_sexp_conv
|
||||
];
|
||||
|
||||
@ -19,13 +19,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "netchannel";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz";
|
||||
sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs=";
|
||||
hash = "sha256-lTmwcNKiaq5EdJdM4UaaAVdZ+hTCX5U9MPKY/r3i7fw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -5,15 +5,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "catboost";
|
||||
version = "1.1.1";
|
||||
version = "1.0.5";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catboost";
|
||||
repo = "catboost";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY=";
|
||||
rev = "v${version}";
|
||||
sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ clang_12 ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, dnspython
|
||||
, deprecat
|
||||
, fetchFromGitHub
|
||||
, loguru
|
||||
, passlib
|
||||
@ -12,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ciscoconfparse";
|
||||
version = "1.6.50";
|
||||
version = "1.7.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,8 +21,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mpenning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-OKPw7P2hhk8yzqjOcf2NYEueJR1ecC/D93ULfkM88Xg=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oGvwtaIgVvvW8Oq/dZN+Zj/PESpqWALFYPia9yeilco=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -34,6 +35,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
passlib
|
||||
deprecat
|
||||
dnspython
|
||||
loguru
|
||||
toml
|
||||
@ -51,6 +53,8 @@ buildPythonPackage rec {
|
||||
# Tests require network access
|
||||
"test_dns_lookup"
|
||||
"test_reverse_dns_lookup"
|
||||
# Path issues with configuration files
|
||||
"testParse_valid_filepath"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
@ -58,8 +62,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations";
|
||||
description = "Module to parse, audit, query, build, and modify Cisco IOS-style configurations";
|
||||
homepage = "https://github.com/mpenning/ciscoconfparse";
|
||||
changelog = "https://github.com/mpenning/ciscoconfparse/blob/${version}/CHANGES.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
};
|
||||
|
||||
47
pkgs/development/python-modules/deprecat/default.nix
Normal file
47
pkgs/development/python-modules/deprecat/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, wrapt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deprecat";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjhajharia";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3Xl/IC+ImFUxxLry15MIIVRf6aR+gA9K5S2IQomkv+o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
wrapt
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"deprecat"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Decorator to deprecate old python classes, functions or methods";
|
||||
homepage = "https://github.com/mjhajharia/deprecat";
|
||||
changelog = "https://github.com/mjhajharia/deprecat/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -5,18 +5,23 @@
|
||||
, packaging
|
||||
, paramiko
|
||||
, pexpect
|
||||
, pythonOlder
|
||||
, requests
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fortiosapi";
|
||||
version = "1.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fortinet-solutions-cse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-M71vleEhRYnlf+RSGT1GbCy5NEZaG0hWmJo01n9s6Rg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -25,11 +30,15 @@ buildPythonPackage rec {
|
||||
paramiko
|
||||
packaging
|
||||
oyaml
|
||||
six
|
||||
];
|
||||
|
||||
# Tests require a local VM
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "fortiosapi" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fortiosapi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to work with Fortigate/Fortios devices";
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "isort";
|
||||
version = "5.11.4";
|
||||
version = "5.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyCQA";
|
||||
repo = "isort";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-1x0rhQOr6pPFuHtbYSCR10tXeDTGwf47ek49wBmJP+I=";
|
||||
sha256 = "sha256-8ija4xWWZuYkElXLdziV7ulN8dubIsChcZQ5dx9hfO0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jaconv";
|
||||
version = "0.3.1";
|
||||
version = "0.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikegami-yukino";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uzGHvklFHVoNloZauczgITeHQIgYQAfI9cjLWgG/vyI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "niaarm";
|
||||
version = "0.2.4";
|
||||
version = "0.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "firefly-cpp";
|
||||
repo = "NiaARM";
|
||||
rev = version;
|
||||
hash = "sha256-JPsBpVMeVZxUhCHoIBP47LhR8nrc8ZtJHREZLwL5Zxw=";
|
||||
hash = "sha256-5XOE3c7amvhw1KrX1hcmTxneYNvAuiHz+OZLb/yhB+I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ocrmypdf";
|
||||
version = "14.0.2";
|
||||
version = "14.0.3";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
||||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-s2G+ZNMEF3ZB1+ibPiYPuqdypoYFdFPpASeqFReR8/g=";
|
||||
hash = "sha256-LAYy1UpGHd3kTH1TIrp9gfrFwXzsXcME6AISf07rUYA=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pikepdf";
|
||||
version = "7.0.0";
|
||||
version = "7.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-sJVAiAQtJ8tU8ZHRU5jzIICnHc6RJwMsvxexnt7b4Yw=";
|
||||
hash = "sha256-u6xfsWHod8U7nM5S40ZU1z4qxNMlWdq+7yhnAtBh8oE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pipdeptree";
|
||||
version = "2.3.3";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "tox-dev";
|
||||
repo = "pipdeptree";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ivqu9b+4FhGa5y+WnKRk4nF6MR4Vj62pSs2d7ycIZMc=";
|
||||
hash = "sha256-agjerQTSkrpHCleqNUxg+NFiPnf9u9DQrs3vSR917oE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -29,9 +29,15 @@ buildPythonPackage rec {
|
||||
pexpect
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
# For cross compilation the doCheck is false and therefor the
|
||||
# nativeCheckInputs not included. We have to include nose here, since
|
||||
# setup.py requires nose unconditionally.
|
||||
nose
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
nose
|
||||
pytestCheckHook
|
||||
]
|
||||
++ passthru.optional-dependencies.GATTTOOL;
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrfxtrx";
|
||||
version = "0.30.0";
|
||||
version = "0.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyRFXtrx";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ntnZITj8upzUzlrSTjQxY9xNTU+gJ2rE9PN35cpWwvM=";
|
||||
hash = "sha256-sxxGu1ON5fhUCaONYJdsUFHraTh5NAdXzj7Cai9k5yc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -27,6 +27,11 @@
|
||||
, typer
|
||||
, typing-extensions
|
||||
, wasabi
|
||||
, writeScript
|
||||
, stdenv
|
||||
, nix
|
||||
, git
|
||||
, nix-update
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -85,7 +90,19 @@ buildPythonPackage rec {
|
||||
"spacy"
|
||||
];
|
||||
|
||||
passthru.tests.annotation = callPackage ./annotation-test { };
|
||||
passthru = {
|
||||
updateScript = writeScript "update-spacy" ''
|
||||
#!${stdenv.shell}
|
||||
set -eou pipefail
|
||||
PATH=${lib.makeBinPath [ nix git nix-update ]}
|
||||
|
||||
nix-update python3Packages.spacy
|
||||
|
||||
# update spacy models as well
|
||||
echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm
|
||||
'';
|
||||
tests.annotation = callPackage ./annotation-test { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Industrial-strength Natural Language Processing (NLP)";
|
||||
|
||||
@ -1,374 +1,374 @@
|
||||
[
|
||||
{
|
||||
"pname": "ca_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "06dyd5h3c1q7vndg8j0vja24y49lvdqkb6cy6i25ldz306b6aa0l",
|
||||
"version": "3.5.0",
|
||||
"sha256": "01wssrmfjnx2lycqbpjpvzpfymwhiy1336s1123y747q7klzic08",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "ca_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0ac8n8lg4x5mknplsfbzhsl1qxhkbi5plx4xd252zmr0kilxkykn",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0z8p2wqp1jsv9ipiqkw7c144nla2xgfwzijkwbb6qf4k2gdizzmq",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "ca_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1gj4ni9mwksrwqxjipvn13lhbfk7wqh8k7hh9gfpsm2saa951yf6",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0kwifrwf8iaxpry7v453hf8vawlwqpqm9df364k4ai6bhcpqad3k",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "ca_core_news_trf",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0fhf71rj568akcwxvzjr2j5x5f5qz7g7i49bz5m9lbqs01bj0rjw",
|
||||
"version": "3.5.0",
|
||||
"sha256": "12vlgy6n2xmap1z8fsf44dbnrw69fbdipss88v9ivwffn6yy3mj8",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "da_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0wyw9lyxbs0jgy8qgxhpqpfhm8y4a9hanar0ggrvhsaxcfjs6qhr",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1289r8qmzfzwyvsz3dvl6r6wrbr6s1jfw1nmb0bpybjzcp48nfnh",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "da_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0rj8l0v6m1ia5r4j0180gl0kh2srfw90bkvq21wr1gq142536f2d",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1i3vamzxnv6xfa1ky2zf6cb9c0blvm5rkfmif15kvgfkjbmhi7id",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "da_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0a8786jqlpjrvg27h9nww0v4p3p9f0rr7kilbpmb7w9466hjbkjy",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0bmbk6vnad3xqhg0jg8dhfhh75vyahsm16mn8ddzchhl7wm8axcc",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "de_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1k80mq5gfiw7m7z60by1qis2zhszwb9z9hg55r0qam71pnbsqb0f",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0l3sg853xfkab7mj41n370x37iksp79nrjp7s60hhajpfbl546a0",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "de_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0y13qwkfh7nzp2m8w3qna0qj3gaxrpsncmc1ramnn515565j62in",
|
||||
"version": "3.5.0",
|
||||
"sha256": "01z9bg59k4aw324dzwa3hlf8fg8yys70k6c3ih93if55svfc5xym",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "de_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0ln5p4dg5y4hzpx1738qlh6591j2ydrf8gyvhfvx5dr1pkwps83d",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1qlqiqadv8r44a2y6iwpf28khmixsnwm8pss6miwdn0k5xh4kqbp",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "de_dep_news_trf",
|
||||
"version": "3.3.0",
|
||||
"sha256": "18clx5dck1wmk39miqlsqgwvzhhqd7xh8vmi6ilpjnwgx48yfjh7",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0d5vkdz653yhqwykn39xm78vmxn9bcl5a9wh6hsvzhg9brffh2cn",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "el_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "165vji0d4imylpgpywnmdjvylsi2l8kz8fpxbhwjdx5cv40ywcda",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1y0na4fz3jfsjh43prc76rmkc508vk42mi9mgahz7n7nwfgyxspj",
|
||||
"license": "cc-by-nc-sa-30"
|
||||
},
|
||||
{
|
||||
"pname": "el_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0jz32glmwj1a662ciz1ay6g2shil0ia8smmbj42ghnjl4dlf2n3b",
|
||||
"version": "3.5.0",
|
||||
"sha256": "10li1rklw2yjs5rhzm2cr2pa0x9wx504hamkyb2d9fkcq1vnj3ds",
|
||||
"license": "cc-by-nc-sa-30"
|
||||
},
|
||||
{
|
||||
"pname": "el_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "179fqj781wfrh9nkizv7s5ia8abb73sgnnl3yim35nbkpwnps47v",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1j728bmmavhhn22k6ppz29ck8ag5y4299jir4y0bjjhn1ghmxq4d",
|
||||
"license": "cc-by-nc-sa-30"
|
||||
},
|
||||
{
|
||||
"pname": "en_core_web_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0j1d9i2xqqbaiyzr1aghzm42nfjlxx3qv2mlfhav3yi69hmy8aj3",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0ib93cn1nv5wv39dpxxs68nzmwr3j6qdc5l71mp6hi74cy0jqwr9",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "en_core_web_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1anq8vlk3rwf7by1j7b9gvc5pjdvc9cz4mazqvrs4448xs3r0ndl",
|
||||
"version": "3.5.0",
|
||||
"sha256": "02w0kjsbzmnp17p7b7cs4lqzg37mbk0ygva7c4qfb312x4wyr9vg",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "en_core_web_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1bknji6j21pm9y0v48zhc0r4di5wm4lxxab35wmzakn0myhag2il",
|
||||
"version": "3.5.0",
|
||||
"sha256": "09j61i5nrdy2amml3kij2xndqawha3dgdm7lg9f67422vpn8zlv3",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "en_core_web_trf",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1qfkif2dzs9gvkydca2mq1w9xb818zmz14rwramxpvq17bfraqdw",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1rqb9p8khy1zy041gsc04b5v9l4v0pc6nqzn5lm5p85161k55c7c",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "es_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0jd9wq7nxw4iywr9v2m19kf84hhgnh1sy9j2zrz6w5vv16363cr9",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0zw6z8aygh9pzdws88iclgnp277v0nlklykmdkkhqs75acpckzkx",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "es_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0gk2rca1qmgy5bnv4r8h9kxpix19h3dgbgjwky60fagnbvch5pzc",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1b5xsidys6jhq9rnv0q38q3hck11jx4z3yvmka83cbdwvzkncaq3",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "es_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0r3hvx5za3iydqfqz65p586c8g86b7pw8mjnipj43y0qnz2d0x14",
|
||||
"version": "3.5.0",
|
||||
"sha256": "169xg2xwn3rkhal9ygwrnkb9xzdgz4rz3419xr252zji34cr8d6a",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "es_dep_news_trf",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1rmccrgddgbfagj2vasfr6bqc5kpziy4gln5bcmnxwhh6mh66rwd",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1py98kc6dxx5a6v6pc7hpldd6jm5s2a8vwp7l7d2jxadh947ma12",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "fr_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "15vxksw3g7g721cwrp9436w5wx43gicq6i2v6v1h63qifxjhkp3j",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1zjf348c60xf35zaldgykrlskvrryxv9vdaz49xlwq9caw0yzyh4",
|
||||
"license": "lgpllr"
|
||||
},
|
||||
{
|
||||
"pname": "fr_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1x3d6nlfmclq961b292aqvgz8ldijpsi330vja75ncrbyz9wygav",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1ph768pv2brv94fzydw8d2daxypvy61zwbmi4hbalgaar62lglhl",
|
||||
"license": "lgpllr"
|
||||
},
|
||||
{
|
||||
"pname": "fr_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1gqzspi8y8b54ja7ikhlr5ip137kgv7x4flavgj456sdhfzkaqkz",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1vhamgrv7adk85i9b3s5bh6j0aw21rma5xcb3ggy9ay51jfmkzzm",
|
||||
"license": "lgpllr"
|
||||
},
|
||||
{
|
||||
"pname": "fr_dep_news_trf",
|
||||
"version": "3.3.0",
|
||||
"sha256": "09n067v07233gr8sw6yma1s2bi2m6wf8ripn74npjjs28akmr5p3",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0ciyilnc5gx0f1qakim57pizj1dknm8l8gd72avmrmzg3z52mgl2",
|
||||
"license": "lgpllr"
|
||||
},
|
||||
{
|
||||
"pname": "it_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1c5zqfpkmjwr21nmcnky6sgf7fr4lpiaai9hz2z14yrnnvby80y1",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1z64s632wbjlqmnmppcnpf2pfrjbml30gbil7mk0qln2i2hrh0qq",
|
||||
"license": "cc-by-nc-sa-30"
|
||||
},
|
||||
{
|
||||
"pname": "it_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1jpcivp0djfm975czn41k23y7ly6b54myrlj5fyjql1scwf0xzh1",
|
||||
"version": "3.5.0",
|
||||
"sha256": "055gj5ai4rda5yc8lkhmfcwpfm7yfzyl6v05xhziz8sh1x4z58kz",
|
||||
"license": "cc-by-nc-sa-30"
|
||||
},
|
||||
{
|
||||
"pname": "it_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0lkgs8sw02p7l5mrbrwkaiqs524hd9bkhfiiz7wzcc0p0zn4hn8h",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1fw262m7bl3g31gz0jb6fxrd385p67q82wfrsff6z9daxi3pi6ip",
|
||||
"license": "cc-by-nc-sa-30"
|
||||
},
|
||||
{
|
||||
"pname": "lt_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "08azxjqpsa66b5vm7gwllbjli36wv1n11m07andlkg3p2nmn6m85",
|
||||
"version": "3.5.0",
|
||||
"sha256": "002xalsrf85vg4c3gmj1zaka1zfy7smxv2xpqkl00idiixc5822y",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "lt_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "05qj4bhjq4v31r05rza7kc52kmp954f4h4zs344pdddzdzzc8h4q",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0rd3jmy7d42q5vwgx5kdf24kzd333i5l6v7pjmc5qnq4vwhqr96j",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "lt_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0wmaxixrm08ikicgnbz5zw3iimmm9dl7j7yy78bqixzym0iv2hxy",
|
||||
"version": "3.5.0",
|
||||
"sha256": "039ldh4wvlnkq7cfxahk0m9hvb90hh2x0dqsqygglbdflxibmia0",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "mk_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "17q62v8nvyz73d5jsbd5nw1mzxkj1cn7g6f0cl0lrl6pqn2b2rgl",
|
||||
"version": "3.5.0",
|
||||
"sha256": "11daxcyapaqskwmfxl57s3hbjaajk79khnafg4k7zshlqpdyvc3p",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "mk_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "103z7hkr5jbk6zmqihzsm9jlmr4mg32r6ph90j6xx71jdmnjz4ky",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0iky995dql569vg1manz4gv65jgr01nlx0559fljmysiqhq8ax76",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "mk_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "09k56dds3mjc2qxa6mbcha1i2h4hqjvbavkhnijmdfhsk6azk3v5",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1ghjpk6p5p19l4gichg361191i7xibp5zw0g1hqn87y0x12d20y3",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "nb_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "11iq62w96zc5z51i9kkxp5bqbfmhzm3jpivrs8arw9fs7xrscjn0",
|
||||
"version": "3.5.0",
|
||||
"sha256": "06pcfcy28r57n9dysjqx6py8r0awwfan4g5s97byl1486h77jkaz",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "nb_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0891z1c867jyhg9jr0ais2vv6h3v5b98sc7c8hxy4apf7nwnkjss",
|
||||
"version": "3.5.0",
|
||||
"sha256": "05vsaqw4x8swi4yamwlwg4rw7nj3bsyxdq8g5qjhcj0mjdabz6kj",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "nb_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1v19jvzvhix6rfac4szggdcqi3qkljwqmrynl75qz28piff0sln5",
|
||||
"version": "3.5.0",
|
||||
"sha256": "030j0v1csn2q38sy7nfxkx60i8ga7mlkma2f99mlh739j1s4nxaz",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "nl_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0ai6pydmd2rabpl8fy98ild7n2wwk2z11qha20x4gn33d8k60ih0",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0qcfka8ahcdv1y9lz4zsd1q6xlfxajf5qbymg9cabxxyqjzjqwys",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "nl_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1c95xcivn09dmfgrq21hh9i82v6wbnk0cwglcdgnx9kfidzgpgjc",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1cl3vynhlgkby7cnda1sgxqi8vrcj5amplmm96xhq5nmb6z6b8jx",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "nl_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1jp978ish3hvn48i1dard82czzx3vvh4lnlhhb50j0kk4b7xv5z1",
|
||||
"version": "3.5.0",
|
||||
"sha256": "16dkiklayp7irc5hwf7qv4pjww6kjg5pd0say25niclrgxfn3482",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "pl_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0w5rpz43ix16sq8h6h5g3h1a64ww8r5z4fydz2vr7bphajkwrhlq",
|
||||
"version": "3.5.0",
|
||||
"sha256": "194mjgbph4xgf7xywwajb0p4l19ww2z2ln7jykhnn2gy3j5dm6pd",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "pl_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1sllknhw689nbf9rmnc5604r0vig1yzkpg3s6yvgjyli7m04k6d1",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0435glcxzw1axlq8dkqv0wn8nxgav0dpx3pzvx475avxfp4qm1rv",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "pl_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0gpa140y04kazr8imifgdjsdzj7m10s15vy8q0vbi8chc8m14i1s",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1ifl01ncfdph32ij1kl8f74ksjw0xiyszabi6q6pskjmcwhfixp7",
|
||||
"license": "gpl3"
|
||||
},
|
||||
{
|
||||
"pname": "pt_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1pk0m03hyck3g6riq1x5n5k0jp70z2fqaw6pl7zrm0rcf2165rh0",
|
||||
"version": "3.5.0",
|
||||
"sha256": "182bl598x65akb368fy2nf4qnq89a8n1hcj2g92n3jwhn6d1xfpw",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "pt_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "190d74ihga38kp68r8xs9rxnavxdzw2j917f7b75wmr04brbf824",
|
||||
"version": "3.5.0",
|
||||
"sha256": "19h8nzx5qfmfcv97sqrzwlv0n45i5yqcngf855djc360mfp2hv69",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "pt_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1477yddal5cjn7a6adw1bvmal4pc4p8bcc4x7q016a22fgk9lcpl",
|
||||
"version": "3.5.0",
|
||||
"sha256": "19raq2b6q6a3ipxfzg4mdhq2wff9di5ip2mzf48blrj2xp2rjxyg",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "ro_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1w8cwll2dp9a1k40b5njbypdrxwf7vacf9sdwc18kkiadkrihy4g",
|
||||
"version": "3.5.0",
|
||||
"sha256": "10dc7c94wm3mia3japcsplxsv708q30yrqjml68zrrm5awwk30a7",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "ro_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1mr3s0fm571idbgi0g3qg4x7hyy1kw9br98vn8g21f8h05qmlc72",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1j8321nn8i13gy6n6rlcw7vsf2wnaf2ybiscwif3wrkzvb07113b",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "ro_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1n6dwfx2l0wzb02r14z47r19v5dy7ld35s11w1kq40k5bbkbakhm",
|
||||
"version": "3.5.0",
|
||||
"sha256": "117dyvkdgfrymh8qvdcfrcc6s8pcbnyzg83sib4vjv0nxxfp2xl8",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "ru_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1yv2r6b6n9ccvizi23q2xdrzbws1asa5mbiw4771irrmqzan9wiq",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1zdlsvlhcfxg2nvcrqvjyx9qyzjl39xb482qqhn572bv89v35h76",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "ru_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0s2yjlibg2r2pdf8cfn36nx6rp9ppk8jjjph91az0sp5lj0c38pp",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0nqlr2kpbznksh5djc669kcqc61i0ljiazn4z81dblfhxxhv692x",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "ru_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0cnn8daf90hnl5mmgk3y6fc0f6x62j7rm9gkq16zbb0qmayb7ri0",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0yb0gx8kl5w0f9pkii788vxv9alc0xb08gdfnim0g2givqa5p4fn",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "sv_core_news_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0503xnr8cdzb2ckj12b51hkayv2gzf2c2rv746w4y50pjk4cmfsx",
|
||||
"version": "3.5.0",
|
||||
"sha256": "100rf8wv4nf679fvvrnvd67wlx5w5d755ssvk9g76gzalzxywrmz",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "sv_core_news_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1hzfl92j13hxf8im4b4mjbgxawp8xqpi3ych6bi2x5pr7qjx6gab",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0ll1i767xb63gqmarxqk7nwg1xn5wjjhrix17hjq03q7rms267mw",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "sv_core_news_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0sjg1ab8r7m1g735amgakslchn1jba0ygyri59h6qsp8cmhvajw7",
|
||||
"version": "3.5.0",
|
||||
"sha256": "1c0w85xn8lnx394qmmnv3px68w0pha7fxx0qlqa74r2mfi3sv6s7",
|
||||
"license": "cc-by-sa-40"
|
||||
},
|
||||
{
|
||||
"pname": "xx_ent_wiki_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "1925y6n90qwy703v410si8sq7vzvlwi6zaj9n19ggysr78kyrsqz",
|
||||
"version": "3.5.0",
|
||||
"sha256": "042aszgyzbp5n5bn6lgk1m38zxfl1irbryid5fslgh19b19l8v3x",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "xx_sent_ud_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0dgd2lwh269f8m7qsv8x3743b3mc5r2lw6kcvdh1cs8qk8hxlfnx",
|
||||
"version": "3.5.0",
|
||||
"sha256": "08hqldksllz387d6h3ch95g6rb6ls329hqh0cxyglg9njw9sc97z",
|
||||
"license": "cc-by-sa-30"
|
||||
},
|
||||
{
|
||||
"pname": "zh_core_web_lg",
|
||||
"version": "3.3.0",
|
||||
"sha256": "15yps28i86shnf313xbsmv1sgnr71aymxnx5s155hbn2fk8pdzwc",
|
||||
"version": "3.5.0",
|
||||
"sha256": "17z7g5my5lyp34prcdqzv6w3cgyb7h5gvq61iwbkzppv0n2kldz2",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "zh_core_web_md",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0mvqgmm4y1ng6asxb2ic215ikk8lx0dm7c5cfwhx02vamllxv20q",
|
||||
"version": "3.5.0",
|
||||
"sha256": "03qxsxdvxn8l11drzicp53jma6j54gxgi8bw53xvbqr9cajxbqva",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "zh_core_web_sm",
|
||||
"version": "3.3.0",
|
||||
"sha256": "05qc50wxddfacf6x7i8q0r9dnrr6gsfnaldzmavry96nfngmqp6v",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0n3ajnbiyr56vy0kplm53rb421cxlc12q5f9p5i7icyv14dy4kml",
|
||||
"license": "mit"
|
||||
},
|
||||
{
|
||||
"pname": "zh_core_web_trf",
|
||||
"version": "3.3.0",
|
||||
"sha256": "0pmb456q8b02qw5zmw735w9yv3clfaqcqm91ng8lphxbcxqkp9jc",
|
||||
"version": "3.5.0",
|
||||
"sha256": "0gc4nn7zsng80j2qn8f7y85akls87dng72jkxp9pldav7k8435nb",
|
||||
"license": "mit"
|
||||
}
|
||||
]
|
||||
|
||||
@ -6,42 +6,72 @@
|
||||
, sentencepiece
|
||||
, spacy
|
||||
, spacy-pkuseg
|
||||
, spacy-transformers }:
|
||||
, spacy-transformers
|
||||
, writeScript
|
||||
, stdenv
|
||||
, jq
|
||||
, nix
|
||||
, moreutils
|
||||
}:
|
||||
let
|
||||
buildModelPackage = { pname, version, sha256, license }:
|
||||
let
|
||||
lang = builtins.substring 0 2 pname;
|
||||
in buildPythonPackage {
|
||||
inherit pname version;
|
||||
let
|
||||
lang = builtins.substring 0 2 pname;
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ spacy ]
|
||||
++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ]
|
||||
++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ]
|
||||
++ lib.optionals (lang == "ru") [ pymorphy2 ]
|
||||
++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ];
|
||||
|
||||
postPatch = lib.optionalString (pname == "fr_dep_news_trf") ''
|
||||
substituteInPlace meta.json \
|
||||
--replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ pname ];
|
||||
|
||||
passthru.updateScript = writeScript "update-spacy-models" ''
|
||||
#!${stdenv.shell}
|
||||
set -eou pipefail
|
||||
PATH=${lib.makeBinPath [ jq nix moreutils ]}
|
||||
|
||||
IFS=. read -r major minor patch <<<"${spacy.version}"
|
||||
spacyVersion="$(echo "$major.$minor.0")"
|
||||
|
||||
pushd pkgs/development/python-modules/spacy/ || exit
|
||||
|
||||
jq -r '.[] | .pname' models.json | while IFS= read -r pname; do
|
||||
if [ "$(jq --arg pname "$pname" -r '.[] | select(.pname == $pname) | .version' models.json)" == "$spacyVersion" ]; then
|
||||
continue
|
||||
fi
|
||||
|
||||
newHash="$(nix-prefetch-url "https://github.com/explosion/spacy-models/releases/download/$pname-$spacyVersion/$pname-$spacyVersion.tar.gz")"
|
||||
jq --arg newHash "$newHash" --arg pname "$pname" --arg spacyVersion "$spacyVersion" \
|
||||
'[(.[] | select(.pname != $pname)), (.[] | select(.pname == $pname) | .sha256 = $newHash | .version = $spacyVersion)] | sort_by(.pname)' \
|
||||
models.json | sponge models.json
|
||||
done
|
||||
|
||||
popd || exit
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Models for the spaCy NLP library";
|
||||
homepage = "https://github.com/explosion/spacy-models";
|
||||
license = licenses.${license};
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ spacy ]
|
||||
++ lib.optionals (lang == "zh") [ jieba spacy-pkuseg ]
|
||||
++ lib.optionals (lib.hasSuffix "_trf" pname) [ spacy-transformers ]
|
||||
++ lib.optionals (lang == "ru") [ pymorphy2 ]
|
||||
++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ];
|
||||
|
||||
postPatch = lib.optionalString (pname == "fr_dep_news_trf") ''
|
||||
substituteInPlace meta.json \
|
||||
--replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ pname ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Models for the spaCy NLP library";
|
||||
homepage = "https://github.com/explosion/spacy-models";
|
||||
license = licenses.${license};
|
||||
maintainers = with maintainers; [ rvl ];
|
||||
};
|
||||
};
|
||||
|
||||
makeModelSet = models: with lib; listToAttrs (map (m: nameValuePair m.pname (buildModelPackage m)) models);
|
||||
|
||||
in makeModelSet (lib.importJSON ./models.json)
|
||||
|
||||
# cat models.json | jq -r '.[] | @uri "https://github.com/explosion/spacy-models/releases/download/\(.pname)-\(.version)/\(.pname)-\(.version).tar.gz"' | xargs -n1 nix-prefetch-url
|
||||
in
|
||||
makeModelSet (lib.importJSON ./models.json)
|
||||
|
||||
@ -2,20 +2,24 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, setuptools
|
||||
, arrow
|
||||
, requests
|
||||
, units
|
||||
, pint
|
||||
, pydantic
|
||||
, pytz
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stravalib";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs=";
|
||||
sha256 = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -26,7 +30,10 @@ buildPythonPackage rec {
|
||||
arrow
|
||||
requests
|
||||
units
|
||||
pint
|
||||
pydantic
|
||||
pytz
|
||||
setuptools
|
||||
six
|
||||
];
|
||||
|
||||
@ -36,7 +43,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for interacting with Strava v3 REST API";
|
||||
homepage = "https://github.com/hozn/stravalib";
|
||||
homepage = "https://github.com/stravalib/stravalib";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
# it would also make the default tensorflow package unfree. See
|
||||
# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0
|
||||
, cudaSupport ? false, cudaPackages ? {}
|
||||
, mklSupport ? false, mkl ? null
|
||||
, mklSupport ? false, mkl
|
||||
, tensorboardSupport ? true
|
||||
# XLA without CUDA is broken
|
||||
, xlaSupport ? cudaSupport
|
||||
@ -39,8 +39,6 @@ assert cudaSupport -> cudatoolkit != null
|
||||
# unsupported combination
|
||||
assert ! (stdenv.isDarwin && cudaSupport);
|
||||
|
||||
assert mklSupport -> mkl != null;
|
||||
|
||||
let
|
||||
withTensorboard = (pythonOlder "3.6") || tensorboardSupport;
|
||||
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, requests-cache
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tvdb_api";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0-beta";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f63f6db99441bb202368d44aaabc956acc4202b18fc343a66bf724383ee1f563";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbr";
|
||||
repo = "tvdb_api";
|
||||
rev = "ce0382181a9e08a5113bfee0fed2c78f8b1e613f";
|
||||
sha256 = "sha256-poUuwySr6+8U9PIHhqFaR7nXzh8kSaW7mZkuKTUJKj8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests-cache ];
|
||||
@ -26,7 +28,5 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/dbr/tvdb_api";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
# https://github.com/dbr/tvdb_api/issues/94
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
30
pkgs/development/python-modules/types-pillow/default.nix
Normal file
30
pkgs/development/python-modules/types-pillow/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pillow";
|
||||
version = "9.4.0.12";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "types-Pillow";
|
||||
sha256 = "sha256-4AdBSdXwbTWTwRisyD41P4VCvMc1dv/vtlaOqrVnE0g=";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"PIL-stubs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for Pillow";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ arjan-s ];
|
||||
};
|
||||
}
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xiaomi-ble";
|
||||
version = "0.16.3";
|
||||
version = "0.16.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yk3rEOcHIEZLz3qKxeGzHuVUWWxG3GhSt9vc0pXcanQ=";
|
||||
hash = "sha256-ye/BuVKLNSC0zJzDyuairbrmZgQ+sX0y9bHWEfb/MJE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
parallel (1.22.1)
|
||||
pg (1.4.4)
|
||||
pgsync (0.7.2)
|
||||
pg (1.4.5)
|
||||
pgsync (0.7.3)
|
||||
parallel
|
||||
pg (>= 0.18.2)
|
||||
slop (>= 4.8.2)
|
||||
tty-spinner
|
||||
slop (4.9.3)
|
||||
slop (4.10.0)
|
||||
tty-cursor (0.7.1)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
|
||||
@ -14,10 +14,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3";
|
||||
sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
};
|
||||
pgsync = {
|
||||
dependencies = ["parallel" "pg" "slop" "tty-spinner"];
|
||||
@ -25,20 +25,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "009xrrxqwcrcackw2w86xamkb1clb70ghcr8g8n8w9h13qaa0j78";
|
||||
sha256 = "18misp6iwjr3cd4jzhbnf2q058gnkxx27jx1b87z6p64bwkgr3x2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
};
|
||||
slop = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cz9fpr7zya6d44070ya0ik4pwv7c8dlqgw4bxgxficzakdxy9kf";
|
||||
sha256 = "052mhd76f4dshc36f2bd5pp807lgnaj5i6ai8jg075384wcfhcpb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.9.3";
|
||||
version = "4.10.0";
|
||||
};
|
||||
tty-cursor = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ugcmsm1j2a1wOnUe9u70yoRXALCmtXSnb80N4B4IUWE=";
|
||||
sha256 = "sha256-nxQ060M5TEUMKtJZ1j3A3v3s1cW1mnHy0/2ZXbxoaMc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-PxnPCevjVvmFMlmYv6qwIBZk2MThz65hgUyVhm2tzlc=";
|
||||
cargoSha256 = "sha256-D/rY9d50uKkheEeHe6S04TSdmTyUVgrABIYrFOuZudY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.22";
|
||||
version = "1.0.23";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-h3w9xxzExDojJw2OIPMT9lQ/lzYQNf9WJVHBP+tOnPw=";
|
||||
sha256 = "sha256-H8odIEGtAMP1SQMdlgvFbduoLEaze89MFarN8AxBkK4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-EPYfmRms00AE4NkmOJBnIKYOCFbjd2qwRi6/i09hQ6U=";
|
||||
cargoSha256 = "sha256-pVHBFub5OTkL6e8ftI0nNisH+vJBOlcq4W0gwzz7vtA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
|
||||
DiskArbitration
|
||||
@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Graph the number of crates that depend on your crate over time";
|
||||
homepage = "https://github.com/dtolnay/cargo-tally";
|
||||
changelog = "https://github.com/dtolnay/cargo-tally/releases/tag/${version}";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
|
||||
@ -145,6 +145,9 @@ in buildFHSUserEnv rec {
|
||||
xorg.libXxf86vm
|
||||
libelf
|
||||
|
||||
# pressure-vessel (required for mangohud and possibly more)
|
||||
elfutils.out
|
||||
|
||||
# Required
|
||||
glib
|
||||
gtk2
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kitty-themes";
|
||||
version = "unstable-2022-08-11";
|
||||
version = "unstable-2023-01-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = pname;
|
||||
rev = "72cf0dc4338ab1ad85f5ed93fdb13318916cae14";
|
||||
sha256 = "d9mO2YqA7WD2dTPsmNeQg2dUR/iv2T/l7yxrt6WKX60=";
|
||||
rev = "e0bb9d751033e82e455bf658744872c83f04b89d";
|
||||
sha256 = "sha256-ol/AWScGsskoxOEW32aGkJFgg8V6pIujoYIMQaVskWM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -70,12 +70,22 @@ let
|
||||
PM_ADVANCED_DEBUG = yes;
|
||||
PM_WAKELOCKS = yes;
|
||||
POWERCAP = yes;
|
||||
# ACPI Firmware Performance Data Table Support
|
||||
ACPI_FPDT = whenAtLeast "5.12" yes;
|
||||
# ACPI Heterogeneous Memory Attribute Table Support
|
||||
ACPI_HMAT = whenAtLeast "5.2" yes;
|
||||
# ACPI Platform Error Interface
|
||||
ACPI_APEI = yes;
|
||||
# APEI Generic Hardware Error Source
|
||||
ACPI_APEI_GHES = yes;
|
||||
} // optionalAttrs (stdenv.hostPlatform.isx86) {
|
||||
INTEL_IDLE = yes;
|
||||
INTEL_RAPL = whenAtLeast "5.3" module;
|
||||
X86_INTEL_LPSS = yes;
|
||||
X86_INTEL_PSTATE = yes;
|
||||
X86_AMD_PSTATE = whenAtLeast "5.17" yes;
|
||||
# Intel DPTF (Dynamic Platform and Thermal Framework) Support
|
||||
ACPI_DPTF = whenAtLeast "5.10" yes;
|
||||
};
|
||||
|
||||
external-firmware = {
|
||||
|
||||
87
pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch
Normal file
87
pkgs/os-specific/linux/kernel/fix-em-ice-bonding.patch
Normal file
@ -0,0 +1,87 @@
|
||||
From 1640688018f329559c61352646f283f98938af31 Mon Sep 17 00:00:00 2001
|
||||
From: Cole Helbling <cole.helbling@determinate.systems>
|
||||
Date: Thu, 16 Feb 2023 09:30:21 -0800
|
||||
Subject: [PATCH] Revert "RDMA/irdma: Report the correct link speed"
|
||||
|
||||
This reverts commit 425c9bd06b7a70796d880828d15c11321bdfb76d.
|
||||
|
||||
Some Equinix Metal instances, such as a3.large.x86, m3.large.x86
|
||||
(specific hardware revisions), and n3.large.x86, use the `ice` kernel
|
||||
driver for their network cards, in conjunction with bonded devices.
|
||||
However, this commit caused a regression where these bonded devices
|
||||
would deadlock. This was initially reported by Jaroslav Pulchart on
|
||||
the netdev mailing list[1], and there were follow-up patches from Dave
|
||||
Ertman[2][3] that attempted to fix this but were not up to snuff for
|
||||
various reasons[4].
|
||||
|
||||
Specifically, v2 of the patch ([3]) appears to fix the issue on some
|
||||
devices (tested with 8086:159B network cards), while it is still broken
|
||||
on others (such as an 8086:1593 network card).
|
||||
|
||||
We revert the patch exposing the issue until upstream has a working
|
||||
solution in order to make Equinix Metal instances work reliably again.
|
||||
|
||||
[1]: https://lore.kernel.org/netdev/CAK8fFZ6A_Gphw_3-QMGKEFQk=sfCw1Qmq0TVZK3rtAi7vb621A@mail.gmail.com/
|
||||
[2]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230111183145.1497367-1-david.m.ertman@intel.com/
|
||||
[3]: https://patchwork.ozlabs.org/project/intel-wired-lan/patch/20230215191757.1826508-1-david.m.ertman@intel.com/
|
||||
[4]: https://lore.kernel.org/netdev/cb31a911-ba80-e2dc-231f-851757cfd0b8@intel.com/T/#m6e53f8c43093693c10268140126abe99e082dc1c
|
||||
---
|
||||
drivers/infiniband/hw/irdma/verbs.c | 35 ++++++++++++++++++++++++++---
|
||||
1 file changed, 32 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
|
||||
index c5971a840b87..911902d2b93e 100644
|
||||
--- a/drivers/infiniband/hw/irdma/verbs.c
|
||||
+++ b/drivers/infiniband/hw/irdma/verbs.c
|
||||
@@ -60,6 +60,36 @@ static int irdma_query_device(struct ib_device *ibdev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * irdma_get_eth_speed_and_width - Get IB port speed and width from netdev speed
|
||||
+ * @link_speed: netdev phy link speed
|
||||
+ * @active_speed: IB port speed
|
||||
+ * @active_width: IB port width
|
||||
+ */
|
||||
+static void irdma_get_eth_speed_and_width(u32 link_speed, u16 *active_speed,
|
||||
+ u8 *active_width)
|
||||
+{
|
||||
+ if (link_speed <= SPEED_1000) {
|
||||
+ *active_width = IB_WIDTH_1X;
|
||||
+ *active_speed = IB_SPEED_SDR;
|
||||
+ } else if (link_speed <= SPEED_10000) {
|
||||
+ *active_width = IB_WIDTH_1X;
|
||||
+ *active_speed = IB_SPEED_FDR10;
|
||||
+ } else if (link_speed <= SPEED_20000) {
|
||||
+ *active_width = IB_WIDTH_4X;
|
||||
+ *active_speed = IB_SPEED_DDR;
|
||||
+ } else if (link_speed <= SPEED_25000) {
|
||||
+ *active_width = IB_WIDTH_1X;
|
||||
+ *active_speed = IB_SPEED_EDR;
|
||||
+ } else if (link_speed <= SPEED_40000) {
|
||||
+ *active_width = IB_WIDTH_4X;
|
||||
+ *active_speed = IB_SPEED_FDR10;
|
||||
+ } else {
|
||||
+ *active_width = IB_WIDTH_4X;
|
||||
+ *active_speed = IB_SPEED_EDR;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* irdma_query_port - get port attributes
|
||||
* @ibdev: device pointer from stack
|
||||
@@ -87,9 +117,8 @@ static int irdma_query_port(struct ib_device *ibdev, u32 port,
|
||||
props->state = IB_PORT_DOWN;
|
||||
props->phys_state = IB_PORT_PHYS_STATE_DISABLED;
|
||||
}
|
||||
-
|
||||
- ib_get_eth_speed(ibdev, port, &props->active_speed,
|
||||
- &props->active_width);
|
||||
+ irdma_get_eth_speed_and_width(SPEED_100000, &props->active_speed,
|
||||
+ &props->active_width);
|
||||
|
||||
if (rdma_protocol_roce(ibdev, 1)) {
|
||||
props->gid_tbl_len = 32;
|
||||
--
|
||||
2.39.0
|
||||
|
||||
@ -57,4 +57,9 @@
|
||||
name = "export-rt-sched-migrate";
|
||||
patch = ./export-rt-sched-migrate.patch;
|
||||
};
|
||||
|
||||
fix-em-ice-bonding = {
|
||||
name = "fix-em-ice-bonding";
|
||||
patch = ./fix-em-ice-bonding.patch;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,19 +1,21 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchpatch, Security }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "martin";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maplibre";
|
||||
repo = "martin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+XD4w6W6dyKuTItLQS0P/waksIVsPXVswcrCQ7jpw90=";
|
||||
hash = "sha256-UIAsij4fFxGAoKluQFAtrfgKIteM+LQtAKRDvRaNLSg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-U3oNyMS4S44ybAtt1/b0AXDLiag41XWt9DT5mKLQzm8=";
|
||||
cargoHash = "sha256-NtPI8MZNUn+QYPuG9WNMVZJW6jmyi5gEfNw8MrkiwUQ=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -179,8 +179,6 @@ stdenv.mkDerivation rec {
|
||||
export XDG_RUNTIME_DIR=/tmp
|
||||
'';
|
||||
|
||||
checkTarget = "ptest";
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pg_ivm";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sraoss";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pz9eHmd7GC30r0uUObOlrcdkAX4c+szjYAXS1U999CE=";
|
||||
hash = "sha256-UhKJmYnqkxORb0eVqxbu+yaamZ7ISJTbSwArg76YY/Q=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
@ -95,11 +95,12 @@ stdenv.mkDerivation rec {
|
||||
zlib
|
||||
];
|
||||
mesonFlags = [
|
||||
"-Dxwayland_eglstream=true"
|
||||
"-Ddefault_font_path=${defaultFontPath}"
|
||||
"-Dxkb_bin_dir=${xkbcomp}/bin"
|
||||
"-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb"
|
||||
"-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled"
|
||||
(lib.mesonBool "xwayland_eglstream" true)
|
||||
(lib.mesonOption "default_font_path" defaultFontPath)
|
||||
(lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin")
|
||||
(lib.mesonOption "xkb_dir" "${xkeyboard_config}/etc/X11/xkb")
|
||||
(lib.mesonOption "xkb_output_dir" "${placeholder "out"}/share/X11/xkb/compiled")
|
||||
(lib.mesonBool "libunwind" (libunwind != null))
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -25,14 +25,14 @@ let
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.9.23"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.10.0"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
rev = version;
|
||||
hash = "sha256-OaZ8Eax8XE4xGs5yHh+1P8mwEfHkFNEtY6ZGLQc8Thk=";
|
||||
hash = "sha256-W05ZxpqamYqtFY/2mV2+XODCeuWRE9KhMdMkaAGAiTU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -64,10 +64,7 @@ with py.pkgs; buildPythonApplication rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i pyproject.toml \
|
||||
-e 's/colorama.*/colorama",/' \
|
||||
-e 's/cryptography.*/cryptography",/' \
|
||||
-e 's/distro.*/distro",/'
|
||||
substituteInPlace pyproject.toml --replace "distro>=1.5.0,<1.6.0" "distro>=1.5.0"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -32,14 +32,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lxd";
|
||||
version = "5.10";
|
||||
version = "5.11";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
|
||||
"https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-sYJkPr/tE22xJEjKX7fMjOLQ9zBDm52UjqbVLrm39zU=";
|
||||
hash = "sha256-6z6C1nWmnHLdLtLf7l1f4riGhuP2J2mt8mVWZIiege0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -7,14 +7,15 @@
|
||||
, libjpeg
|
||||
, gd
|
||||
, freetype
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ploticus";
|
||||
version = "2.42";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ploticus/ploticus/${version}/ploticus${lib.replaceStrings [ "." ] [ "" ] version}_src.tar.gz";
|
||||
url = "mirror://sourceforge/ploticus/ploticus/${finalAttrs.version}/ploticus${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}_src.tar.gz";
|
||||
sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA=";
|
||||
};
|
||||
|
||||
@ -42,6 +43,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/pl.h --subst-var out
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cd src
|
||||
'';
|
||||
@ -62,6 +67,16 @@ stdenv.mkDerivation rec {
|
||||
ln -s "pl" "$out/bin/ploticus"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
prefab = runCommand "ploticus-prefab-test" {
|
||||
buildInputs = [ finalAttrs.finalPackage ];
|
||||
} ''
|
||||
# trivial test to see if the prefab path munging works
|
||||
mkdir $out/
|
||||
pl -prefab scat inlinedata="A 1 2" x=2 y=3 -png -o $out/out.png
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A non-interactive software package for producing plots and charts";
|
||||
longDescription = ''
|
||||
@ -77,4 +92,4 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://ploticus.sourceforge.net/";
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,22 +1,32 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, testers
|
||||
, gh-dash
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh-dash";
|
||||
version = "3.6.0";
|
||||
version = "3.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-dash";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pQd41uQdfkbqIjdUIwUnKS/Qso495Ips8P2CXPd8JRU=";
|
||||
hash = "sha256-EYDSfxFOnMuPDZaG1CYQtYLNe6afm/2YYlQPheAKXDg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-66GxD48fCWUWMyZ3GiivWNtz0mgI4JHMcvNwHGFTRfU=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/dlvhdr/gh-dash/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { package = gh-dash; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "gh extension to display a dashboard with pull requests and issues";
|
||||
|
||||
@ -4,16 +4,20 @@
|
||||
|
||||
let
|
||||
python' = python3.override {
|
||||
packageOverrides = self: super: rec {
|
||||
packageOverrides = final: prev: rec {
|
||||
# tvdb_api v3.1.0 has a hard requirement on requests-cache < 0.6
|
||||
requests-cache = super.requests-cache.overridePythonAttrs (super: rec {
|
||||
requests-cache = prev.requests-cache.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.5.2";
|
||||
src = self.fetchPypi {
|
||||
inherit (super) pname;
|
||||
src = final.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
sha256 = "sha256-gTAjJpaGBF+OAeIonMHn6a5asi3dHihJqQk6s6tycOs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with final; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# too many changes have been made to requests-cache based on version 0.6 so
|
||||
# simply disable tests
|
||||
doCheck = false;
|
||||
|
||||
@ -2,15 +2,16 @@
|
||||
|
||||
let
|
||||
pname = "via";
|
||||
version = "2.0.5";
|
||||
version = "2.1.0";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage";
|
||||
name = "via-${version}-linux.AppImage";
|
||||
sha256 = "sha256-APNtzfeV6z8IF20bomcgMq7mwcK1fbDdFF77Xr0UPOs=";
|
||||
sha256 = "sha256-eVmaVD3W+ZEw3HkuZWKsd9XYhASP5+dxzVW64fOhqwk=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
in appimageTools.wrapType2 {
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
profile = ''
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
, ffmpegSupport ? true
|
||||
, rtmpSupport ? true
|
||||
, withAlias ? false # Provides bin/youtube-dl for backcompat
|
||||
, update-python-libraries
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -53,6 +54,8 @@ buildPythonPackage rec {
|
||||
ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"
|
||||
'';
|
||||
|
||||
passthru.updateScript = [ update-python-libraries (toString ./.) ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/yt-dlp/yt-dlp/";
|
||||
description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user