Merge master into staging-next
This commit is contained in:
commit
2394986204
|
@ -4,6 +4,15 @@ with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.jicofo;
|
cfg = config.services.jicofo;
|
||||||
|
|
||||||
|
# HOCON is a JSON superset that some jitsi-meet components use for configuration
|
||||||
|
toHOCON = x: if isAttrs x && x ? __hocon_envvar then ("\${" + x.__hocon_envvar + "}")
|
||||||
|
else if isAttrs x && x ? __hocon_unquoted_string then x.__hocon_unquoted_string
|
||||||
|
else if isAttrs x then "{${ concatStringsSep "," (mapAttrsToList (k: v: ''"${k}":${toHOCON v}'') x) }}"
|
||||||
|
else if isList x then "[${ concatMapStringsSep "," toHOCON x }]"
|
||||||
|
else builtins.toJSON x;
|
||||||
|
|
||||||
|
configFile = pkgs.writeText "jicofo.conf" (toHOCON cfg.config);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.services.jicofo = with types; {
|
options.services.jicofo = with types; {
|
||||||
|
@ -68,22 +77,34 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkOption {
|
config = mkOption {
|
||||||
type = attrsOf str;
|
type = (pkgs.formats.json {}).type;
|
||||||
default = { };
|
default = { };
|
||||||
example = literalExpression ''
|
example = literalExpression ''
|
||||||
{
|
{
|
||||||
"org.jitsi.jicofo.auth.URL" = "XMPP:jitsi-meet.example.com";
|
jicofo.bridge.max-bridge-participants = 42;
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
Contents of the {file}`sip-communicator.properties` configuration file for jicofo.
|
Contents of the {file}`jicofo.conf` configuration file.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
services.jicofo.config = mapAttrs (_: v: mkDefault v) {
|
services.jicofo.config = {
|
||||||
"org.jitsi.jicofo.BRIDGE_MUC" = cfg.bridgeMuc;
|
jicofo = {
|
||||||
|
bridge.brewery-jid = cfg.bridgeMuc;
|
||||||
|
xmpp = rec {
|
||||||
|
client = {
|
||||||
|
hostname = cfg.xmppHost;
|
||||||
|
username = cfg.userName;
|
||||||
|
domain = cfg.userDomain;
|
||||||
|
password = { __hocon_envvar = "JICOFO_AUTH_PASS"; };
|
||||||
|
xmpp-domain = if cfg.xmppDomain == null then cfg.xmppHost else cfg.xmppDomain;
|
||||||
|
};
|
||||||
|
service = client;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
users.groups.jitsi-meet = {};
|
users.groups.jitsi-meet = {};
|
||||||
|
@ -93,6 +114,7 @@ in
|
||||||
"-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION" = "/etc/jitsi";
|
"-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION" = "/etc/jitsi";
|
||||||
"-Dnet.java.sip.communicator.SC_HOME_DIR_NAME" = "jicofo";
|
"-Dnet.java.sip.communicator.SC_HOME_DIR_NAME" = "jicofo";
|
||||||
"-Djava.util.logging.config.file" = "/etc/jitsi/jicofo/logging.properties";
|
"-Djava.util.logging.config.file" = "/etc/jitsi/jicofo/logging.properties";
|
||||||
|
"-Dconfig.file" = configFile;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
@ -101,18 +123,13 @@ in
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
|
|
||||||
restartTriggers = [
|
restartTriggers = [
|
||||||
config.environment.etc."jitsi/jicofo/sip-communicator.properties".source
|
configFile
|
||||||
];
|
];
|
||||||
environment.JAVA_SYS_PROPS = concatStringsSep " " (mapAttrsToList (k: v: "${k}=${toString v}") jicofoProps);
|
environment.JAVA_SYS_PROPS = concatStringsSep " " (mapAttrsToList (k: v: "${k}=${toString v}") jicofoProps);
|
||||||
|
|
||||||
script = ''
|
script = ''
|
||||||
${pkgs.jicofo}/bin/jicofo \
|
export JICOFO_AUTH_PASS="$(<${cfg.userPasswordFile})"
|
||||||
--host=${cfg.xmppHost} \
|
exec "${pkgs.jicofo}/bin/jicofo"
|
||||||
--domain=${if cfg.xmppDomain == null then cfg.xmppHost else cfg.xmppDomain} \
|
|
||||||
--secret=$(cat ${cfg.componentPasswordFile}) \
|
|
||||||
--user_name=${cfg.userName} \
|
|
||||||
--user_domain=${cfg.userDomain} \
|
|
||||||
--user_password=$(cat ${cfg.userPasswordFile})
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
@ -140,10 +157,7 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.etc."jitsi/jicofo/sip-communicator.properties".source =
|
environment.etc."jitsi/jicofo/sip-communicator.properties".text = "";
|
||||||
pkgs.writeText "sip-communicator.properties" (
|
|
||||||
generators.toKeyValue {} cfg.config
|
|
||||||
);
|
|
||||||
environment.etc."jitsi/jicofo/logging.properties".source =
|
environment.etc."jitsi/jicofo/logging.properties".source =
|
||||||
mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal";
|
mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal";
|
||||||
};
|
};
|
||||||
|
|
|
@ -411,11 +411,14 @@ in
|
||||||
componentPasswordFile = "/var/lib/jitsi-meet/jicofo-component-secret";
|
componentPasswordFile = "/var/lib/jitsi-meet/jicofo-component-secret";
|
||||||
bridgeMuc = "jvbbrewery@internal.${cfg.hostName}";
|
bridgeMuc = "jvbbrewery@internal.${cfg.hostName}";
|
||||||
config = mkMerge [{
|
config = mkMerge [{
|
||||||
"org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED" = "true";
|
jicofo.xmpp.service.disable-certificate-verification = true;
|
||||||
|
jicofo.xmpp.client.disable-certificate-verification = true;
|
||||||
#} (lib.mkIf cfg.jibri.enable {
|
#} (lib.mkIf cfg.jibri.enable {
|
||||||
} (lib.mkIf (config.services.jibri.enable || cfg.jibri.enable) {
|
} (lib.mkIf (config.services.jibri.enable || cfg.jibri.enable) {
|
||||||
"org.jitsi.jicofo.jibri.BREWERY" = "JibriBrewery@internal.${cfg.hostName}";
|
jicofo.jibri = {
|
||||||
"org.jitsi.jicofo.jibri.PENDING_TIMEOUT" = "90";
|
brewery-jid = "JibriBrewery@internal.${cfg.hostName}";
|
||||||
|
pending-timeout = "90";
|
||||||
|
};
|
||||||
})];
|
})];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -19,13 +19,13 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tiled";
|
pname = "tiled";
|
||||||
version = "1.9.2";
|
version = "1.10.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bjorn";
|
owner = "mapeditor";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-026OO7r8n1BUapUtKRHvqKdSZiClTQIiYfajiC2TAcQ=";
|
sha256 = "sha256-y79trmkRrkOOP6p9VMjo/11IE22J3YJtnerBsVP9134=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ];
|
nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ];
|
||||||
|
|
|
@ -12,14 +12,14 @@
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
pname = "hydrus";
|
pname = "hydrus";
|
||||||
version = "519";
|
version = "520";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hydrusnetwork";
|
owner = "hydrusnetwork";
|
||||||
repo = "hydrus";
|
repo = "hydrus";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-q5pPRMBuB6hqDGuOl0kMyXjMKze5dw+3kdmA2FPJTPU=";
|
hash = "sha256-y8KfPe3cBBq/iPCG7hNXrZDkOSNi+qSir6rO/65SHkI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "coreaction";
|
pname = "coreaction";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-XQ/GcSjGSe+3d0dJxjmmcBFoDzrmM6zsHMfbDdzmpPs=";
|
sha256 = "sha256-rJ4EFKk/zlvQqptbL81WdqqZQUR9hYADFkXuw11SzRc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corearchiver";
|
pname = "corearchiver";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-EUcUivUuuUApIC9daS6BFA1YoE4yO3Kc8jG0VIks/Y0=";
|
sha256 = "sha256-rn0rasFWSjgBIOpKIb35xsEewOfAQOr4kEiA1GhShg0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corefm";
|
pname = "corefm";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-uScM6cVRwYopZ6NY3PSAAyxNNyX3hVnFs6hkAyF29PA=";
|
sha256 = "sha256-ue0OOBf0PAxYHTfo37RvxnsKxzAEGIiGltXBVZpI6lk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "coregarage";
|
pname = "coregarage";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Jq0lIXfw/1Ixd+QIY7D1ErBCOSKmwkWBupcDxUUEliM=";
|
sha256 = "sha256-NsCJS+FyHWj2aLXlbzxcHEcdZ2cViZmJlh501/48xdI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corehunt";
|
pname = "corehunt";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-zhJadrdOXpl0bXxEPWjQ59Pzjg4MfIZXtYzCnJbh+pI=";
|
sha256 = "sha256-txQ/uoSwseo0i4/CqdQm3wN9/3p3gioRG9IuJTsgSF4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "coreimage";
|
pname = "coreimage";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-uG9/8sQK0G3f7O59OHEHqNHP8cUC73hmjsfpOnj0kFM=";
|
sha256 = "sha256-8ILnZQIErLakiNfGZ91/vY+9XS/eOHcAnIFIuT1x9Mg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "coreinfo";
|
pname = "coreinfo";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-KoX2U07giVF2xZR1diM6teiNfKYRiqjowTJgnsMlaN0=";
|
sha256 = "sha256-EWz2FQQzWVeP2qw1pz2Lg3COUo2y7/9a105R1Bj0Aqw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
--- a/corekeyboard/CMakeLists.txt 2022-01-29 14:03:28.149607341 +0700
|
|
||||||
+++ b/CMakeLists.txt 2022-01-29 14:04:00.178733700 +0700
|
|
||||||
@@ -55,5 +55,4 @@
|
|
||||||
|
|
||||||
install( TARGETS corekeyboard DESTINATION bin )
|
|
||||||
install( FILES org.cubocore.CoreKeyboard.desktop DESTINATION share/applications )
|
|
||||||
-install( FILES org.cubocore.CoreKeyboard-Tray.desktop DESTINATION /etc/xdg/autostart )
|
|
||||||
install( FILES org.cubocore.CoreKeyboard.svg DESTINATION share/icons/hicolor/scalable/apps/ )
|
|
|
@ -2,20 +2,15 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corekeyboard";
|
pname = "corekeyboard";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-yJOcuE6HknDhXCr1qW/NJkerjvBABYntXos0owDDwcw=";
|
sha256 = "sha256-zOH/w4QroMaVjWnFuWAJQ11RYlpXwIXRG9QYGDkfLVY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Remove autostart
|
|
||||||
./0001-fix-installPhase.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
ninja
|
ninja
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corepad";
|
pname = "corepad";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-19qR08QhWeeXnJAQHe1SJjT0xnQLlbkXlzmd9uiMp14=";
|
sha256 = "sha256-MZdEdGfCaQp5DuDDYRNXi37O+O/aRS8XgAN0Jma/J3k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corepaint";
|
pname = "corepaint";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-uAFV3NKtgNri8GQLD+MRacl9WYMfkMVZcoVML+oSX78=";
|
sha256 = "sha256-wRF2Z2n9rEixmKYDRqKxQad2JDSxsgfGIWQWpjz/+yU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corepdf";
|
pname = "corepdf";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-VwJ3H/jNP3u5C+LATPUSftiWm89upx77fN3NqzTnU7Y=";
|
sha256 = "sha256-Dm3RDVHw1JXSC3HdS0k/IVTO/o5vaWiCr5vPDjr2uFk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corepins";
|
pname = "corepins";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-CVToPF8/Tw+n31/A0bzyBbwF7xPBVirsqVOUsM8QtH0=";
|
sha256 = "sha256-wrP9Jm3T9gzEwEjNH2SXSqwP/+YRxVIyQRSPxdYgPCs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corerenamer";
|
pname = "corerenamer";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-WrMyz8Noq0EeBIxL4mSl6e+8wrivmwfoa1yKBrSgrRI=";
|
sha256 = "sha256-hjI7KK+/u7OcqyjrZkRtBTfo8obDNqdudlFYcJR0dl8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "coreshot";
|
pname = "coreshot";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-wEpo/YINtKAYHqlGYytUPh9ndkvQBw3tRIlyjnKJaf8=";
|
sha256 = "sha256-K/K6630ctWG856igXF1fAukwu6FbsBzF8JxG8K3gICc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corestats";
|
pname = "corestats";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-154BZIKb6QDrTC4DXh4dbFtN/Lq0ok/qOrqTkXa+rAo=";
|
sha256 = "sha256-AhM7Rvxh8WZPrpDzhY6DYALVe4VlF9b77oX61AVntI0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "corestuff";
|
pname = "corestuff";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-snzW6cqxIyiXJLOD5MoEqmzen1aZN4IALESaIWIOMro=";
|
sha256 = "sha256-F0kddb622W44MDkZOh4YTyFQ+J/UGGbkcrWXCSDYcek=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -12,13 +12,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "coreterminal";
|
pname = "coreterminal";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-0gxcbfDD43BnkxYWSdViK3hjzfgPGFruwzF4hCxFZ7c=";
|
sha256 = "sha256-sFNKyqzNrPAGitmR8YEtIf6vtnvAP7+jXk4GFnDeGJs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "coretime";
|
pname = "coretime";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-MIcmgBfgyjEyJxXCq6IbQ/i6IdtL5cWVGpV2YZbzK58=";
|
sha256 = "sha256-XTX4oeUFwfZE0ey1NjXpAzw0x+4d8IGwU/sEojRwBBY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -30,13 +30,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "coretoppings";
|
pname = "coretoppings";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Yq57dY1zIuQN2Gj9haxJMomafL32B+/9v3lWlY9fvcc=";
|
sha256 = "sha256-3wLDTN3SrbQNs43nQmSBrSB0bD6YineBQ8eNPDws1G8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "coreuniverse";
|
pname = "coreuniverse";
|
||||||
version = "4.3.0";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore/coreapps";
|
owner = "cubocore/coreapps";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-KNjXrsm4OfBxida8mcAlKgomcpg0xJg51ZxEdhaiL84=";
|
sha256 = "sha256-ThEzuwBrPUkXURcW9KiXJs8ExqYWZamlfeQ1IggMWdc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,29 +1,31 @@
|
||||||
From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001
|
From a63a4b6de9ba730e10b54f4b5ce454edb10c7c39 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com>
|
From: dyrnade <gurescicem@gmail.com>
|
||||||
Date: Wed, 28 Jul 2021 02:26:39 +0300
|
Date: Wed, 1 Feb 2023 22:28:02 +0100
|
||||||
Subject: [PATCH] fix application dirs
|
Subject: [PATCH] fix application dirs
|
||||||
|
|
||||||
---
|
---
|
||||||
cprime/systemxdg.cpp | 6 ++++--
|
cprime/systemxdg.cpp | 7 ++++---
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp
|
diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp
|
||||||
index f9eee66..ea0553d 100644
|
index 4c40d4c..5dbb6ff 100644
|
||||||
--- a/cprime/systemxdg.cpp
|
--- a/cprime/systemxdg.cpp
|
||||||
+++ b/cprime/systemxdg.cpp
|
+++ b/cprime/systemxdg.cpp
|
||||||
@@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety
|
@@ -372,9 +372,10 @@ void SystemXdgMime::setApplicationAsDefault(QString appFileName, QString mimetyp
|
||||||
SystemXdgMime::SystemXdgMime() {
|
|
||||||
|
|
||||||
appsDirs << QDir::home().filePath( ".local/share/applications/" );
|
SystemXdgMime::SystemXdgMime()
|
||||||
|
{
|
||||||
|
- appsDirs << QDir::home().filePath(".local/share/applications/");
|
||||||
- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/";
|
- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/";
|
||||||
- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/";
|
- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/";
|
||||||
+ appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" );
|
+ appsDirs << QDir::home().filePath(".nix-profile/share/applications/");
|
||||||
+ appsDirs << "/run/current-system/sw/share/applications/";
|
+ appsDirs << "/run/current-system/sw/share/applications/";
|
||||||
+ appsDirs << "/run/current-system/sw/share/applications/kde4/";
|
+ appsDirs << "/run/current-system/sw/share/applications/kde4/";
|
||||||
+ appsDirs << "/run/current-system/sw/share/gnome/applications/";
|
+ appsDirs << "/run/current-system/sw/share/gnome/applications/";
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) {
|
|
||||||
--
|
--
|
||||||
2.32.0
|
2.39.0
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "libcprime";
|
pname = "libcprime";
|
||||||
version = "4.3.0";
|
version = "4.4.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore";
|
owner = "cubocore";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-+z5dXKaV2anN6OLMycEz87kDqQScgHHEKwGhDAdHSd4=";
|
sha256 = "sha256-6kkKmF9mARhSm93ZrWJiwRNmpkiCxyhSD3W7X3gYuu4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "libcsys";
|
pname = "libcsys";
|
||||||
version = "4.3.0";
|
version = "4.4.1";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cubocore";
|
owner = "cubocore";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-/iRFppe08+rMQNFjWSyxo3Noy0iNaelg0JAczg/BYBs=";
|
sha256 = "sha256-IWzgRwouI/0bQBuEd9CV0Ue6cF2HwRw3jMdLyGA1+TY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nut";
|
pname = "nut";
|
||||||
version = "2.7.4";
|
version = "2.8.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://networkupstools.org/source/2.7/${pname}-${version}.tar.gz";
|
url = "https://networkupstools.org/source/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq";
|
sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -13,16 +13,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "watchmate";
|
pname = "watchmate";
|
||||||
version = "0.4.2";
|
version = "0.4.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "azymohliad";
|
owner = "azymohliad";
|
||||||
repo = "watchmate";
|
repo = "watchmate";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-UHlHfDFTQapQcETCvtch72DqelfBYMymMD/zODFtr1c=";
|
hash = "sha256-LwtlI6WCOO24w8seUzyhCp51pfEiCM+iL6lu/J6v4PQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-QYw/am5cMVbRdx/XQ+lZv2Jo9Aiwd2ypUlo854sm7i4=";
|
cargoHash = "sha256-MD0eWZDpCevBY1Y3Gzgk13qCFtL7QOPDATv8MA+Q5go=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "kubelogin";
|
pname = "kubelogin";
|
||||||
version = "0.0.27";
|
version = "0.0.28";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Azure";
|
owner = "Azure";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-yC0J6uXL0W00o0BGIrrZ9WjThSgIu5fEgQdyH2vZESs=";
|
sha256 = "sha256-uIWlOVZIqwOSvFWRIWKTFEp0aToIBo1htUXb3F+njyI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-QGzaKtku7fm14ijmE68nqgqoX86IgmEsemlQltZECI0=";
|
vendorHash = "sha256-CVBpBb8yYkc6/yLPsCPbVhBHecqZ03WE0NcKiH8SGYs=";
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"-X main.version=${version}"
|
"-X main.version=${version}"
|
||||||
|
|
|
@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
beautifulsoup4
|
beautifulsoup4
|
||||||
click
|
click
|
||||||
colorama
|
colorama
|
||||||
|
commonmark
|
||||||
feedparser
|
feedparser
|
||||||
guessit
|
guessit
|
||||||
html5lib
|
html5lib
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sumo";
|
pname = "sumo";
|
||||||
version = "1.9.2";
|
version = "1.15.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "eclipse";
|
owner = "eclipse";
|
||||||
repo = "sumo";
|
repo = "sumo";
|
||||||
rev = "v${lib.replaceStrings ["."] ["_"] version}";
|
rev = "v${lib.replaceStrings ["."] ["_"] version}";
|
||||||
sha256 = "0zpd331vy1kfi4hfiszv3m8wl4m0wdfr3zzza200kkaakw5hjxhs";
|
sha256 = "sha256-Mm8Kqb5W9h2jYvRGypI6v5IHDm4CnAeT+NcJybdU5K0=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
, lib
|
, lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, addOpenGLRunpath
|
, addOpenGLRunpath
|
||||||
, docutils
|
, docutils
|
||||||
, meson
|
, meson
|
||||||
|
@ -93,6 +94,15 @@ in stdenv.mkDerivation (self: {
|
||||||
sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM=";
|
sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
# fixes EDL error on youtube DASH streams https://github.com/mpv-player/mpv/issues/11392
|
||||||
|
# to be removed on next release
|
||||||
|
url = "https://github.com/mpv-player/mpv/commit/94c189dae76ba280d9883b16346c3dfb9720687e.patch";
|
||||||
|
sha256 = "sha256-MGXU1L5OSxY5bdEpu9vHngnRXMr7WHeHWuamhjcUD4A=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs version.* ./TOOLS/
|
patchShebangs version.* ./TOOLS/
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "plex-mpv-shim";
|
pname = "plex-mpv-shim";
|
||||||
version = "1.10.3";
|
version = "1.11.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "iwalton3";
|
owner = "iwalton3";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r";
|
sha256 = "sha256-hUGKOJEDZMK5uhHoevFt1ay6QQEcoN4F8cPxln5uMRo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -11,13 +11,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "guile-ssh";
|
pname = "guile-ssh";
|
||||||
version = "0.16.2";
|
version = "0.16.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "artyom-poptsov";
|
owner = "artyom-poptsov";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-BDnLm5Q+69v8JbrfAn0+XMuWzRvCeUB/prfrKnvw5eY=";
|
sha256 = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ];
|
configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ];
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "clojure";
|
pname = "clojure";
|
||||||
version = "1.11.1.1252";
|
version = "1.11.1.1257";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# https://clojure.org/releases/tools
|
# https://clojure.org/releases/tools
|
||||||
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
|
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
|
||||||
sha256 = "sha256-ZQFhN/vO1L1kKmEC6wKT74qimR6ctkdoXrCFujobX6A=";
|
sha256 = "sha256-bZcJFtDOo8S2LQebsdTkgzlBVuZaKJUlUQX4F/qSq9A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bobcat";
|
pname = "bobcat";
|
||||||
version = "5.10.01";
|
version = "5.11.01";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
sha256 = "sha256-QhjUIaPSDAvOt0ZCzQWASpG+GJaTviosGDrzrckhuhs=";
|
sha256 = "sha256-JLJKaJmztputIon9JkKzpm3Ch60iwm4Imh9p42crYzA=";
|
||||||
domain = "gitlab.com";
|
domain = "gitlab.com";
|
||||||
rev = version;
|
rev = version;
|
||||||
repo = "bobcat";
|
repo = "bobcat";
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "drumstick";
|
pname = "drumstick";
|
||||||
version = "2.6.1";
|
version = "2.7.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
|
url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
|
||||||
hash = "sha256-5O9yD3MexorJUm5tv6oghDb4J/b3SO10mDQR9dT2jlA=";
|
hash = "sha256-Yb5SrXJ5ZK0IJ8XbnxAGLlfqKGOrfv2VET9Ba8dKItU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "freetds";
|
pname = "freetds";
|
||||||
version = "1.3.13";
|
version = "1.3.17";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
|
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
|
||||||
sha256 = "sha256-1M+QCUFR/c3aEo7RjLCmv2WzCL41K1NEmUO1JJxbSPI=";
|
sha256 = "sha256-+AzAGg71u+M+fLs3Au2SSqteJaxuzNk8lJ6H3+98WYQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
37
pkgs/development/libraries/json-fortran/default.nix
Normal file
37
pkgs/development/libraries/json-fortran/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
{ stdenv, lib, fetchFromGitHub, gfortran, cmake }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "json-fortran";
|
||||||
|
version = "8.3.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jacobwilliams";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-96W9bzWEZ3EN4wtnDT3G3pvLdcI4SIhGJWBVPU3rNZ4=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
gfortran
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DUSE_GNU_INSTALL_CONVENTION=ON"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Due to some misconfiguration in CMake the Fortran modules end up in $out/$out.
|
||||||
|
# Move them back to the desired location.
|
||||||
|
postInstall = ''
|
||||||
|
mv $out/$out/include $out/.
|
||||||
|
rm -r $out/nix
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Modern Fortran JSON API";
|
||||||
|
homepage = "https://github.com/jacobwilliams/json-fortran";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,47 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, gfortran
|
||||||
|
, blas
|
||||||
|
, lapack
|
||||||
|
, mctc-lib
|
||||||
|
, mstore
|
||||||
|
, multicharge
|
||||||
|
}:
|
||||||
|
|
||||||
|
assert !blas.isILP64 && !lapack.isILP64;
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "dftd4";
|
||||||
|
version = "3.5.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "dftd4";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-ZCoFbjTNQD7slq5sKwPRPkrHSHofsxU9C9h/bF5jmZI=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake gfortran ];
|
||||||
|
|
||||||
|
buildInputs = [ blas lapack mctc-lib mstore multicharge ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
substituteInPlace $out/lib/pkgconfig/${pname}.pc \
|
||||||
|
--replace "''${prefix}" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
preCheck = ''
|
||||||
|
export OMP_NUM_THREADS=2
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Generally Applicable Atomic-Charge Dependent London Dispersion Correction";
|
||||||
|
license = with licenses; [ lgpl3Plus gpl3Plus ];
|
||||||
|
homepage = "https://github.com/grimme-lab/dftd4";
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,39 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, gfortran
|
||||||
|
, pkg-config
|
||||||
|
, json-fortran
|
||||||
|
, cmake
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "mctc-lib";
|
||||||
|
version = "0.3.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "grimme-lab";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-AXjg/ZsitdDf9fNoGVmVal1iZ4/sxjJb7A9W4yye/rg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ gfortran pkg-config cmake ];
|
||||||
|
|
||||||
|
buildInputs = [ json-fortran ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
substituteInPlace $out/lib/pkgconfig/${pname}.pc \
|
||||||
|
--replace "''${prefix}" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Modular computation tool chain library";
|
||||||
|
homepage = "https://github.com/grimme-lab/mctc-lib";
|
||||||
|
license = licenses.asl20;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,36 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, gfortran
|
||||||
|
, mctc-lib
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "mstore";
|
||||||
|
version = "0.2.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "grimme-lab";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-dN2BulLS/ENRFVdJIrZRxgBV8S4d5+7BjTCGnhBbf4I=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake gfortran ];
|
||||||
|
|
||||||
|
buildInputs = [ mctc-lib ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
substituteInPlace $out/lib/pkgconfig/${pname}.pc \
|
||||||
|
--replace "''${prefix}" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Molecular structure store for testing";
|
||||||
|
license = licenses.asl20;
|
||||||
|
homepage = "https://github.com/grimme-lab/mstore";
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,46 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, gfortran
|
||||||
|
, blas
|
||||||
|
, lapack
|
||||||
|
, mctc-lib
|
||||||
|
, mstore
|
||||||
|
}:
|
||||||
|
|
||||||
|
assert !blas.isILP64 && !lapack.isILP64;
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "multicharge";
|
||||||
|
version = "0.2.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "grimme-lab";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-oUI5x5/Gd0EZBb1w+0jlJUF9X51FnkHFu8H7KctqXl0=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake gfortran ];
|
||||||
|
|
||||||
|
buildInputs = [ blas lapack mctc-lib mstore ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
substituteInPlace $out/lib/pkgconfig/${pname}.pc \
|
||||||
|
--replace "''${prefix}" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
preCheck = ''
|
||||||
|
export OMP_NUM_THREADS=2
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Electronegativity equilibration model for atomic partial charges";
|
||||||
|
license = licenses.asl20;
|
||||||
|
homepage = "https://github.com/grimme-lab/multicharge";
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,46 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, gfortran
|
||||||
|
, cmake
|
||||||
|
, mctc-lib
|
||||||
|
, mstore
|
||||||
|
, toml-f
|
||||||
|
, blas
|
||||||
|
}:
|
||||||
|
|
||||||
|
assert !blas.isILP64;
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "simple-dftd3";
|
||||||
|
version = "0.7.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "dftd3";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-5OvmMgjD8ujjKHkuw4NT8hEXKh5YPxuBl/Mu6g2/KIA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake gfortran ];
|
||||||
|
|
||||||
|
buildInputs = [ mctc-lib mstore toml-f blas ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
substituteInPlace $out/lib/pkgconfig/s-dftd3.pc \
|
||||||
|
--replace "''${prefix}" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
preCheck = ''
|
||||||
|
export OMP_NUM_THREADS=2
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Reimplementation of the DFT-D3 program";
|
||||||
|
license = with licenses; [lgpl3Only gpl3Only];
|
||||||
|
homepage = "https://github.com/dftd3/simple-dftd3";
|
||||||
|
platforms = [ "x86_64-linux" ];
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,59 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, gfortran
|
||||||
|
, blas
|
||||||
|
, lapack
|
||||||
|
, mctc-lib
|
||||||
|
, mstore
|
||||||
|
, toml-f
|
||||||
|
, multicharge
|
||||||
|
, dftd4
|
||||||
|
, simple-dftd3
|
||||||
|
}:
|
||||||
|
|
||||||
|
assert !blas.isILP64 && !lapack.isILP64;
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "tblite";
|
||||||
|
version = "0.3.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "tblite";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-R7CAFG/x55k5Ieslxeq+DWq1wPip4cI+Yvn1cBbeVNs=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ cmake gfortran ];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
blas
|
||||||
|
lapack
|
||||||
|
mctc-lib
|
||||||
|
mstore
|
||||||
|
toml-f
|
||||||
|
multicharge
|
||||||
|
dftd4
|
||||||
|
simple-dftd3
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
preCheck = ''
|
||||||
|
export OMP_NUM_THREADS=2
|
||||||
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
substituteInPlace $out/lib/pkgconfig/${pname}.pc \
|
||||||
|
--replace "''${prefix}" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Light-weight tight-binding framework";
|
||||||
|
license = with licenses; [ gpl3Plus lgpl3Plus ];
|
||||||
|
homepage = "https://github.com/tblite/tblite";
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,28 @@
|
||||||
|
{ buildPythonPackage
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, pkg-config
|
||||||
|
, tblite
|
||||||
|
, cffi
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
inherit (tblite) pname version src meta;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||||
|
|
||||||
|
buildInputs = [ tblite ];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ cffi ];
|
||||||
|
|
||||||
|
format = "other";
|
||||||
|
|
||||||
|
configurePhase = ''
|
||||||
|
runHook preConfigure
|
||||||
|
|
||||||
|
meson setup build python --prefix=$out
|
||||||
|
cd build
|
||||||
|
|
||||||
|
runHook postConfigure
|
||||||
|
'';
|
||||||
|
}
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "suitesparse-graphblas";
|
pname = "suitesparse-graphblas";
|
||||||
version = "7.2.0";
|
version = "7.4.3";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "DrTimothyAldenDavis";
|
owner = "DrTimothyAldenDavis";
|
||||||
repo = "GraphBLAS";
|
repo = "GraphBLAS";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-N3TBuKWQRisXE5DQ0c+N2cv0darQ8mz4g2oe7pKst9E=";
|
sha256 = "sha256-myUaSzBlt34L3UJDKB9VXetaPCc3SZCzpbsSn1j+MPw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
32
pkgs/development/libraries/test-drive/default.nix
Normal file
32
pkgs/development/libraries/test-drive/default.nix
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
{ stdenv, lib, fetchFromGitHub, gfortran, cmake }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "test-drive";
|
||||||
|
version = "0.4.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "fortran-lang";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-ObAnHFP1Hp0knf/jtGHynVF0CCqK47eqetePx4NLmlM=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace config/template.pc \
|
||||||
|
--replace 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' "libdir=@CMAKE_INSTALL_LIBDIR@" \
|
||||||
|
--replace 'includedir=''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
gfortran
|
||||||
|
cmake
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Procedural Fortran testing framework";
|
||||||
|
homepage = "https://github.com/fortran-lang/test-drive";
|
||||||
|
license = with licenses; [ asl20 mit ] ;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
38
pkgs/development/libraries/toml-f/default.nix
Normal file
38
pkgs/development/libraries/toml-f/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, gfortran
|
||||||
|
, cmake
|
||||||
|
, test-drive
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "toml-f";
|
||||||
|
version = "0.3.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = pname;
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-8FbnUkeJUP4fiuJCroAVDo6U2M7ZkFLpG2OYrapMYtU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ gfortran cmake ];
|
||||||
|
|
||||||
|
buildInputs = [ test-drive ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
substituteInPlace $out/lib/pkgconfig/${pname}.pc \
|
||||||
|
--replace "''${prefix}/" ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "TOML parser implementation for data serialization and deserialization in Fortran";
|
||||||
|
license = with licenses; [ asl20 mit ];
|
||||||
|
homepage = "https://github.com/toml-f/toml-f";
|
||||||
|
platforms = [ "x86_64-linux" ];
|
||||||
|
maintainers = [ maintainers.sheepforce ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,12 +1,12 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, gtest }:
|
{ lib, stdenv, fetchFromGitHub, cmake, gtest }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xsimd";
|
pname = "xsimd";
|
||||||
version = "8.1.0";
|
version = "9.0.1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xtensor-stack";
|
owner = "xtensor-stack";
|
||||||
repo = "xsimd";
|
repo = "xsimd";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-Aqs6XJkGjAjGAp0PprabSM4m+32M/UXpSHppCHdzaZk=";
|
sha256 = "sha256-onALN6agtrHWigtFlCeefD9CiRZI4Y690XTzy2UDnrk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -1,30 +1,46 @@
|
||||||
{ lib, buildPythonPackage, fetchFromGitHub, glfw3 }:
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, glfw3
|
||||||
|
, pythonOlder
|
||||||
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "glfw";
|
pname = "glfw";
|
||||||
version = "2.5.6";
|
version = "2.5.7";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "FlorianRhiem";
|
owner = "FlorianRhiem";
|
||||||
repo = "pyGLFW";
|
repo = "pyGLFW";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-zusVOhZfJyUpftvrUSLZJl7mG5AEGMLGXMOojFnEsH0=";
|
hash = "sha256-tB9qoGIUb0KgD7SQIV7nP5/fWKY/LrP/lQbljfVqiXw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Patch path to GLFW shared object
|
# Patch path to GLFW shared object
|
||||||
patches = [ ./search-path.patch ];
|
patches = [ ./search-path.patch ];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace glfw/library.py --replace "@GLFW@" '${glfw3}/lib'
|
substituteInPlace glfw/library.py --replace "@GLFW@" '${glfw3}/lib'
|
||||||
'';
|
'';
|
||||||
propagatedBuildInputs = [ glfw3 ];
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
glfw3
|
||||||
|
];
|
||||||
|
|
||||||
# Project has no tests
|
# Project has no tests
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
pythonImportsCheck = [ "glfw" ];
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"glfw"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python bindings for GLFW";
|
description = "Python bindings for GLFW";
|
||||||
homepage = "https://github.com/FlorianRhiem/pyGLFW";
|
homepage = "https://github.com/FlorianRhiem/pyGLFW";
|
||||||
|
changelog = "https://github.com/FlorianRhiem/pyGLFW/blob/v${version}/CHANGELOG.md";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = [ maintainers.McSinyx ];
|
maintainers = [ maintainers.McSinyx ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -28,14 +28,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-bigquery";
|
pname = "google-cloud-bigquery";
|
||||||
version = "3.6.0";
|
version = "3.7.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-WIbBTykJcVjVmvp0pnMtvdWD5u8w3Jk0pWrVMpBt41Y=";
|
hash = "sha256-z59UP606r0hxxT9Wtxjh75Spp3ixfxaJABX2/CXDKOw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -9,14 +9,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "moderngl";
|
pname = "moderngl";
|
||||||
version = "5.8.0";
|
version = "5.8.1";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-eudtjF6NanAFFDHqHOVLfcBBX02mpIIPW3gqvZV7Dds=";
|
hash = "sha256-li7QA9jXZL0z4C508bOxwMdaG5L1HwONKhMJwG9OXLg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
39
pkgs/development/python-modules/tlv8/default.nix
Normal file
39
pkgs/development/python-modules/tlv8/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pytestCheckHook
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "tlv8";
|
||||||
|
version = "0.10.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
# pypi does not contain test files
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jlusiardi";
|
||||||
|
repo = "tlv8_python";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-G35xMFYasKD3LnGi9q8wBmmFvqgtg0HPdC+y82nxRWA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"tlv8"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Type-Length-Value8 (TLV8) for Python";
|
||||||
|
longDescription = ''
|
||||||
|
Python module to handle type-length-value (TLV) encoded data 8-bit type, 8-bit length, and N-byte
|
||||||
|
value as described within the Apple HomeKit Accessory Protocol Specification Non-Commercial Version
|
||||||
|
Release R2.
|
||||||
|
'';
|
||||||
|
homepage = "https://github.com/jlusiardi/tlv8_python";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = with maintainers; [ jojosch ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "transmission-rpc";
|
pname = "transmission-rpc";
|
||||||
version = "4.1.0";
|
version = "4.1.3";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||||
owner = "Trim21";
|
owner = "Trim21";
|
||||||
repo = "transmission-rpc";
|
repo = "transmission-rpc";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-LHxB3VkpUlDupqOybvnhW8ER1gvu4vex6dT3m9y0r4o=";
|
hash = "sha256-GF2dXvtYgXTjdcellyCPFFTjp4Y6PKb2ihQETfomgU4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "trimesh";
|
pname = "trimesh";
|
||||||
version = "3.20.1";
|
version = "3.20.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-UUkzHQoRCC7SmQgA4uz09J/KRxizr5LhwCYobINY1gc=";
|
hash = "sha256-6tSrWovgVTEccDelUFrw8E1ghyiPmUsEASW8kGPUBhM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ numpy ];
|
propagatedBuildInputs = [ numpy ];
|
||||||
|
|
|
@ -23,14 +23,14 @@ with py.pkgs;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "checkov";
|
pname = "checkov";
|
||||||
version = "2.3.95";
|
version = "2.3.96";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bridgecrewio";
|
owner = "bridgecrewio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-M7Qy7+yh1LZlMq3cN5HJ2IHea4qBlLr7ckT0v/PuunI=";
|
hash = "sha256-jQ5VaOvJkxhZ0fHrNmkuFK+qmRUNdzR5XCWqWv1iBs4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -114,7 +114,7 @@ buildPythonApplication rec {
|
||||||
# Tests are comparing console output
|
# Tests are comparing console output
|
||||||
"cli"
|
"cli"
|
||||||
"console"
|
"console"
|
||||||
# Starting to fail after 2.3.95
|
# Starting to fail after 2.3.96
|
||||||
"test_runner_verify_secrets_skip"
|
"test_runner_verify_secrets_skip"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,21 @@
|
||||||
{
|
{
|
||||||
"version": "0.2.0",
|
"version": "0.2.1",
|
||||||
"assets": {
|
"assets": {
|
||||||
"aarch64-darwin": {
|
"aarch64-darwin": {
|
||||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||||
"sha256": "0fv4ph1pf924wf3vmzri68s79i4kxgmp2fl9qy9v14ff71bbnyv5"
|
"sha256": "184ywxdqn729pjnhmy3y02j9zwvy89a4g95wng35j0wdlyrv7j1f"
|
||||||
},
|
},
|
||||||
"aarch64-linux": {
|
"aarch64-linux": {
|
||||||
"asset": "scala-cli-aarch64-pc-linux.gz",
|
"asset": "scala-cli-aarch64-pc-linux.gz",
|
||||||
"sha256": "1h5kvd1wf6x3xis15bdrsvrivs8zmbvggcaspr9brsjw38q13c7q"
|
"sha256": "0g55svbzy7nlrs7hn6lfn428zndahcln34p2szf6yx180h56irns"
|
||||||
},
|
},
|
||||||
"x86_64-darwin": {
|
"x86_64-darwin": {
|
||||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||||
"sha256": "1p4gkghbfs5cac4k7760nnsdf7m5i5d4f568m8xsyfx8nkhpyw1w"
|
"sha256": "1hm0gf4bq4hhnd54rlzpv6sbl1vyp6gzsswc8kyk7f31mzazqg14"
|
||||||
},
|
},
|
||||||
"x86_64-linux": {
|
"x86_64-linux": {
|
||||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||||
"sha256": "0xk4n71lgg91kkjk0633sz04s2ypyjkig9vsxg60b16gzm7z4j22"
|
"sha256": "1v7hbr1wk89wzvdja2pdzridrdvw6vsb7qfsqx8fl6xi613wn66p"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,13 +8,13 @@ with python3.pkgs;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "nrfutil";
|
pname = "nrfutil";
|
||||||
version = "6.1.6";
|
version = "6.1.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NordicSemiconductor";
|
owner = "NordicSemiconductor";
|
||||||
repo = "pc-nrfutil";
|
repo = "pc-nrfutil";
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-UiGNNJxNSpIzpeYMlzocLG2kuetl8xti5A3n6zz0lcY=";
|
sha256 = "sha256-WiXqeQObhXszDcLxJN8ABd2ZkxsOUvtZQSVP8cYlT2M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -7,16 +7,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "rain";
|
pname = "rain";
|
||||||
version = "1.2.0";
|
version = "1.3.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aws-cloudformation";
|
owner = "aws-cloudformation";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-6YKZy6sdy1Yi2cDaLMA54GBTZ9uPhYi5Cq5QqCGbD5k=";
|
sha256 = "sha256-34BHWvXwwdiFotVlV8U6HSkRy9TvJ6DLIC0Mpz//C3w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-e3R8+xarofbx3Ky6JIfDbysTQETCUaQj/QmzAiU7fZk=";
|
vendorHash = "sha256-h/9a+o/jiNH2b1XIkbnKXSpCsBtyIhdOGyTNHU+Q/bA=";
|
||||||
|
|
||||||
subPackages = [ "cmd/rain" ];
|
subPackages = [ "cmd/rain" ];
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jitsi-meet-prosody";
|
pname = "jitsi-meet-prosody";
|
||||||
version = "1.0.6644";
|
version = "1.0.6943";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||||
sha256 = "41jlcsJpcFlNdBIOAdzTUF3wOUAOS9upF/uxFQaGULc=";
|
sha256 = "MrLRA0XdaDWD7frh4XDXLTcjsAYWal5qwT5C6cq4MKc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "slurm";
|
pname = "slurm";
|
||||||
version = "22.05.8.1";
|
version = "23.02.0.1";
|
||||||
|
|
||||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||||
# because the latter does not keep older releases.
|
# because the latter does not keep older releases.
|
||||||
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||||
repo = "slurm";
|
repo = "slurm";
|
||||||
# The release tags use - instead of .
|
# The release tags use - instead of .
|
||||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||||
sha256 = "sha256-hL/FnHl+Fj62xGH1FVkB9jVtvrVxbPU73DlMWC6CyJ0=";
|
sha256 = "sha256-MxlrDLdPKtYF2xpX2q0i0DHinEL6BIzIGAxqTwWX/k0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
|
@ -13,10 +13,10 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jibri";
|
pname = "jibri";
|
||||||
version = "8.0-139-g7ab9aa2";
|
version = "8.0-140-gccc7278";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||||
sha256 = "14V5khp6S9T3SWiNfKyxn2WCzwhcXDCRDtATa15p01M=";
|
sha256 = "TiKCK41ar3X1aOrGitnNBr/iWru1HOjjGkwLBB76M1M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "jicofo";
|
pname = "jicofo";
|
||||||
version = "1.0-940";
|
version = "1.0-987";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||||
sha256 = "vx7aUHfKxG+tZ0sM8eWr1tTKf//bMxdKVhE5I4P4mLo=";
|
sha256 = "VK4Ck+OU6xv/Lma4YpXduPThej2wopbs+OkBC2SOkJU=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "jitsi-videobridge2";
|
pname = "jitsi-videobridge2";
|
||||||
version = "2.2-45-ge8b20f06";
|
version = "2.2-69-gad606ca2";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||||
sha256 = "fbSpjLdx9xbLdp7vzHTW9B/cDf3DahpwuI4IcqEqpas=";
|
sha256 = "+5fcxUiCMy45CdDuORU5Xo//f4iAAJEzt1gO+fKU43c=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "klipper";
|
pname = "klipper";
|
||||||
version = "unstable-2023-02-03";
|
version = "unstable-2023-02-20";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "KevinOConnor";
|
owner = "KevinOConnor";
|
||||||
repo = "klipper";
|
repo = "klipper";
|
||||||
rev = "5644481590a16ac5b3d8c20874f0477d5d51a963";
|
rev = "848a78d1a548cfe28af20d5d0ab021558368cfae";
|
||||||
sha256 = "sha256-OGFVcUPw0sqTbJyrMvCxp8nER9/42ZRN4zIrpm/qh4E=";
|
sha256 = "sha256-pSuGNBvLBJ64pm4hECign2FhtAPx6xnXlhCa2eFzrwE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "source/klippy";
|
sourceRoot = "source/klippy";
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jitsi-meet";
|
pname = "jitsi-meet";
|
||||||
version = "1.0.6644";
|
version = "1.0.6943";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2";
|
||||||
sha256 = "y1oI3nxIu7breYNPhdX7PU5GfnCyxdEbAYlyZmif2Uo=";
|
sha256 = "4swWsCo6PmMzvSVY6vS5n2HH8o6pU+Ak37ng18BLqIk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
|
@ -5,13 +5,13 @@ with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "grml-zsh-config";
|
pname = "grml-zsh-config";
|
||||||
version = "0.19.4";
|
version = "0.19.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "grml";
|
owner = "grml";
|
||||||
repo = "grml-etc-core";
|
repo = "grml-etc-core";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-2TAhs2/yAVAU35IeVfT/68xLt9QZ4fLxMQjxnbCfBKs=";
|
sha256 = "sha256-/phoIi8amqdO+OK26+CE2OXwHTE71PaV9NIXEnGl6Co=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -174,10 +174,10 @@
|
||||||
|
|
||||||
for fname in language.{dat,def,dat.lua} ; do
|
for fname in language.{dat,def,dat.lua} ; do
|
||||||
diff --ignore-matching-lines='^\(%\|--\) Generated by ' -u \
|
diff --ignore-matching-lines='^\(%\|--\) Generated by ' -u \
|
||||||
{"$hyphenBase","$schemeFull"/share/texmf}/tex/generic/config/"$fname" \
|
{"$hyphenBase","$schemeFull"/share/texmf-var}/tex/generic/config/"$fname" \
|
||||||
| tee "$out/scheme-full/$fname.patch"
|
| tee "$out/scheme-full/$fname.patch"
|
||||||
diff --ignore-matching-lines='^\(%\|--\) Generated by ' -u \
|
diff --ignore-matching-lines='^\(%\|--\) Generated by ' -u \
|
||||||
{,"$schemeInfraOnly"/share/texmf/tex/generic/config/}"$fname" \
|
{,"$schemeInfraOnly"/share/texmf-var/tex/generic/config/}"$fname" \
|
||||||
| tee "$out/scheme-infraonly/$fname.patch"
|
| tee "$out/scheme-infraonly/$fname.patch"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
@ -190,7 +190,7 @@
|
||||||
mkdir -p "$out"
|
mkdir -p "$out"
|
||||||
|
|
||||||
diff --ignore-matching-lines='^# Generated by ' -u \
|
diff --ignore-matching-lines='^# Generated by ' -u \
|
||||||
{"$kpathsea","$schemeFull"/share/texmf}/web2c/fmtutil.cnf \
|
{"$kpathsea","$schemeFull"/share/texmf-var}/web2c/fmtutil.cnf \
|
||||||
| tee "$out/fmtutil.cnf.patch"
|
| tee "$out/fmtutil.cnf.patch"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xmousepasteblock";
|
pname = "xmousepasteblock";
|
||||||
version = "1.0";
|
version = "1.3";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "milaq";
|
owner = "milaq";
|
||||||
repo = "XMousePasteBlock";
|
repo = "XMousePasteBlock";
|
||||||
sha256 = "0vidckfp277cg2gsww8a8q5b18m10iy4ppyp2qipr89771nrcmns";
|
hash = "sha256-0rpAbYUU0SoeQaVNStmIEuYyiWbRAdTN7Mvm0ySDnhU=";
|
||||||
rev = version;
|
rev = version;
|
||||||
};
|
};
|
||||||
makeFlags = [ "PREFIX=$(out)" ];
|
makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||||
buildInputs = with xorg; [ libX11 libXext libXi libev ];
|
buildInputs = with xorg; [ libX11 libXext libXi libev ];
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -69,11 +69,11 @@ let
|
||||||
'';
|
'';
|
||||||
in buildPythonApplication rec {
|
in buildPythonApplication rec {
|
||||||
pname = "xpra";
|
pname = "xpra";
|
||||||
version = "4.4.3";
|
version = "4.4.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://xpra.org/src/${pname}-${version}.tar.xz";
|
url = "https://xpra.org/src/${pname}-${version}.tar.xz";
|
||||||
hash = "sha256-j7tHT486ylyWAmR34BBWw9+HbDPnYMvHU88HV+Cs1w8=";
|
hash = "sha256-oPa9ECqCE9+PrcZufsHWYR6EHxTZVFJOMUlK2b0mwLE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, qmake
|
, qmake
|
||||||
, vulkan-loader
|
, vulkan-loader
|
||||||
|
, wayland
|
||||||
, wrapQtAppsHook
|
, wrapQtAppsHook
|
||||||
, withX11 ? true
|
, withX11 ? true
|
||||||
, qtx11extras
|
, qtx11extras
|
||||||
|
@ -10,13 +11,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vulkan-caps-viewer";
|
pname = "vulkan-caps-viewer";
|
||||||
version = "3.28";
|
version = "3.29";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "SaschaWillems";
|
owner = "SaschaWillems";
|
||||||
repo = "VulkanCapsViewer";
|
repo = "VulkanCapsViewer";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-gy0gFbPZAwQJHqJvk7WrbZ5y2I+9BGv9VaCoOW1QPek=";
|
hash = "sha256-c7jvlwvz85cf8lUlBPyRYvDkSlvkzSW6Jc6wlyKnHBc=";
|
||||||
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
|
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
|
||||||
# To help us, they've put it in a git-submodule.
|
# To help us, they've put it in a git-submodule.
|
||||||
# The result will work with any vulkan-loader version.
|
# The result will work with any vulkan-loader version.
|
||||||
|
@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
|
wayland
|
||||||
] ++ lib.lists.optionals withX11 [ qtx11extras ];
|
] ++ lib.lists.optionals withX11 [ qtx11extras ];
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
|
@ -38,9 +40,8 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
qmakeFlags = [
|
qmakeFlags = [
|
||||||
"DEFINES+=wayland"
|
|
||||||
"CONFIG+=release"
|
"CONFIG+=release"
|
||||||
] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ];
|
];
|
||||||
|
|
||||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||||
|
|
||||||
|
|
|
@ -6,11 +6,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bandwidth";
|
pname = "bandwidth";
|
||||||
version = "1.11.2";
|
version = "1.11.2d";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://zsmith.co/archives/${pname}-${version}.tar.gz";
|
url = "https://zsmith.co/archives/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-mjtvQAOH9rv12XszGdD5hIX197er7Uc74WfVaP32TpM=";
|
hash = "sha256-7IrNiCXKf1vyRGl73Ccu3aYMqPVc4PpEr6lnSqIa4Q8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
|
||||||
# Fix missing symbol exports for macOS clang
|
# Fix missing symbol exports for macOS clang
|
||||||
echo global _VectorToVector128 >> routines-x86-64bit.asm
|
echo global _VectorToVector128 >> routines-x86-64bit.asm
|
||||||
echo global _VectorToVector256 >> routines-x86-64bit.asm
|
echo global _VectorToVector256 >> routines-x86-64bit.asm
|
||||||
|
# Fix unexpected token on macOS
|
||||||
|
sed -i '/.section .note.GNU-stack/d' *-64bit.asm
|
||||||
|
sed -i '/.section code/d' *-arm-64bit.asm
|
||||||
|
sed -i 's#-Wl,-z,noexecstack##g' Makefile-arm64
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ nasm ];
|
nativeBuildInputs = [ nasm ];
|
||||||
|
|
|
@ -16,11 +16,11 @@ let
|
||||||
in
|
in
|
||||||
tcl.mkTclDerivation rec {
|
tcl.mkTclDerivation rec {
|
||||||
pname = "remind";
|
pname = "remind";
|
||||||
version = "04.02.01";
|
version = "04.02.03";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
||||||
sha256 = "sha256-RknG1SyKKYSMLWihR2GM8MVROJx0E0E1gD+vSLv6uk0=";
|
sha256 = "sha256-0hY/ee3+ErqPNucD1ZcisK7WbzT7dmV/9vQKus/sOgA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = tclLibraries;
|
propagatedBuildInputs = tclLibraries;
|
||||||
|
|
87
pkgs/tools/misc/tkman/default.nix
Normal file
87
pkgs/tools/misc/tkman/default.nix
Normal file
|
@ -0,0 +1,87 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchzip
|
||||||
|
, fetchpatch
|
||||||
|
, makeWrapper
|
||||||
|
, makeDesktopItem
|
||||||
|
, copyDesktopItems
|
||||||
|
, tk
|
||||||
|
, groff
|
||||||
|
, rman
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "tkman";
|
||||||
|
version = "2.2";
|
||||||
|
|
||||||
|
src = fetchzip {
|
||||||
|
url = "mirror://sourceforge/tkman/tkman-${version}.tar.gz";
|
||||||
|
hash = "sha256-S4ffz+7zmVy9+isz/8q+FV4wF5Rw2iL1ftY8RsJjRLs=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
makeWrapper
|
||||||
|
copyDesktopItems
|
||||||
|
];
|
||||||
|
|
||||||
|
patches = [(fetchpatch {
|
||||||
|
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/tkman/files/tkman-CVE-2008-5137.diff";
|
||||||
|
hash = "sha256-l97SY2/YnMgzHYKnVYCVJKV7oGLN1hXNpeHFlLVzTMA=";
|
||||||
|
})];
|
||||||
|
|
||||||
|
makeFlags = [
|
||||||
|
"BINDIR=$(out)/bin"
|
||||||
|
"WISH=${tk}/bin/wish"
|
||||||
|
"rman=${rman}/bin/rman"
|
||||||
|
# TODO package glimpse https://github.com/gvelez17/glimpse
|
||||||
|
"glimpse=\"\""
|
||||||
|
];
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
makeFlagsArray+=(
|
||||||
|
'manformat="${groff}/bin/groff -te -Tlatin1 -mandoc $$manx(longtmp) -"'
|
||||||
|
)
|
||||||
|
'';
|
||||||
|
|
||||||
|
preInstall = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram $out/bin/tkman \
|
||||||
|
--run 'export MANPATH="$(manpath)"'
|
||||||
|
rm $out/bin/retkman # doesn't work
|
||||||
|
install -Dm644 contrib/TkMan.gif $out/share/icons/hicolor/64x64/apps/tkman.gif
|
||||||
|
'';
|
||||||
|
|
||||||
|
desktopItems = [(makeDesktopItem {
|
||||||
|
name = "tkman";
|
||||||
|
desktopName = "TkMan";
|
||||||
|
comment = "Graphical man page and info viewer";
|
||||||
|
exec = "tkman %f";
|
||||||
|
icon = "tkman";
|
||||||
|
terminal = false;
|
||||||
|
type = "Application";
|
||||||
|
categories = [ "Utility" ];
|
||||||
|
})];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Graphical, hypertext manual page and Texinfo browser for UNIX";
|
||||||
|
longDescription = ''
|
||||||
|
TkMan is a graphical, hypertext manual page and Texinfo browser for UNIX.
|
||||||
|
TkMan boasts hypertext links, unmatched online text formatting and display
|
||||||
|
quality, (optional) outline view of man pages, high quality display and
|
||||||
|
superior navigational interface to Texinfo documents, a novel information
|
||||||
|
visualization mechanism called Notemarks, full text search among man pages
|
||||||
|
and Texinfo, incremental and regular expression search within pages,
|
||||||
|
regular expression search within Texinfo that shows all matches (not just
|
||||||
|
the next), robustly attached yellow highlight annotations, a shortcut/hot
|
||||||
|
list, lists of all pages in user configurable volumes, a comprehensive
|
||||||
|
Preferences panel, and man page versioning support, among many other features.
|
||||||
|
'';
|
||||||
|
homepage = "https://tkman.sourceforge.net/index.html";
|
||||||
|
license = licenses.artistic1;
|
||||||
|
platforms = platforms.unix;
|
||||||
|
maintainers = with maintainers; [ fgaz ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -11,11 +11,11 @@ assert enableCurrenciesUpdater -> pythonPackages != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "units";
|
pname = "units";
|
||||||
version = "2.21";
|
version = "2.22";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/units/${pname}-${version}.tar.gz";
|
url = "mirror://gnu/units/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-bD6AqfmAWJ/ZYqWFKiZ0ZCJX2xxf1bJ8TZ5mTzSGy68=";
|
sha256 = "sha256-XRPhIHch/ncm2Qa6HZLcDt2qn8JnWe0i47jRp5MSWEg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonEnv = pythonPackages.python.withPackages(ps: [
|
pythonEnv = pythonPackages.python.withPackages(ps: [
|
||||||
|
|
|
@ -4,12 +4,12 @@ with python3Packages;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "pynitrokey";
|
pname = "pynitrokey";
|
||||||
version = "0.4.27";
|
version = "0.4.31";
|
||||||
format = "flit";
|
format = "flit";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-aWQhMvATcDtyBtj38mGnypkKIqKQgneBzWDh5o/5Wkc=";
|
sha256 = "sha256-nqw5wUzQxKCBzYBRhqB6v7WWrF1Ojf8z6Kf1YUA9+wU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -29,13 +29,18 @@ buildPythonApplication rec {
|
||||||
cffi
|
cffi
|
||||||
cbor
|
cbor
|
||||||
nkdfu
|
nkdfu
|
||||||
|
fido2
|
||||||
|
tlv8
|
||||||
];
|
];
|
||||||
|
|
||||||
# spsdk is patched to allow for newer cryptography
|
nativeBuildInputs = [
|
||||||
postPatch = ''
|
pythonRelaxDepsHook
|
||||||
substituteInPlace pyproject.toml \
|
];
|
||||||
--replace "cryptography >=3.4.4,<37" "cryptography"
|
|
||||||
'';
|
pythonRelaxDeps = [
|
||||||
|
"cryptography"
|
||||||
|
"spsdk"
|
||||||
|
];
|
||||||
|
|
||||||
# no tests
|
# no tests
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
@ -38,16 +38,44 @@ let
|
||||||
mkUniqueOutPaths = pkgs: lib.unique
|
mkUniqueOutPaths = pkgs: lib.unique
|
||||||
(map (p: p.outPath) (builtins.filter lib.isDerivation pkgs));
|
(map (p: p.outPath) (builtins.filter lib.isDerivation pkgs));
|
||||||
|
|
||||||
in (buildEnv {
|
|
||||||
name = "texlive-${extraName}-${bin.texliveYear}${extraVersion}";
|
name = "texlive-${extraName}-${bin.texliveYear}${extraVersion}";
|
||||||
|
|
||||||
extraPrefix = "/share/texmf";
|
texmf = (buildEnv {
|
||||||
|
name = "${name}-texmf";
|
||||||
|
|
||||||
|
paths = pkgList.nonbin;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ perl bin.core.out ];
|
||||||
|
|
||||||
|
postBuild = # generate ls-R database
|
||||||
|
''
|
||||||
|
perl -I "${bin.core.out}/share/texmf-dist/scripts/texlive" \
|
||||||
|
-- "$out/scripts/texlive/mktexlsr.pl" --sort "$out"
|
||||||
|
'';
|
||||||
|
}).overrideAttrs (_: { allowSubstitutes = true; });
|
||||||
|
|
||||||
|
# expose info and man pages in usual /share/{info,man} location
|
||||||
|
doc = buildEnv {
|
||||||
|
name = "${name}-doc";
|
||||||
|
|
||||||
|
paths = [ (texmf.outPath + "/doc") ];
|
||||||
|
extraPrefix = "/share";
|
||||||
|
|
||||||
|
pathsToLink = [
|
||||||
|
"/info"
|
||||||
|
"/man"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
in (buildEnv {
|
||||||
|
|
||||||
|
inherit name;
|
||||||
|
|
||||||
ignoreCollisions = false;
|
ignoreCollisions = false;
|
||||||
paths = pkgList.nonbin;
|
paths = pkgList.bin ++ [ doc ];
|
||||||
pathsToLink = [
|
pathsToLink = [
|
||||||
"/"
|
"/"
|
||||||
"/tex/generic/config" # make it a real directory for scheme-infraonly
|
"/bin" # ensure these are writeable directories
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper libfaketime perl bin.texlinks ];
|
nativeBuildInputs = [ makeWrapper libfaketime perl bin.texlinks ];
|
||||||
|
@ -57,54 +85,40 @@ in (buildEnv {
|
||||||
passthru.packages = pkgList.all;
|
passthru.packages = pkgList.all;
|
||||||
|
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
mkdir -p "$out"/bin
|
TEXMFDIST="${texmf}"
|
||||||
'' +
|
export PATH="$out/bin:$PATH"
|
||||||
lib.concatMapStrings
|
export PERL5LIB="$TEXMFDIST/scripts/texlive:${bin.core.out}/share/texmf-dist/scripts/texlive"
|
||||||
(path: ''
|
|
||||||
for f in '${path}'/bin/*; do
|
|
||||||
if [[ -L "$f" ]]; then
|
|
||||||
cp -d "$f" "$out"/bin/
|
|
||||||
else
|
|
||||||
ln -s "$f" "$out"/bin/
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
'')
|
|
||||||
pkgList.bin
|
|
||||||
+
|
|
||||||
''
|
|
||||||
export PATH="$out/bin:$out/share/texmf/scripts/texlive:$PATH"
|
|
||||||
export TEXMFCNF="$out/share/texmf/web2c"
|
|
||||||
TEXMFSYSCONFIG="$out/share/texmf-config"
|
TEXMFSYSCONFIG="$out/share/texmf-config"
|
||||||
TEXMFSYSVAR="$out/share/texmf-var"
|
TEXMFSYSVAR="$out/share/texmf-var"
|
||||||
export PERL5LIB="$out/share/texmf/scripts/texlive:${bin.core.out}/share/texmf-dist/scripts/texlive"
|
export TEXMFCNF="$TEXMFSYSVAR/web2c"
|
||||||
'' +
|
'' +
|
||||||
# patch texmf-dist -> $out/share/texmf
|
# patch texmf-dist -> $TEXMFDIST
|
||||||
# patch texmf-local -> $out/share/texmf-local
|
# patch texmf-local -> $out/share/texmf-local
|
||||||
|
# patch texmf.cnf -> $TEXMFSYSVAR/web2c/texmf.cnf
|
||||||
# TODO: perhaps do lua actions?
|
# TODO: perhaps do lua actions?
|
||||||
# tried inspiration from install-tl, sub do_texmf_cnf
|
# tried inspiration from install-tl, sub do_texmf_cnf
|
||||||
''
|
''
|
||||||
if [ -e "$TEXMFCNF/texmfcnf.lua" ]; then
|
mkdir -p "$TEXMFCNF"
|
||||||
|
if [ -e "$TEXMFDIST/web2c/texmfcnf.lua" ]; then
|
||||||
sed \
|
sed \
|
||||||
-e 's,texmf-dist,texmf,g' \
|
-e "s,\(TEXMFDIST[ ]*=[ ]*\)[^\,]*,\1\"$TEXMFDIST\",g" \
|
||||||
-e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf-local\",g" \
|
-e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf-local\",g" \
|
||||||
-e "s,\$SELFAUTOLOC,$out,g" \
|
-e "s,\$SELFAUTOLOC,$out,g" \
|
||||||
-e "s,selfautodir:/,$out/share/,g" \
|
-e "s,selfautodir:/,$out/share/,g" \
|
||||||
-e "s,selfautodir:,$out/share/,g" \
|
-e "s,selfautodir:,$out/share/,g" \
|
||||||
-e "s,selfautoparent:/,$out/share/,g" \
|
-e "s,selfautoparent:/,$out/share/,g" \
|
||||||
-e "s,selfautoparent:,$out/share/,g" \
|
-e "s,selfautoparent:,$out/share/,g" \
|
||||||
-i "$TEXMFCNF/texmfcnf.lua"
|
"$TEXMFDIST/web2c/texmfcnf.lua" > "$TEXMFCNF/texmfcnf.lua"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sed \
|
sed \
|
||||||
-e 's,texmf-dist,texmf,g' \
|
-e "s,\(TEXMFDIST[ ]*=[ ]*\)[^\,]*,\1$TEXMFDIST,g" \
|
||||||
-e "s,\$SELFAUTOLOC,$out,g" \
|
-e "s,\$SELFAUTOLOC,$out,g" \
|
||||||
-e "s,\$SELFAUTODIR,$out/share,g" \
|
-e "s,\$SELFAUTODIR,$out/share,g" \
|
||||||
-e "s,\$SELFAUTOPARENT,$out/share,g" \
|
-e "s,\$SELFAUTOPARENT,$out/share,g" \
|
||||||
-e "s,\$SELFAUTOGRANDPARENT,$out/share,g" \
|
-e "s,\$SELFAUTOGRANDPARENT,$out/share,g" \
|
||||||
-e "/^mpost,/d" `# CVE-2016-10243` \
|
-e "/^mpost,/d" `# CVE-2016-10243` \
|
||||||
-i "$TEXMFCNF/texmf.cnf"
|
"$TEXMFDIST/web2c/texmf.cnf" > "$TEXMFCNF/texmf.cnf"
|
||||||
|
|
||||||
mkdir "$out/share/texmf-local"
|
|
||||||
'' +
|
'' +
|
||||||
# now filter hyphenation patterns and formats
|
# now filter hyphenation patterns and formats
|
||||||
(let
|
(let
|
||||||
|
@ -132,18 +146,31 @@ in (buildEnv {
|
||||||
+ lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") hyphenPNames
|
+ lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") hyphenPNames
|
||||||
+ "$p;\n"
|
+ "$p;\n"
|
||||||
);
|
);
|
||||||
|
# formats not being installed must be disabled by prepending #! (see man fmtutil)
|
||||||
|
# sed expression that enables the formats in /start/,/end/
|
||||||
|
enableFormats = pname: "/^# from ${pname}:$/,/^# from/{ s/^#! //; };\n";
|
||||||
fmtutilSed =
|
fmtutilSed =
|
||||||
writeText "fmtutil.sed" (
|
writeText "fmtutil.sed" (
|
||||||
"1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; p; }\n"
|
# document how file was generated
|
||||||
+ "2,/^# from/{ /^# from/!p; };\n"
|
"1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; }\n"
|
||||||
+ lib.concatMapStrings (pname: section "^# from ${pname}:$" "^# from") formatPNames
|
# disable all formats, even those already disabled
|
||||||
|
+ "s/^([^#]|#! )/#! \\1/;\n"
|
||||||
|
# enable the formats from the packages being installed
|
||||||
|
+ lib.concatMapStrings enableFormats formatPNames
|
||||||
|
# clean up formats that have been disabled twice
|
||||||
|
+ "s/^#! #! /#! /;\n"
|
||||||
);
|
);
|
||||||
in ''
|
in ''
|
||||||
for fname in "$out"/share/texmf/tex/generic/config/language.{dat,def}; do
|
mkdir -p "$TEXMFSYSVAR/tex/generic/config"
|
||||||
[[ -e "$fname" ]] && sed -E -n -f '${script}' -i "$fname"
|
for fname in tex/generic/config/language.{dat,def}; do
|
||||||
|
[[ -e "$TEXMFDIST/$fname" ]] && sed -E -n -f '${script}' "$TEXMFDIST/$fname" > "$TEXMFSYSVAR/$fname"
|
||||||
done
|
done
|
||||||
[[ -e "$out"/share/texmf/tex/generic/config/language.dat.lua ]] && sed -E -n -f '${scriptLua}' -i "$out"/share/texmf/tex/generic/config/language.dat.lua
|
[[ -e "$TEXMFDIST"/tex/generic/config/language.dat.lua ]] && sed -E -n -f '${scriptLua}' \
|
||||||
[[ -e "$TEXMFCNF"/fmtutil.cnf ]] && sed -E -n -f '${fmtutilSed}' -i "$TEXMFCNF"/fmtutil.cnf
|
"$TEXMFDIST"/tex/generic/config/language.dat.lua > "$TEXMFSYSVAR"/tex/generic/config/language.dat.lua
|
||||||
|
[[ -e "$TEXMFDIST"/web2c/fmtutil.cnf ]] && sed -E -f '${fmtutilSed}' "$TEXMFDIST"/web2c/fmtutil.cnf > "$TEXMFCNF"/fmtutil.cnf
|
||||||
|
|
||||||
|
# make new files visible to kpathsea
|
||||||
|
perl "$TEXMFDIST"/scripts/texlive/mktexlsr.pl --sort "$TEXMFSYSVAR"
|
||||||
'') +
|
'') +
|
||||||
|
|
||||||
# function to wrap created executables with required env vars
|
# function to wrap created executables with required env vars
|
||||||
|
@ -191,16 +218,15 @@ in (buildEnv {
|
||||||
'' +
|
'' +
|
||||||
# texlive post-install actions
|
# texlive post-install actions
|
||||||
''
|
''
|
||||||
ln -sf "$out"/share/texmf/scripts/texlive/updmap.pl "$out"/bin/updmap
|
ln -sf "$TEXMFDIST"/scripts/texlive/updmap.pl "$out"/bin/updmap
|
||||||
'' +
|
'' +
|
||||||
# now hack to preserve "$0" for mktexfmt
|
# now hack to preserve "$0" for mktexfmt
|
||||||
''
|
''
|
||||||
cp "$out"/share/texmf/scripts/texlive/fmtutil.pl "$out/bin/fmtutil"
|
cp "$TEXMFDIST"/scripts/texlive/fmtutil.pl "$out/bin/fmtutil"
|
||||||
patchShebangs "$out/bin/fmtutil"
|
patchShebangs "$out/bin/fmtutil"
|
||||||
sed "1s|$| -I $out/share/texmf/scripts/texlive|" -i "$out/bin/fmtutil"
|
sed "1s|$| -I $TEXMFDIST/scripts/texlive|" -i "$out/bin/fmtutil"
|
||||||
ln -sf fmtutil "$out/bin/mktexfmt"
|
ln -sf fmtutil "$out/bin/mktexfmt"
|
||||||
|
|
||||||
perl "$out"/share/texmf/scripts/texlive/mktexlsr.pl --sort "$out"/share/texmf
|
|
||||||
texlinks "$out/bin" && wrapBin
|
texlinks "$out/bin" && wrapBin
|
||||||
FORCE_SOURCE_DATE=1 fmtutil --sys --all | grep '^fmtutil' # too verbose
|
FORCE_SOURCE_DATE=1 fmtutil --sys --all | grep '^fmtutil' # too verbose
|
||||||
#texlinks "$out/bin" && wrapBin # do we need to regenerate format links?
|
#texlinks "$out/bin" && wrapBin # do we need to regenerate format links?
|
||||||
|
@ -224,16 +250,16 @@ in (buildEnv {
|
||||||
# sort entries to improve reproducibility
|
# sort entries to improve reproducibility
|
||||||
[[ -f "$TEXMFSYSCONFIG"/web2c/updmap.cfg ]] && sort -o "$TEXMFSYSCONFIG"/web2c/updmap.cfg "$TEXMFSYSCONFIG"/web2c/updmap.cfg
|
[[ -f "$TEXMFSYSCONFIG"/web2c/updmap.cfg ]] && sort -o "$TEXMFSYSCONFIG"/web2c/updmap.cfg "$TEXMFSYSCONFIG"/web2c/updmap.cfg
|
||||||
|
|
||||||
perl "$out"/share/texmf/scripts/texlive/mktexlsr.pl --sort "$out"/share/texmf-* # to make sure
|
perl "$TEXMFDIST"/scripts/texlive/mktexlsr.pl --sort "$TEXMFSYSCONFIG" "$TEXMFSYSVAR" # to make sure
|
||||||
'' +
|
'' +
|
||||||
# install (wrappers for) scripts, based on a list from upstream texlive
|
# install (wrappers for) scripts, based on a list from upstream texlive
|
||||||
''
|
''
|
||||||
source '${bin.core.out}/share/texmf-dist/scripts/texlive/scripts.lst'
|
source '${bin.core.out}/share/texmf-dist/scripts/texlive/scripts.lst'
|
||||||
for s in $texmf_scripts; do
|
for s in $texmf_scripts; do
|
||||||
[[ -x "$out/share/texmf/scripts/$s" ]] || continue
|
[[ -x "$TEXMFDIST/scripts/$s" ]] || continue
|
||||||
tName="$(basename $s | sed 's/\.[a-z]\+$//')" # remove extension
|
tName="$(basename $s | sed 's/\.[a-z]\+$//')" # remove extension
|
||||||
[[ ! -e "$out/bin/$tName" ]] || continue
|
[[ ! -e "$out/bin/$tName" ]] || continue
|
||||||
ln -sv "$(realpath $out/share/texmf/scripts/$s)" "$out/bin/$tName" # wrapped below
|
ln -sv "$(realpath "$TEXMFDIST/scripts/$s")" "$out/bin/$tName" # wrapped below
|
||||||
done
|
done
|
||||||
'' +
|
'' +
|
||||||
# A hacky way to provide repstopdf
|
# A hacky way to provide repstopdf
|
||||||
|
@ -241,8 +267,9 @@ in (buildEnv {
|
||||||
# * ./bin/repstopdf needs to be a symlink to be processed by wrapBin
|
# * ./bin/repstopdf needs to be a symlink to be processed by wrapBin
|
||||||
''
|
''
|
||||||
if [[ -e "$out"/bin/epstopdf ]]; then
|
if [[ -e "$out"/bin/epstopdf ]]; then
|
||||||
cp "$out"/bin/epstopdf "$out"/share/texmf/scripts/repstopdf
|
mkdir -p "$TEXMFSYSVAR/scripts"
|
||||||
ln -s "$out"/share/texmf/scripts/repstopdf "$out"/bin/repstopdf
|
cp "$out"/bin/epstopdf "$TEXMFSYSVAR"/scripts/repstopdf
|
||||||
|
ln -s "$TEXMFSYSVAR"/scripts/repstopdf "$out"/bin/repstopdf
|
||||||
fi
|
fi
|
||||||
'' +
|
'' +
|
||||||
# finish up the wrappers
|
# finish up the wrappers
|
||||||
|
@ -262,16 +289,6 @@ in (buildEnv {
|
||||||
# TODO: a context trigger https://www.preining.info/blog/2015/06/debian-tex-live-2015-the-new-layout/
|
# TODO: a context trigger https://www.preining.info/blog/2015/06/debian-tex-live-2015-the-new-layout/
|
||||||
# http://wiki.contextgarden.net/ConTeXt_Standalone#Unix-like_platforms_.28Linux.2FMacOS_X.2FFreeBSD.2FSolaris.29
|
# http://wiki.contextgarden.net/ConTeXt_Standalone#Unix-like_platforms_.28Linux.2FMacOS_X.2FFreeBSD.2FSolaris.29
|
||||||
|
|
||||||
# I would just create links from "$out"/share/{man,info},
|
|
||||||
# but buildenv has problems with merging symlinks with directories;
|
|
||||||
# note: it's possible we might need deepen the work-around to man/*.
|
|
||||||
''
|
|
||||||
for d in {man,info}; do
|
|
||||||
[[ -e "$out/share/texmf/doc/$d" ]] || continue;
|
|
||||||
mkdir -p "$out/share/$d"
|
|
||||||
ln -s -t "$out/share/$d" "$out/share/texmf/doc/$d"/*
|
|
||||||
done
|
|
||||||
'' +
|
|
||||||
# MkIV uses its own lookup mechanism and we need to initialize
|
# MkIV uses its own lookup mechanism and we need to initialize
|
||||||
# caches for it.
|
# caches for it.
|
||||||
''
|
''
|
||||||
|
@ -283,7 +300,7 @@ in (buildEnv {
|
||||||
# Get rid of all log files. They are not needed, but take up space
|
# Get rid of all log files. They are not needed, but take up space
|
||||||
# and render the build unreproducible by their embedded timestamps.
|
# and render the build unreproducible by their embedded timestamps.
|
||||||
''
|
''
|
||||||
find $TEXMFSYSVAR/web2c -name '*.log' -delete
|
find "$TEXMFSYSVAR"/web2c -name '*.log' -delete
|
||||||
''
|
''
|
||||||
;
|
;
|
||||||
}).overrideAttrs (_: { allowSubstitutes = true; })
|
}).overrideAttrs (_: { allowSubstitutes = true; })
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "swayrbar";
|
pname = "swayrbar";
|
||||||
version = "0.3.4";
|
version = "0.3.5";
|
||||||
|
|
||||||
src = fetchFromSourcehut {
|
src = fetchFromSourcehut {
|
||||||
owner = "~tsdh";
|
owner = "~tsdh";
|
||||||
repo = "swayr";
|
repo = "swayr";
|
||||||
rev = "swayrbar-${version}";
|
rev = "swayrbar-${version}";
|
||||||
sha256 = "sha256-OQhq5ZUe2OrfRFxoaAbbewoHgQVPv9cQy0VCpYe1SNo=";
|
sha256 = "sha256-uYQGwccSwqHJ1w8CyxXimmENnGx7e3EMA1MKZuZDTIk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-vM4SoRbVylN90b378Qk18A8/2S2IB88lnGCM6sqrhs8=";
|
cargoHash = "sha256-PdPaUqJUycUhleaND6XwKkRvwO0MHbvw5lzz95bdfCQ=";
|
||||||
|
|
||||||
# don't build swayr
|
# don't build swayr
|
||||||
buildAndTestSubdir = pname;
|
buildAndTestSubdir = pname;
|
||||||
|
|
|
@ -28,13 +28,13 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wl-mirror";
|
pname = "wl-mirror";
|
||||||
version = "0.13.0";
|
version = "0.13.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Ferdi265";
|
owner = "Ferdi265";
|
||||||
repo = "wl-mirror";
|
repo = "wl-mirror";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-jjOcEr/E7l3ykdLAfiDlRSI0u76byDmBwfispTbopk8=";
|
hash = "sha256-qYJmcsID5qbUs27ZCU2HkWVVnBmxWmyzSgruLPB4jI8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
|
@ -12774,6 +12774,8 @@ with pkgs;
|
||||||
|
|
||||||
tiv = callPackage ../applications/misc/tiv { };
|
tiv = callPackage ../applications/misc/tiv { };
|
||||||
|
|
||||||
|
tkman = callPackage ../tools/misc/tkman { };
|
||||||
|
|
||||||
tldr = callPackage ../tools/misc/tldr { };
|
tldr = callPackage ../tools/misc/tldr { };
|
||||||
|
|
||||||
tldr-hs = haskellPackages.tldr;
|
tldr-hs = haskellPackages.tldr;
|
||||||
|
@ -20830,6 +20832,8 @@ with pkgs;
|
||||||
|
|
||||||
jsoncpp = callPackage ../development/libraries/jsoncpp { };
|
jsoncpp = callPackage ../development/libraries/jsoncpp { };
|
||||||
|
|
||||||
|
json-fortran = callPackage ../development/libraries/json-fortran { };
|
||||||
|
|
||||||
jsonnet = callPackage ../development/compilers/jsonnet { };
|
jsonnet = callPackage ../development/compilers/jsonnet { };
|
||||||
|
|
||||||
jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { };
|
jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { };
|
||||||
|
@ -22420,6 +22424,22 @@ with pkgs;
|
||||||
|
|
||||||
mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { };
|
mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { };
|
||||||
|
|
||||||
|
mctc-lib = callPackage ../development/libraries/science/chemistry/mctc-lib { };
|
||||||
|
|
||||||
|
mstore = callPackage ../development/libraries/science/chemistry/mstore { };
|
||||||
|
|
||||||
|
multicharge = callPackage ../development/libraries/science/chemistry/multicharge { };
|
||||||
|
|
||||||
|
test-drive = callPackage ../development/libraries/test-drive { };
|
||||||
|
|
||||||
|
dftd4 = callPackage ../development/libraries/science/chemistry/dftd4 { };
|
||||||
|
|
||||||
|
simple-dftd3 = callPackage ../development/libraries/science/chemistry/simple-dftd3 { };
|
||||||
|
|
||||||
|
tblite = callPackage ../development/libraries/science/chemistry/tblite { };
|
||||||
|
|
||||||
|
toml-f = callPackage ../development/libraries/toml-f { };
|
||||||
|
|
||||||
## libGL/libGLU/Mesa stuff
|
## libGL/libGLU/Mesa stuff
|
||||||
|
|
||||||
# Default libGL implementation, should provide headers and
|
# Default libGL implementation, should provide headers and
|
||||||
|
|
|
@ -11443,6 +11443,11 @@ self: super: with self; {
|
||||||
|
|
||||||
tblib = callPackage ../development/python-modules/tblib { };
|
tblib = callPackage ../development/python-modules/tblib { };
|
||||||
|
|
||||||
|
tblite = callPackage ../development/libraries/science/chemistry/tblite/python.nix {
|
||||||
|
tblite = pkgs.tblite;
|
||||||
|
meson = pkgs.meson;
|
||||||
|
};
|
||||||
|
|
||||||
tbm-utils = callPackage ../development/python-modules/tbm-utils { };
|
tbm-utils = callPackage ../development/python-modules/tbm-utils { };
|
||||||
|
|
||||||
tcolorpy = callPackage ../development/python-modules/tcolorpy { };
|
tcolorpy = callPackage ../development/python-modules/tcolorpy { };
|
||||||
|
@ -11716,6 +11721,8 @@ self: super: with self; {
|
||||||
|
|
||||||
tls-parser = callPackage ../development/python-modules/tls-parser { };
|
tls-parser = callPackage ../development/python-modules/tls-parser { };
|
||||||
|
|
||||||
|
tlv8 = callPackage ../development/python-modules/tlv8 { };
|
||||||
|
|
||||||
tmb = callPackage ../development/python-modules/tmb { };
|
tmb = callPackage ../development/python-modules/tmb { };
|
||||||
|
|
||||||
todoist = callPackage ../development/python-modules/todoist { };
|
todoist = callPackage ../development/python-modules/todoist { };
|
||||||
|
|
Loading…
Reference in a new issue