mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 21:50:55 +00:00
Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
efb45f7638
|
|
@ -8798,6 +8798,16 @@
|
|||
fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A";
|
||||
}];
|
||||
};
|
||||
vincentbernat = {
|
||||
email = "vincent@bernat.ch";
|
||||
github = "vincentbernat";
|
||||
githubId = 631446;
|
||||
name = "Vincent Bernat";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x95A42FE8353525F9";
|
||||
fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9";
|
||||
}];
|
||||
};
|
||||
vinymeuh = {
|
||||
email = "vinymeuh@gmail.com";
|
||||
github = "vinymeuh";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ import argparse
|
|||
import atexit
|
||||
import base64
|
||||
import io
|
||||
import itertools
|
||||
import logging
|
||||
import os
|
||||
import pathlib
|
||||
|
|
@ -92,10 +93,17 @@ logging.basicConfig(format="%(message)s")
|
|||
logger = logging.getLogger("test-driver")
|
||||
logger.setLevel(logging.INFO)
|
||||
|
||||
machine_colours_iter = (
|
||||
"\x1b[{}m".format(x) for x in itertools.cycle(reversed(range(31, 37)))
|
||||
)
|
||||
|
||||
|
||||
class MachineLogAdapter(logging.LoggerAdapter):
|
||||
def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]:
|
||||
return f"{self.extra['machine']}: {msg}", kwargs
|
||||
return (
|
||||
f"{self.extra['colour_code']}{self.extra['machine']}\x1b[39m: {msg}",
|
||||
kwargs,
|
||||
)
|
||||
|
||||
|
||||
def make_command(args: list) -> str:
|
||||
|
|
@ -172,7 +180,10 @@ class Machine:
|
|||
self.socket = None
|
||||
self.monitor: Optional[socket.socket] = None
|
||||
self.allow_reboot = args.get("allowReboot", False)
|
||||
self.logger = MachineLogAdapter(logger, extra=dict(machine=self.name))
|
||||
self.logger = MachineLogAdapter(
|
||||
logger,
|
||||
extra=dict(machine=self.name, colour_code=next(machine_colours_iter)),
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def create_startcommand(args: Dict[str, str]) -> str:
|
||||
|
|
|
|||
|
|
@ -108,6 +108,15 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
postBuildCommands = mkOption {
|
||||
example = literalExample "'' dd if=\${pkgs.myBootLoader}/SPL of=$img bs=1024 seek=1 conv=notrunc ''";
|
||||
default = "";
|
||||
description = ''
|
||||
Shell commands to run after the image is built.
|
||||
Can be used for boards requiring to dd u-boot SPL before actual partitions.
|
||||
'';
|
||||
};
|
||||
|
||||
compressImage = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
|
|
@ -197,6 +206,9 @@ in
|
|||
# Verify the FAT partition before copying it.
|
||||
fsck.vfat -vn firmware_part.img
|
||||
dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
|
||||
|
||||
${config.sdImage.postBuildCommands}
|
||||
|
||||
if test -n "$compressImage"; then
|
||||
zstd -T$NIX_BUILD_CORES --rm $img
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -52,6 +52,14 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
lockMessage = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
Message to show on physlock login terminal.
|
||||
'';
|
||||
};
|
||||
|
||||
lockOn = {
|
||||
|
||||
suspend = mkOption {
|
||||
|
|
@ -111,7 +119,7 @@ in
|
|||
++ cfg.lockOn.extraTargets;
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}";
|
||||
ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\""}";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ in {
|
|||
auth required pam_unix.so nullok
|
||||
account required pam_unix.so
|
||||
session required pam_unix.so
|
||||
session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0
|
||||
session required ${pkgs.systemd}/lib/security/pam_systemd.so
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ with stdenv.lib.strings;
|
|||
|
||||
let
|
||||
|
||||
version = "unstable-2020-08-03";
|
||||
version = "unstable-2020-08-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grame-cncm";
|
||||
repo = "faust";
|
||||
rev = "b6045f4592384076d3b383d116e602a95a000eb3";
|
||||
sha256 = "1wcpilwnkc7rrbv9gbkj5hb7kamkh8nrc3r4hbcvbz5ar2pfc6d5";
|
||||
rev = "c10f316fa90f338e248787ebf55e3795c3a0d70e";
|
||||
sha256 = "068pm04ddafbsj2r8akdpqyzb0m8mp9ql0rgi83hcqs4ndr8v7sb";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, alsaLib
|
||||
, opencv2
|
||||
, libsndfile
|
||||
, which
|
||||
}:
|
||||
|
||||
faust.wrapWithBuildEnv {
|
||||
|
|
@ -21,6 +22,7 @@ faust.wrapWithBuildEnv {
|
|||
alsaLib
|
||||
opencv2
|
||||
libsndfile
|
||||
which
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, opencv2
|
||||
, qt4
|
||||
, libsndfile
|
||||
, alsaLib
|
||||
, which
|
||||
}:
|
||||
|
||||
|
|
@ -20,6 +21,7 @@ faust.wrapWithBuildEnv {
|
|||
opencv2
|
||||
qt4
|
||||
libsndfile
|
||||
alsaLib
|
||||
which
|
||||
];
|
||||
|
||||
|
|
|
|||
35
pkgs/applications/audio/mooSpace/default.nix
Normal file
35
pkgs/applications/audio/mooSpace/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mooSpace";
|
||||
version = "unstable-2020-06-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modularev";
|
||||
repo = pname;
|
||||
rev = "e5440407ea6ef9f7fcca838383b2b9a388c22874";
|
||||
sha256 = "10vsbddf6d7i06040850v8xkmqh3bqawczs29kfgakair809wqxl";
|
||||
};
|
||||
|
||||
buildInputs = [ faust2jaqt faust2lv2 ];
|
||||
|
||||
patchPhase = "mv ${pname}_faust.dsp ${pname}.dsp";
|
||||
|
||||
buildPhase = ''
|
||||
faust2jaqt -time -vec -t 0 ${pname}.dsp
|
||||
faust2lv2 -time -vec -t 0 -gui ${pname}.dsp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ${pname} $out/bin/
|
||||
mkdir -p $out/lib/lv2
|
||||
cp -r ${pname}.lv2 $out/lib/lv2
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Variable reverb audio effect, jack and lv2";
|
||||
homepage = "https://github.com/modularev/mooSpace";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [ stdenv.lib.maintainers.magnetophon ];
|
||||
};
|
||||
}
|
||||
48
pkgs/applications/editors/code-browser/default.nix
Normal file
48
pkgs/applications/editors/code-browser/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, copper
|
||||
, ruby
|
||||
, python3
|
||||
, qtbase
|
||||
, gtk3
|
||||
, pkg-config
|
||||
, withQt ? false
|
||||
, withGtk ? false, wrapQtAppsHook ? null
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "code-browser";
|
||||
version = "7.1.20";
|
||||
src = fetchurl {
|
||||
url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz";
|
||||
sha256 = "1svi0v3h42h2lrb8c7pjvqc8019v1p20ibsnl48pfhl8d96mmdnz";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L."
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"
|
||||
patchShebangs .
|
||||
'';
|
||||
nativeBuildInputs = [ copper
|
||||
python3
|
||||
ruby
|
||||
qtbase
|
||||
gtk3
|
||||
pkg-config
|
||||
]
|
||||
++ stdenv.lib.optionals withQt [ wrapQtAppsHook ];
|
||||
buildInputs = stdenv.lib.optionals withQt [ qtbase ]
|
||||
++ stdenv.lib.optionals withGtk [ gtk3 ];
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"COPPER=${copper}/bin/copper-elf64"
|
||||
"with-local-libs"
|
||||
"QINC=${qtbase.dev}/include"
|
||||
]
|
||||
++ stdenv.lib.optionals withQt [ "UI=qt" ]
|
||||
++ stdenv.lib.optionals withGtk [ "UI=gtk" ];
|
||||
meta = with stdenv.lib; {
|
||||
description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code.";
|
||||
homepage = "https://tibleiz.net/code-browser/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.x86_64;
|
||||
};
|
||||
}
|
||||
27
pkgs/applications/editors/kakoune/plugins/case.kak.nix
Normal file
27
pkgs/applications/editors/kakoune/plugins/case.kak.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, fetchFromGitLab }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "case.kak";
|
||||
version = "unstable-2020-04-06";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "FlyingWombat";
|
||||
repo = "case.kak";
|
||||
rev = "6f1511820aa3abfa118e0f856118adc8113e2185";
|
||||
sha256 = "002njrlwgakqgp74wivbppr9qyn57dn4n5bxkr6k6nglk9qndwdp";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/kak/autoload/plugins
|
||||
cp -r rc/case.kak $out/share/kak/autoload/plugins
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Ease navigation between opened buffers in Kakoune";
|
||||
homepage = "https://gitlab.com/FlyingWombat/case.kak";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ eraserhd ];
|
||||
platform = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
{
|
||||
inherit parinfer-rust;
|
||||
|
||||
case-kak = pkgs.callPackage ./case.kak.nix { };
|
||||
kak-ansi = pkgs.callPackage ./kak-ansi.nix { };
|
||||
kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { };
|
||||
kak-buffers = pkgs.callPackage ./kak-buffers.nix { };
|
||||
|
|
|
|||
25
pkgs/applications/editors/kibi/default.nix
Normal file
25
pkgs/applications/editors/kibi/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kibi";
|
||||
version = "0.2.0";
|
||||
|
||||
cargoSha256 = "0zyqzb3k4ak7h58zjbg9b32hz1vgbbn9i9l85j4vd4aw8mhsz0n9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ilai-deutel";
|
||||
repo = "kibi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cqnzw6gpsmrqcz82zn1x5i6najcr3i7shj0wnqzpwppff9a6yac";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A text editor in ≤1024 lines of code, written in Rust";
|
||||
homepage = "https://github.com/ilai-deutel/kibi";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ robertodr ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,8 +11,8 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1yar8j6h39gpnq4givxh5cvi336p56sgc8pg32j6sasqk6mxv02c";
|
||||
x86_64-darwin = "1d68xkqkd49z7v4y3230l2v77aw34d7jkdbgj0wnc04kv6n8wx88";
|
||||
x86_64-linux = "1i4vq8a81jgshn9iqkj8rp0yqihq2bjim27c8sh4vl9d6a8a6vcr";
|
||||
x86_64-darwin = "090xj8pq3fdn7dcfrzvgvx906k6gs2xm04xkymz8vpm3a4rq1svn";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
|
|
@ -21,7 +21,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.48.1";
|
||||
version = "1.48.2";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0f8p25963i7bbm2zxb4ra935maxk3sxims6j873wqwqnzn701diq";
|
||||
x86_64-darwin = "0k8ylcbiqvb0cnvbz3059rbyjqxmvig8zf7bfqgln1w591i411c4";
|
||||
x86_64-linux = "17frdyli375l20mb7sb5bmw000p9cplj4pagmhnb6nibi9wqypdx";
|
||||
x86_64-darwin = "1dh5k36fjdfwhidlsg1grjwy3s9jik3pg6xpdgi6946vzqv1vxll";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
|
|
@ -27,7 +27,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.48.1";
|
||||
version = "1.48.2";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "nomacs";
|
||||
version = "3.17.2045";
|
||||
version = "3.17.2206";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nomacs";
|
||||
repo = "nomacs";
|
||||
rev = version;
|
||||
sha256 = "1lchdmmw2sg0xbpcnsk3sxh120xpcv1lh2khf4h5zzdlccbklq7l";
|
||||
sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,24 +1,38 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms
|
||||
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms
|
||||
, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "viewnior";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xsisqox";
|
||||
owner = "hellosiyan";
|
||||
repo = "Viewnior";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p";
|
||||
sha256 = "0y4hk3vq8psba5k615w18qj0kbdfp5w0lm98nv5apy6hmcpwfyig";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs =
|
||||
[ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
|
||||
shared-mime-info glib gdk-pixbuf perl
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
desktop-file-utils
|
||||
intltool
|
||||
gettext
|
||||
];
|
||||
|
||||
meta = {
|
||||
buildInputs = [
|
||||
gtk2
|
||||
libpng
|
||||
exiv2
|
||||
lcms
|
||||
shared-mime-info
|
||||
glib
|
||||
gdk-pixbuf
|
||||
perl
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Fast and simple image viewer";
|
||||
longDescription =
|
||||
'' Viewnior is insipred by big projects like Eye of Gnome, because of it's
|
||||
|
|
@ -27,13 +41,9 @@ stdenv.mkDerivation rec {
|
|||
with the quality of it's functions. The program is made with better integration
|
||||
in mind (follows Gnome HIG2).
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
|
||||
license = licenses.gpl3;
|
||||
homepage = "http://siyanpanayotov.com/project/viewnior/";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.smironov ];
|
||||
|
||||
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
|
||||
maintainers = with maintainers; [ smironov artturin ];
|
||||
platforms = platforms.gnu ++ platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "havoc";
|
||||
version = "2019-12-08";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ii8";
|
||||
repo = pname;
|
||||
rev = "507446c92ed7bf8380a58c5ba2b14aba5cdf412c";
|
||||
sha256 = "13nfnan1gmy4cqxmqv0rc8a4mcb1g62v73d56hy7z2psv4am7a09";
|
||||
rev = version;
|
||||
sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cni-plugins";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containernetworking";
|
||||
repo = "plugins";
|
||||
rev = "v${version}";
|
||||
sha256 = "0f1cqxjf26sy1c4aw6y7pyd9lrz0vknby4q5j6xj77a1pab9073m";
|
||||
sha256 = "1sjk0cghldygx1jgx4bqv83qky7shk64n6xkkfxl92f12wyvsq9j";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
doCheck = false;
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${version}"
|
||||
"-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}"
|
||||
];
|
||||
|
||||
subPackages = [
|
||||
|
|
|
|||
|
|
@ -132,8 +132,8 @@ in rec {
|
|||
});
|
||||
|
||||
terraform_0_13 = pluggable (generic {
|
||||
version = "0.13.0";
|
||||
sha256 = "0kangddd99ix50w67hi0pwa9js9c0hjxqvrc0lxaa6msjvjsxyyq";
|
||||
version = "0.13.1";
|
||||
sha256 = "0a2sjjb79ziv42ifhplpkvqgsg8gxvr1wdgkhdj59dwahqv64pm2";
|
||||
patches = [ ./provider-path.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
});
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ with stdenv.lib;
|
|||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "convos";
|
||||
version = "4.29";
|
||||
version = "4.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nordaaker";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "07m9lhwgqq77hi4n2zrya7n8apkjv8xi166bxa0n7pnlknlp74ar";
|
||||
sha256 = "0mxq4jpjk4vvhi5lqslj614dvk84iq12rsdyykxr8h9cnjjs57im";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
|
|
@ -33,6 +33,10 @@ perlPackages.buildPerlPackage rec {
|
|||
'';
|
||||
|
||||
preCheck = ''
|
||||
# Remove online test
|
||||
#
|
||||
rm t/web-pwa.t
|
||||
|
||||
# A test fails since gethostbyaddr(127.0.0.1) fails to resolve to localhost in
|
||||
# the sandbox, we replace the this out from a substitution expression
|
||||
#
|
||||
|
|
|
|||
37
pkgs/applications/networking/ncgopher/default.nix
Normal file
37
pkgs/applications/networking/ncgopher/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, ncurses6
|
||||
, openssl
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ncgopher";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jansc";
|
||||
repo = "ncgopher";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mv89sanmr49b9za95jl5slpq960b246j2054r8xfafzqmbp44af";
|
||||
};
|
||||
|
||||
cargoSha256 = "12r4vgrg2bkr3p61yxcsg02kppg84vn956l0v1vb08i94rxzc8zk";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
ncurses6
|
||||
openssl
|
||||
sqlite
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A gopher and gemini client for the modern internet";
|
||||
homepage = "https://github.com/jansc/ncgopher";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ shamilton ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "2.15.3";
|
||||
version = "2.15.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0kpfi1w1jnn7v7mny71jil3sc9mm08lz47l9v3hzgs5z3ham98jb";
|
||||
sha256 = "0n2lrsjs3flfv7650yfhck1c96wkn41cv49440m7csy5yw16zlim";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pbr ];
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ with lib;
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "singularity";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
|
||||
sha256 = "070jj6kbiw23sd2p4xhvmyb8gd83imwgisdf18ahkwp7dq85db3c";
|
||||
sha256 = "16sd08bfa2b1qgpnd3q6k7glw0w1wyrqyf47fz2220yafrryrmyz";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/sylabs/singularity";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "2.001";
|
||||
version = "2.002";
|
||||
in
|
||||
fetchzip {
|
||||
name = "JetBrainsMono-${version}";
|
||||
|
||||
url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrains.Mono.${version}.zip";
|
||||
url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
|
||||
|
||||
sha256 = "06rh8dssq6qzgb9rri3an2ka24j47c0i8yhgq81yyg471spc39h1";
|
||||
sha256 = "018lhxi9m8aprls6cnpndzdg5snijwzm22m2pxxi6zcqxrcxh8vb";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
|
|
@ -21,7 +21,7 @@ fetchzip {
|
|||
meta = with lib; {
|
||||
description = "A typeface made for developers";
|
||||
homepage = "https://jetbrains.com/mono/";
|
||||
license = licenses.asl20;
|
||||
license = licenses.ofl;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "7.4.2";
|
||||
version = "7.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0kq7d8nqp8m0kbh2k9s0yybfdkyfkhbkjsv22lplnzh1p84pnlx7";
|
||||
sha256 = "1g8xyv0najy4lpwa9xplx3ylxvn86dyi58j7qanc6r9yddy85ln9";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
mkdir -p $out/share/themes
|
||||
cp -a Marwaita* $out/share/themes
|
||||
rm $out/share/themes/*/COPYING
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,18 @@
|
|||
{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa, makeWrapper }:
|
||||
{ stdenv, fetchurl, meson, ninja, pkg-config, efl, pcre, mesa }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "terminology";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0pvn8mdzxlx7181xdha32fbr0w8xl7hsnb3hfxr5099g841v1xf6";
|
||||
sha256 = "1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
mkDerivation, extra-cmake-modules, kdoctools,
|
||||
lib, mkDerivation, extra-cmake-modules, kdoctools,
|
||||
kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
|
||||
qtsvg, qtx11extras, kactivities, plasma-workspace
|
||||
}:
|
||||
|
|
@ -11,4 +11,18 @@ mkDerivation {
|
|||
kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
|
||||
qtx11extras kactivities plasma-workspace
|
||||
];
|
||||
postInstall = ''
|
||||
# install a symlink in bin so that kdesu can eventually be found in PATH
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/libexec/kf5/kdesu $out/bin
|
||||
'';
|
||||
dontWrapQtApps = true;
|
||||
preFixup = ''
|
||||
for program in $out/bin/*; do
|
||||
wrapQtApp $program
|
||||
done
|
||||
|
||||
# kdesu looks for kdeinit5 in PATH
|
||||
wrapQtApp $out/libexec/kf5/kdesu --suffix PATH : ${lib.getBin kinit}/bin
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,210 @@
|
|||
From e63a0dc2a7b185906a93d60e9d5d6deee4950efc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven.car@enioka.com>
|
||||
Date: Wed, 20 May 2020 14:02:07 +0200
|
||||
Subject: [PATCH] Add a logging category config file
|
||||
|
||||
Makes powerdevil default logging level Warning
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
daemon/CMakeLists.txt | 6 ++++++
|
||||
daemon/actions/dpms/CMakeLists.txt | 2 +-
|
||||
daemon/backends/CMakeLists.txt | 6 +++---
|
||||
daemon/powerdevil_debug.cpp | 21 ---------------------
|
||||
daemon/powerdevil_debug.h | 26 --------------------------
|
||||
kcmodule/activities/CMakeLists.txt | 2 +-
|
||||
kcmodule/common/CMakeLists.txt | 2 +-
|
||||
kcmodule/profiles/CMakeLists.txt | 2 +-
|
||||
powerdevil.categories | 1 +
|
||||
10 files changed, 16 insertions(+), 54 deletions(-)
|
||||
delete mode 100644 daemon/powerdevil_debug.cpp
|
||||
delete mode 100644 daemon/powerdevil_debug.h
|
||||
create mode 100644 powerdevil.categories
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5ded8f5a..52a7318c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -11,6 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
|
||||
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
|
||||
|
||||
include(ECMSetupVersion)
|
||||
+include(ECMQtDeclareLoggingCategory)
|
||||
include(FeatureSummary)
|
||||
include(KDEInstallDirs)
|
||||
include(KDECMakeSettings)
|
||||
@@ -76,6 +77,7 @@ add_subdirectory(daemon)
|
||||
add_subdirectory(kcmodule)
|
||||
add_subdirectory(doc)
|
||||
|
||||
+install( FILES powerdevil.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
|
||||
install( FILES powerdevil.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
|
||||
|
||||
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
|
||||
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
|
||||
index 33ca655b..96cc9b7b 100644
|
||||
--- a/daemon/CMakeLists.txt
|
||||
+++ b/daemon/CMakeLists.txt
|
||||
@@ -48,6 +48,12 @@ set(powerdevilcore_SRCS
|
||||
kwinkscreenhelpereffect.cpp
|
||||
)
|
||||
|
||||
+ecm_qt_declare_logging_category(powerdevilcore_SRCS
|
||||
+ HEADER powerdevil_debug.h
|
||||
+ IDENTIFIER POWERDEVIL
|
||||
+ CATEGORY_NAME org.kde.powerdevil
|
||||
+ DEFAULT_SEVERITY Warning)
|
||||
+
|
||||
kconfig_add_kcfg_files(powerdevilcore_SRCS ../PowerDevilSettings.kcfgc)
|
||||
|
||||
# Action DBus Adaptors
|
||||
diff --git a/daemon/actions/dpms/CMakeLists.txt b/daemon/actions/dpms/CMakeLists.txt
|
||||
index f8ca4e20..3b8bd95b 100644
|
||||
--- a/daemon/actions/dpms/CMakeLists.txt
|
||||
+++ b/daemon/actions/dpms/CMakeLists.txt
|
||||
@@ -3,7 +3,7 @@ include_directories(${PowerDevil_SOURCE_DIR}/daemon
|
||||
${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
set(powerdevildpmsaction_SRCS
|
||||
- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/../../powerdevil_debug.cpp
|
||||
powerdevildpmsaction.cpp
|
||||
abstractdpmshelper.cpp
|
||||
xcbdpmshelper.cpp
|
||||
diff --git a/daemon/backends/CMakeLists.txt b/daemon/backends/CMakeLists.txt
|
||||
index 89400446..05c4263e 100644
|
||||
--- a/daemon/backends/CMakeLists.txt
|
||||
+++ b/daemon/backends/CMakeLists.txt
|
||||
@@ -4,7 +4,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/upower
|
||||
${X11_Xrandr_INCLUDE_PATH})
|
||||
|
||||
set(powerdevilupowerbackend_SRCS
|
||||
- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/../powerdevil_debug.cpp
|
||||
upower/upowersuspendjob.cpp
|
||||
upower/login1suspendjob.cpp
|
||||
upower/powerdevilupowerbackend.cpp
|
||||
@@ -33,14 +33,14 @@ ${CMAKE_CURRENT_SOURCE_DIR}/upower/dbus/org.freedesktop.UPower.KbdBacklight.xml
|
||||
upower_kbdbacklight_interface)
|
||||
|
||||
## backlight helper executable
|
||||
-add_executable(backlighthelper upower/backlighthelper.cpp ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ${backlighthelper_mocs})
|
||||
+add_executable(backlighthelper upower/backlighthelper.cpp ${CMAKE_CURRENT_BINARY_DIR}/../powerdevil_debug.cpp ${backlighthelper_mocs})
|
||||
target_link_libraries(backlighthelper Qt5::Core KF5::AuthCore KF5::I18n)
|
||||
install(TARGETS backlighthelper DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
|
||||
kauth_install_helper_files(backlighthelper org.kde.powerdevil.backlighthelper root)
|
||||
kauth_install_actions(org.kde.powerdevil.backlighthelper ${CMAKE_CURRENT_SOURCE_DIR}/upower/backlight_helper_actions.actions)
|
||||
|
||||
## discrete gpu helper executable
|
||||
-add_executable(discretegpuhelper upower/discretegpuhelper.cpp ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ${discretegpuhelper_mocs})
|
||||
+add_executable(discretegpuhelper upower/discretegpuhelper.cpp ${CMAKE_CURRENT_BINARY_DIR}/../powerdevil_debug.cpp ${discretegpuhelper_mocs})
|
||||
target_link_libraries(discretegpuhelper Qt5::Core KF5::AuthCore)
|
||||
install(TARGETS discretegpuhelper DESTINATION ${KAUTH_HELPER_INSTALL_DIR})
|
||||
kauth_install_helper_files(discretegpuhelper org.kde.powerdevil.discretegpuhelper root)
|
||||
diff --git a/daemon/powerdevil_debug.cpp b/daemon/powerdevil_debug.cpp
|
||||
deleted file mode 100644
|
||||
index 86172c1b..00000000
|
||||
--- a/daemon/powerdevil_debug.cpp
|
||||
+++ /dev/null
|
||||
@@ -1,21 +0,0 @@
|
||||
-/* This file is part of the KDE project
|
||||
- Copyright (C) 2014 Hrvoje Senjan <hrvoje.senjan@gmail.com>
|
||||
-
|
||||
- This library is free software; you can redistribute it and/or
|
||||
- modify it under the terms of the GNU Library General Public
|
||||
- License as published by the Free Software Foundation; either
|
||||
- version 2 of the License, or (at your option) any later version.
|
||||
-
|
||||
- This library is distributed in the hope that it will be useful,
|
||||
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
- Library General Public License for more details.
|
||||
-
|
||||
- You should have received a copy of the GNU Library General Public License
|
||||
- along with this library; see the file COPYING.LIB. If not, write to
|
||||
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
- Boston, MA 02110-1301, USA.
|
||||
-*/
|
||||
-
|
||||
-#include "powerdevil_debug.h"
|
||||
-Q_LOGGING_CATEGORY(POWERDEVIL, "powerdevil")
|
||||
diff --git a/daemon/powerdevil_debug.h b/daemon/powerdevil_debug.h
|
||||
deleted file mode 100644
|
||||
index fcd9c10f..00000000
|
||||
--- a/daemon/powerdevil_debug.h
|
||||
+++ /dev/null
|
||||
@@ -1,26 +0,0 @@
|
||||
-/* This file is part of the KDE project
|
||||
- Copyright (C) 2014 Hrvoje Senjan <hrvoje.senjan@gmail.com>
|
||||
-
|
||||
- This library is free software; you can redistribute it and/or
|
||||
- modify it under the terms of the GNU Library General Public
|
||||
- License as published by the Free Software Foundation; either
|
||||
- version 2 of the License, or (at your option) any later version.
|
||||
-
|
||||
- This library is distributed in the hope that it will be useful,
|
||||
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
- Library General Public License for more details.
|
||||
-
|
||||
- You should have received a copy of the GNU Library General Public License
|
||||
- along with this library; see the file COPYING.LIB. If not, write to
|
||||
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
- Boston, MA 02110-1301, USA.
|
||||
-*/
|
||||
-
|
||||
-#ifndef PROCESSCORE_DEBUG_H
|
||||
-#define PROCESSCORE_DEBUG_H
|
||||
-
|
||||
-#include <QLoggingCategory>
|
||||
-Q_DECLARE_LOGGING_CATEGORY(POWERDEVIL)
|
||||
-
|
||||
-#endif
|
||||
diff --git a/kcmodule/activities/CMakeLists.txt b/kcmodule/activities/CMakeLists.txt
|
||||
index 41a6da48..6e248e91 100644
|
||||
--- a/kcmodule/activities/CMakeLists.txt
|
||||
+++ b/kcmodule/activities/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
add_definitions(-DTRANSLATION_DOMAIN=\"powerdevilactivitiesconfig\")
|
||||
|
||||
set( kcm_powerdevil_activities_SRCS
|
||||
- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/../../daemon/powerdevil_debug.cpp
|
||||
activitypage.cpp
|
||||
activitywidget.cpp
|
||||
../common/ErrorOverlay.cpp
|
||||
diff --git a/kcmodule/common/CMakeLists.txt b/kcmodule/common/CMakeLists.txt
|
||||
index ca483fa7..400b7746 100644
|
||||
--- a/kcmodule/common/CMakeLists.txt
|
||||
+++ b/kcmodule/common/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
add_definitions(-DTRANSLATION_DOMAIN=\"libpowerdevilcommonconfig\")
|
||||
|
||||
set( powerdevil_config_common_private_SRCS
|
||||
- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/../../daemon/powerdevil_debug.cpp
|
||||
actionconfigwidget.cpp
|
||||
actioneditwidget.cpp
|
||||
ErrorOverlay.cpp
|
||||
diff --git a/kcmodule/profiles/CMakeLists.txt b/kcmodule/profiles/CMakeLists.txt
|
||||
index ac5c96e0..32279089 100644
|
||||
--- a/kcmodule/profiles/CMakeLists.txt
|
||||
+++ b/kcmodule/profiles/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
add_definitions(-DTRANSLATION_DOMAIN=\"powerdevilprofilesconfig\")
|
||||
|
||||
set( kcm_powerdevil_profiles_SRCS
|
||||
- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/../../daemon/powerdevil_debug.cpp
|
||||
EditPage.cpp
|
||||
${PowerDevil_SOURCE_DIR}/daemon/powerdevilprofilegenerator.cpp
|
||||
)
|
||||
diff --git a/powerdevil.categories b/powerdevil.categories
|
||||
new file mode 100644
|
||||
index 00000000..3147de54
|
||||
--- /dev/null
|
||||
+++ b/powerdevil.categories
|
||||
@@ -0,0 +1 @@
|
||||
+org.kde.powerdevil Powerdevil DEFAULT_SEVERITY [WARNING] IDENTIFIER [POWERDEVIL]
|
||||
--
|
||||
2.25.4
|
||||
|
||||
|
|
@ -27,5 +27,10 @@ mkDerivation {
|
|||
url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch";
|
||||
sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s";
|
||||
})
|
||||
# This is a backport of
|
||||
# https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch,
|
||||
# which doesn't apply cleanly to 5.17.5. It should make it into 5.20, so
|
||||
# this patch can be removed when we upgrade to 5.20.
|
||||
./patches/0001-Add-a-logging-category-config-file.patch
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,11 @@
|
|||
enableX11 ? false, xlibsWrapper ? null }:
|
||||
|
||||
let
|
||||
version = "9.2";
|
||||
version = "10.1.10";
|
||||
bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
|
||||
|
||||
arch = if stdenv.isi686 then "-i386"
|
||||
else if stdenv.isx86_64 then "-x86-64"
|
||||
else "";
|
||||
else "-x86-64";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}";
|
||||
|
|
@ -20,14 +19,10 @@ stdenv.mkDerivation {
|
|||
if stdenv.isi686
|
||||
then fetchurl {
|
||||
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
|
||||
sha256 = "1fmlpnhf5a75db93phajh4ysbdgrgl72v45lk3kznriprl0a7jc6";
|
||||
} else if stdenv.isx86_64
|
||||
then fetchurl {
|
||||
sha256 = "117lf06vcdbaa5432hwqnskpywc6x8ai0gj99h480a4wzkp3vhy6";
|
||||
} else fetchurl {
|
||||
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
|
||||
sha256 = "1skzxxhr0iq96bf0j5m7mvf3i4sppfyfa6gpqn34mwgkw1fx8274";
|
||||
} else fetchurl {
|
||||
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
|
||||
sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg";
|
||||
sha256 = "1rljv6iddrbssm91c0nn08myj92af36hkix88cc6qwq38xsxs52g";
|
||||
};
|
||||
|
||||
buildInputs = if enableX11 then [xlibsWrapper] else [];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "11";
|
||||
patch_version = "0+beta3";
|
||||
sha256 = "18lpgirxil00pgy805cyi97v6ycmg93sdvbkc60i35ili030v1f7";
|
||||
patch_version = "0";
|
||||
sha256 = "04b13yfismkqh21ag641q9dl0i602khgh4427g1a7pb77c4skr7z";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
let params = {
|
||||
"8.11" = rec {
|
||||
version = "1.5.0";
|
||||
version = "1.6.0_8.11";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dlw869j6ib58i8fhbr7x3hq2cy088arihhfanv8i08djqml6g8x";
|
||||
sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq";
|
||||
};
|
||||
"8.12" = rec {
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
rev = "v${version}";
|
||||
sha256 = "1znjc8c8rivsawmz5bgm9ddl69p62p2pwxphvpap1gfmi5cp8lwi";
|
||||
sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b";
|
||||
};
|
||||
};
|
||||
param = params.${coq.coq-version};
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.mit;
|
||||
description = "Intel Graphics Memory Management Library";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ let
|
|||
kdeclarative = callPackage ./kdeclarative.nix {};
|
||||
kded = callPackage ./kded.nix {};
|
||||
kdesignerplugin = callPackage ./kdesignerplugin.nix {};
|
||||
kdesu = callPackage ./kdesu.nix {};
|
||||
kdesu = callPackage ./kdesu {};
|
||||
kdewebkit = callPackage ./kdewebkit.nix {};
|
||||
kemoticons = callPackage ./kemoticons.nix {};
|
||||
kglobalaccel = callPackage ./kglobalaccel.nix {};
|
||||
|
|
|
|||
|
|
@ -11,4 +11,5 @@ mkDerivation {
|
|||
buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ];
|
||||
propagatedBuildInputs = [ kpty ];
|
||||
outputs = [ "out" "dev" ];
|
||||
patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ];
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
From 01af4d2a098e5819c09bca37568941dcd4b89d0b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
|
||||
Date: Thu, 16 Jul 2020 13:21:42 -0300
|
||||
Subject: [PATCH] Search for the daemon first in /run/wrappers/bin
|
||||
|
||||
If looking first in libexec, the eventually wrapped one in
|
||||
/run/wrappers/bin can not be found.
|
||||
---
|
||||
src/client.cpp | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/client.cpp b/src/client.cpp
|
||||
index 44fbacd..6b5abf5 100644
|
||||
--- a/src/client.cpp
|
||||
+++ b/src/client.cpp
|
||||
@@ -378,11 +378,14 @@ int KDEsuClient::stopServer()
|
||||
|
||||
static QString findDaemon()
|
||||
{
|
||||
- QString daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
|
||||
- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
|
||||
- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
|
||||
- if (daemon.isEmpty()) {
|
||||
- qWarning() << "kdesud daemon not found.";
|
||||
+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud");
|
||||
+ if (!QFile::exists(daemon)) { // if not in wrappers
|
||||
+ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
|
||||
+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
|
||||
+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
|
||||
+ if (daemon.isEmpty()) {
|
||||
+ qWarning() << "kdesud daemon not found.";
|
||||
+ }
|
||||
}
|
||||
}
|
||||
return daemon;
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -101,11 +101,17 @@ let
|
|||
./qtwebengine-darwin-no-platform-check.patch
|
||||
./qtwebengine-darwin-fix-failed-static-assertion.patch
|
||||
];
|
||||
qtwebkit = [ ./qtwebkit.patch ]
|
||||
++ optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
];
|
||||
qtwebkit = [
|
||||
(fetchpatch {
|
||||
name = "qtwebkit-bison-3.7-build.patch";
|
||||
url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
|
||||
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
|
||||
})
|
||||
./qtwebkit.patch
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
];
|
||||
qttools = [ ./qttools.patch ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -72,11 +72,17 @@ let
|
|||
qtserialport = [ ./qtserialport.patch ];
|
||||
qtwebengine = [ ]
|
||||
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
||||
qtwebkit = [ ./qtwebkit.patch ]
|
||||
++ optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
];
|
||||
qtwebkit = [
|
||||
(fetchpatch {
|
||||
name = "qtwebkit-bison-3.7-build.patch";
|
||||
url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
|
||||
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
|
||||
})
|
||||
./qtwebkit.patch
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
];
|
||||
qttools = [ ./qttools.patch ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "petsc";
|
||||
version = "3.13.3";
|
||||
version = "3.13.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
|
||||
sha256 = "0fhydhws57hvxv7mkldlicm2xmmnb9f4nhd8n16idxg4snck38vz";
|
||||
sha256 = "1n2paqw5c0ja392s1qhp7q2ypwav8s5drxxz2w5m2cn31vbspy1c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ];
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ lib, fetchzip, buildDunePackage, camlp5
|
||||
, ppx_tools_versioned, ppx_deriving, re
|
||||
, ppxlib, ppx_deriving, re, perl, ncurses
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "elpi";
|
||||
version = "1.11.2";
|
||||
version = "1.11.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/LPCIC/elpi/releases/download/v${version}/elpi-v${version}.tbz";
|
||||
sha256 = "15hamy9ifr05kczadwh3yj2gmr12a9z1jwppmp5yrns0vykjbj76";
|
||||
sha256 = "1hmjp2z52j17vwhhdkj45n9jx11jxkdg2dwa0n04yyw0qqy4m7c1";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.04";
|
||||
|
||||
buildInputs = [ ppx_tools_versioned ];
|
||||
buildInputs = [ perl ncurses ppxlib ];
|
||||
|
||||
propagatedBuildInputs = [ camlp5 ppx_deriving re ];
|
||||
|
||||
|
|
@ -24,5 +24,9 @@ buildDunePackage rec {
|
|||
homepage = "https://github.com/LPCIC/elpi";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols"
|
||||
'';
|
||||
|
||||
useDune2 = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
|||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4";
|
||||
};
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
|
|
@ -21,4 +21,3 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
rev = "v${version}";
|
||||
sha256 = "1inak3y2win58zbzykfzy6xp00f276sqsz69h2nfsd93mpr74wf6";
|
||||
};
|
||||
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "atlassian-python-api";
|
||||
version = "1.16.0";
|
||||
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1sp036192vdl5nqifcswg2j838vf8i9k8bfd0w4qh1vz4f0pjz7y";
|
||||
};
|
||||
|
||||
|
||||
checkInputs = [ pytestrunner pytest ];
|
||||
|
||||
|
||||
propagatedBuildInputs = [ oauthlib requests requests_oauthlib six ];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Atlassian REST API Wrapper";
|
||||
homepage = "https://github.com/atlassian-api/atlassian-python-api";
|
||||
|
|
@ -34,4 +34,3 @@ buildPythonPackage rec {
|
|||
maintainers = [ maintainers.arnoldfarkas ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,4 +25,4 @@ buildPythonPackage rec {
|
|||
homepage = "http://audiotools.sourceforge.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-cosmosdb";
|
||||
version = "0.16.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "308aeabdff61bf35ceb7a3d6dd19f1ab69a041bd92c85ee24d98a624968697f3";
|
||||
sha256 = "e08b37aea8e6b62596f55f9beb924e1759b2dc424c180ab2e752153a2b01b723";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
pname = "azure-mgmt-hdinsight";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b1d06279307c41da5e0a5c9722aa6b36ce3b2c212534a54767210639451b9800";
|
||||
sha256 = "9d1120bd9760687d87594ec5ce9257b7335504afbe55b3cda79462c1e07a095b";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf";
|
||||
|
||||
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
scikitlearn
|
||||
scipy
|
||||
];
|
||||
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkPhase = ''
|
||||
pytest tests
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [ ];
|
||||
# upstream doesn't contain tests
|
||||
doCheck = false;
|
||||
|
||||
|
||||
pythonImportsCheck = [ "bespon" ];
|
||||
meta = with stdenv.lib; {
|
||||
description = "Encodes and decodes data in the BespON format.";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitarray";
|
||||
version = "1.5.1";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "45bba08bc142781ec7e18a847735219390808f9b6279c356252edddaee1f5fcd";
|
||||
sha256 = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.19.2";
|
||||
version = "4.20.0";
|
||||
pname = "breathe";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1mzcggfr61lqkn6sghg842ah9slfjr0ikc776vbx60iqqw9l1gvn";
|
||||
sha256 = "d7e1e1ee9b0615423b7e9abc64f0afe12e7bcf32c817a8fd1d9c8c3c4b3d71c9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docutils six sphinx ];
|
||||
|
|
|
|||
|
|
@ -33,4 +33,4 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/python-hyper/brotlipy/";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,4 +43,4 @@ buildPythonPackage rec {
|
|||
description = "A simple, correct PEP517 package builder";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [ pyopenssl ];
|
||||
|
||||
|
||||
doCheck = false; #no tests were included
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -28,4 +28,4 @@ buildPythonPackage rec {
|
|||
description = "Time-handling functionality from netcdf4-python";
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||
# pytest
|
||||
# pytest-asyncio
|
||||
# ];
|
||||
#
|
||||
#
|
||||
# # Fails with : ConnectionRefusedError: [Errno 111] Connect call failed ('127.0.0.1', 6379)
|
||||
# # (even with a local redis instance running)
|
||||
# checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@ buildPythonPackage rec {
|
|||
license = licenses.mit;
|
||||
homepage = "https://github.com/jaraco/configparser";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify
|
||||
];
|
||||
|
||||
|
||||
# requires network access for cloning git repos
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -24,4 +24,4 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/nucleic/cppy";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
|
||||
preConfigure = ''
|
||||
export CUDA_PATH=${cudatoolkit}
|
||||
'';
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cudatoolkit
|
||||
|
|
|
|||
|
|
@ -11,18 +11,19 @@
|
|||
, scs
|
||||
, six
|
||||
# Check inputs
|
||||
, pytestCheckHook
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cvxpy";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1f37da2f891508ebc2bbb2b75c46a2076be39a60a45c8a88261e000e8aabeef2";
|
||||
sha256 = "7c826a874db2e4cefe54e63ebd3a3763d0d72e55a17c7d1cfec80008a87b8d81";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -36,15 +37,19 @@ buildPythonPackage rec {
|
|||
six
|
||||
];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
checkPhase = ''
|
||||
nosetests cvxpy
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook nose ];
|
||||
pytestFlagsArray = [ "./cvxpy" ];
|
||||
# Disable the slowest benchmarking tests, cuts test time in half
|
||||
disabledTests = [
|
||||
"test_tv_inpainting"
|
||||
"test_diffcp_sdp_example"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A domain-specific language for modeling convex optimization problems in Python.";
|
||||
homepage = "https://www.cvxpy.org/";
|
||||
downloadPage = "https://github.com/cvxgrp/cvxpy/releases";
|
||||
changelog = "https://github.com/cvxgrp/cvxpy/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi, isPy27
|
||||
, ldap , django
|
||||
, ldap , django
|
||||
, mock
|
||||
}:
|
||||
|
||||
|
|
@ -14,8 +14,8 @@ buildPythonPackage rec {
|
|||
sha256 = "11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ldap django ];
|
||||
checkInputs = [ mock ];
|
||||
propagatedBuildInputs = [ ldap django ];
|
||||
checkInputs = [ mock ];
|
||||
|
||||
# django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
sha256 = "2310291c7f40606be045938d65e117383549aa8a979c6c4b700464c6a6204a34";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six django persisting-theory ];
|
||||
propagatedBuildInputs = [ six django persisting-theory ];
|
||||
|
||||
# django.core.exceptions.ImproperlyConfigured: Requested setting DYNAMIC_PREFERENCES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/goinnn/django-multiselectfield";
|
||||
license = lib.licenses.lgpl3;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,17 +3,17 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "djangorestframework_simplejwt";
|
||||
version = "4.4.0";
|
||||
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c315be70aa12a5f5790c0ab9acd426c3a58eebea65a77d0893248c5144a5080c";
|
||||
};
|
||||
|
||||
|
||||
propagatedBuildInputs = [ django djangorestframework pyjwt ];
|
||||
|
||||
|
||||
# Test raises django.core.exceptions.ImproperlyConfigured
|
||||
doCheck = false;
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "A minimal JSON Web Token authentication plugin for Django REST Framework";
|
||||
homepage = "https://github.com/davesque/django-rest-framework-simplejwt";
|
||||
|
|
|
|||
|
|
@ -27,4 +27,4 @@ buildPythonPackage rec {
|
|||
homepage = "https://pypi.python.org/pypi/fixtures";
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/marshmallow-code/flask-marshmallow";
|
||||
description = "Flask + marshmallow for beautiful APIs";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [ msgpack ];
|
||||
|
||||
|
||||
# Tests fail because absent in package
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ fuse ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
||||
# no tests in the Pypi archive
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -22,4 +22,3 @@ buildPythonPackage rec {
|
|||
maintainers = with maintainers; [ psyanticy ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ buildPythonPackage rec {
|
|||
|
||||
# No tests in archive
|
||||
doCheck = false;
|
||||
|
||||
|
||||
checkInputs = [ flake8 nose2 mock ];
|
||||
|
||||
|
||||
propagatedBuildInputs = [ requests pyjwt ];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API.";
|
||||
homepage = "https://github.com/globus/globus-sdk-python";
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphviz";
|
||||
version = "0.10.1";
|
||||
version = "0.14.1";
|
||||
|
||||
# patch does not apply to PyPI tarball due to different line endings
|
||||
src = fetchFromGitHub {
|
||||
owner = "xflr6";
|
||||
repo = "graphviz";
|
||||
rev = version;
|
||||
sha256 = "1vqk4xy45c72la56j24z9jmjp5a0aa2k32fybnlbkzqjvvbl72d8";
|
||||
sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -30,9 +30,9 @@ buildPythonPackage rec {
|
|||
})
|
||||
];
|
||||
|
||||
# Fontconfig error: Cannot load default config file
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
# Fontconfig error: Cannot load default config file
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
|
||||
checkInputs = [ mock pytest pytest-mock pytestcov ];
|
||||
|
|
|
|||
|
|
@ -1,38 +1,39 @@
|
|||
diff --git a/graphviz/backend.py b/graphviz/backend.py
|
||||
index 704017b..fe4aefe 100644
|
||||
index 6f4cc0c..bc4781e 100644
|
||||
--- a/graphviz/backend.py
|
||||
+++ b/graphviz/backend.py
|
||||
@@ -114,7 +114,7 @@ def command(engine, format, filepath=None, renderer=None, formatter=None):
|
||||
suffix = '.'.join(reversed(format_arg))
|
||||
format_arg = ':'.join(format_arg)
|
||||
@@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None):
|
||||
raise ValueError('unknown formatter: %r' % formatter)
|
||||
|
||||
- cmd = [engine, '-T%s' % format_arg]
|
||||
+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % format_arg]
|
||||
rendered = None
|
||||
if filepath is not None:
|
||||
cmd.extend(['-O', filepath])
|
||||
@@ -217,7 +217,7 @@ def version():
|
||||
output_format = [f for f in (format_, renderer, formatter) if f is not None]
|
||||
- cmd = [engine, '-T%s' % ':'.join(output_format)]
|
||||
+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)]
|
||||
|
||||
if filepath is None:
|
||||
rendered = None
|
||||
@@ -255,7 +255,7 @@ def version():
|
||||
subprocess.CalledProcessError: If the exit status is non-zero.
|
||||
RuntimmeError: If the output cannot be parsed into a version number.
|
||||
"""
|
||||
- cmd = ['dot', '-V']
|
||||
+ cmd = ['@graphviz@/bin/dot', '-V']
|
||||
out, _ = run(cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
|
||||
info = out.decode('ascii')
|
||||
out, _ = run(cmd, check=True, encoding='ascii',
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT)
|
||||
diff --git a/tests/test_backend.py b/tests/test_backend.py
|
||||
index 7ec12f7..2e8550d 100644
|
||||
index 9f307f5..e43bf5b 100644
|
||||
--- a/tests/test_backend.py
|
||||
+++ b/tests/test_backend.py
|
||||
@@ -47,6 +47,7 @@ def test_render_formatter_unknown():
|
||||
render('dot', 'ps', 'nonfilepath', 'ps', '')
|
||||
@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
|
||||
m.decode.assert_called_once_with(encoding)
|
||||
|
||||
|
||||
-@pytest.exe
|
||||
+@pytest.mark.skip(reason='empty $PATH has no effect')
|
||||
@pytest.mark.usefixtures('empty_path')
|
||||
def test_render_missing_executable():
|
||||
with pytest.raises(ExecutableNotFound, match=r'execute'):
|
||||
@@ -85,7 +86,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet):
|
||||
@pytest.mark.parametrize('func, args', [
|
||||
(render, ['dot', 'pdf', 'nonfilepath']),
|
||||
@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803
|
||||
|
||||
assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf'
|
||||
|
||||
|
|
@ -40,25 +41,17 @@ index 7ec12f7..2e8550d 100644
|
|||
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'],
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
startupinfo=mocker.ANY)
|
||||
@@ -94,6 +95,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet):
|
||||
assert capsys.readouterr() == ('', '' if quiet else 'stderr')
|
||||
|
||||
|
||||
+@pytest.mark.skip(reason='empty $PATH has no effect')
|
||||
@pytest.mark.usefixtures('empty_path')
|
||||
def test_pipe_missing_executable():
|
||||
with pytest.raises(ExecutableNotFound, match=r'execute'):
|
||||
@@ -143,7 +145,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
|
||||
assert e.value.returncode is mocker.sentinel.returncode
|
||||
cwd=None, startupinfo=mocker.ANY)
|
||||
@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
|
||||
assert e.value.stdout is mocker.sentinel.out
|
||||
assert e.value.stderr is err
|
||||
e.value.stdout = mocker.sentinel.new_stdout
|
||||
assert e.value.stdout is mocker.sentinel.new_stdout
|
||||
- Popen.assert_called_once_with(['dot', '-Tpng'],
|
||||
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'],
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
@@ -166,7 +168,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
|
||||
@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
|
||||
|
||||
assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out
|
||||
|
||||
|
|
@ -67,16 +60,8 @@ index 7ec12f7..2e8550d 100644
|
|||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
@@ -176,6 +178,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
|
||||
assert capsys.readouterr() == ('', '' if quiet else 'stderr')
|
||||
|
||||
|
||||
+@pytest.mark.skip(reason='empty $PATH has no effect')
|
||||
@pytest.mark.usefixtures('empty_path')
|
||||
def test_version_missing_executable():
|
||||
with pytest.raises(ExecutableNotFound, match=r'execute'):
|
||||
@@ -196,7 +199,7 @@ def test_version_parsefail_mocked(mocker, Popen):
|
||||
with pytest.raises(RuntimeError):
|
||||
@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803
|
||||
with pytest.raises(RuntimeError, match=r'nonversioninfo'):
|
||||
version()
|
||||
|
||||
- Popen.assert_called_once_with(['dot', '-V'],
|
||||
|
|
@ -84,9 +69,9 @@ index 7ec12f7..2e8550d 100644
|
|||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT,
|
||||
startupinfo=mocker.ANY)
|
||||
@@ -211,7 +214,7 @@ def test_version_mocked(mocker, Popen):
|
||||
@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803
|
||||
|
||||
assert version() == (1, 2, 3)
|
||||
assert version() == expected
|
||||
|
||||
- Popen.assert_called_once_with(['dot', '-V'],
|
||||
+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'],
|
||||
|
|
|
|||
|
|
@ -35,4 +35,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.bsd3;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,4 +27,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.mit;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,4 +17,4 @@ buildPythonPackage rec {
|
|||
description = "Internationalized Domain Names in Applications (IDNA)";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
substituteInPlace setup.py \
|
||||
--replace "'opencv-python >= 3.4.5'," ""
|
||||
'';
|
||||
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scikitimage
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ buildPythonPackage rec {
|
|||
"test_subprocess_print"
|
||||
"test_subprocess_error"
|
||||
"test_ipython_start_kernel_no_userns"
|
||||
|
||||
|
||||
# https://github.com/ipython/ipykernel/issues/506
|
||||
"test_unc_paths"
|
||||
"test_unc_paths"
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
# flaky test https://github.com/ipython/ipykernel/issues/485
|
||||
"test_shutdown"
|
||||
|
|
|
|||
|
|
@ -25,4 +25,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ lihop ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,6 @@ buildPythonPackage rec {
|
|||
description = "Jupyter Sphinx Extensions";
|
||||
homepage = "https://github.com/jupyter/jupyter-sphinx/";
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
|
||||
# No tests implemented
|
||||
doCheck = false;
|
||||
|
||||
|
||||
propagatedBuildInputs = [ jupyterhub ldap3 ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jwcrypto";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "002i60yidafpr642qcxrd74d8frbc4ci8vfysm05vqydcri1zgmd";
|
||||
sha256 = "b7fee2635bbefdf145399392f5be26ad54161c8271c66b5fe107b4b452f06c24";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@ buildPythonPackage rec {
|
|||
inherit pname version;
|
||||
sha256 = "247800260cd38160c362d211dcaf4ed0f7816afb5efe56544748b21d6ad6d17f";
|
||||
};
|
||||
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
|
||||
|
||||
|
||||
nativeBuildInputs = [
|
||||
cppy
|
||||
];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ];
|
||||
|
||||
# Test cases are not running on pypi or GitHub
|
||||
doCheck = false;
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Labelbox/Labelbox";
|
||||
|
|
|
|||
|
|
@ -18,4 +18,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.bsd2;
|
||||
homepage = "https://github.com/stefanholek/lazy";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, audioread
|
||||
, resampy
|
||||
, soundfile
|
||||
, pooch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -20,15 +21,21 @@ buildPythonPackage rec {
|
|||
sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile ];
|
||||
propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ];
|
||||
|
||||
# No tests
|
||||
# 1. Internet connection is required
|
||||
# 2. Got error "module 'librosa' has no attribute 'version'"
|
||||
doCheck = false;
|
||||
|
||||
# check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160
|
||||
pythonImportsCheck = [ "librosa" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python module for audio and music processing";
|
||||
homepage = "http://librosa.github.io/";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ GuillaumeDesforges ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,4 +28,4 @@ buildPythonPackage rec {
|
|||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ jwiegley ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "loguru";
|
||||
version = "0.5.1";
|
||||
|
||||
|
||||
disabled = isPy27;
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
|||
sha256 = "041cd779ae383fb5c56f2bb44824f4e80ba895febd9a3f21570ac274221c82e0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest
|
||||
wptserve manifestparser marionette_driver ];
|
||||
propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest
|
||||
wptserve manifestparser marionette_driver ];
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Marionette protocol test automation harness";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
sha256 = "99ca2513d4e2ca29a08e550346f23947a50627a2b02f6ad36a4550e779fa0ce8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mozversion mozrunner ];
|
||||
propagatedBuildInputs = [ mozversion mozrunner ];
|
||||
|
||||
meta = {
|
||||
description = "Mozilla Marionette driver";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
|||
sha256 = "10y1cr933ajx9ni701ayb7r361pak9wrzr7pdpyx81kkbjddq7qa";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ moznetwork ];
|
||||
propagatedBuildInputs = [ moznetwork ];
|
||||
|
||||
meta = {
|
||||
description = "Webserver for Mozilla testing";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
|||
sha256 = "0ws20l4ggb6mj7ycwrk5h7hj1jmj3mj0ca48k5jzsa4n042ahwrd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mozlog mozinfo ];
|
||||
propagatedBuildInputs = [ mozlog mozinfo ];
|
||||
|
||||
meta = {
|
||||
description = "Network utilities for Mozilla testing";
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
|||
sha256 = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
|
|
|||
|
|
@ -31,4 +31,4 @@ buildPythonPackage rec {
|
|||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ drewrisinger ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "mask-rcnn";
|
||||
version = "2.1";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matterport";
|
||||
repo = "Mask_RCNN";
|
||||
|
|
@ -49,4 +49,3 @@ buildPythonPackage rec {
|
|||
maintainers = with maintainers; [ rakesh4g ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,4 +41,4 @@ buildPythonPackage rec {
|
|||
license = licenses.bsd2;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@ buildPythonPackage rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rakesh4g ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
|
||||
# package has no tests
|
||||
doCheck = false;
|
||||
|
||||
|
||||
propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -80,14 +80,14 @@ buildPythonPackage rec {
|
|||
cp ${opensslLegacyStatic.out}/lib/libssl.a \
|
||||
${opensslLegacyStatic.out}/lib/libcrypto.a \
|
||||
deps/openssl-OpenSSL_1_0_2e/
|
||||
ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include
|
||||
ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include
|
||||
ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps
|
||||
|
||||
mkdir -p deps/openssl-OpenSSL_1_1_1/
|
||||
cp ${opensslStatic.out}/lib/libssl.a \
|
||||
${opensslStatic.out}/lib/libcrypto.a \
|
||||
deps/openssl-OpenSSL_1_1_1/
|
||||
ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include
|
||||
ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include
|
||||
ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps
|
||||
|
||||
mkdir -p deps/zlib-1.2.11/
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue