Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
6745e40e28
@ -12810,9 +12810,9 @@
|
||||
githubId = 5837359;
|
||||
name = "Adrian Pistol";
|
||||
};
|
||||
vika_nezrimaya = {
|
||||
vikanezrimaya = {
|
||||
email = "vika@fireburn.ru";
|
||||
github = "kisik21";
|
||||
github = "vikanezrimaya";
|
||||
githubId = 7953163;
|
||||
name = "Vika Shleina";
|
||||
keys = [{
|
||||
|
||||
@ -9,7 +9,7 @@ let
|
||||
pkg = pkgs.clamav;
|
||||
|
||||
toKeyValue = generators.toKeyValue {
|
||||
mkKeyValue = generators.mkKeyValueDefault {} " ";
|
||||
mkKeyValue = generators.mkKeyValueDefault { } " ";
|
||||
listsAsDuplicateKeys = true;
|
||||
};
|
||||
|
||||
@ -30,7 +30,7 @@ in
|
||||
|
||||
settings = mkOption {
|
||||
type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
|
||||
default = {};
|
||||
default = { };
|
||||
description = ''
|
||||
ClamAV configuration. Refer to <link xlink:href="https://linux.die.net/man/5/clamd.conf"/>,
|
||||
for details on supported values.
|
||||
@ -59,7 +59,7 @@ in
|
||||
|
||||
settings = mkOption {
|
||||
type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
|
||||
default = {};
|
||||
default = { };
|
||||
description = ''
|
||||
freshclam configuration. Refer to <link xlink:href="https://linux.die.net/man/5/freshclam.conf"/>,
|
||||
for details on supported values.
|
||||
@ -104,7 +104,6 @@ in
|
||||
systemd.services.clamav-daemon = mkIf cfg.daemon.enable {
|
||||
description = "ClamAV daemon (clamd)";
|
||||
after = optional cfg.updater.enable "clamav-freshclam.service";
|
||||
requires = optional cfg.updater.enable "clamav-freshclam.service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
restartTriggers = [ clamdConfigFile ];
|
||||
|
||||
@ -134,7 +133,7 @@ in
|
||||
systemd.services.clamav-freshclam = mkIf cfg.updater.enable {
|
||||
description = "ClamAV virus database updater (freshclam)";
|
||||
restartTriggers = [ freshclamConfigFile ];
|
||||
|
||||
after = [ "network-online.target" ];
|
||||
preStart = ''
|
||||
mkdir -m 0755 -p ${stateDir}
|
||||
chown ${clamavUser}:${clamavGroup} ${stateDir}
|
||||
|
||||
@ -98,7 +98,6 @@ in rec {
|
||||
(onFullSupported "nixos.tests.login")
|
||||
(onFullSupported "nixos.tests.misc")
|
||||
(onFullSupported "nixos.tests.mutableUsers")
|
||||
(onFullSupported "nixos.tests.nano")
|
||||
(onFullSupported "nixos.tests.nat.firewall-conntrack")
|
||||
(onFullSupported "nixos.tests.nat.firewall")
|
||||
(onFullSupported "nixos.tests.nat.standalone")
|
||||
|
||||
@ -189,9 +189,9 @@ in
|
||||
grocy = handleTest ./grocy.nix {};
|
||||
grub = handleTest ./grub.nix {};
|
||||
gvisor = handleTest ./gvisor.nix {};
|
||||
hadoop.all = handleTestOn [ "x86_64-linux" ] ./hadoop/hadoop.nix {};
|
||||
hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {};
|
||||
hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {};
|
||||
hadoop.all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/hadoop.nix {};
|
||||
hadoop.hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/hdfs.nix {};
|
||||
hadoop.yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/yarn.nix {};
|
||||
haka = handleTest ./haka.nix {};
|
||||
haproxy = handleTest ./haproxy.nix {};
|
||||
hardened = handleTest ./hardened.nix {};
|
||||
@ -554,6 +554,7 @@ in
|
||||
vikunja = handleTest ./vikunja.nix {};
|
||||
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
|
||||
vscodium = discoverTests (import ./vscodium.nix);
|
||||
vsftpd = handleTest ./vsftpd.nix {};
|
||||
wasabibackend = handleTest ./wasabibackend.nix {};
|
||||
wiki-js = handleTest ./wiki-js.nix {};
|
||||
wine = handleTest ./wine.nix {};
|
||||
|
||||
42
nixos/tests/vsftpd.nix
Normal file
42
nixos/tests/vsftpd.nix
Normal file
@ -0,0 +1,42 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "vsftpd";
|
||||
|
||||
nodes = {
|
||||
server = {
|
||||
services.vsftpd = {
|
||||
enable = true;
|
||||
userlistDeny = false;
|
||||
localUsers = true;
|
||||
userlist = [ "ftp-test-user" ];
|
||||
writeEnable = true;
|
||||
localRoot = "/tmp";
|
||||
};
|
||||
networking.firewall.enable = false;
|
||||
|
||||
users = {
|
||||
users.ftp-test-user = {
|
||||
isSystemUser = true;
|
||||
password = "ftp-test-password";
|
||||
group = "ftp-test-group";
|
||||
};
|
||||
groups.ftp-test-group = {};
|
||||
};
|
||||
};
|
||||
|
||||
client = {};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
client.start()
|
||||
server.wait_for_unit("vsftpd")
|
||||
server.wait_for_open_port("21")
|
||||
|
||||
client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server")
|
||||
client.succeed('echo "this is a test" > /tmp/test.file.up')
|
||||
client.succeed("curl -v -T /tmp/test.file.up -u ftp-test-user:ftp-test-password ftp://server")
|
||||
client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server/test.file.up > /tmp/test.file.down")
|
||||
client.succeed("diff /tmp/test.file.up /tmp/test.file.down")
|
||||
assert client.succeed("cat /tmp/test.file.up") == server.succeed("cat /tmp/test.file.up")
|
||||
assert client.succeed("cat /tmp/test.file.down") == server.succeed("cat /tmp/test.file.up")
|
||||
'';
|
||||
})
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.51";
|
||||
version = "1.52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g8LZhP6qHctmvbmrhJ8gAOeAd57SePeO2tdFi9SVjQ0=";
|
||||
sha256 = "sha256-RyZ3PV7jaTN3DEYMT0BqKDHbb+7/IgiRaCra1xA0h1A=";
|
||||
};
|
||||
|
||||
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sptlrx";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raitonoberu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Wk4vXm6sB+Rw0VFAhfD0GKxsP+1LwpS6VFHa3UENuJk=";
|
||||
sha256 = "sha256-b38DACSdnjwPsLMrkt0Ubpqpn/4SDAgrdSlp9iAcxfE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-l5gIbjB2rJyNmZBqrHo4kwClmAgjgDWHTs5KWzrfC08=";
|
||||
vendorSha256 = "sha256-/fqWnRQBpLNoTwqrFDKqQuv1r9do1voysBhLuj223S0=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tauon";
|
||||
version = "7.1.2";
|
||||
version = "7.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "TauonMusicBox";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0/xWSae5TD5qI+HgoJ2DAHxqv/Z0E4DGiQhfTA03xkM=";
|
||||
sha256 = "sha256-UadE8qsQxRjE+POHLAUY1tRUInNXsMEqTAP02zSDSZ4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1928,6 +1928,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/vim-scripts/emodeline/";
|
||||
};
|
||||
|
||||
everforest = buildVimPluginFrom2Nix {
|
||||
pname = "everforest";
|
||||
version = "2022-02-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sainnhe";
|
||||
repo = "everforest";
|
||||
rev = "7c5e520962a57f7cd42bb0b9eab268795375d26e";
|
||||
sha256 = "IBDWDvSpUHHgE2zslYfvznHyQmisbRZsF0D80YqcKto=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sainnhe/everforest/";
|
||||
};
|
||||
|
||||
falcon = buildVimPluginFrom2Nix {
|
||||
pname = "falcon";
|
||||
version = "2021-12-19";
|
||||
|
||||
@ -720,6 +720,7 @@ ryvnf/readline.vim
|
||||
saadparwaiz1/cmp_luasnip
|
||||
saecki/crates.nvim
|
||||
sainnhe/edge
|
||||
sainnhe/everforest
|
||||
sainnhe/gruvbox-material
|
||||
sainnhe/sonokai
|
||||
sakhnik/nvim-gdb
|
||||
|
||||
@ -349,6 +349,42 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
bierner.emojisense = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "emojisense";
|
||||
publisher = "bierner";
|
||||
version = "0.9.0";
|
||||
sha256 = "0gpcpwh57lqlynsrkv3smykndb46xjh7r85lb291wdklq5ahmb2j";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
bierner.markdown-checkbox = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "markdown-checkbox";
|
||||
publisher = "bierner";
|
||||
version = "0.3.1";
|
||||
sha256 = "0x57dnr6ksqxi28g1c392k04vxy0vdni9nl4xps3i5zh0pyxizhw";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
bierner.markdown-emoji = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "markdown-emoji";
|
||||
publisher = "bierner";
|
||||
version = "0.2.1";
|
||||
sha256 = "1lcg2b39jydl40wcfrbgshl2i1r58k92c7dipz0hl1fa1v23vj4v";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-tailwindcss";
|
||||
|
||||
@ -221,6 +221,7 @@ let
|
||||
skanlite = callPackage ./skanlite.nix {};
|
||||
spectacle = callPackage ./spectacle.nix {};
|
||||
yakuake = callPackage ./yakuake.nix {};
|
||||
zanshin = callPackage ./zanshin.nix {};
|
||||
};
|
||||
|
||||
in lib.makeScope libsForQt5.newScope packages
|
||||
|
||||
18
pkgs/applications/kde/zanshin.nix
Normal file
18
pkgs/applications/kde/zanshin.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules,
|
||||
akonadi-calendar, boost, kontactinterface, krunner
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "zanshin";
|
||||
meta = with lib; {
|
||||
description = "A powerful yet simple application to manage your day to day actions, getting your mind like water";
|
||||
homepage = "https://zanshin.kde.org/";
|
||||
maintainers = with maintainers; [ zraexy ];
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ akonadi-calendar boost kontactinterface krunner ];
|
||||
}
|
||||
@ -20,8 +20,8 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bottles";
|
||||
version = "2022.2.14-trento";
|
||||
sha256 = "GtVC3JfVoooJ+MuF9r1W3J8RfXNKalaIgecv1ner7GA=";
|
||||
version = "2022.2.28-trento-1";
|
||||
sha256 = "tE6YuuZZcs3RKxs1S6OoGt0CXz3oHUi/sopFN0iywds=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bottlesdevs";
|
||||
@ -99,6 +99,7 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "An easy-to-use wineprefix manager";
|
||||
homepage = "https://usebottles.com/";
|
||||
downloadPage = "https://github.com/bottlesdevs/Bottles/releases";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ bloomvdomino psydvl shamilton ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "koreader";
|
||||
version = "2022.01";
|
||||
version = "2022.02";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
|
||||
sha256 = "sha256-XuIYNvGhzJ649LxVPit2AOmb+YOHtZA4AhDyxjaB5OE=";
|
||||
sha256 = "sha256-gR81ZN0N3bmvLVqwUanXTrpBnzhPZT0bo4J8VOfaJh8=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neo";
|
||||
version = "0.6";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/st3w/neo/releases/download/v${version}/neo-${version}.tar.gz";
|
||||
sha256 = "sha256-skXLT1td4dGdsu+wbX44Z2u5sDEOKXYVVys4Q6RayIk=";
|
||||
sha256 = "sha256-pV5O1e/QpK8kjRYBinqq07YX7x06wF0pKiWKOKr0ank=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
@ -25,6 +25,8 @@
|
||||
, steam-run-native
|
||||
# needed for avoiding crash on file selector
|
||||
, gsettings-desktop-schemas
|
||||
, glib
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
@ -76,13 +78,14 @@ in stdenv.mkDerivation {
|
||||
./0001-fix-locale.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(PYTHON="python -m py_compile")
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
xorg.libX11
|
||||
libGL
|
||||
python
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "98.0.4758.102",
|
||||
"sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1",
|
||||
"sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6",
|
||||
"version": "99.0.4844.51",
|
||||
"sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp",
|
||||
"sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-12-07",
|
||||
"version": "2022-01-10",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f",
|
||||
"sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh"
|
||||
"rev": "80a40b07305373617eba2d5878d353532af77da3",
|
||||
"sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv"
|
||||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "98.0.4758.102",
|
||||
"sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im",
|
||||
"sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny",
|
||||
"sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l"
|
||||
"version": "99.0.4844.35",
|
||||
"sha256_linux": "1q10mn34s03zy0nqcgrjd7ry53g4paxpwcki1bgicpcrwnjlzc3y",
|
||||
"sha256_darwin": "0mcfry8vqqc8n1sgyn2azr8pc4lgjnkpnhz0ggjqm12njq0lfjfx",
|
||||
"sha256_darwin_aarch64": "19wpqd5mq2vrgma899vbbdqhg660x47v4ppbz1r8dcg5r5y93x3s"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "99.0.4844.45",
|
||||
"sha256": "1j6s9r2k6zyyjk3f74k2103zlih96wrr2a83bk79fwc582af9505",
|
||||
"sha256bin64": "0lqps8lf7yg9nn5z2iy6hfrx2df59hif8vhf0camx2lfmrkgw8qa",
|
||||
"version": "99.0.4844.51",
|
||||
"sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp",
|
||||
"sha256bin64": "1bayx03xf94ra0wid1jn10vysa6src4hmrdzdxf566rx9wcg29pk",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-10",
|
||||
|
||||
@ -1,23 +1,38 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook
|
||||
, jdk8_headless, jdk11_headless
|
||||
, bash, coreutils, which
|
||||
, bzip2, cyrus_sasl , protobuf3_7, snappy, zlib, zstd
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, autoPatchelfHook
|
||||
, jdk8_headless
|
||||
, jdk11_headless
|
||||
, bash
|
||||
, coreutils
|
||||
, which
|
||||
, bzip2
|
||||
, cyrus_sasl
|
||||
, protobuf3_7
|
||||
, snappy
|
||||
, zlib
|
||||
, zstd
|
||||
, openssl
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||
|
||||
let
|
||||
common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl, nativeLibs ? [ ], libPatches ? "" }:
|
||||
common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "" }:
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version jdk libPatches untarDir openssl;
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz";
|
||||
sha256 = sha256.${stdenv.system};
|
||||
};
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ optional (nativeLibs != [] || libPatches != "") [ autoPatchelfHook ];
|
||||
++ optional (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ];
|
||||
buildInputs = [ openssl ] ++ nativeLibs;
|
||||
|
||||
installPhase = ''
|
||||
@ -51,46 +66,49 @@ let
|
||||
computers, each of which may be prone to failures.
|
||||
'';
|
||||
maintainers = with maintainers; [ volth illustris ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = attrNames sha256;
|
||||
};
|
||||
|
||||
};
|
||||
in
|
||||
{
|
||||
# Different version of hadoop support different java runtime versions
|
||||
# https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions
|
||||
hadoop_3_3 = common rec {
|
||||
pname = "hadoop";
|
||||
version = "3.3.1";
|
||||
sha256 = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd";
|
||||
untarDir = "${pname}-${version}";
|
||||
jdk = jdk11_headless;
|
||||
inherit openssl;
|
||||
# TODO: Package and add Intel Storage Acceleration Library
|
||||
nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ];
|
||||
libPatches = ''
|
||||
ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2
|
||||
ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/
|
||||
ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/
|
||||
ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/
|
||||
ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/
|
||||
patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0
|
||||
'';
|
||||
};
|
||||
hadoop_3_3 =
|
||||
common
|
||||
(rec {
|
||||
pname = "hadoop";
|
||||
version = "3.3.1";
|
||||
untarDir = "${pname}-${version}";
|
||||
sha256 = rec {
|
||||
x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd";
|
||||
x86_64-darwin = x86_64-linux;
|
||||
aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz";
|
||||
aarch64-darwin = aarch64-linux;
|
||||
};
|
||||
|
||||
inherit openssl;
|
||||
nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ];
|
||||
libPatches = ''
|
||||
ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2
|
||||
ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/
|
||||
ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/
|
||||
ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/
|
||||
ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/
|
||||
'' + optionalString stdenv.isLinux "patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0";
|
||||
jdk = jdk11_headless;
|
||||
});
|
||||
hadoop_3_2 = common rec {
|
||||
pname = "hadoop";
|
||||
version = "3.2.2";
|
||||
sha256 = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp";
|
||||
sha256.x86_64-linux = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp";
|
||||
jdk = jdk8_headless;
|
||||
# not using native libs because of broken openssl_1_0_2 dependency
|
||||
# can be manually overriden
|
||||
openssl = null;
|
||||
};
|
||||
hadoop2 = common rec {
|
||||
pname = "hadoop";
|
||||
version = "2.10.1";
|
||||
sha256 = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97";
|
||||
sha256.x86_64-linux = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97";
|
||||
jdk = jdk8_headless;
|
||||
openssl = null;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20220218";
|
||||
version = "20220227";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-6fwkhqXM6T0WCC1Y+GCmyLwStqhBTUAzDDsBTd5XlSE=";
|
||||
sha256 = "sha256-TpemAMBh3XN71C4vYr9TmKBw2W5esgtL2dKLHN4sQd8=";
|
||||
};
|
||||
|
||||
# Remove when Apple SDK is >= 10.13
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.9.3.1911";
|
||||
version = "5.9.6.2225";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
sha256 = "0pamn028k96z0j9xzv56szk7sy0czd9myqm4p3hps1gkczc9wzs4";
|
||||
sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
36
pkgs/applications/networking/n8n/node-packages.nix
generated
36
pkgs/applications/networking/n8n/node-packages.nix
generated
@ -85,13 +85,13 @@ let
|
||||
sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw==";
|
||||
};
|
||||
};
|
||||
"@azure/ms-rest-js-2.6.0" = {
|
||||
"@azure/ms-rest-js-2.6.1" = {
|
||||
name = "_at_azure_slash_ms-rest-js";
|
||||
packageName = "@azure/ms-rest-js";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.0.tgz";
|
||||
sha512 = "4C5FCtvEzWudblB+h92/TYYPiq7tuElX8icVYToxOdggnYqeec4Se14mjse5miInKtZahiFHdl8lZA/jziEc5g==";
|
||||
url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.1.tgz";
|
||||
sha512 = "LLi4jRe/qy5IM8U2CkoDgSZp2OH+MgDe2wePmhz8uY84Svc53EhHaamVyoU6BjjHBxvCRh1vcD1urJDccrxqIw==";
|
||||
};
|
||||
};
|
||||
"@azure/ms-rest-nodeauth-3.1.1" = {
|
||||
@ -976,13 +976,13 @@ let
|
||||
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1082.0" = {
|
||||
"aws-sdk-2.1083.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1082.0";
|
||||
version = "2.1083.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1082.0.tgz";
|
||||
sha512 = "aDrUZ63O/ocuC827ursDqFQAm3jhqsJu1DvMCCFg73y+FK9pXXNHp2mwdi3UeeHvtfxISCLCjuyO3VFd/tpVfA==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1083.0.tgz";
|
||||
sha512 = "o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
@ -4504,13 +4504,13 @@ let
|
||||
sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.132.0" = {
|
||||
"n8n-editor-ui-0.132.1" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.132.0";
|
||||
version = "0.132.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.0.tgz";
|
||||
sha512 = "WOH1Lh+2VYTqBL75pe+WB0H2K8O/6BSW/Wsl5zXbrI0YXmaC9YEvSTAcmjxvjW+oYnYLfQR3p3j6g3AtNldiJQ==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.1.tgz";
|
||||
sha512 = "Kggz0oSLjmh/kqIkerfTaPqGE+qk8mEK9Vs7ZxgmQ4CdRreELSBBVGZiuZALfDjm//+hUF2VnLU3PWUm6uqfDg==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.163.0" = {
|
||||
@ -7480,10 +7480,10 @@ in
|
||||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.165.0";
|
||||
version = "0.165.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.165.0.tgz";
|
||||
sha512 = "PYg5cXEeH6YzVZaSDD9yOZbPtTM/yfaohbZjijyyzVmlOBnI6teQsaY+aLqK6ST4LfMfpB0ZkXpaiBj6xE9azA==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.165.1.tgz";
|
||||
sha512 = "bezUoR+PGGZIoZ4fV7BfH3C9poVJj0GXBkswsA2nhCSGoE2WExhLFEh8mR1ExDUqCwe9mhVLUEdJHO/RNJAD4g==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@azure/abort-controller-1.0.5" // {
|
||||
@ -7524,7 +7524,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."@azure/ms-rest-azure-env-2.0.0"
|
||||
(sources."@azure/ms-rest-js-2.6.0" // {
|
||||
(sources."@azure/ms-rest-js-2.6.1" // {
|
||||
dependencies = [
|
||||
sources."form-data-2.5.1"
|
||||
];
|
||||
@ -7664,7 +7664,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."avsc-5.7.3"
|
||||
(sources."aws-sdk-2.1082.0" // {
|
||||
(sources."aws-sdk-2.1083.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
@ -8230,7 +8230,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."n8n-design-system-0.12.0"
|
||||
sources."n8n-editor-ui-0.132.0"
|
||||
sources."n8n-editor-ui-0.132.1"
|
||||
(sources."n8n-nodes-base-0.163.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
|
||||
@ -1,28 +1,41 @@
|
||||
{ lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.9.5";
|
||||
version = "6.9.7";
|
||||
pname = "frostwire";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
|
||||
sha256 = "sha256-jMv4wIBsmgg2Q/Q/QDJnWa5wUeD1ur6Lu6eXOCLaGg4=";
|
||||
sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/java
|
||||
mv $(ls */*.jar) $out/share/java
|
||||
|
||||
makeWrapper $out/share/java/frostwire $out/bin/frostwire \
|
||||
--prefix PATH : ${jre}/bin/
|
||||
--prefix PATH : ${jre}/bin \
|
||||
--prefix LD_LIBRARY_PATH : $out/share/java \
|
||||
--set JAVA_HOME "${jre}"
|
||||
|
||||
substituteInPlace $out/share/java/frostwire \
|
||||
--replace "export JAVA_PROGRAM_DIR=/usr/lib/frostwire/jre/bin" \
|
||||
"export JAVA_PROGRAM_DIR=${jre}/bin/"
|
||||
|
||||
substituteInPlace $out/share/java/frostwire.desktop \
|
||||
--replace "Exec=/usr/bin/frostwire %U" "Exec=${placeholder "out"}/bin/frostwire %U"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.frostwire.com/";
|
||||
description = "BitTorrent Client and Cloud File Downloader";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ gavin ];
|
||||
platforms = [ "x86_64-linux"];
|
||||
};
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "seafile-client";
|
||||
version = "8.0.5";
|
||||
version = "8.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx";
|
||||
sha256 = "sha256-pImSrQ63AS1hi9CUvFAR91ZHgPCJB0ZOAA0fEZ24O8o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchurl
|
||||
, extra-cmake-modules
|
||||
, boost
|
||||
, akonadi-calendar
|
||||
, kontactinterface
|
||||
, krunner
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "zanshin";
|
||||
version = "21.12.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz";
|
||||
sha256 = "sha256-zMCV4KIrqeKHEsMbqEbnm/DgQiGxZbZXDVMuSSrXj8Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
akonadi-calendar
|
||||
kontactinterface
|
||||
krunner
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A powerful yet simple application to manage your day to day actions, getting your mind like water";
|
||||
homepage = "https://zanshin.kde.org/";
|
||||
maintainers = with maintainers; [ zraexy ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, coreutils, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }:
|
||||
{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, rlwrap, perl, makeDesktopItem }:
|
||||
# nettools needed for hostname
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -77,6 +77,10 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace lib/Tools/env \
|
||||
--replace /usr/bin/env ${coreutils}/bin/env
|
||||
|
||||
substituteInPlace src/Tools/Setup/src/Environment.java \
|
||||
--replace 'cmd.add("/usr/bin/env");' "" \
|
||||
--replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");"
|
||||
|
||||
rm -r heaps
|
||||
'' + (if ! stdenv.isLinux then "" else ''
|
||||
arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"}
|
||||
@ -90,6 +94,24 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildPhase = ''
|
||||
export HOME=$TMP # The build fails if home is not set
|
||||
setup_name=$(basename contrib/isabelle_setup*)
|
||||
|
||||
#The following is adapted from https://isabelle.sketis.net/repos/isabelle/file/Isabelle2021-1/Admin/lib/Tools/build_setup
|
||||
TARGET_DIR="contrib/$setup_name/lib"
|
||||
rm -rf "$TARGET_DIR"
|
||||
mkdir -p "$TARGET_DIR/isabelle/setup"
|
||||
declare -a ARGS=("-Xlint:unchecked")
|
||||
|
||||
SOURCES="$(${perl}/bin/perl -e 'while (<>) { if (m/(\S+\.java)/) { print "$1 "; } }' "src/Tools/Setup/etc/build.props")"
|
||||
for SRC in $SOURCES
|
||||
do
|
||||
ARGS["''${#ARGS[@]}"]="src/Tools/Setup/$SRC"
|
||||
done
|
||||
${java}/bin/javac -d "$TARGET_DIR" -classpath ${scala}/lib/scala-compiler.jar "''${ARGS[@]}"
|
||||
${java}/bin/jar -c -f "$TARGET_DIR/isabelle_setup.jar" -e "isabelle.setup.Setup" -C "$TARGET_DIR" isabelle
|
||||
rm -rf "$TARGET_DIR/isabelle"
|
||||
|
||||
# Prebuild HOL Session
|
||||
bin/isabelle build -v -o system_heaps -b HOL
|
||||
'';
|
||||
|
||||
|
||||
@ -3,32 +3,41 @@
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, bash
|
||||
, coreutils
|
||||
, git
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
let
|
||||
version = "1.2.1";
|
||||
commit = "eed9dc7c82c5a7fbc13fd9b496e1faaec3f20d57";
|
||||
in buildGoModule {
|
||||
pname = "gg-scm";
|
||||
version = "1.1.0";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gg-scm";
|
||||
repo = "gg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk=";
|
||||
sha256 = "770c807403f5d99cea6450f889d268800e1c2563f0cd6142936741c40b29cc95";
|
||||
};
|
||||
patches = [ ./skip-broken-revert-tests.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/gg/editor_unix.go \
|
||||
--replace /bin/sh ${bash}/bin/sh
|
||||
'';
|
||||
subPackages = [ "cmd/gg" ];
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X" "main.versionInfo=${version}"
|
||||
"-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+"
|
||||
"-X" "main.buildCommit=${commit}"
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk=";
|
||||
vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405";
|
||||
|
||||
nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ];
|
||||
buildInputs = [ git ];
|
||||
nativeBuildInputs = [ pandoc installShellFiles makeWrapper ];
|
||||
checkInputs = [ bash coreutils git ];
|
||||
buildInputs = [ bash git ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/gg --suffix PATH : ${git}/bin
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/cmd/gg/revert_test.go b/cmd/gg/revert_test.go
|
||||
index 9420e9b..ff6ca93 100644
|
||||
--- a/cmd/gg/revert_test.go
|
||||
+++ b/cmd/gg/revert_test.go
|
||||
@@ -592,6 +592,7 @@ func TestRevert_LocalRename(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestRevert_UnknownFile(t *testing.T) {
|
||||
+ t.Skip("Broken in 1.1.0")
|
||||
t.Parallel()
|
||||
t.Run("EmptyRepo", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-T0xThL4VHzpNMQV8fTVnG7R+D9ol/Z7a4MYMXbkQ680=";
|
||||
sha256 = "sha256-60XEc0V8stbl+JozTqu8yO37K1NXX/X2xFkcO9p/QNY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tJg/vekGUYP4q1ZP5UV3+lXv6bht4doVV3IaGH+4uf8=";
|
||||
vendorSha256 = "sha256-aMD4a+jwCINcHV/z5UyTF+o3BzN9wviz+kLwDys9/BI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, desktop-file-utils
|
||||
, makeWrapper
|
||||
, shared-mime-info
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, meson
|
||||
, gjs
|
||||
, gtk4
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
python3
|
||||
shared-mime-info # for update-mime-database
|
||||
wrapGAppsHook # for gsettings
|
||||
wrapGAppsHook4 # for gsettings
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook
|
||||
{ lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook
|
||||
, zlib, libzen, libmediainfo, curl, libmms, glib
|
||||
}:
|
||||
|
||||
@ -10,11 +10,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "filebot";
|
||||
version = "4.9.4";
|
||||
version = "4.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
sha256 = "sha256-fz0B9P/UBrlKGPZkheMd/4cFnWHt+brS3zRTv4nVt9o=";
|
||||
url = "https://web.archive.org/web/20220226124706/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
sha256 = "sha256-LNvfAueDMd2TedK6bqnNG+J/4YhhbmUca9iyUkoUNkE=";
|
||||
};
|
||||
|
||||
unpackPhase = "tar xvf $src";
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
--replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
|
||||
--replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license'
|
||||
wrapProgram $out/opt/filebot.sh \
|
||||
--prefix PATH : ${lib.makeBinPath [ openjdk11 ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ openjdk17 ]}
|
||||
# Expose the binary in bin to make runnable.
|
||||
ln -s $out/opt/filebot.sh $out/bin/filebot
|
||||
'';
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, makeWrapper
|
||||
, symlinkJoin
|
||||
, lib
|
||||
, stdenv
|
||||
, extraPackages ? []
|
||||
, podman # Docker compat
|
||||
, runc # Default container runtime
|
||||
@ -15,6 +16,7 @@
|
||||
, iptables
|
||||
, iproute2
|
||||
, catatonit
|
||||
, gvproxy
|
||||
}:
|
||||
|
||||
# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed
|
||||
@ -25,6 +27,7 @@ let
|
||||
podman = podman-unwrapped;
|
||||
|
||||
binPath = lib.makeBinPath ([
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
runc
|
||||
crun
|
||||
conmon
|
||||
@ -40,6 +43,8 @@ let
|
||||
|
||||
# this only works for some binaries, others may need to be be added to `binPath` or in the modules
|
||||
paths = [
|
||||
gvproxy
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
|
||||
podman.rootlessport
|
||||
];
|
||||
|
||||
44
pkgs/applications/window-managers/i3/swallow.nix
Normal file
44
pkgs/applications/window-managers/i3/swallow.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, i3ipc
|
||||
, xlib
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "i3-swallow";
|
||||
version = "unstable-2022-02-19";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jamesofarrell";
|
||||
repo = "i3-swallow";
|
||||
rev = "6fbc04645c483fe733de56b56743e453693d4c78";
|
||||
sha256 = "1l3x8mixwq4n0lnyp0wz5vijgnypamq6lqjazcd2ywl2jv8d6fif";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
i3ipc
|
||||
xlib
|
||||
six
|
||||
];
|
||||
|
||||
# No tests available
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jamesofarrell/i3-swallow";
|
||||
description = "Swallow a terminal window in i3wm";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "swallow";
|
||||
maintainers = [ maintainers.ivar ];
|
||||
};
|
||||
}
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
buildManPages {
|
||||
pname = "execline-man-pages";
|
||||
version = "2.8.1.0.3";
|
||||
sha256 = "1n7c75lmyrjzzcbwjl6fxhfs4k29qlr66r1q35799h942cn4li7v";
|
||||
version = "2.8.1.0.4";
|
||||
sha256 = "1cxi09dlzvjbilmzgmr3xvwvx0l3s1874k3gr85kbjnvp1c1r6cd";
|
||||
description = "Port of the documentation for the execline suite to mdoc";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildManPages {
|
||||
pname = "s6-man-pages";
|
||||
version = "2.11.0.0.5";
|
||||
version = "2.11.0.1.1";
|
||||
sha256 = "03gl0vvdaqfb5hs0dfdbs9djxiyq3abcx9vwgkfw22b1rm2fa0r6";
|
||||
description = "Port of the documentation for the s6 supervision suite to mdoc";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
buildManPages {
|
||||
pname = "s6-networking-man-pages";
|
||||
version = "2.5.0.0.2";
|
||||
sha256 = "1ix8qrivp9prw0m401d7s9vkxhw16a4sxfhrs7abf9qqhs2zkd1r";
|
||||
version = "2.5.1.0.1";
|
||||
sha256 = "1h87s3wixsms8ys7gvm1s9d8pzn73q5j4sgybpi3gmr55d4cwra4";
|
||||
description = "Port of the documentation for the s6-networking suite to mdoc";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
|
||||
@ -7,70 +7,70 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nordic";
|
||||
version = "unstable-2022-01-08";
|
||||
version = "unstable-2022-02-26";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "85086324c2a8fa7ca538b85ad0681e03733b2c86";
|
||||
sha256 = "sha256-p1nr71iJZm+2123WF67NkunBX2dR4ruK2Afqd7XdeGc=";
|
||||
rev = "0da58e462e8ba6c71245d13fbddac950b72018ae";
|
||||
sha256 = "sha256-w7e3DqQV4L/OvntKHJA4+3Dj6dRnlH73SxvW770QIyU=";
|
||||
name = "Nordic";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "46c9e6665963ccb54938d7730e520bd8c52f4307";
|
||||
sha256 = "sha256-uFnNLshyKOvzaij7tEKb0fw0j3/GGfzznAf/aaKx7XI=";
|
||||
rev = "9daf11acf3419e2f23d0993ce862a1c944fb8519";
|
||||
sha256 = "sha256-zGgw6THLX7q19BDsllPUrWqQcL6FYAewcyqjQdXzLzg=";
|
||||
name = "Nordic-standard-buttons";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "da5c930386427fce65ea185f164709c8a20e362f";
|
||||
sha256 = "sha256-Ee9ymuMWs2ZgU+8FVLaviGtHMT4Sz5NWLaEGln2Z4V0=";
|
||||
rev = "a40819bd00160f987cdf254ce8c34eabebecf0eb";
|
||||
sha256 = "sha256-rSNLdxTfvzTFzI5723WIGRS+NZ8iqUOUliDpkznZrwE=";
|
||||
name = "Nordic-darker";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "fd85fb2712ac1192e35c92149b75bfc3c440b1c7";
|
||||
sha256 = "sha256-6WUQBeNq7EKNkYcCt/fUYloue90gxfp8bDYawkQQ6ss=";
|
||||
rev = "4e69cf6e1798938ab7c5795940c663d866ce8201";
|
||||
sha256 = "sha256-p8VaKeKxEiYX4oVqWoyschAq0j/LvPq9yD/awaHKRZw=";
|
||||
name = "Nordic-darker-standard-buttons";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "259e30ce13566214c7594b038dd2c240648a07a0";
|
||||
sha256 = "sha256-F6hC6XbT9yJl6SW9qJNlwmmBcvOrOS5yPCQALZFhgbM=";
|
||||
rev = "866629583187b914725f05683125fde7f6c280f1";
|
||||
sha256 = "sha256-TQ4G5W87zpTrLU+f+eb5VHwaWuKSbItXCgXSL33U8As=";
|
||||
name = "Nordic-bluish-accent";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = pname;
|
||||
rev = "2a27051d87558dfa595fb94eff34241d3a1b8c30";
|
||||
sha256 = "sha256-JIld6GVtr1tz02Do2Ft92qtza6iGrPapasd6jmMFG6k=";
|
||||
rev = "f3702ae02e3caaf74eab0ef9156af9f2a476021b";
|
||||
sha256 = "sha256-drXRfZxCrH2vAXjZSAjWEHcQrehxnM0WLkgbh+cFJhI=";
|
||||
name = "Nordic-bluish-accent-standard-buttons";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "${pname}-polar";
|
||||
rev = "0bea76aed39bb2a2669278b8403c4129aa47be0f";
|
||||
sha256 = "sha256-OXmz6uHXh1zl93sgv5WEwARkEUCr4PRh0/mJyMLXpnk=";
|
||||
rev = "4cf3e5c30ebd17a3d53ab0337c191e304feff7b5";
|
||||
sha256 = "sha256-LTCJ7AyABQDTDkjuqcXaKXePFwOpmXeKaW2mWYah4ao=";
|
||||
name = "Nordic-Polar";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "${pname}-polar";
|
||||
rev = "8fe52b6c276a7e548e87a558db6734cf9f003b06";
|
||||
sha256 = "sha256-/IxlBvMLAK+mGRyaa7bTv/oZS24nSNeE5GsyJIeN6UU=";
|
||||
rev = "72cbd567212b21ea20769fe244c148f799435536";
|
||||
sha256 = "sha256-qNIyr+Eo0dzPVh9PxDCHv0e6pswACbf9nLhAG75YEYc=";
|
||||
name = "Nordic-Polar-standard-buttons";
|
||||
})
|
||||
];
|
||||
|
||||
@ -255,8 +255,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
gitg = callPackage ./misc/gitg { };
|
||||
|
||||
libgnome-games-support = callPackage ./misc/libgnome-games-support { };
|
||||
|
||||
gnome-applets = callPackage ./misc/gnome-applets { };
|
||||
|
||||
gnome-flashback = callPackage ./misc/gnome-flashback { };
|
||||
@ -283,6 +281,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
}) // lib.optionalAttrs (config.allowAliases or true) {
|
||||
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
|
||||
|
||||
libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19
|
||||
|
||||
bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26
|
||||
evolution_data_server = throw "The ‘gnome.evolution_data_server’ alias was removed on 2022-01-13. Please use ‘gnome.evolution-data-server’ directly."; # added 2018-02-25
|
||||
geocode_glib = throw "The ‘gnome.geocode_glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2018-02-25
|
||||
@ -300,7 +300,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
gnome_themes_standard = throw "The ‘gnome.gnome_themes_standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-standard’ directly."; # added 2018-02-25
|
||||
gnome-tweak-tool = throw "The ‘gnome.gnome-tweak-tool’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-tweaks’ directly."; # added 2018-03-21
|
||||
gsettings_desktop_schemas = throw "The ‘gnome.gsettings_desktop_schemas’ alias was removed on 2022-01-13. Please use ‘gnome.gsettings-desktop-schemas’ directly."; # added 2018-02-25
|
||||
libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-games-support’ directly."; # added 2018-03-14
|
||||
libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnome-games-support’ directly."; # added 2018-03-14
|
||||
libgnome_keyring = throw "The ‘gnome.libgnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-keyring’ directly."; # added 2018-02-25
|
||||
rarian = throw "The ‘gnome.rarian’ alias was removed on 2022-01-13. Please use ‘pkgs.rarian’ directly."; # added 2018-04-25
|
||||
networkmanager_fortisslvpn = throw "The ‘gnome.networkmanager_fortisslvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-fortisslvpn’ directly."; # added 2018-02-25
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, itstool
|
||||
, clutter-gtk
|
||||
, libgee
|
||||
, libgnome-games-support
|
||||
, gnome
|
||||
, gtk3
|
||||
}:
|
||||
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
clutter-gtk
|
||||
libgee
|
||||
gnome.libgnome-games-support
|
||||
libgnome-games-support
|
||||
gtk3
|
||||
];
|
||||
|
||||
|
||||
@ -82,5 +82,6 @@ stdenv.mkDerivation rec {
|
||||
# the UIUC License (a BSD-like license)":
|
||||
license = with lib.licenses; [ mit ncsa ];
|
||||
maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ];
|
||||
broken = true; # TODO: gnu-install-dirs.patch fails to apply
|
||||
};
|
||||
}
|
||||
|
||||
@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
|
||||
I). It is a dependency of the C++ ABI library, and sometimes is a
|
||||
dependency of other runtimes.
|
||||
'';
|
||||
broken = true; # TODO: gnu-install-dirs.patch fails to apply
|
||||
};
|
||||
}
|
||||
|
||||
@ -115,6 +115,7 @@ stdenv.mkDerivation (rec {
|
||||
larger LLVM Project, such as the Clang expression parser and LLVM
|
||||
disassembler.
|
||||
'';
|
||||
broken = stdenv.isDarwin; # error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E'
|
||||
};
|
||||
} // lib.optionalAttrs enableManpages {
|
||||
pname = "lldb-manpages";
|
||||
|
||||
@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
|
||||
# "All of the code is dual licensed under the MIT license and the UIUC
|
||||
# License (a BSD-like license)":
|
||||
license = with lib.licenses; [ mit ncsa ];
|
||||
broken = true; # TODO: gnu-install-dirs.patch fails to apply
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,24 +2,24 @@
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, unstableGitUpdater
|
||||
, dosbox
|
||||
|
||||
# Docs cause an immense increase in build time, up to 2 additional hours
|
||||
, withDocs ? false
|
||||
, dosbox
|
||||
, ghostscript
|
||||
, withGUI ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-watcom-v2";
|
||||
version = "unstable-2022-01-18";
|
||||
version = "unstable-2022-02-22";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "f09e0c969c45679c048180f2dc6b3dbbe69e42a0";
|
||||
sha256 = "dEjG4L/VVufSAerKcXPUqZ7esz4m8/210ZshVz4SNAA=";
|
||||
rev = "9e25b3d6b8066f09b4f7131a31de1cf2af691e9a";
|
||||
sha256 = "1w336070kmhc6cmn2aqr8vm0fmw3yza2n0w4asvs2kqxjgmbn6i2";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -41,8 +41,7 @@ stdenv.mkDerivation rec {
|
||||
--replace '-static' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ ]
|
||||
++ lib.optional (withDocs || withGUI) dosbox
|
||||
nativeBuildInputs = [ dosbox ]
|
||||
++ lib.optional withDocs ghostscript;
|
||||
|
||||
configurePhase = ''
|
||||
@ -55,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
export OWGUINOBUILD=${if withGUI then "0" else "1"}
|
||||
export OWNOBUILD=
|
||||
export OWDISTRBUILD=0
|
||||
export OWDOSBOX=${lib.optionalString (withDocs || withGUI) "${dosbox}/bin/dosbox"}
|
||||
export OWDOSBOX=${dosbox}/bin/dosbox
|
||||
export OWVERBOSE=0
|
||||
export OWRELROOT=$out
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ let
|
||||
in
|
||||
|
||||
let result = stdenv.mkDerivation rec {
|
||||
pname = if installjdk then "oraclejdk" else "oraclejre";
|
||||
pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin";
|
||||
version = "${productVersion}u${patchVersion}";
|
||||
|
||||
src =
|
||||
|
||||
@ -24,7 +24,6 @@ lib.makePackageOverridable
|
||||
code = "${src}/${file}";
|
||||
|
||||
}
|
||||
// lib.optionalAttrs document { documentationRoot = src; }
|
||||
// lib.optionalAttrs document { documentationRoot = "${src}"; }
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, pkg-config
|
||||
, glib
|
||||
@ -20,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "accountsservice";
|
||||
version = "22.07.5";
|
||||
version = "22.08.8";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
|
||||
sha256 = "IdRJwN6tilQ86o8R5x6wSWwDXXMOpIOTOXowKzpMfBo=";
|
||||
sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -45,15 +44,6 @@ stdenv.mkDerivation rec {
|
||||
# Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme.
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/72396
|
||||
./drop-prefix-check-extensions.patch
|
||||
|
||||
# Work around not being able to set profile picture in GNOME Settings.
|
||||
# https://github.com/NixOS/nixpkgs/issues/85357
|
||||
# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/98
|
||||
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1629
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/1ef3add46983af875adfed5d29954cbfb184f688.patch";
|
||||
sha256 = "N4siK4SWkwYBnFa0JJUFgahi9XBkB/nS5yc+PyH3/iM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, intltool
|
||||
, meson
|
||||
@ -37,6 +38,20 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix undefined behavior
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/657b2f8497da907559a6769c5b1d2d7b5bd40688.patch";
|
||||
sha256 = "Qx4S9KQsTAr4M0QJi0Xr5kKuHSp4NwZJHoRPYyxIyTk=";
|
||||
})
|
||||
|
||||
# Fix building vapi
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch";
|
||||
sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool
|
||||
|
||||
@ -45,15 +45,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gcr
|
||||
glib
|
||||
libsoup
|
||||
libxml2
|
||||
openssl
|
||||
p11-kit
|
||||
uhttpmock
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
libsoup
|
||||
libxml2
|
||||
gnome-online-accounts
|
||||
json-glib
|
||||
];
|
||||
|
||||
@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsigc++";
|
||||
version = "3.0.7";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "v76RwNCU6mu8bL05CbfZjGVh7qi22cDCWt2Qam6D1zM=";
|
||||
sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsigc++";
|
||||
version = "2.10.7";
|
||||
version = "2.10.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI=";
|
||||
sha256 = "sha256-I1pAvsc0bHuCtqjKrgRWNT3AbnHxS8QUvMhYrxg4cZo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
|
||||
@ -21,14 +21,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libwnck";
|
||||
version = "40.0";
|
||||
version = "40.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM=";
|
||||
sha256 = "AxNPoRTvP740B1qoNnj1iqLevp/O9OojwHeeKGAdZhE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpich";
|
||||
version = "4.0";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
|
||||
sha256 = "0r7zzcj8b9dbf5lp2d81wcvffi38c1zchkgzyxckk51adv4ijx6z";
|
||||
sha256 = "11rnljqwz6mr88ybj726mk710h7gvz20hy7labmz4jkkaa0gx8b6";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
|
||||
"OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace \
|
||||
'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/' 'INTERFACE_INCLUDE_DIRECTORIES "'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://nlopt.readthedocs.io/en/latest/";
|
||||
description = "Free open-source library for nonlinear optimization";
|
||||
|
||||
@ -5,21 +5,22 @@
|
||||
, nlopt
|
||||
, ipopt
|
||||
, boost
|
||||
, tbb
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pagmo2";
|
||||
version = "2.9";
|
||||
version = "2.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esa";
|
||||
repo = "pagmo2";
|
||||
rev = "v${version}";
|
||||
sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400";
|
||||
sha256 = "0rd8scs4hj6qd8ylmn5hafncml2vr4fvcgm3agz3jrvmnc7hadrj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ eigen nlopt ipopt boost ];
|
||||
buildInputs = [ eigen nlopt ipopt boost tbb ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPAGMO_BUILD_TESTS=no"
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
# false build-time dependencies
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qt";
|
||||
pname = "qt" + lib.optionalString ( docs && demos && examples && developerBuild ) "-full";
|
||||
version = "4.8.7";
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
51
pkgs/development/libraries/science/math/bonmin/default.nix
Normal file
51
pkgs/development/libraries/science/math/bonmin/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gfortran
|
||||
, pkg-config
|
||||
, blas
|
||||
, bzip2
|
||||
, cbc
|
||||
, clp
|
||||
, ipopt
|
||||
, lapack
|
||||
, libamplsolver
|
||||
, zlib
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bonmin";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "Bonmin";
|
||||
rev = "releases/${version}";
|
||||
sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gfortran
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
blas
|
||||
bzip2
|
||||
cbc
|
||||
clp
|
||||
ipopt
|
||||
lapack
|
||||
libamplsolver
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems";
|
||||
homepage = "https://github.com/coin-or/Bonmin";
|
||||
license = licenses.epl10;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ aanderse ];
|
||||
};
|
||||
}
|
||||
@ -1,26 +1,35 @@
|
||||
{ lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, blas
|
||||
, lapack
|
||||
, gfortran
|
||||
, enableAMPL ? stdenv.isLinux, libamplsolver
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipopt";
|
||||
version = "3.12.13";
|
||||
version = "3.14.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
|
||||
sha256 = "0kzf05aypx8q5mr3sciclk926ans0yi2d2chjdxxgpi3sza609dx";
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "Ipopt";
|
||||
rev = "releases/${version}";
|
||||
sha256 = "sha256-eqOacZGuuGAjWMs2H6RntQ+WJmGTi+EqydHUQXEpY54=";
|
||||
};
|
||||
|
||||
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-blas-lib=-lblas"
|
||||
"--with-lapack-lib=-llapack"
|
||||
"--with-asl-cflags=-I${libamplsolver}/include"
|
||||
"--with-asl-lflags=-lamplsolver"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ unzip gfortran ];
|
||||
|
||||
buildInputs = [ blas lapack ];
|
||||
nativeBuildInputs = [ pkg-config gfortran ];
|
||||
buildInputs = [ blas lapack ] ++ lib.optionals enableAMPL [ libamplsolver ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libamplsolver";
|
||||
version = "20211109";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ampl.com/netlib/ampl/solvers.tgz";
|
||||
sha256 = "sha256-LVmScuIvxmZzywPSBl9T9YcUBJP7UFAa3eWs9r4q3JM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Debian provides a patch to build a shared library
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/liba/libamplsolver/0~20190702-2/debian/patches/fix-makefile-shared-lib.patch";
|
||||
sha256 = "sha256-96qwj3fLugzbsfxguKMce13cUo7XGC4VUE7xKcJs42Y=";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
pushd sys.`uname -m`.`uname -s`
|
||||
install -D -m 0644 *.h -t $out/include
|
||||
install -D -m 0644 *.so* -t $out/lib
|
||||
install -D -m 0644 *.a -t $out/lib
|
||||
popd
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library of routines that help solvers work with AMPL";
|
||||
homepage = "https://ampl.com/netlib/ampl/";
|
||||
license = [ licenses.mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ aanderse ];
|
||||
};
|
||||
}
|
||||
@ -59,7 +59,9 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trilinos";
|
||||
version = "12.12.1"; # Xyce 7.4 requires version 12.12.1
|
||||
# Xyce 7.4 requires version 12.12.1
|
||||
# nixpkgs-update: no auto update
|
||||
version = "12.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trilinos";
|
||||
|
||||
@ -336,7 +336,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
|
||||
sha512 = "sha512-xLmVyO/L6C4ZdHzHqiJVq3ZfDWSym29x75JcwJx746ps61UcNEg4ozSwN9ud7UjXLntdXe1xDLNOUO1lc7LN5g==";
|
||||
sha512 = "sha512-dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA==";
|
||||
};
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
|
||||
@ -1,8 +1,18 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }:
|
||||
{ lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi }:
|
||||
|
||||
let params =
|
||||
if lib.versionAtLeast ocaml.version "4.08" then {
|
||||
version = "3.2.0";
|
||||
sha256 = "sha256:048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i";
|
||||
} else {
|
||||
version = "3.1.0";
|
||||
sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg";
|
||||
}
|
||||
; in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "lambda-term";
|
||||
version = "3.1.0";
|
||||
inherit (params) version;
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
@ -10,7 +20,7 @@ buildDunePackage rec {
|
||||
owner = "ocaml-community";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg";
|
||||
inherit (params) sha256;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ];
|
||||
|
||||
@ -21,9 +21,9 @@ buildDunePackage rec {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config cppo ];
|
||||
nativeBuildInputs = [ pkg-config cppo ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims;
|
||||
buildInputs = [ dune-configurator ]
|
||||
++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims
|
||||
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
|
||||
propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, cohttp
|
||||
, ocaml_lwt
|
||||
, cohttp-lwt-unix
|
||||
, lambdaTerm
|
||||
, lambda-term
|
||||
, stdlib-shims
|
||||
}:
|
||||
|
||||
@ -30,7 +30,7 @@ buildDunePackage rec {
|
||||
cohttp
|
||||
ocaml_lwt
|
||||
cohttp-lwt-unix
|
||||
lambdaTerm
|
||||
lambda-term
|
||||
stdlib-shims
|
||||
];
|
||||
|
||||
|
||||
31
pkgs/development/php-packages/grumphp/default.nix
Normal file
31
pkgs/development/php-packages/grumphp/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
mkDerivation rec {
|
||||
pname = "grumphp";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/phpro/${pname}/releases/download/v${version}/${pname}.phar";
|
||||
sha256 = "sha256-3XPMyH2F3ZfRr8DmvlBY3Z6uolhaRraQxwKIskIwPq8=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src $out/libexec/${pname}/grumphp.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/grumphp \
|
||||
--add-flags "$out/libexec/${pname}/grumphp.phar"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = versionOlder php.version "8.0";
|
||||
description = "A PHP code-quality tool";
|
||||
homepage = "https://github.com/phpro/grumphp";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.php.members;
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
@ -15,6 +16,10 @@ buildPythonPackage rec {
|
||||
sha256 = "03kj15cf1pbd11mxsik96m5w1m6p0fbdc4ia5ihzmq8rz28razpq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ckcc-protocol";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "65f0313f9915b36068f6dfcab08e04671621e6227650443bc12e81997081ae7f";
|
||||
sha256 = "sha256-UVLKJHDPxi9ivY3JyIySmce0NUhxIIlIxVTdPoXMaKM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ecdsa hidapi pyaes ];
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "decopatch";
|
||||
version = "1.4.9";
|
||||
version = "1.4.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tYgsjPDVsB0hi04E9nYtB7ModCDqUJcG9Zlxw9b+xW8=";
|
||||
hash = "sha256-lX9JyT9BUBgsI/j7UdE7syE+DxenngnIzKcFdZi1VyA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -39,14 +39,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EQ+1j7Euylngcq1Z/ELXcc1kLdei8kFlgqqdp6jvlUo=";
|
||||
hash = "sha256-d/8ucFDjMkybZ+KbZwd1RWb1hRQRKprHMxD2DNUmGTA=";
|
||||
};
|
||||
|
||||
patches = lib.optional withGdal
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elastic-apm";
|
||||
version = "6.7.2";
|
||||
version = "6.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
owner = "elastic";
|
||||
repo = "apm-agent-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NyoFJ3HVxE3AdCCZCZrEk4dDiTIv9cGZYPHVre/PMO4=";
|
||||
sha256 = "sha256-5G+ALFDEClItXvSQFGari0QdhW+RGV8FukxUoxqphFg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, requests-mock
|
||||
, pythonOlder
|
||||
@ -13,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flipr-api";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -22,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "cnico";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "00qkzr2g38fpa7ndnbfx9m4d50lmz0j74nkxif3amnkbl4m6l5vn";
|
||||
sha256 = "sha256-/G92WkWUr3T5T7VVzMERFVmLDfLz6m9rlZLQZCBQbCI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -40,17 +39,10 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/cnico/flipr-api/pull/4
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/cnico/flipr-api/commit/f14be1dfd4f46d4d43d9ea47e51cafca3cc18e86.patch";
|
||||
sha256 = "1fdi19cq21zcjx4g132k480yhi5y0x5qj2l0h8k5zky5cdxs58r6";
|
||||
})
|
||||
pythonImportsCheck = [
|
||||
"flipr_api"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "flipr_api" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for Flipr API";
|
||||
homepage = "https://github.com/cnico/flipr-api";
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-asset";
|
||||
version = "3.7.1";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "848b3028d87358666c50b36253404c15d0a83686700c4586475997b1478d71d5";
|
||||
sha256 = "sha256-4r1F7OgMS3TZdmEgXf5TtY4xv/YWInS6NyY6Ay4l8Ig=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,15 +10,19 @@
|
||||
, proto-plus
|
||||
, pytest-asyncio
|
||||
, mock
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-automl";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hUaxA9QZ0M9klmTAN71OvY4xsRdZuic7V8TeZWzcdMc=";
|
||||
hash = "sha256-NHjHzZm20jDdIg91Zr0ytM0V2sHAmZUF0hlD1C9DeSM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2ot8e34FbJ51dByIp+3Tq0OggpKbjqZAjwNxUZtnf0I=";
|
||||
hash = "sha256-z6qhLNPfZnFJE6CStAByqxHBv3Itfzn1FtxDE+JPci8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,19 +1,44 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, libcst, google-api-core, grpc-google-iam-v1, proto-plus, pytest-asyncio, pytestCheckHook, mock }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, libcst
|
||||
, google-api-core
|
||||
, grpc-google-iam-v1
|
||||
, proto-plus
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.6.2";
|
||||
version = "3.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE=";
|
||||
hash = "sha256-5ehghcpPZTlw8dOJ74pkB4k0g79wHLh+zj3fLCOR4Rc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ];
|
||||
propagatedBuildInputs = [
|
||||
libcst
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
proto-plus
|
||||
];
|
||||
|
||||
checkInputs = [ pytest-asyncio pytestCheckHook mock ];
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "google.cloud.datacatalog" ];
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.datacatalog"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google Cloud Data Catalog API API client library";
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4a6f04112f2685a0a5cd8c7cb7946572bb7e0f6ca7cbe0088514006fca8594ca";
|
||||
sha256 = "sha256-4OwOEb+E+doiQ+gm3f4O+O88PXwFWINfTpRvOlzMuCA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,20 +9,34 @@
|
||||
, pytest-asyncio
|
||||
, pytz
|
||||
, mock
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.6.0";
|
||||
version = "3.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "20abce8d8d3939db243cbc0da62a73ff1a4e3b3b341f7ced0cfeb5e2c4a66621";
|
||||
hash = "sha256-zDGLdyBvm2haNaWRanHkRJZqHl+yvBuHRxCGqXYO7Ow=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
libcst
|
||||
proto-plus
|
||||
pytz
|
||||
];
|
||||
|
||||
checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
|
||||
checkInputs = [
|
||||
google-cloud-testutils
|
||||
mock
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# requires credentials
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iam";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b26294d02b14b40586eceb099a0e3a74265ae10a3f46fd49890cac55ad5f861f";
|
||||
sha256 = "sha256-iLfXzZ3LCNlkgsMilf8TW5ZXgdSBWRgJtuL8zIpUlns=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-language";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "90af7858911f52350191575bb729305114c3c80d1f585d0f6cea39ab1ab3e409";
|
||||
sha256 = "sha256-ZqnwvpXfWGEc+yiImNGRGUXVJGiNzGFeMSmjn7MzuQE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@ -9,20 +9,34 @@
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, mock
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-monitoring";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2a25f7535f21cdeabfccb07fe4a75eae5a47bb36b82025537755b37d3376da46";
|
||||
hash = "sha256-6Xu07QBrVGQOwxi65KZaYFKF3DJ/1uc+zC+NUKqJeWM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
|
||||
propagatedBuildInputs = [
|
||||
libcst
|
||||
google-api-core
|
||||
proto-plus
|
||||
];
|
||||
|
||||
checkInputs = [ google-cloud-testutils mock pandas pytestCheckHook pytest-asyncio ];
|
||||
checkInputs = [
|
||||
google-cloud-testutils
|
||||
mock
|
||||
pandas
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# requires credentials
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-os-config";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ng1XmHQ4h32cyz68PjHSzfSmCB2vrwkGkzCtz4vZmcM=";
|
||||
sha256 = "sha256-1emoPnXxKRLzMQe+/ojTGvt2sYQJLSwu6N3C06p0T00=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@ -7,20 +7,32 @@
|
||||
, proto-plus
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-redis";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CaD/pMQeEdQtcQKBCW1/e42oof9KTpA0IFvCsOaD5zU=";
|
||||
hash = "sha256-i3jgEaAJ0zEaJWtpzhOe23CtpUpt1ON4gXnVvSG8fTI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
libcst
|
||||
proto-plus
|
||||
];
|
||||
|
||||
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.redis"
|
||||
|
||||
@ -7,20 +7,32 @@
|
||||
, grpc-google-iam-v1
|
||||
, proto-plus
|
||||
, mock
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-resource-manager";
|
||||
version = "1.3.3";
|
||||
version = "1.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b13e0a614b4865287a4b5fc43f4810d3d48fef7e24d9bcf54cb4bd93bfbb2bf2";
|
||||
hash = "sha256-InkkAtqK5f1oqUK0Nsxc2PYt5JWBlB3ElGVNs5IJV/Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ];
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
google-cloud-core
|
||||
grpc-google-iam-v1
|
||||
proto-plus
|
||||
];
|
||||
|
||||
checkInputs = [ mock pytestCheckHook ];
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# prevent google directory from shadowing google imports
|
||||
preCheck = ''
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-secret-manager";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e8a3fb7c2a1595f59923661c568667d1ba40fcaaa4dd55fe8b1f5e54871e9460";
|
||||
sha256 = "sha256-G2vyhj2pbNywGE2/QTyNviYQOcsAj4KR8vIcGhvM5e8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,20 +8,33 @@
|
||||
, proto-plus
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c77a765415d5e5465a3d74fefee9ce8f9a914ff228f1b10dda70841400ce1320";
|
||||
hash = "sha256-qtaZs6mgcYeEEdf6KGQNx7c+RP8SqSNyTCZuhTVAq38=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
|
||||
propagatedBuildInputs = [
|
||||
grpc-google-iam-v1
|
||||
google-api-core
|
||||
libcst
|
||||
proto-plus
|
||||
];
|
||||
|
||||
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.securitycenter"
|
||||
|
||||
@ -7,25 +7,37 @@
|
||||
, proto-plus
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-speech";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "acbf9948ce3870c72b45089356985de9df3cd881830d1127a10cb80ada9786c7";
|
||||
hash = "sha256-NO2oxVszbm2KYiN2NCn3edIyBx+E++sttJTgZd/yXzQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
|
||||
propagatedBuildInputs = [
|
||||
libcst
|
||||
google-api-core
|
||||
proto-plus
|
||||
];
|
||||
|
||||
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# requrire credentials
|
||||
"--ignore=tests/system/gapic/v1/test_system_speech_v1.py"
|
||||
"--ignore=tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py"
|
||||
disabledTestPaths = [
|
||||
# Requrire credentials
|
||||
"tests/system/gapic/v1/test_system_speech_v1.py"
|
||||
"tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-texttospeech";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-j2MSeQLw7udQrEqj9LtMqvaGSgTLiItdpN8dUTedYdI=";
|
||||
sha256 = "sha256-5uFtHqZJgouUBgkGNqSBFQrWaU2Gm06icDjKx57HY94=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-translate";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dJ+i8D2p5yz3jh1BwedE4/EZfsH2B3AHokuyedWK6Jc=";
|
||||
hash = "sha256-x4gSLVNo2uk93GWpvcPM20f0gJ1S3x/BVe13oNIpa0Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,20 +7,32 @@
|
||||
, proto-plus
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vision";
|
||||
version = "2.6.3";
|
||||
version = "2.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "54b7f63c746ab95a504bd6b9b1d806192483976a3452a1a59a7faa0eaaa03491";
|
||||
hash = "sha256-antpKF6egHtya4g9sKuQLQepz1QRLQ6LiCdpfYBsDh8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus];
|
||||
propagatedBuildInputs = [
|
||||
libcst
|
||||
google-api-core
|
||||
proto-plus
|
||||
];
|
||||
|
||||
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.vision"
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphql-subscription-manager";
|
||||
version = "0.4.3";
|
||||
version = "0.5.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "PyGraphqlWebsocketManager";
|
||||
rev = version;
|
||||
sha256 = "sha256-+LP+MDeHo0svoN/o0in6xtIqrfxs+UCBQRtBe4lZt+4=";
|
||||
sha256 = "sha256-18GR0OZeEh6EQT0kKCJyq7ckvKYKDJn/lugN5xlRg64=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, aenum
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
@ -10,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "intellifire4py";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,10 +20,11 @@ buildPythonPackage rec {
|
||||
owner = "jeeftor";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-oI4iGnfitou8/Jhe7K4rnSPnmddfO+6FLZzqgNmaPV8=";
|
||||
hash = "sha256-eXXcPowLbIsjPXul2Un0LTBPLbDhpEqfUg7pPR22NHM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aenum
|
||||
aiohttp
|
||||
pydantic
|
||||
requests
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipyparallel";
|
||||
version = "8.1.0";
|
||||
version = "8.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "63f7e136e88f890e9802522fa5475dd81e7614ba06a8cfe4f80cc3056fdb7d73";
|
||||
sha256 = "sha256-D9n2SlEgmAqJtkKZgGwSu434zuoVXlIAtwUwHrJAHhk=";
|
||||
};
|
||||
|
||||
buildInputs = [ nose ];
|
||||
|
||||
32
pkgs/development/python-modules/jupyter-lsp/default.nix
Normal file
32
pkgs/development/python-modules/jupyter-lsp/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jupyter_server
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-lsp";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-dRq9NUE76ZpDMfNZewk0Gtx1VYntMgkawvaG2z1hJn4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jupyter_server
|
||||
];
|
||||
# tests require network
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "jupyter_lsp" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi-Language Server WebSocket proxy for your Jupyter notebook or lab server";
|
||||
homepage = "https://pypi.org/project/jupyter-lsp";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
|
||||
33
pkgs/development/python-modules/jupyterlab-lsp/default.nix
Normal file
33
pkgs/development/python-modules/jupyterlab-lsp/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jupyterlab
|
||||
, jupyter-lsp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab-lsp";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8/ZGTIwpFuPiYVGZZLF+1Gc8aJcWc3BirtXdahYKwt8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jupyterlab
|
||||
jupyter-lsp
|
||||
];
|
||||
# No tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "jupyterlab_lsp" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Language Server Protocol integration for Jupyter(Lab)";
|
||||
homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minikerberos";
|
||||
version = "0.2.17";
|
||||
version = "0.2.18";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-yoPUTwpsk8wimN9DXFFz6ZJi1tI0uAVcfAi5BiwsfJM=";
|
||||
sha256 = "sha256-5bmuCbX4a69sP9SnHkB4OQrOHmFufUTlchHkgu6iBYk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "motionblinds";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "motion-blinds";
|
||||
rev = version;
|
||||
sha256 = "sha256-0Vkx5Hnoa09ZgavReQ72iWqmOG42ATG5w+ptCs7geoA=";
|
||||
sha256 = "sha256-31ofLiBQjSMDtptgYF5rqS1bB5UDUbsbo25Nrk4WvIY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nitransforms";
|
||||
version = "21.0.0";
|
||||
version = "22.0.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "njJqHqXVxldyGfmdM8GmgKdgIT4kMYLzcM5+ayR2EDo=";
|
||||
sha256 = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c=";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools-scm toml ];
|
||||
|
||||
@ -14,5 +14,8 @@ buildPythonPackage rec {
|
||||
homepage = "https://pypi.python.org/pypi/orderedset";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.jtojnar ];
|
||||
# No support for Python 3.9/3.10
|
||||
# https://github.com/simonpercivall/orderedset/issues/36
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.67";
|
||||
version = "2.1.68";
|
||||
format = "flit";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rtxHRuZ30S81pdWUvQnSImcEX6/vCY/pvKFNY7sJaBw=";
|
||||
sha256 = "sha256-IuYEDKK4sQQ9xVBfHWtya/t9pLNX2gYcXMBpn72FDyo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user