Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
90966a9742
@ -8147,6 +8147,16 @@
|
||||
githubId = 1312525;
|
||||
name = "Rongcui Dong";
|
||||
};
|
||||
ronthecookie = {
|
||||
name = "Ron B";
|
||||
email = "me@ronthecookie.me";
|
||||
github = "ronthecookie";
|
||||
githubId = 2526321;
|
||||
keys = [{
|
||||
longkeyid = "rsa2048/0x6F5B32DE5E5FA80C";
|
||||
fingerprint = "4B2C DDA5 FA35 642D 956D 7294 6F5B 32DE 5E5F A80C";
|
||||
}];
|
||||
};
|
||||
roosemberth = {
|
||||
email = "roosembert.palacios+nixpkgs@gmail.com";
|
||||
github = "roosemberth";
|
||||
|
||||
@ -12,7 +12,25 @@ let
|
||||
else [ package32 ] ++ extraPackages32;
|
||||
};
|
||||
in {
|
||||
options.programs.steam.enable = mkEnableOption "steam";
|
||||
options.programs.steam = {
|
||||
enable = mkEnableOption "steam";
|
||||
|
||||
remotePlay.openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open ports in the firewall for Steam Remote Play.
|
||||
'';
|
||||
};
|
||||
|
||||
dedicatedServer.openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open ports in the firewall for Source Dedicated Server.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932
|
||||
@ -27,6 +45,18 @@ in {
|
||||
hardware.steam-hardware.enable = true;
|
||||
|
||||
environment.systemPackages = [ steam steam.run ];
|
||||
|
||||
networking.firewall = lib.mkMerge [
|
||||
(mkIf cfg.remotePlay.openFirewall {
|
||||
allowedTCPPorts = [ 27036 ];
|
||||
allowedUDPPortRanges = [ { from = 27031; to = 27036; } ];
|
||||
})
|
||||
|
||||
(mkIf cfg.dedicatedServer.openFirewall {
|
||||
allowedTCPPorts = [ 27015 ]; # SRCDS Rcon port
|
||||
allowedUDPPorts = [ 27015 ]; # Gameplay traffic
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ mkg20001 ];
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.virtualisation.amazon-init;
|
||||
|
||||
script = ''
|
||||
#!${pkgs.runtimeShell} -eu
|
||||
|
||||
@ -41,20 +45,33 @@ let
|
||||
nixos-rebuild switch
|
||||
'';
|
||||
in {
|
||||
systemd.services.amazon-init = {
|
||||
inherit script;
|
||||
description = "Reconfigure the system from EC2 userdata on startup";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "multi-user.target" ];
|
||||
requires = [ "network-online.target" ];
|
||||
options.virtualisation.amazon-init = {
|
||||
enable = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Enable or disable the amazon-init service.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
restartIfChanged = false;
|
||||
unitConfig.X-StopOnRemoval = false;
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.amazon-init = {
|
||||
inherit script;
|
||||
description = "Reconfigure the system from EC2 userdata on startup";
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "multi-user.target" ];
|
||||
requires = [ "network-online.target" ];
|
||||
|
||||
restartIfChanged = false;
|
||||
unitConfig.X-StopOnRemoval = false;
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bschaffl";
|
||||
version = "1.4.2";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-R6QTADPE2PW/ySQla2lQbb308jrHXZ43DpFxUfQ0/NY=";
|
||||
sha256 = "sha256-tu5JL0vcqRsZYmoaYGYm/aj95i7wLtnKYGbEPD7AsoM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BSEQuencer";
|
||||
version = "1.8.4";
|
||||
version = "1.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hagnn104ybzdp13r95idw20fhmzif8p3kmiypnr20m6c64rdd29";
|
||||
sha256 = "sha256-PZ2Ft7y2mbb5Wpa7mWPys2BVpcQC3WE5rKu2sRqkf8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BShapr";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04zd3a178i2nivg5rjailzqvc5mlnilmhj1ziygmbhshbrywplri";
|
||||
sha256 = "sha256-oEBsaIcw/Ltxr2CUPGBjwcxOPhNQoYPZDkfQE7QA940=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "lollypop";
|
||||
version = "1.4.16";
|
||||
version = "1.4.17";
|
||||
|
||||
format = "other";
|
||||
doCheck = false;
|
||||
@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
url = "https://gitlab.gnome.org/World/lollypop";
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-4txJ+lYx2BROjZznFwWMc+tTVpYQpPtPySfCl+Hfy+0=";
|
||||
sha256 = "sha256-GrznUXIYUTYOKQ1znsCqmBdm5YImCABMK2NGRtx5fSk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "projectm";
|
||||
version = "3.1.8";
|
||||
version = "3.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectM-visualizer";
|
||||
repo = "projectM";
|
||||
rev = "v${version}";
|
||||
sha256 = "17zyxj1q0zj17jskq8w9bn2ijn34ldvdq61wy01yf5wgngax2r4z";
|
||||
sha256 = "sha256-0aIaT+pzwPjI1nSo6C5SrHBXcrxIpSi6TFV2mgK5GvU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
48
pkgs/applications/graphics/blockbench-electron/default.nix
Normal file
48
pkgs/applications/graphics/blockbench-electron/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_8 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blockbench-electron";
|
||||
version = "3.7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage";
|
||||
sha256 = "0qqklhncd4khqmgp7jg7wap2rzkrg8b6dflmz0wmm5zxxp5vcy1c";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/share/${pname} $out/share/applications
|
||||
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
|
||||
cp -a ${appimageContents}/blockbench.desktop $out/share/applications/${pname}.desktop
|
||||
cp -a ${appimageContents}/usr/share/icons $out/share
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron_8}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A boxy 3D model editor powered by Electron";
|
||||
homepage = "https://blockbench.net/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.ronthecookie ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -1,18 +1,12 @@
|
||||
{
|
||||
mkDerivation, lib, config,
|
||||
|
||||
extra-cmake-modules, kdoctools,
|
||||
|
||||
breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n,
|
||||
kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons,
|
||||
|
||||
libarchive, libzip,
|
||||
|
||||
# Archive tools
|
||||
p7zip, lrzip,
|
||||
|
||||
# Unfree tools
|
||||
unfreeEnableUnrar ? false, unrar,
|
||||
{ mkDerivation, lib, config
|
||||
, extra-cmake-modules, kdoctools
|
||||
, breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n
|
||||
, kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons
|
||||
, libarchive, libzip
|
||||
# Archive tools
|
||||
, p7zip, lrzip
|
||||
# Unfree tools
|
||||
, unfreeEnableUnrar ? false, unrar
|
||||
}:
|
||||
|
||||
let
|
||||
@ -21,20 +15,23 @@ in
|
||||
|
||||
mkDerivation {
|
||||
pname = "ark";
|
||||
meta = {
|
||||
description = "Graphical file compression/decompression utility";
|
||||
license = with lib.licenses;
|
||||
[ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
|
||||
buildInputs = [ libarchive libzip ] ++ extraTools;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
breeze-icons karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio
|
||||
kitemmodels kparts kpty kservice kwidgetsaddons
|
||||
];
|
||||
|
||||
qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath extraTools) ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical file compression/decompression utility";
|
||||
license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unfree;
|
||||
maintainers = [ maintainers.ttuegel ];
|
||||
};
|
||||
}
|
||||
|
||||
77
pkgs/applications/misc/bottles/default.nix
Normal file
77
pkgs/applications/misc/bottles/default.nix
Normal file
@ -0,0 +1,77 @@
|
||||
{ lib, fetchFromGitHub
|
||||
, meson, ninja, pkg-config, wrapGAppsHook
|
||||
, desktop-file-utils, gsettings-desktop-schemas, libnotify
|
||||
, python3Packages, gettext
|
||||
, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3
|
||||
, steam-run-native
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bottles";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bottlesdevs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1hbjnd06h0h47gcwb1s1b9py5nwmia1m35da6zydbl70vs75imhn";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/postinstall.py
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
gettext
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gobject-introspection
|
||||
gsettings-desktop-schemas
|
||||
gspell
|
||||
gtk3
|
||||
libnotify
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pycairo
|
||||
pygobject3
|
||||
lxml
|
||||
dbus-python
|
||||
gst-python
|
||||
liblarch
|
||||
] ++ [ steam-run-native ];
|
||||
|
||||
format = "other";
|
||||
strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
dontWrapGApps = true; # prevent double wrapping
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'"
|
||||
substituteInPlace src/runner.py \
|
||||
--replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \
|
||||
--replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An easy-to-use wineprefix manager";
|
||||
homepage = "https://github.com/bottlesdevs/Bottles";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ bloomvdomino ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -30,6 +30,7 @@
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libXScrnSaver
|
||||
, libxshmfence
|
||||
, libXtst
|
||||
, mesa
|
||||
, nspr
|
||||
@ -72,6 +73,7 @@ rpath = lib.makeLibraryPath [
|
||||
libXi
|
||||
libXrandr
|
||||
libXrender
|
||||
libxshmfence
|
||||
libXtst
|
||||
libuuid
|
||||
mesa
|
||||
@ -88,11 +90,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.20.110";
|
||||
version = "1.21.73";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "0xmf74qh85f2jvi90q4cw2n7cvx5p46xmdr2iznfy09hdsymxfry";
|
||||
sha256 = "12jkj9h1smipqlkidnd3r492yfnncl0b2dmjq22qp2vsrscc3jfg";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -6,8 +6,7 @@ let
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
|
||||
url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
|
||||
sha256 = "sha256-iw2tU8qqXWbtEdLGlW8HNBHx8F2CgnCGCBUWpM407us=";
|
||||
};
|
||||
|
||||
|
||||
@ -27,11 +27,11 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "0k80s27sf7djb7zxj81ihksr8jkr71mfaa8976fzh41i1pn5l7g2";
|
||||
sha256 = "165mpivdhvhavglykwlz0hss2akxd6i6l40rgxs29mjzi52irqw1";
|
||||
};
|
||||
|
||||
patches = optional smimeSupport (fetchpatch {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tig";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonas";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-kkH4px34VpnO/S1VjgQGU9Mm4/VpmiOtvlz2ubtStAk=";
|
||||
sha256 = "sha256-BXs7aKUYiU5L2OjhhmJ+dkHvNcrnw5qREwOTB6npLnw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ];
|
||||
|
||||
@ -9,11 +9,11 @@ with lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.13.3";
|
||||
version = "1.13.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "sha256-+uuadtpDC4br+DUHpoY2aOwklpD9LxvkSqcBMC0+UHE=";
|
||||
sha256 = "sha256-Q9wM+TGgE9oFFzg6516bG7iFNjhxOxPMLKtTHghA/OU=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -13,11 +13,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitkraken";
|
||||
version = "7.5.1";
|
||||
version = "7.5.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
sha256 = "sha256-7baWXv+SV1LX5p+eH6egp4QfTm1SXK8ITcOEj8yFAXg=";
|
||||
sha256 = "0qd83licmw3p7cl04dki510nsn3kxk31s18g2xlixl8zqs3h08lp";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "0.21";
|
||||
version = "0.22";
|
||||
pname = "charliecloud";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hpc";
|
||||
repo = "charliecloud";
|
||||
rev = "v${version}";
|
||||
sha256 = "Y/tH6Znq//HBA/FHfIm2Wpppx6TiL7CqKtZFDc/XSNc=";
|
||||
sha256 = "sha256-+9u7WRKAJ9F70+I68xNRck5Q22XzgLKTCnjGbIcsyW8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook makeWrapper ];
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.13.c.1";
|
||||
version = "2.13.c.2";
|
||||
pname = "i3lock-color";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PandorasFox";
|
||||
repo = "i3lock-color";
|
||||
rev = version;
|
||||
sha256 = "sha256-E+ejc26eyCJ0PnMpDgQrouaBIaUH0SWlzB08fQs8lDw=";
|
||||
sha256 = "sha256-cMj1uB2Hf7v5Rukw9c5YeUmwbdTn1+PV13bUaOWzBp0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -219,9 +219,9 @@ in {
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "2";
|
||||
patch = "3";
|
||||
};
|
||||
sha256 = "1l98b7s9sf16a5w8y0fdn7a489l3gpykjasws1j67bahhc6li2c1";
|
||||
sha256 = "0di3dr5ry4r0hwxh4fbqjhyl5im948wdby0bhijzsxx83c2qhd7n";
|
||||
pythonVersion = "2.7";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
@ -235,9 +235,9 @@ in {
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "2";
|
||||
patch = "3";
|
||||
};
|
||||
sha256 = "03f1fdw6yk2mypa9pbmgk26r8y1hhmw801l6g36zry9zsvz7aqgx";
|
||||
sha256 = "1bq5i2mqgjjfc4rhxgxm6ihwa76vn2qapd7l59ri7xp01p522gd2";
|
||||
pythonVersion = "3.6";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
@ -252,9 +252,9 @@ in {
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "2";
|
||||
patch = "3";
|
||||
};
|
||||
sha256 = "0fx1kp13cgx3rijd0zf8rdjbai6mfhc9is4xfc7kl5cpd88hhkwd"; # linux64
|
||||
sha256 = "1cfpdyvbvzwc0ynjr7248jhwgcpl7073wlp7w3g2v4fnrh1bc4pl"; # linux64
|
||||
pythonVersion = "2.7";
|
||||
inherit passthruFun;
|
||||
};
|
||||
@ -265,9 +265,9 @@ in {
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "2";
|
||||
patch = "3";
|
||||
};
|
||||
sha256 = "10xdx7q04fzy4v4rbj9bbdw8g9y68qgaih7z2n0s5aknj0bizafp"; # linux64
|
||||
sha256 = "02lys9bjky9bqg6ggv8djirbd3zzcsq7755v4yvwm0k4a7fmzf2g"; # linux64
|
||||
pythonVersion = "3.6";
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "belle-sip";
|
||||
version = "4.4.21";
|
||||
version = "4.4.26";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ylv1jsqnfhw23i6p3lfqqzw48lwii8zwkq3y34q0hhnngn26iiw";
|
||||
sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ antlr3_4 cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cm256cc";
|
||||
version = "1.0.5";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4exb";
|
||||
repo = "cm256cc";
|
||||
rev = "v${version}";
|
||||
sha256 = "0d16y3lhdwr644am4sxqpshpbc3qik6dgr1w2c39vy75w9ff61a0";
|
||||
sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules,
|
||||
qtbase, qtx11extras, wayland,
|
||||
{ mkDerivation, lib
|
||||
, extra-cmake-modules
|
||||
, qtbase, qtx11extras, wayland
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "kguiaddons";
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtx11extras wayland ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = [ maintainers.ttuegel ];
|
||||
broken = versionOlder qtbase.version "5.14.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libburn";
|
||||
version = "1.5.2.pl01";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8";
|
||||
sha256 = "sha256-UlBZ0QdZxcuBSO68hju1EOMRxmNgPae9LSHEa3z2O1Q=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libisofs";
|
||||
version = "1.5.2";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "002mcyqwg625a8hqvsrmgm26mhhfwj0j7rahfhsqirmk02b16npg";
|
||||
sha256 = "sha256-qqDtgKdQGXkxb1BbCwF/Kcug6lRjt1EUO60sNgIVqI4=";
|
||||
};
|
||||
|
||||
buildInputs = [ attr zlib ];
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
, tzlocal
|
||||
, funcsigs
|
||||
, futures
|
||||
, setuptools
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
@ -47,12 +48,15 @@ buildPythonPackage rec {
|
||||
pytz
|
||||
tzlocal
|
||||
funcsigs
|
||||
setuptools
|
||||
] ++ lib.optional (!isPy3k) futures;
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "apscheduler" ];
|
||||
|
||||
# Somehow it cannot find pytestcov
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{ lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k
|
||||
{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k
|
||||
, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
|
||||
, service-identity
|
||||
, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
|
||||
, withManpage ? false }:
|
||||
|
||||
, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "alot";
|
||||
@ -41,7 +39,7 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
postBuild = lib.optionalString withManpage "make -C docs man";
|
||||
|
||||
checkInputs = [ awk future mock gnupg procps ];
|
||||
checkInputs = [ gawk future mock gnupg procps ];
|
||||
|
||||
postInstall = let
|
||||
completionPython = python.withPackages (ps: [ ps.configobj ]);
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, requests-cache }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coinmarketcap";
|
||||
version = "5.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1cfee31bf330a17cedf188e4e99588e6a4c6c969c93da71f55a9f4ec6a6c216f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests-cache ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A python wrapper around the https://coinmarketcap.com API.";
|
||||
homepage = "https://github.com/barnumbirr/coinmarketcap";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
@ -6,6 +6,7 @@
|
||||
, isPy3k
|
||||
, sqlalchemy
|
||||
, pytestCheckHook
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -28,6 +29,8 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/crate/crate-python";
|
||||
description = "A Python client library for CrateDB";
|
||||
|
||||
@ -1,11 +1,25 @@
|
||||
{ buildPythonPackage, fetchPypi }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "defusedxml";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5";
|
||||
sha256 = "183fz8xwclhkirwpvpldyypn47r8lgzfz2mk9jgyg7b37jg5vcc6";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "defusedxml" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to defuse XML issues";
|
||||
homepage = "https://github.com/tiran/defusedxml";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, fetchPypi
|
||||
, grpc
|
||||
, protobuf
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypykatz";
|
||||
version = "0.3.15";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skelsec";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0bx2jdcfr1pdy3jgzg8fr5id9ffl2m1nc81dqhcplxdj8p214yri";
|
||||
sha256 = "sha256-dTpkwBYEAITdyKsRTfeJk40hgO8+wmxD3d2XXkvWUpc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,25 +7,29 @@
|
||||
, urllib3
|
||||
, tornado
|
||||
, pytest
|
||||
, APScheduler
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-telegram-bot";
|
||||
version = "13.0";
|
||||
version = "13.3";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ca78a41626d728a8f51affa792270e210fa503ed298d395bed2bd1281842dca3";
|
||||
hash = "sha256-dw1sGfdeUw3n9qh4TsBpRdqEvNI0SnKTK4wqBaeM1CE=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ certifi future urllib3 tornado decorator ];
|
||||
propagatedBuildInputs = [ certifi future urllib3 tornado decorator APScheduler ];
|
||||
|
||||
# --with-upstream-urllib3 is not working properly
|
||||
postPatch = ''
|
||||
rm -rf telegram/vendor
|
||||
rm -r telegram/vendor
|
||||
|
||||
substituteInPlace requirements.txt \
|
||||
--replace 'APScheduler==3.6.3' 'APScheduler'
|
||||
'';
|
||||
setupPyGlobalFlags = "--with-upstream-urllib3";
|
||||
|
||||
@ -36,7 +40,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "This library provides a pure Python interface for the Telegram Bot API.";
|
||||
homepage = "https://python-telegram-bot.org";
|
||||
license = licenses.lgpl3;
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ veprbl pingiun ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -66,5 +66,7 @@ buildPythonPackage rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ evax ];
|
||||
platforms = platforms.unix;
|
||||
# ModuleNotFoundError: No module named 'sklearn.ensemble.iforest'
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,27 +1,86 @@
|
||||
{ lib, stdenv, fetchurl, bison, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
, gobject-introspection
|
||||
, perl
|
||||
, bison
|
||||
, gettext
|
||||
, glib
|
||||
, pkg-config
|
||||
, libgsf
|
||||
, gcab
|
||||
, bzip2
|
||||
, gnome3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "msitools";
|
||||
version = "0.99";
|
||||
version = "0.101";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-1HWTml4zayBesxN7rHM96Ambx0gpBA4GWwGxX2yLNjU=";
|
||||
sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison intltool pkg-config ];
|
||||
buildInputs = [ glib libgsf libuuid gcab bzip2 ];
|
||||
patches = [
|
||||
# Fix executable bit on tools (regression in Meson migration).
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch";
|
||||
sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U=";
|
||||
})
|
||||
|
||||
# Fix failure on big-endian platforms.
|
||||
# https://gitlab.gnome.org/GNOME/msitools/issues/31
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch";
|
||||
sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
gobject-introspection
|
||||
perl
|
||||
bison
|
||||
gettext
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libgsf
|
||||
gcab
|
||||
bzip2
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs subprojects/bats-core/{bin,libexec}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
versionPolicy = "none";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Set of programs to inspect and build Windows Installer (.MSI) files";
|
||||
homepage = "https://wiki.gnome.org/msitools";
|
||||
license = [ licenses.gpl2 licenses.lgpl21 ];
|
||||
license = with licenses; [
|
||||
# Library
|
||||
lgpl21Plus
|
||||
# Tools
|
||||
gpl2Plus
|
||||
];
|
||||
maintainers = with maintainers; [ PlushBeaver ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@ -108,7 +108,7 @@ in rustPlatform.buildRustPackage {
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tree-sitter/tree-sitter";
|
||||
description = "A parser generator tool and an incremental parsing library";
|
||||
longDescription = ''
|
||||
@ -122,10 +122,9 @@ in rustPlatform.buildRustPackage {
|
||||
* Robust enough to provide useful results even in the presence of syntax errors
|
||||
* Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ Profpatsch ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Profpatsch ];
|
||||
# Aarch has test failures with how tree-sitter compiles the generated C files
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -25,11 +25,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "3.12.13-patch1";
|
||||
version = "3.12.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
sha256 = "sha256-OwS1rn5mfU6cA6pvpp7Q407Kw2wBGvpqWmqlajgHtCI=";
|
||||
sha256 = "sha256-FE6oPtEerjVusK3fpxLwcpvKjIAQl6oCrBj8GIkuVwU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
37
pkgs/misc/pylode/default.nix
Normal file
37
pkgs/misc/pylode/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyLODE";
|
||||
version = "2.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RDFLib";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0zbk5lj9vlg32rmvw1himlw63kxd7sim7nzglrjs5zm6vpi4x5ch";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
dateutil
|
||||
falcon
|
||||
gunicorn
|
||||
isodate
|
||||
jinja2
|
||||
markdown
|
||||
rdflib
|
||||
rdflib-jsonld
|
||||
requests
|
||||
six
|
||||
beautifulsoup4
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An OWL ontology documentation tool using Python and templating, based on LODE";
|
||||
homepage = "https://github.com/RDFLib/pyLODE";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ koslambrou ];
|
||||
};
|
||||
}
|
||||
@ -325,20 +325,6 @@ cleanup() {
|
||||
trap cleanup EXIT
|
||||
|
||||
|
||||
|
||||
# If the Nix daemon is running, then use it. This allows us to use
|
||||
# the latest Nix from Nixpkgs (below) for expression evaluation, while
|
||||
# still using the old Nix (via the daemon) for actual store access.
|
||||
# This matters if the new Nix in Nixpkgs has a schema change. It
|
||||
# would upgrade the schema, which should only happen once we actually
|
||||
# switch to the new configuration.
|
||||
# If --repair is given, don't try to use the Nix daemon, because the
|
||||
# flag can only be used directly.
|
||||
if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then
|
||||
export NIX_REMOTE=${NIX_REMOTE-daemon}
|
||||
fi
|
||||
|
||||
|
||||
# First build Nix, since NixOS may require a newer version than the
|
||||
# current one.
|
||||
if [ -n "$rollback" -o "$action" = dry-build ]; then
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "groonga";
|
||||
version = "10.1.1";
|
||||
version = "11.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-9NKyY+oliGIJQaNHdHOs+1GAfdZ0sy+mbQFrRNXpjLM=";
|
||||
sha256 = "sha256-kgQAFa4Orvfms/trjaMrXULYy7nV+nsmLPpyZAq3cDY=";
|
||||
};
|
||||
|
||||
buildInputs = with lib;
|
||||
|
||||
@ -1,24 +1,23 @@
|
||||
{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
|
||||
, pythonPackages, imagemagick, gobject-introspection, gst_all_1
|
||||
, runtimeShell
|
||||
, unstableGitUpdater
|
||||
, runtimeShell, unstableGitUpdater
|
||||
|
||||
# external plugins package set
|
||||
, beetsExternalPlugins
|
||||
|
||||
, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null
|
||||
, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor
|
||||
, enableAcousticbrainz ? true
|
||||
, enableAcoustid ? true
|
||||
, enableBadfiles ? true, flac ? null, mp3val ? null
|
||||
, enableBadfiles ? true, flac, mp3val
|
||||
, enableBeatport ? true
|
||||
, enableBpsync ? true
|
||||
, enableConvert ? true, ffmpeg ? null
|
||||
, enableConvert ? true, ffmpeg
|
||||
, enableDeezer ? true
|
||||
, enableDiscogs ? true
|
||||
, enableEmbyupdate ? true
|
||||
, enableFetchart ? true
|
||||
, enableGmusic ? true
|
||||
, enableKeyfinder ? true, keyfinder-cli ? null
|
||||
, enableKeyfinder ? true, keyfinder-cli
|
||||
, enableKodiupdate ? true
|
||||
, enableLastfm ? true
|
||||
, enableLoadext ? true
|
||||
@ -33,32 +32,14 @@
|
||||
|
||||
# External plugins
|
||||
, enableAlternatives ? false
|
||||
, enableCheck ? false, liboggz ? null
|
||||
, enableCheck ? false, liboggz
|
||||
, enableCopyArtifacts ? false
|
||||
, enableExtraFiles ? false
|
||||
|
||||
, bashInteractive, bash-completion
|
||||
}:
|
||||
|
||||
assert enableAbsubmit -> essentia-extractor != null;
|
||||
assert enableAcoustid -> pythonPackages.pyacoustid != null;
|
||||
assert enableBadfiles -> flac != null && mp3val != null;
|
||||
assert enableBeatport -> pythonPackages.requests_oauthlib != null;
|
||||
assert enableBpsync -> enableBeatport;
|
||||
assert enableCheck -> flac != null && mp3val != null && liboggz != null;
|
||||
assert enableConvert -> ffmpeg != null;
|
||||
assert enableDiscogs -> pythonPackages.discogs_client != null;
|
||||
assert enableFetchart -> pythonPackages.responses != null;
|
||||
assert enableGmusic -> pythonPackages.gmusicapi != null;
|
||||
assert enableKeyfinder -> keyfinder-cli != null;
|
||||
assert enableLastfm -> pythonPackages.pylast != null;
|
||||
assert enableMpd -> pythonPackages.mpd2 != null;
|
||||
assert enableReplaygain -> ffmpeg != null;
|
||||
assert enableSonosUpdate -> pythonPackages.soco != null;
|
||||
assert enableThumbnails -> pythonPackages.pyxdg != null;
|
||||
assert enableWeb -> pythonPackages.flask != null;
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
optionalPlugins = {
|
||||
@ -99,20 +80,20 @@ let
|
||||
"types" "unimported" "zero"
|
||||
];
|
||||
|
||||
enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
|
||||
enabledOptionalPlugins = lib.attrNames (lib.filterAttrs (_: lib.id) optionalPlugins);
|
||||
|
||||
allPlugins = pluginsWithoutDeps ++ attrNames optionalPlugins;
|
||||
allPlugins = pluginsWithoutDeps ++ lib.attrNames optionalPlugins;
|
||||
allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;
|
||||
|
||||
testShell = "${bashInteractive}/bin/bash --norc";
|
||||
completion = "${bash-completion}/share/bash-completion/bash_completion";
|
||||
|
||||
# This is a stripped down beets for testing of the external plugins.
|
||||
externalTestArgs.beets = (beets.override {
|
||||
externalTestArgs.beets = (lib.beets.override {
|
||||
enableAlternatives = false;
|
||||
enableCopyArtifacts = false;
|
||||
enableExtraFiles = false;
|
||||
}).overrideAttrs (const {
|
||||
}).overrideAttrs (lib.const {
|
||||
doInstallCheck = false;
|
||||
});
|
||||
|
||||
@ -147,10 +128,10 @@ in pythonPackages.buildPythonApplication rec {
|
||||
pythonPackages.confuse
|
||||
pythonPackages.mediafile
|
||||
gobject-introspection
|
||||
] ++ optional enableAbsubmit essentia-extractor
|
||||
++ optional enableAcoustid pythonPackages.pyacoustid
|
||||
++ optional enableBeatport pythonPackages.requests_oauthlib
|
||||
++ optional (enableFetchart
|
||||
] ++ lib.optional enableAbsubmit essentia-extractor
|
||||
++ lib.optional enableAcoustid pythonPackages.pyacoustid
|
||||
++ lib.optional enableBeatport pythonPackages.requests_oauthlib
|
||||
++ lib.optional (enableFetchart
|
||||
|| enableDeezer
|
||||
|| enableEmbyupdate
|
||||
|| enableKodiupdate
|
||||
@ -160,19 +141,19 @@ in pythonPackages.buildPythonApplication rec {
|
||||
|| enableSubsonicupdate
|
||||
|| enableAcousticbrainz)
|
||||
pythonPackages.requests
|
||||
++ optional enableCheck beetsExternalPlugins.check
|
||||
++ optional enableConvert ffmpeg
|
||||
++ optional enableDiscogs pythonPackages.discogs_client
|
||||
++ optional enableGmusic pythonPackages.gmusicapi
|
||||
++ optional enableKeyfinder keyfinder-cli
|
||||
++ optional enableLastfm pythonPackages.pylast
|
||||
++ optional enableMpd pythonPackages.mpd2
|
||||
++ optional enableSonosUpdate pythonPackages.soco
|
||||
++ optional enableThumbnails pythonPackages.pyxdg
|
||||
++ optional enableWeb pythonPackages.flask
|
||||
++ optional enableAlternatives beetsExternalPlugins.alternatives
|
||||
++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
|
||||
++ optional enableExtraFiles beetsExternalPlugins.extrafiles
|
||||
++ lib.optional enableCheck beetsExternalPlugins.check
|
||||
++ lib.optional enableConvert ffmpeg
|
||||
++ lib.optional enableDiscogs pythonPackages.discogs_client
|
||||
++ lib.optional enableGmusic pythonPackages.gmusicapi
|
||||
++ lib.optional enableKeyfinder keyfinder-cli
|
||||
++ lib.optional enableLastfm pythonPackages.pylast
|
||||
++ lib.optional enableMpd pythonPackages.mpd2
|
||||
++ lib.optional enableSonosUpdate pythonPackages.soco
|
||||
++ lib.optional enableThumbnails pythonPackages.pyxdg
|
||||
++ lib.optional enableWeb pythonPackages.flask
|
||||
++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
|
||||
++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
|
||||
++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
|
||||
;
|
||||
|
||||
buildInputs = [
|
||||
@ -209,12 +190,12 @@ in pythonPackages.buildPythonApplication rec {
|
||||
# bs1770gain, and set the absolute path there, to avoid impurities.
|
||||
++ lib.optional enableReplaygain (substituteAll {
|
||||
src = ./replaygain-default-ffmpeg.patch;
|
||||
ffmpeg = getBin ffmpeg;
|
||||
ffmpeg = lib.getBin ffmpeg;
|
||||
})
|
||||
# Put absolute Nix paths in place
|
||||
++ lib.optional enableConvert (substituteAll {
|
||||
src = ./convert-plugin-ffmpeg-path.patch;
|
||||
ffmpeg = getBin ffmpeg;
|
||||
ffmpeg = lib.getBin ffmpeg;
|
||||
})
|
||||
++ lib.optional enableBadfiles (substituteAll {
|
||||
src = ./badfiles-plugin-nix-paths.patch;
|
||||
@ -269,7 +250,7 @@ in pythonPackages.buildPythonApplication rec {
|
||||
EDITOR="${writeScript "beetconfig.sh" ''
|
||||
#!${runtimeShell}
|
||||
cat > "$1" <<CFG
|
||||
plugins: ${concatStringsSep " " allEnabledPlugins}
|
||||
plugins: ${lib.concatStringsSep " " allEnabledPlugins}
|
||||
CFG
|
||||
''}" HOME="$tmphome" "$out/bin/beet" config -e
|
||||
EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e
|
||||
@ -285,7 +266,7 @@ in pythonPackages.buildPythonApplication rec {
|
||||
updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Music tagger and library organizer";
|
||||
homepage = "http://beets.io";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, pkgs
|
||||
, rustPackages
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
# Updater script
|
||||
, runtimeShell
|
||||
, writers
|
||||
# Tests
|
||||
, nixosTests
|
||||
# Apple dependencies
|
||||
, CoreServices
|
||||
, Security
|
||||
}:
|
||||
@ -23,13 +21,6 @@ in (rustPlatform.buildRustPackage rec {
|
||||
pname = "lorri";
|
||||
inherit version;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Your project's nix-env";
|
||||
homepage = "https://github.com/nix-community/lorri";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ grahamc Profpatsch ];
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
@ -43,11 +34,10 @@ in (rustPlatform.buildRustPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
BUILD_REV_COUNT = src.revCount or 1;
|
||||
RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {};
|
||||
RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { };
|
||||
|
||||
nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ];
|
||||
buildInputs =
|
||||
lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
||||
nativeBuildInputs = [ rustPackages.rustfmt ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
||||
|
||||
# copy the docs to the $man and $doc outputs
|
||||
postInstall = ''
|
||||
@ -70,4 +60,11 @@ in (rustPlatform.buildRustPackage rec {
|
||||
nixos = nixosTests.lorri;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Your project's nix-env";
|
||||
homepage = "https://github.com/target/lorri";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ grahamc Profpatsch ];
|
||||
};
|
||||
})
|
||||
|
||||
20
pkgs/tools/networking/cadaver/configure.patch
Normal file
20
pkgs/tools/networking/cadaver/configure.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- a/configure.orig
|
||||
+++ b/configure
|
||||
@@ -9595,7 +9595,7 @@ fi
|
||||
$as_echo "$ne_cv_lib_neon" >&6; }
|
||||
if test "$ne_cv_lib_neon" = "yes"; then
|
||||
ne_cv_lib_neonver=no
|
||||
- for v in 27 28 29; do
|
||||
+ for v in 27 28 29 30 31; do
|
||||
case $ne_libver in
|
||||
0.$v.*) ne_cv_lib_neonver=yes ;;
|
||||
esac
|
||||
@@ -10328,7 +10328,7 @@ fi
|
||||
$as_echo "$ne_cv_lib_neon" >&6; }
|
||||
if test "$ne_cv_lib_neon" = "yes"; then
|
||||
ne_cv_lib_neonver=no
|
||||
- for v in 27 28 29; do
|
||||
+ for v in 27 28 29 30 31; do
|
||||
case $ne_libver in
|
||||
0.$v.*) ne_cv_lib_neonver=yes ;;
|
||||
esac
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, openssl, readline }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cadaver-0.23.3";
|
||||
@ -14,11 +14,15 @@ stdenv.mkDerivation rec {
|
||||
name = "disable-sslv2.patch";
|
||||
sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr";
|
||||
})
|
||||
# Cadaver also works with newer versions of neon than stated
|
||||
# in the configure script
|
||||
./configure.patch
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-ssl" "--with-readline" ];
|
||||
|
||||
buildInputs = [ openssl readline ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ neon readline zlib ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line WebDAV client";
|
||||
|
||||
@ -8,13 +8,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openfortivpn";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adrienverge";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2";
|
||||
sha256 = "sha256-wijP9VGKXlxCAU3xN6+cv9+NGwBS55ql8WsZZ592b/k=";
|
||||
};
|
||||
|
||||
# we cannot write the config file to /etc and as we don't need the file, so drop it
|
||||
|
||||
@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
|
||||
description = "A set of cross-platform tools to compute hashes";
|
||||
homepage = "https://github.com/jessek/hashdeep";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.karantan ];
|
||||
platforms = platforms.all;
|
||||
# Build fails on Darwin:
|
||||
# > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
|
||||
# > void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); }
|
||||
platforms = with platforms; linux ++ freebsd ++ openbsd;
|
||||
maintainers = [ maintainers.karantan ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
, lib
|
||||
, makeWrapper
|
||||
, moreutils
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "zstxtns-utils";
|
||||
version = "0.0.3";
|
||||
|
||||
|
||||
@ -1131,6 +1131,8 @@ in
|
||||
|
||||
bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { };
|
||||
|
||||
blockbench-electron = callPackage ../applications/graphics/blockbench-electron { };
|
||||
|
||||
bmap-tools = callPackage ../tools/misc/bmap-tools { };
|
||||
|
||||
bonnmotion = callPackage ../development/tools/misc/bonnmotion { };
|
||||
@ -3116,9 +3118,7 @@ in
|
||||
|
||||
cabextract = callPackage ../tools/archivers/cabextract { };
|
||||
|
||||
cadaver = callPackage ../tools/networking/cadaver {
|
||||
openssl = openssl_1_0_2;
|
||||
};
|
||||
cadaver = callPackage ../tools/networking/cadaver { };
|
||||
|
||||
davix = callPackage ../tools/networking/davix { };
|
||||
|
||||
@ -16536,6 +16536,8 @@ in
|
||||
|
||||
pybind11 = pythonPackages.pybind11;
|
||||
|
||||
pylode = callPackage ../misc/pylode {};
|
||||
|
||||
python-qt = callPackage ../development/libraries/python-qt {
|
||||
python = python27;
|
||||
inherit (qt514) qmake qttools qtwebengine qtxmlpatterns;
|
||||
@ -21607,6 +21609,8 @@ in
|
||||
|
||||
bonzomatic = callPackage ../applications/editors/bonzomatic { };
|
||||
|
||||
bottles = callPackage ../applications/misc/bottles { };
|
||||
|
||||
brave = callPackage ../applications/networking/browsers/brave { };
|
||||
|
||||
break-time = callPackage ../applications/misc/break-time { };
|
||||
|
||||
@ -1411,8 +1411,6 @@ in {
|
||||
|
||||
coilmq = callPackage ../development/python-modules/coilmq { };
|
||||
|
||||
coinmarketcap = callPackage ../development/python-modules/coinmarketcap { };
|
||||
|
||||
ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { };
|
||||
|
||||
colander = callPackage ../development/python-modules/colander { };
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user