Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
6522c61c67
|
|
@ -85,17 +85,18 @@ rec {
|
|||
# is why we use the more obscure "bfd" and not "binutils" for this
|
||||
# choice.
|
||||
else "bfd";
|
||||
extensions = rec {
|
||||
sharedLibrary = assert final.hasSharedLibraries;
|
||||
/**/ if final.isDarwin then ".dylib"
|
||||
extensions = lib.optionalAttrs final.hasSharedLibraries {
|
||||
sharedLibrary =
|
||||
if final.isDarwin then ".dylib"
|
||||
else if final.isWindows then ".dll"
|
||||
else ".so";
|
||||
} // {
|
||||
staticLibrary =
|
||||
/**/ if final.isWindows then ".lib"
|
||||
else ".a";
|
||||
library =
|
||||
/**/ if final.isStatic then staticLibrary
|
||||
else sharedLibrary;
|
||||
/**/ if final.isStatic then final.extensions.staticLibrary
|
||||
else final.extensions.sharedLibrary;
|
||||
executable =
|
||||
/**/ if final.isWindows then ".exe"
|
||||
else "";
|
||||
|
|
|
|||
|
|
@ -5620,6 +5620,12 @@
|
|||
githubId = 84968;
|
||||
name = "Florian Paul Schmidt";
|
||||
};
|
||||
fptje = {
|
||||
email = "fpeijnenburg@gmail.com";
|
||||
github = "FPtje";
|
||||
githubId = 1202014;
|
||||
name = "Falco Peijnenburg";
|
||||
};
|
||||
fragamus = {
|
||||
email = "innovative.engineer@gmail.com";
|
||||
github = "fragamus";
|
||||
|
|
@ -10839,6 +10845,12 @@
|
|||
fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83";
|
||||
}];
|
||||
};
|
||||
mig4ng = {
|
||||
email = "mig4ng@gmail.com";
|
||||
github = "mig4ng";
|
||||
githubId = 5817039;
|
||||
name = "Miguel Carneiro";
|
||||
};
|
||||
mightyiam = {
|
||||
email = "mightyiampresence@gmail.com";
|
||||
github = "mightyiam";
|
||||
|
|
@ -15550,6 +15562,12 @@
|
|||
githubId = 6391601;
|
||||
name = "Roger Mason";
|
||||
};
|
||||
sputn1ck = {
|
||||
email = "kon@kon.ninja";
|
||||
github = "sputn1ck";
|
||||
githubId = 8904314;
|
||||
name = "Konstantin Nick";
|
||||
};
|
||||
squalus = {
|
||||
email = "squalus@squalus.net";
|
||||
github = "squalus";
|
||||
|
|
@ -18466,6 +18484,12 @@
|
|||
github = "zmitchell";
|
||||
githubId = 10246891;
|
||||
};
|
||||
znewman01 = {
|
||||
email = "znewman01@gmail.com";
|
||||
github = "znewman01";
|
||||
githubId = 873857;
|
||||
name = "Zack Newman";
|
||||
};
|
||||
zoedsoupe = {
|
||||
github = "zoedsoupe";
|
||||
githubId = 44469426;
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@
|
|||
|
||||
- [trust-dns](https://trust-dns.org/), a Rust based DNS server built to be safe and secure from the ground up. Available as [services.trust-dns](#opt-services.trust-dns.enable).
|
||||
|
||||
- [osquery](https://www.osquery.io/), a SQL powered operating system instrumentation, monitoring, and analytics.
|
||||
|
||||
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
|
||||
|
||||
- The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices.
|
||||
|
|
|
|||
|
|
@ -572,7 +572,7 @@ let format' = format; in let
|
|||
${lib.optionalString installBootLoader ''
|
||||
# In this throwaway resource, we only have /dev/vda, but the actual VM may refer to another disk for bootloader, e.g. /dev/vdb
|
||||
# Use this option to create a symlink from vda to any arbitrary device you want.
|
||||
${optionalString (config.boot.loader.grub.device != "/dev/vda") ''
|
||||
${optionalString (config.boot.loader.grub.enable && config.boot.loader.grub.device != "/dev/vda") ''
|
||||
mkdir -p $(dirname ${config.boot.loader.grub.device})
|
||||
ln -s /dev/vda ${config.boot.loader.grub.device}
|
||||
''}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ in rec {
|
|||
"Systemd ${group} field `${name}' must be a valid MAC address.";
|
||||
|
||||
assertNetdevMacAddress = name: group: attr:
|
||||
optional (attr ? ${name} && (! isMacAddress attr.${name} || attr.${name} != "none"))
|
||||
optional (attr ? ${name} && (! isMacAddress attr.${name} && attr.${name} != "none"))
|
||||
"Systemd ${group} field `${name}` must be a valid MAC address or the special value `none`.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -764,6 +764,7 @@
|
|||
./services/monitoring/nagios.nix
|
||||
./services/monitoring/netdata.nix
|
||||
./services/monitoring/opentelemetry-collector.nix
|
||||
./services/monitoring/osquery.nix
|
||||
./services/monitoring/parsedmarc.nix
|
||||
./services/monitoring/prometheus/alertmanager-irc-relay.nix
|
||||
./services/monitoring/prometheus/alertmanager.nix
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ in
|
|||
(mkRemovedOptionModule [ "services" "mesos" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed")
|
||||
(mkRemovedOptionModule [ "services" "pantheon" "files" ] ''
|
||||
This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.
|
||||
'')
|
||||
|
|
|
|||
97
nixos/modules/services/monitoring/osquery.nix
Normal file
97
nixos/modules/services/monitoring/osquery.nix
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.osquery;
|
||||
dirname = path: with lib.strings; with lib.lists; concatStringsSep "/"
|
||||
(init (splitString "/" (normalizePath path)));
|
||||
|
||||
# conf is the osquery configuration file used when the --config_plugin=filesystem.
|
||||
# filesystem is the osquery default value for the config_plugin flag.
|
||||
conf = pkgs.writeText "osquery.conf" (builtins.toJSON cfg.settings);
|
||||
|
||||
# flagfile is the file containing osquery command line flags to be
|
||||
# provided to the application using the special --flagfile option.
|
||||
flagfile = pkgs.writeText "osquery.flags"
|
||||
(concatStringsSep "\n"
|
||||
(mapAttrsToList (name: value: "--${name}=${value}")
|
||||
# Use the conf derivation if not otherwise specified.
|
||||
({ config_path = conf; } // cfg.flags)));
|
||||
|
||||
osqueryi = pkgs.runCommand "osqueryi" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${pkgs.osquery}/bin/osqueryi $out/bin/osqueryi \
|
||||
--add-flags "--flagfile ${flagfile}"
|
||||
'';
|
||||
in
|
||||
{
|
||||
options.services.osquery = {
|
||||
enable = mkEnableOption (mdDoc "osqueryd daemon");
|
||||
|
||||
settings = mkOption {
|
||||
default = { };
|
||||
description = mdDoc ''
|
||||
Configuration to be written to the osqueryd JSON configuration file.
|
||||
To understand the configuration format, refer to https://osquery.readthedocs.io/en/stable/deployment/configuration/#configuration-components.
|
||||
'';
|
||||
example = {
|
||||
options.utc = false;
|
||||
};
|
||||
type = types.attrs;
|
||||
};
|
||||
|
||||
flags = mkOption {
|
||||
default = { };
|
||||
description = mdDoc ''
|
||||
Attribute set of flag names and values to be written to the osqueryd flagfile.
|
||||
For more information, refer to https://osquery.readthedocs.io/en/stable/installation/cli-flags.
|
||||
'';
|
||||
example = {
|
||||
config_refresh = "10";
|
||||
};
|
||||
type = with types;
|
||||
submodule {
|
||||
freeformType = attrsOf str;
|
||||
options = {
|
||||
database_path = mkOption {
|
||||
default = "/var/lib/osquery/osquery.db";
|
||||
readOnly = true;
|
||||
description = mdDoc "Path used for the database file.";
|
||||
type = path;
|
||||
};
|
||||
logger_path = mkOption {
|
||||
default = "/var/log/osquery";
|
||||
readOnly = true;
|
||||
description = mdDoc "Base directory used for logging.";
|
||||
type = path;
|
||||
};
|
||||
pidfile = mkOption {
|
||||
default = "/run/osquery/osqueryd.pid";
|
||||
readOnly = true;
|
||||
description = mdDoc "Path used for pid file.";
|
||||
type = path;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ osqueryi ];
|
||||
systemd.services.osqueryd = {
|
||||
after = [ "network.target" "syslog.service" ];
|
||||
description = "The osquery daemon";
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.osquery}/bin/osqueryd --flagfile ${flagfile}";
|
||||
PIDFile = cfg.flags.pidfile;
|
||||
LogsDirectory = cfg.flags.logger_path;
|
||||
StateDirectory = dirname cfg.flags.database_path;
|
||||
Restart = "always";
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
systemd.tmpfiles.rules = [
|
||||
"d ${dirname (cfg.flags.pidfile)} 0755 root root -"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@ let
|
|||
poolName = "freshrss";
|
||||
in
|
||||
{
|
||||
meta.maintainers = with maintainers; [ etu stunkymonkey ];
|
||||
meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ];
|
||||
|
||||
options.services.freshrss = {
|
||||
enable = mkEnableOption (mdDoc "FreshRSS feed reader");
|
||||
|
|
@ -27,7 +27,8 @@ in
|
|||
};
|
||||
|
||||
passwordFile = mkOption {
|
||||
type = types.path;
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = mdDoc "Password for the defaultUser for FreshRSS.";
|
||||
example = "/run/secrets/freshrss";
|
||||
};
|
||||
|
|
@ -120,7 +121,13 @@ in
|
|||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "freshrss";
|
||||
description = lib.mdDoc "User under which Freshrss runs.";
|
||||
description = lib.mdDoc "User under which FreshRSS runs.";
|
||||
};
|
||||
|
||||
authType = mkOption {
|
||||
type = types.enum [ "form" "http_auth" "none" ];
|
||||
default = "form";
|
||||
description = mdDoc "Authentication type for FreshRSS.";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -160,6 +167,14 @@ in
|
|||
};
|
||||
in
|
||||
mkIf cfg.enable {
|
||||
assertions = mkIf (cfg.authType == "form") [
|
||||
{
|
||||
assertion = cfg.passwordFile != null;
|
||||
message = ''
|
||||
`passwordFile` must be supplied when using "form" authentication!
|
||||
'';
|
||||
}
|
||||
];
|
||||
# Set up a Nginx virtual host.
|
||||
services.nginx = mkIf (cfg.virtualHost != null) {
|
||||
enable = true;
|
||||
|
|
@ -227,7 +242,7 @@ in
|
|||
settingsFlags = concatStringsSep " \\\n "
|
||||
(mapAttrsToList (k: v: "${k} ${toString v}") {
|
||||
"--default_user" = ''"${cfg.defaultUser}"'';
|
||||
"--auth_type" = ''"form"'';
|
||||
"--auth_type" = ''"${cfg.authType}"'';
|
||||
"--base_url" = ''"${cfg.baseUrl}"'';
|
||||
"--language" = ''"${cfg.language}"'';
|
||||
"--db-type" = ''"${cfg.database.type}"'';
|
||||
|
|
@ -255,20 +270,30 @@ in
|
|||
FRESHRSS_DATA_PATH = cfg.dataDir;
|
||||
};
|
||||
|
||||
script = ''
|
||||
# do installation or reconfigure
|
||||
if test -f ${cfg.dataDir}/config.php; then
|
||||
# reconfigure with settings
|
||||
./cli/reconfigure.php ${settingsFlags}
|
||||
./cli/update-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"
|
||||
else
|
||||
# check correct folders in data folder
|
||||
./cli/prepare.php
|
||||
# install with settings
|
||||
./cli/do-install.php ${settingsFlags}
|
||||
./cli/create-user.php --user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"
|
||||
fi
|
||||
'';
|
||||
script =
|
||||
let
|
||||
userScriptArgs = ''--user ${cfg.defaultUser} --password "$(cat ${cfg.passwordFile})"'';
|
||||
updateUserScript = optionalString (cfg.authType == "form") ''
|
||||
./cli/update-user.php ${userScriptArgs}
|
||||
'';
|
||||
createUserScript = optionalString (cfg.authType == "form") ''
|
||||
./cli/create-user.php ${userScriptArgs}
|
||||
'';
|
||||
in
|
||||
''
|
||||
# do installation or reconfigure
|
||||
if test -f ${cfg.dataDir}/config.php; then
|
||||
# reconfigure with settings
|
||||
./cli/reconfigure.php ${settingsFlags}
|
||||
${updateUserScript}
|
||||
else
|
||||
# check correct folders in data folder
|
||||
./cli/prepare.php
|
||||
# install with settings
|
||||
./cli/do-install.php ${settingsFlags}
|
||||
${createUserScript}
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services.freshrss-updater = {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ let
|
|||
# we just copy what we need from Glibc and use patchelf to make it
|
||||
# work.
|
||||
extraUtils = pkgs.runCommand "extra-utils"
|
||||
{ nativeBuildInputs = [pkgs.buildPackages.nukeReferences];
|
||||
{ nativeBuildInputs = with pkgs.buildPackages; [ nukeReferences bintools ];
|
||||
allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
|
||||
}
|
||||
''
|
||||
|
|
@ -102,7 +102,7 @@ let
|
|||
|
||||
copy_bin_and_libs () {
|
||||
[ -f "$out/bin/$(basename $1)" ] && rm "$out/bin/$(basename $1)"
|
||||
cp -pdvH $1 $out/bin
|
||||
cp -pdv $1 $out/bin
|
||||
}
|
||||
|
||||
# Copy BusyBox.
|
||||
|
|
@ -122,7 +122,7 @@ let
|
|||
# code, using default options and effectively ignore security relevant
|
||||
# ZFS properties such as `setuid=off` and `exec=off` (unless manually
|
||||
# duplicated in `fileSystems.*.options`, defeating "zfsutil"'s purpose).
|
||||
copy_bin_and_libs ${pkgs.util-linux}/bin/mount
|
||||
copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount
|
||||
copy_bin_and_libs ${pkgs.zfs}/bin/mount.zfs
|
||||
''}
|
||||
|
||||
|
|
|
|||
|
|
@ -577,6 +577,7 @@ in {
|
|||
openvscode-server = handleTest ./openvscode-server.nix {};
|
||||
orangefs = handleTest ./orangefs.nix {};
|
||||
os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
|
||||
osquery = handleTestOn ["x86_64-linux"] ./osquery.nix {};
|
||||
osrm-backend = handleTest ./osrm-backend.nix {};
|
||||
overlayfs = handleTest ./overlayfs.nix {};
|
||||
pacemaker = handleTest ./pacemaker.nix {};
|
||||
|
|
|
|||
20
nixos/tests/freshrss-http-auth.nix
Normal file
20
nixos/tests/freshrss-http-auth.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
name = "freshrss";
|
||||
meta.maintainers = with lib.maintainers; [ mattchrist ];
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
services.freshrss = {
|
||||
enable = true;
|
||||
baseUrl = "http://localhost";
|
||||
dataDir = "/srv/freshrss";
|
||||
authType = "http_auth";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.wait_for_open_port(80)
|
||||
response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/")
|
||||
assert 'Account: testuser' in response, "http_auth method didn't work."
|
||||
'';
|
||||
})
|
||||
56
nixos/tests/osquery.nix
Normal file
56
nixos/tests/osquery.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
config_refresh = "10";
|
||||
nullvalue = "NULL";
|
||||
utc = false;
|
||||
in
|
||||
{
|
||||
name = "osquery";
|
||||
meta = with maintainers; {
|
||||
maintainers = [ znewman01 lewo ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
services.osquery = {
|
||||
enable = true;
|
||||
|
||||
settings.options = { inherit nullvalue utc; };
|
||||
flags = {
|
||||
inherit config_refresh;
|
||||
nullvalue = "IGNORED";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }:
|
||||
let
|
||||
cfg = nodes.machine.services.osquery;
|
||||
in
|
||||
''
|
||||
machine.start()
|
||||
machine.wait_for_unit("osqueryd.service")
|
||||
|
||||
# Stop the osqueryd service so that we can use osqueryi to check information stored in the database.
|
||||
machine.wait_until_succeeds("systemctl stop osqueryd.service")
|
||||
|
||||
# osqueryd was able to query information about the host.
|
||||
machine.succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | tee /dev/console | grep -q '127.0.0.1'")
|
||||
|
||||
# osquery binaries respect configuration from the Nix config option.
|
||||
machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"utc\";' | osqueryi | tee /dev/console | grep -q ${boolToString utc}")
|
||||
|
||||
# osquery binaries respect configuration from the Nix flags option.
|
||||
machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"config_refresh\";' | osqueryi | tee /dev/console | grep -q ${config_refresh}")
|
||||
|
||||
# Demonstrate that osquery binaries prefer configuration plugin options over CLI flags.
|
||||
# https://osquery.readthedocs.io/en/latest/deployment/configuration/#options.
|
||||
machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"nullvalue\";' | osqueryi | tee /dev/console | grep -q ${nullvalue}")
|
||||
|
||||
# Module creates directories for default database_path and pidfile flag values.
|
||||
machine.succeed("test -d $(dirname ${cfg.flags.database_path})")
|
||||
machine.succeed("test -d $(dirname ${cfg.flags.pidfile})")
|
||||
'';
|
||||
})
|
||||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "roomeqwizard";
|
||||
version = "5.20.5";
|
||||
version = "5.20.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceStrings [ "." ] [ "_" ] version}.sh";
|
||||
sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U=";
|
||||
url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh";
|
||||
sha256 = "sha256-6zaBDOmQlyMRQ84j64oS7TMwcctT1PSbuQOUYY9QjvY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "transcribe";
|
||||
version = "9.21";
|
||||
version = "9.25";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchzip
|
||||
{
|
||||
url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-9.21.0.tar.gz";
|
||||
sha256 = "sha256-M0hOJOsTTRxPef8rTO+/KpiP4lr8mtplS9KITaFOFPA=";
|
||||
url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.0.tar.gz";
|
||||
sha256 = "sha256-vgl3BCAC7gOYTviHJzMbgZfHTpP90XUvxpC1IhvEZ8I=";
|
||||
}
|
||||
else throw "Platform not supported";
|
||||
|
||||
|
|
|
|||
27
pkgs/applications/blockchains/aperture/default.nix
Normal file
27
pkgs/applications/blockchains/aperture/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aperture";
|
||||
version = "0.2-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightninglabs";
|
||||
repo = "aperture";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-l1fpjCAg+1PGNotKrjFLoYOMEzRNXC1mfdjRPfE0DsY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tWFFmRSDUZXijAUTgR8k4EERHwIEBOyZZZ9BGXso/tU=";
|
||||
|
||||
subPackages = [ "cmd/aperture" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "L402 (Lightning HTTP 402) Reverse Proxy";
|
||||
homepage = "https://github.com/lightninglabs/aperture";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sputn1ck ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10470,6 +10470,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/haya14busa/vim-asterisk/";
|
||||
};
|
||||
|
||||
vim-astro = buildVimPluginFrom2Nix {
|
||||
pname = "vim-astro";
|
||||
version = "2022-08-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wuelnerdotexe";
|
||||
repo = "vim-astro";
|
||||
rev = "34732be5e9a5c28c2409f4490edf92d46d8b55a9";
|
||||
sha256 = "1ild33hxiphj0z8b4kpcad4rai7q7jd0lsmhpa30kfgmyj5kh90z";
|
||||
};
|
||||
meta.homepage = "https://github.com/wuelnerdotexe/vim-astro/";
|
||||
};
|
||||
|
||||
vim-asymptote = buildVimPluginFrom2Nix {
|
||||
pname = "vim-asymptote";
|
||||
version = "2014-06-26";
|
||||
|
|
|
|||
|
|
@ -885,6 +885,7 @@ https://github.com/ThePrimeagen/vim-apm/,,
|
|||
https://github.com/PeterRincker/vim-argumentative/,,
|
||||
https://github.com/FooSoft/vim-argwrap/,,
|
||||
https://github.com/haya14busa/vim-asterisk/,,
|
||||
https://github.com/wuelnerdotexe/vim-astro/,HEAD,
|
||||
https://github.com/hura/vim-asymptote/,,
|
||||
https://github.com/907th/vim-auto-save/,,
|
||||
https://github.com/vim-autoformat/vim-autoformat/,,
|
||||
|
|
|
|||
|
|
@ -47,13 +47,13 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-12";
|
||||
version = "7.1.1-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-URwSufiTcLGWRFNOJidJyEcIPxWUSdN7yHaCiFh7GEI=";
|
||||
hash = "sha256-HrUka7VLF9YH23TxDQeQpulQf3ssSfYOhi29v2onvCE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { package = imagemagick; };
|
||||
version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
inherit (python3.pkgs) img2pdf;
|
||||
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gscreenshot";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thenaterhood";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "YuISiTUReX9IQpckIgbt03CY7klnog/IeOtfBoQ1DZM=";
|
||||
sha256 = "sLJ+Fk+ePrmJeSllGd30uEQ/uFDl5CIob//1cDLKZHg=";
|
||||
};
|
||||
|
||||
# needed for wrapGAppsHook to function
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "anytype";
|
||||
version = "0.33.0";
|
||||
version = "0.33.3";
|
||||
name = "Anytype-${version}";
|
||||
nameExecutable = pname;
|
||||
src = fetchurl {
|
||||
url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage";
|
||||
name = "Anytype-${version}.AppImage";
|
||||
sha256 = "sha256-lkocuPlUYGFWWEMaz7Q/SWMFIGa2w+jNQ0u5EzcSz7M=";
|
||||
sha256 = "sha256-3qBd1WgHn/sfEyNRPTX5viMX3lVZPfsG6x7GfNwkL3E=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
in
|
||||
|
|
|
|||
|
|
@ -61,6 +61,81 @@ let
|
|||
rev = 144;
|
||||
sha256 = "sha256-JfmDIUoDY7dYdMgwwUMgcwNhWxuxsdkv1taw8DXhPY4=";
|
||||
};
|
||||
darkPlacesPack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/trunk";
|
||||
rev = 57;
|
||||
sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
};
|
||||
doom3Pack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/Doom3Pack/trunk";
|
||||
rev = 56;
|
||||
sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
};
|
||||
halfLifePack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/HalfLifePack/trunk";
|
||||
rev = 1;
|
||||
sha256 = "sha256-CrbN3iOG89j71y4ZJ4gNZEA5CYxphLLGbZwv6Tbjui0=";
|
||||
};
|
||||
her2Pack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/Her2Pack/trunk";
|
||||
rev = 55;
|
||||
sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
};
|
||||
jk2Pack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/JK2Pack/trunk";
|
||||
rev = 77;
|
||||
sha256 = "sha256-3g/p9OC0j2va9CXXtsQf0lP6VJ1WyI5k2W9xNRwYjS8=";
|
||||
};
|
||||
nexuizPack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/NexuizPack/trunk";
|
||||
rev = 49;
|
||||
sha256 = "sha256-nAV7rZKDgAxlEmu2RfBFNsHv9Xgas1IlDgioligvY+c=";
|
||||
};
|
||||
preyPack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/PreyPack/trunk";
|
||||
rev = 19;
|
||||
sha256 = "sha256-wbKEnSaFO40HxhMsbYKy76MxXDvY9O1lTcr3M7fXxW0=";
|
||||
};
|
||||
q2wPack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2WPack/trunk";
|
||||
rev = 126;
|
||||
sha256 = "sha256-Q6IyL2qUr+6ktP34oYkFqN5MeFxCXOkcjrPg5J95ftg=";
|
||||
};
|
||||
q4Pack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q4Pack/trunk";
|
||||
rev = 54;
|
||||
sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
};
|
||||
ravenPack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/RavenPack/trunk";
|
||||
rev = 1;
|
||||
sha256 = "sha256-bYRjCkdaznaO7+WDB6cgL3szTB+MXwt3IKH3L2rGjLs=";
|
||||
};
|
||||
reactionPack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/ReactionPack/trunk";
|
||||
rev = 69;
|
||||
sha256 = "sha256-aXSM0ubyhgamLBzfNZ6RzRSdzKwfHWLt/6OS/i9mMVo=";
|
||||
};
|
||||
sof2Pack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/Sof2Pack/trunk";
|
||||
rev = 1;
|
||||
sha256 = "sha256-EnGhYghXe6hU5vvdF+Z9geTiHDukBEr1+CQgunxxGic=";
|
||||
};
|
||||
tremulousPack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/TremulousPack/trunk";
|
||||
rev = 46;
|
||||
sha256 = "sha256-NU+ynpqydFxdZSkh7Szm6DTqyMYVS+PU70Mp98ZjdOs=";
|
||||
};
|
||||
ufoaiPack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/trunk";
|
||||
rev = 69;
|
||||
sha256 = "sha256-nAd7fFZJJ82rDPVlTiZkkTGXi5tw7BSKk+akFBXSWvY=";
|
||||
};
|
||||
warsowPack = fetchsvn {
|
||||
url = "svn://svn.icculus.org/gtkradiant-gamepacks/WarsowPack/trunk";
|
||||
rev = 53;
|
||||
sha256 = "sha256-IQ12fEKnq0cJxef+ddvTXcwM8lQ8nlUoMJy81XJ7ANY=";
|
||||
};
|
||||
packs = runCommand "gtkradiant-packs" {} ''
|
||||
mkdir -p $out
|
||||
ln -s ${q3Pack} $out/Q3Pack
|
||||
|
|
@ -74,30 +149,36 @@ let
|
|||
ln -s ${wolfPack} $out/WolfPack
|
||||
ln -s ${unvanquishedPack} $out/UnvanquishedPack
|
||||
ln -s ${q1Pack} $out/Q1Pack
|
||||
ln -s ${darkPlacesPack} $out/DarkPlacesPack
|
||||
ln -s ${doom3Pack} $out/Doom3Pack
|
||||
ln -s ${halfLifePack} $out/HalfLifePack
|
||||
ln -s ${her2Pack} $out/Her2Pack
|
||||
ln -s ${jk2Pack} $out/JK2Pack
|
||||
ln -s ${nexuizPack} $out/NexuizPack
|
||||
ln -s ${preyPack} $out/PreyPack
|
||||
ln -s ${q2wPack} $out/Q2WPack
|
||||
ln -s ${q4Pack} $out/Q4Pack
|
||||
ln -s ${ravenPack} $out/RavenPack
|
||||
ln -s ${reactionPack} $out/ReactionPack
|
||||
ln -s ${sof2Pack} $out/Sof2Pack
|
||||
ln -s ${tremulousPack} $out/TermulousPack
|
||||
ln -s ${ufoaiPack} $out/UFOAIPack
|
||||
ln -s ${warsowPack} $out/WarsowPack
|
||||
'';
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtkradiant";
|
||||
|
||||
version = "unstable-2022-07-31";
|
||||
version = "unstable-2023-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TTimo";
|
||||
repo = "GtkRadiant";
|
||||
rev = "5b498bfa01bde6c2c9eb60fb94cf04666e52d22d";
|
||||
sha256 = "sha256-407faeQnhxqbWgOUunQKj2JhHeqIzPPgrhz2K5O4CaM=";
|
||||
rev = "ddbaf03d723a633d53fa442c2f802f7ad164dd6c";
|
||||
sha256 = "sha256-qI+KGx73AbM5PLFR2JDXKDbiqmU0gS/43rhjRKm/Gms=";
|
||||
};
|
||||
|
||||
# patch paths so that .game settings are put into the user's home instead of the read-only /nix/store
|
||||
postPatch = ''
|
||||
substituteInPlace radiant/preferences.cpp \
|
||||
--replace 'gameFilePath += "games/";' 'gameFilePath = g_get_home_dir(); gameFilePath += "/.cache/radiant/games/";printf("gameFilePath: %s\\n", gameFilePath);' \
|
||||
--replace 'radCreateDirectory( gameFilePath );' 'if (g_mkdir_with_parents( gameFilePath, 0777 ) == -1) {radCreateDirectory( gameFilePath );};' \
|
||||
--replace 'strGamesPath = g_strAppPath.GetBuffer();' 'strGamesPath = g_get_home_dir();' \
|
||||
--replace 'strGamesPath += "games";' 'strGamesPath += "/.cache/radiant/games";'
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
let
|
||||
python = python3.withPackages (ps: with ps; [
|
||||
|
|
@ -113,7 +194,7 @@ stdenv.mkDerivation rec {
|
|||
test -e $(readlink $3)
|
||||
elif [ "$1" = update ]; then
|
||||
# verify existence
|
||||
test -e $(readlink $3)
|
||||
test -e $(readlink $2)
|
||||
else
|
||||
echo "$@"
|
||||
exit 1
|
||||
|
|
@ -145,8 +226,19 @@ stdenv.mkDerivation rec {
|
|||
postInstall = ''
|
||||
mkdir -p $out/{bin,lib}
|
||||
cp -ar install $out/lib/gtkradiant
|
||||
for pack in ${packs}/* ; do
|
||||
name=$(basename "$pack")
|
||||
if ! [ -e $out/lib/gtkradiant/installs/$name ]; then
|
||||
ln -s $pack $out/lib/gtkradiant/installs/$name
|
||||
fi
|
||||
done
|
||||
|
||||
ln -s ../lib/gtkradiant/radiant.bin $out/bin/gtkradiant
|
||||
cat >$out/bin/gtkradiant <<EOF
|
||||
#!${runtimeShell} -e
|
||||
export XDG_DATA_HOME="\''${XDG_DATA_HOME:-\$HOME/.local/share}"
|
||||
exec "$out/lib/gtkradiant/radiant.bin" "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/gtkradiant
|
||||
ln -s ../lib/gtkradiant/{q3map2,q3map2_urt,q3data} $out/bin/
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.115.3";
|
||||
version = "0.115.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MzGOBR++mnQd4CvBpPCibeimt05gsa3aHNK6FphBFGU=";
|
||||
hash = "sha256-//WWdU6vKgc+X4R3/GClABbsAp+ZBnG3xsVh4YozPFg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BmMrdPr3sQI0Pw32iIIVmWy2qLlR7SHyKu7+PLplxkE=";
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: let
|
|||
|
||||
in {
|
||||
pname = "logseq";
|
||||
version = "0.9.10";
|
||||
version = "0.9.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
hash = "sha256-en8ws0qdMY5j1o8oTkKcIHHQV+kCuQZzQbdFU97qAQE=";
|
||||
hash = "sha256-4qOXFSbHaoXqTmH6wSGyb6hutda63AxiKnUxJsHBtCg=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, ninja, git, pandoc, pkg-config
|
||||
, libGL, libGLU, freeimage
|
||||
{ lib, stdenv, fetchFromGitHub, writeText
|
||||
, cmake, ninja, curl, git, pandoc, pkg-config, unzip, zip
|
||||
, libGL, libGLU, freeimage, freetype, assimp
|
||||
, catch2, fmt, glew, miniz, tinyxml-2, xorg
|
||||
, qtbase, wrapQtAppsHook
|
||||
, copyDesktopItems, makeDesktopItem
|
||||
|
|
@ -8,38 +8,88 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "TrenchBroom";
|
||||
version = "2022.1";
|
||||
version = "2023.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TrenchBroom";
|
||||
repo = "TrenchBroom";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FNpYBfKnY9foPq1+21+382KKXieHksr3tCox251iJn4=";
|
||||
sha256 = "sha256-62xcFKSqxPS+J54+kLo/hewM+Wu/rVBGD8oiECDCJpA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
# Manually simulate a vcpkg installation so that it can link the libraries
|
||||
# properly.
|
||||
postUnpack =
|
||||
let
|
||||
vcpkg_target = "x64-linux";
|
||||
|
||||
vcpkg_pkgs = [
|
||||
"assimp"
|
||||
"catch2"
|
||||
"fmt"
|
||||
"freeimage"
|
||||
"freetype"
|
||||
"glew"
|
||||
"miniz"
|
||||
"tinyxml2"
|
||||
];
|
||||
|
||||
updates_vcpkg_file = writeText "update_vcpkg_trenchbroom" (
|
||||
lib.concatMapStringsSep "\n" (name: ''
|
||||
Package : ${name}
|
||||
Architecture : ${vcpkg_target}
|
||||
Version : 1.0
|
||||
Status : is installed
|
||||
'') vcpkg_pkgs);
|
||||
in ''
|
||||
export VCPKG_ROOT="$TMP/vcpkg"
|
||||
|
||||
mkdir -p $VCPKG_ROOT/.vcpkg-root
|
||||
mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib
|
||||
mkdir -p $VCPKG_ROOT/installed/vcpkg/updates
|
||||
ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status
|
||||
mkdir -p $VCPKG_ROOT/installed/vcpkg/info
|
||||
${lib.concatMapStrings (name: ''
|
||||
touch $VCPKG_ROOT/installed/vcpkg/info/${name}_1.0_${vcpkg_target}.list
|
||||
'') vcpkg_pkgs}
|
||||
|
||||
ln -s ${assimp.lib}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
ln -s ${catch2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
ln -s ${fmt}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
ln -s ${freeimage}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
ln -s ${freetype}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
ln -s ${glew.out}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
ln -s ${miniz}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
ln -s ${tinyxml-2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
|
||||
'';
|
||||
postPatch = ''
|
||||
substituteInPlace common/src/Version.h.in \
|
||||
--subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \
|
||||
--subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \
|
||||
--subst-var-by GIT_DESCRIBE v${version}
|
||||
substituteInPlace app/CMakeLists.txt \
|
||||
--replace 'set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")' 'set(CPACK_PACKAGING_INSTALL_PREFIX "'$out'")'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ];
|
||||
nativeBuildInputs = [ cmake ninja curl git pandoc wrapQtAppsHook copyDesktopItems pkg-config unzip zip ];
|
||||
buildInputs = [
|
||||
libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2
|
||||
xorg.libSM
|
||||
libGL libGLU xorg.libXxf86vm xorg.libSM
|
||||
freeimage freetype qtbase catch2 fmt
|
||||
glew miniz tinyxml-2 assimp
|
||||
];
|
||||
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
QT_QPA_PLATFORM = "offscreen";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_MAKE_PROGRAM=ninja"
|
||||
"-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
|
||||
"-DVCPKG_MANIFEST_INSTALL=OFF"
|
||||
# https://github.com/TrenchBroom/TrenchBroom/issues/4002#issuecomment-1125390780
|
||||
"-DCMAKE_PREFIX_PATH=cmake/packages"
|
||||
];
|
||||
ninjaFlags = [
|
||||
"TrenchBroom"
|
||||
];
|
||||
preBuild = "export HOME=$(mktemp -d)";
|
||||
|
||||
postInstall = ''
|
||||
pushd $out/share/TrenchBroom/icons
|
||||
|
|
@ -71,5 +121,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Level editor for Quake-engine based games";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tuba";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GeopJr";
|
||||
repo = "Tuba";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PSEPpJn/lYpeI6AN2AY73NpOcDkMm0zNqeSdELn5HvY=";
|
||||
hash = "sha256-sLdkSIevz2spL+Q5sS+ugqEbqJTXrLxmszzijtKvY6k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@ let
|
|||
repoUrl = "https://codeberg.org/explosion-mental/wallust";
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "wallust";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "${repoUrl}.git";
|
||||
rev = version;
|
||||
sha256 = "sha256-7zSUyj8Zzk8rsDe7ukPaV02HH7VQ+yjh+wM5TZzJxSA=";
|
||||
sha256 = "sha256-np03F4XxGFjWfxCKUUIm7Xlp1y9yjzkeb7F2I7dYttA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-toqt5vqEsflhqFargEcCXrb6ab748mn6k6/RH5d/3RA=";
|
||||
cargoSha256 = "sha256-yq51LQB53VKjMoNM3f/JzifEHSA69Jso2QYRsaplQfk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A better pywall";
|
||||
description = "A better pywal";
|
||||
homepage = repoUrl;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [onemoresuza];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon-bin";
|
||||
version = "32.2.1";
|
||||
version = "32.3.1";
|
||||
|
||||
src = fetchzip {
|
||||
urls = [
|
||||
|
|
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
|
|||
"https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
|
||||
];
|
||||
hash = if withGTK3 then
|
||||
"sha256-brF9ACAG+JM7bk/JarB208f8ihI/1d90l+6e1pHmC20="
|
||||
"sha256-1JYaxxkqgg/gLdZ+uGDB5BI0NKjHO4huk0b/M9QFuII="
|
||||
else
|
||||
"sha256-205rhW89Jlk4ICraqndTbJ6/88+ZqhtDOIvhFTiEUz0=";
|
||||
"sha256-p/Lid6Uv3XTEg+43Gke5VLILhzENHoBP6XjGVHy7wCY=";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
|
|
|||
|
|
@ -1,22 +1,24 @@
|
|||
{ dpkg, fetchurl, lib, stdenv }:
|
||||
{ squashfsTools, fetchurl, lib, stdenv }:
|
||||
|
||||
# This derivation roughly follows the update-ffmpeg script that ships with the official Vivaldi
|
||||
# downloads at https://vivaldi.com/download/
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chromium-codecs-ffmpeg-extra";
|
||||
version = "112.0.5615.49";
|
||||
version = "111306";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpadlibrarian.net/660647727/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
|
||||
sha256 = "sha256-mHjvjRG+toRcsOMca+JPXNZPgyQROH2qtSpBPHLmt3s=";
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_34.snap";
|
||||
sha256 = "sha256-Dna9yFgP7JeQLAeZWvSZ+eSMX2yQbX2/+mX0QC22lYY=";
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
buildInputs = [ squashfsTools ];
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x $src .
|
||||
unsquashfs -dest . $src
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -vD usr/lib/chromium-browser/libffmpeg.so $out/lib/libffmpeg.so
|
||||
install -vD chromium-ffmpeg-${version}/chromium-ffmpeg/libffmpeg.so $out/lib/libffmpeg.so
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://ffmpeg.org/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ betaboon cawilliamson lluchs ];
|
||||
maintainers = with maintainers; [ betaboon cawilliamson fptje ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
26
pkgs/applications/networking/cluster/kubevpn/default.nix
Normal file
26
pkgs/applications/networking/cluster/kubevpn/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubevpn";
|
||||
version = "1.1.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KubeNetworks";
|
||||
repo = "kubevpn";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P4lROZ6UxsCtMwGWIDBkXjd8v/wtD7u9LBoUUzP9Tz0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LihRVqVMrN45T9NLOQw/EsrEMTSLYYhWzVm+lYXtFRQ=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/KubeNetworks/kubevpn/releases/tag/${src.rev}";
|
||||
description = "Create a VPN and connect to Kubernetes cluster network, access resources, and more";
|
||||
homepage = "https://github.com/KubeNetworks/kubevpn";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mig4ng ];
|
||||
};
|
||||
}
|
||||
|
|
@ -77,9 +77,20 @@ rec {
|
|||
|
||||
nomad_1_5 = generic {
|
||||
buildGoModule = buildGo120Module;
|
||||
version = "1.5.6";
|
||||
sha256 = "sha256-eFzGaTJ9BcK5F10lkTKB3sNaGZsmZ0BbPZI6kT5ZUpo=";
|
||||
vendorSha256 = "sha256-tOUQr44wUhhCccvj4dCI7fvLMrKaEX7xY7035Q3wU3M=";
|
||||
version = "1.5.7";
|
||||
sha256 = "sha256-IafIC1YVbJFQjC04S2rqjDgB83uSFpMajgsKxfFc/H8=";
|
||||
vendorSha256 = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno=";
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
export PATH="$PATH:/build/go/bin"
|
||||
'';
|
||||
};
|
||||
|
||||
nomad_1_6 = generic {
|
||||
buildGoModule = buildGo120Module;
|
||||
version = "1.6.0";
|
||||
sha256 = "sha256-979SlqBu2/kUdPB4BplhOcEq0J2sjKmFkEiLOzOAUPM=";
|
||||
vendorSha256 = "sha256-Y3O7ADzZPlLWFbXSYBcI6b5MAhMD0UnkhQxO9VJMpOY=";
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
export PATH="$PATH:/build/go/bin"
|
||||
|
|
|
|||
|
|
@ -655,11 +655,11 @@
|
|||
"vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
|
||||
},
|
||||
"launchdarkly": {
|
||||
"hash": "sha256-d0Gtofv4Ly2D+ensPEjLhSjN+OGnAa6W2tb4+jqNGlc=",
|
||||
"hash": "sha256-RNLWcABBoTDY541og/euj4CLhK6t58wck9rpdedwRJM=",
|
||||
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
|
||||
"owner": "launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.13.1",
|
||||
"rev": "v2.13.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA="
|
||||
},
|
||||
|
|
@ -673,13 +673,13 @@
|
|||
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="
|
||||
},
|
||||
"linode": {
|
||||
"hash": "sha256-dX6sG8htSZgs/OSfH09gfx4ng3Sj0uAdzQFMrVwibPk=",
|
||||
"hash": "sha256-4lcEiX/Prx1fpD1HOo8B4YSvxo9yo7zWu07DVZ6NTmw=",
|
||||
"homepage": "https://registry.terraform.io/providers/linode/linode",
|
||||
"owner": "linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v2.5.1",
|
||||
"rev": "v2.5.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-n9ZZsTNE4E3T3SjF3+JjElDq5PVaD9o2Q2ATexRS/q0="
|
||||
"vendorHash": "sha256-ggKPeTPIFrnfoREB4yr5Wr2dwc5y7Gq0fBtUsbnoCL0="
|
||||
},
|
||||
"linuxbox": {
|
||||
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
|
||||
|
|
@ -745,13 +745,13 @@
|
|||
"vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-vhzidHQzWrLQ2fGZ0A7aGKwvrqWi6GJ3JCdoCX/dZkc=",
|
||||
"hash": "sha256-lNWGGDGr0dp+4S1mnRnLl0n//5GtOqqSH4mWQxvzXEQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.10.1",
|
||||
"rev": "v1.10.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-7wrN2BoFY0I9dV52x9LJ43PgUSOVnhJULm1EY+LEZOI="
|
||||
"vendorHash": "sha256-o8VrabFScEQyjfk4BLJGxq7LgZMWaQZ2cNAph37Grzo="
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
|
||||
|
|
@ -818,11 +818,11 @@
|
|||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-NyNQht7mWG4+IbyhCPSJnLTIFm7KeBpEfua5oR6ovC0=",
|
||||
"hash": "sha256-kGz6lginz3cZOYcfh21pBe+wAQ1slbsIz02sc1fNJ0E=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v5.4.0",
|
||||
"rev": "v5.5.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -971,13 +971,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"scaleway": {
|
||||
"hash": "sha256-AA9ctS5YQ36mvxfXSU77rfOWL5UXynVN+TUjpjBR40I=",
|
||||
"hash": "sha256-W1s4SCxpPsZH31KOExoGX1h5y8twaJQ6qKPiRXUkTZk=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.24.0",
|
||||
"rev": "v2.25.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-g/hNdUharGRTOIJZMk8lRAwO9PdMAbwJYTNcxTpfaV0="
|
||||
"vendorHash": "sha256-wwm0edsOwsuCiURFI2Y2Jue0FD+4pAzyDxqSVJYkQYE="
|
||||
},
|
||||
"secret": {
|
||||
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
|
||||
|
|
@ -1052,13 +1052,13 @@
|
|||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-fnWSDapAJXnNG1DHribLcRpMgGHke5EhmuQQjaj6sWE=",
|
||||
"hash": "sha256-gScCKmDH8uavJass9Fg9pa6u/ZZfkHEhfBHlyyv3svE=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.126.0",
|
||||
"rev": "v1.127.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-2SUCMdZRkAU97HFKEAKe5ryB+NB55aR/5k5K3p/digI="
|
||||
"vendorHash": "sha256-0rWVOVRndC/Y0gSfJoqd65rvBqUnNQb47S6RiBw7q+4="
|
||||
},
|
||||
"stackpath": {
|
||||
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
|
||||
|
|
@ -1106,11 +1106,11 @@
|
|||
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-53s1j5Xw7ZERz35lGzv9pHiAzcUX2dn5A74vFqv94Cg=",
|
||||
"hash": "sha256-WogC3T8KWOtgCczk7J589OIHN0gPCbll0NgchJ0WQAQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.81.14",
|
||||
"rev": "v1.81.15",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ notmuch openssl sqlite xapian zlib ];
|
||||
XAPIAN_CONFIG = "${xapian}/bin/xapian-config";
|
||||
meta = {
|
||||
description = "Synchronize maildirs and notmuch databases";
|
||||
homepage = "http://www.muchsync.org/";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
From dd4a96073d4a60ca8fff55be6ea6b17018de96a8 Mon Sep 17 00:00:00 2001
|
||||
From: Varun Madiath <git@madiathv.com>
|
||||
Date: Wed, 19 Jul 2023 15:30:57 -0400
|
||||
Subject: [PATCH] utils: lockfile: avoid stack overflow for lockfile buffer
|
||||
|
||||
Original patch by @cyphar was submitted to rakshasa/rtorrent at
|
||||
https://github.com/rakshasa/rtorrent/pull/1169.
|
||||
|
||||
Observed the segfault on nixos-unstable.
|
||||
---
|
||||
src/utils/lockfile.cc | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/utils/lockfile.cc b/src/utils/lockfile.cc
|
||||
index 76e4b8f..441f5c8 100644
|
||||
--- a/src/utils/lockfile.cc
|
||||
+++ b/src/utils/lockfile.cc
|
||||
@@ -75,7 +75,8 @@ Lockfile::try_lock() {
|
||||
int pos = ::gethostname(buf, 255);
|
||||
|
||||
if (pos == 0) {
|
||||
- ::snprintf(buf + std::strlen(buf), 255, ":+%i\n", ::getpid());
|
||||
+ ssize_t len = std::strlen(buf);
|
||||
+ ::snprintf(buf + len, 255 - len, ":+%i\n", ::getpid());
|
||||
ssize_t __attribute__((unused)) result = ::write(fd, buf, std::strlen(buf));
|
||||
}
|
||||
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./avoid-stack-overflow-for-lockfile-buf.patch
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit libtorrent;
|
||||
};
|
||||
|
|
|
|||
54
pkgs/applications/networking/pyload-ng/default.nix
Normal file
54
pkgs/applications/networking/pyload-ng/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ lib, fetchPypi, python3 }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
version = "0.5.0b3.dev72";
|
||||
pname = "pyload-ng";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pcbJc23Fylh/JoWRmbZmC8xUzUqh2ej6gT+B2w8DHFQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# relax version bounds
|
||||
sed -i 's/\([A-z0-9]*\)~=.*$/\1/' setup.cfg
|
||||
# not sure what Flask-Session2 is but flask-session works just fine
|
||||
sed -i '/Flask-Session2/d' setup.cfg
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
bitmath
|
||||
certifi
|
||||
cheroot
|
||||
cryptography
|
||||
filetype
|
||||
flask
|
||||
flask-babel
|
||||
flask-caching
|
||||
flask-compress
|
||||
flask-session
|
||||
flask-themes2
|
||||
js2py
|
||||
pycurl
|
||||
semver
|
||||
setuptools
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
plugins = with python3.pkgs; [
|
||||
beautifulsoup4 # for some plugins
|
||||
colorlog # colorful console logging
|
||||
pillow # for some CAPTCHA plugin
|
||||
send2trash # send some files to trash instead of deleting them
|
||||
slixmpp # XMPP plugin
|
||||
];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free and open-source download manager with support for 1-click-hosting sites";
|
||||
homepage = "https://github.com/pyload/pyload";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ ruby0b ];
|
||||
};
|
||||
}
|
||||
|
|
@ -20,10 +20,18 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "b308c422af8a33ecd58e21a10a72c353351a189df67006e38d1ec029a93d5678";
|
||||
};
|
||||
|
||||
buildInputs = [ dbus curl libnl udev cryptsetup ];
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook ];
|
||||
buildInputs = [
|
||||
dbus
|
||||
curl
|
||||
libnl
|
||||
udev
|
||||
cryptsetup
|
||||
];
|
||||
|
||||
unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root";
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
while read file; do
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fava";
|
||||
version = "1.24.4";
|
||||
version = "1.25";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-klRPe6NQMn3HVayfCGc05mB0afi3x4Wlj3EI0XdSkMc=";
|
||||
hash = "sha256-3SxFvvYZupYOsQU/n+zq3hamyWaaN9guoiV8km9mHjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.4.3";
|
||||
version = "2.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
sha256 = "sha256-2L+Yp8yxhmoVh34cW1s5Xy1f0X2xUo3UP32XcAV2LsM=";
|
||||
sha256 = "sha256-L68jk49lGw9LNSqIPlDp2WHoQhn8UBW6VDZwsCtjTQI=";
|
||||
};
|
||||
|
||||
postPath = ''
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackbox";
|
||||
version = "0.13.2";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "raggesilver";
|
||||
repo = "blackbox";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qz1805HLG/Yexilw0YCkTzed1wqonUtJ+QrbMyhKHh8=";
|
||||
hash = "sha256-ebwh9WTooJuvYFIygDBn9lYC7+lx9P1HskvKU8EX9jw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -64,6 +64,8 @@ stdenv.mkDerivation rec {
|
|||
libgee
|
||||
];
|
||||
|
||||
mesonFlags = [ "-Dblackbox_is_flatpak=false" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Beautiful GTK 4 terminal";
|
||||
homepage = "https://gitlab.gnome.org/raggesilver/blackbox";
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "marble";
|
||||
version = "unstable-2022-04-20";
|
||||
version = "unstable-2023-05-11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "raggesilver";
|
||||
repo = "marble";
|
||||
# Latest commit from the 'wip/gtk4' branch
|
||||
rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8";
|
||||
sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY=";
|
||||
# the same used on flatpak
|
||||
rev = "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb";
|
||||
sha256 = "sha256-obtz7zOyEZPgi/NNjtLr6aFm/1UVTzjTdJpN3JQfpUs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,22 +1,39 @@
|
|||
{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget
|
||||
, qtquickcontrols, qtgraphicaleffects, qmake, nixosTests }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, mkDerivation
|
||||
, qtbase
|
||||
, qtquick1
|
||||
, qmltermwidget
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
, qmake
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
pname = "cool-retro-term";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Swordfish90";
|
||||
repo = "cool-retro-term";
|
||||
rev = version;
|
||||
sha256 = "0mird4k88ml6y61hky2jynrjmnxl849fvhsr5jfdlnv0i7r5vwi5";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PewHLVmo+RTBHIQ/y2FBkgXsIvujYd7u56JdFC10B4c=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e '/qmltermwidget/d' cool-retro-term.pro
|
||||
'';
|
||||
|
||||
buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtquick1
|
||||
qmltermwidget
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -29,14 +29,14 @@
|
|||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.29.0";
|
||||
version = "0.29.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FTitj43RFCNvSWInXHALyIljfcBBkaq/XI1ZA1k0glk=";
|
||||
hash = "sha256-C7Km98N/ER+IJ964V+BFkVF8N7uRmraPIpHn8yJtb/Q=";
|
||||
};
|
||||
|
||||
goModules = (buildGoModule {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, stdenv, fetchFromGitHub, git, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-backdate";
|
||||
version = "2023-07-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rixx";
|
||||
repo = pname;
|
||||
rev = "8ba5a0eba04e5559be2e4b1b6e02e62b64ca4dd8";
|
||||
sha256 = "sha256-91cEGQ0FtoiHEZHQ93jPFHF2vLoeQuBidykePFHtrsY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 git-backdate -t $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Backdate a commit or range of commit to a date or range of dates";
|
||||
homepage = "https://github.com/rixx/git-backdate";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gql";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AmrDeveloper";
|
||||
repo = "GQL";
|
||||
rev = version;
|
||||
hash = "sha256-x6Es8J6qdtCdrs23eQoIDSusOiDH/mLKch14loEhO5k=";
|
||||
hash = "sha256-d6uncWHq9bLDODFle7xij9YjhpiQPL7mmyFmVxmy8hY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OUMIISLsOAjjIZjMrPYK/cW+n0NbTnuu5Rakvm4LUf4=";
|
||||
cargoHash = "sha256-jR79xchMpib76oVnpy+UIbcwhDXvDPyl+jWmVPfXVog=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -28,11 +28,6 @@ rustPlatform.buildRustPackage rec {
|
|||
zlib
|
||||
];
|
||||
|
||||
# Cargo.lock is outdated
|
||||
preConfigure = ''
|
||||
cargo metadata --offline
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A SQL like query language to perform queries on .git files";
|
||||
homepage = "https://github.com/AmrDeveloper/GQL";
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-reSC9j9ESjRigItBRytef78XBjmMGsqu0o9qcN2AstU=";
|
||||
hash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, subversion, glibcLocales, sshSupport ? true, openssh ? null
|
||||
}:
|
||||
|
||||
{ url, rev ? "HEAD", md5 ? "", sha256 ? ""
|
||||
{ url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? ""
|
||||
, ignoreExternals ? false, ignoreKeywords ? false, name ? null
|
||||
, preferLocalBuild ? true
|
||||
}:
|
||||
|
|
@ -34,6 +34,8 @@ in
|
|||
|
||||
if md5 != "" then
|
||||
throw "fetchsvn does not support md5 anymore, please use sha256"
|
||||
else if hash != "" && sha256 != "" then
|
||||
throw "Only one of sha256 or hash can be set"
|
||||
else
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = name_;
|
||||
|
|
@ -43,9 +45,14 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null;
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashAlgo = if hash != "" then null else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = sha256;
|
||||
outputHash = if hash != "" then
|
||||
hash
|
||||
else if sha256 != "" then
|
||||
sha256
|
||||
else
|
||||
lib.fakeSha256;
|
||||
|
||||
inherit url rev ignoreExternals ignoreKeywords;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
, gnome-themes-extra
|
||||
, gtk-engine-murrine
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "gruvbox-gtk-theme";
|
||||
version = "unstable-2022-12-09";
|
||||
version = "unstable-2023-05-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Gruvbox-GTK-Theme";
|
||||
rev = "c3172d8dcba66f4125a014d280d41e23f0b95cad";
|
||||
sha256 = "1411mjlcj1d6kw3d3h1w9zsr0a08bzl5nddkkbv7w7lf67jy9b22";
|
||||
rev = "c0b7fb501938241a3b6b5734f8cb1f0982edc6b4";
|
||||
hash = "sha256-Y+6HuWaVkNqlYc+w5wLkS2LpKcDtpeOpdHnqBmShm5Q=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
|
|
|
|||
|
|
@ -117,10 +117,35 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
|
|||
# https://web.archive.org/web/20170222224855/http://frank.harvard.edu/~coldwell/toolchain/
|
||||
# https://web.archive.org/web/20170224235700/http://frank.harvard.edu/~coldwell/toolchain/t-linux.diff
|
||||
+ lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && enableShared)
|
||||
(lib.optionalString (!stdenv.targetPlatform.isPower) ''
|
||||
echo 'libgcc.a: crti.o crtn.o' >> libgcc/Makefile.in
|
||||
'' + ''
|
||||
echo 'SHLIB_LC=' >> libgcc/Makefile.in
|
||||
(let
|
||||
|
||||
# crt{i,n}.o are the first and last (respectively) object file
|
||||
# linked when producing an executable. Traditionally these
|
||||
# files are delivered as part of the C library, but on GNU
|
||||
# systems they are in fact built by GCC. Since libgcc needs to
|
||||
# build before glibc, we can't wait for them to be copied by
|
||||
# glibc. At this early pre-glibc stage these files sometimes
|
||||
# have different names.
|
||||
crtstuff-ofiles =
|
||||
if targetPlatform.isPower
|
||||
then "ecrti.o ecrtn.o ncrti.o ncrtn.o"
|
||||
else "crti.o crtn.o";
|
||||
|
||||
# Normally, `SHLIB_LC` is set to `-lc`, which means that
|
||||
# `libgcc_s.so` cannot be built until `libc.so` is available.
|
||||
# The assignment below clobbers this variable, removing the
|
||||
# `-lc`.
|
||||
#
|
||||
# On PowerPC we add `-mnewlib`, which means "libc has not been
|
||||
# built yet". This causes libgcc's Makefile to use the
|
||||
# gcc-built `{e,n}crt{n,i}.o` instead of failing to find the
|
||||
# versions which have been repackaged in libc as `crt{n,i}.o`
|
||||
#
|
||||
SHLIB_LC = lib.optionalString targetPlatform.isPower "-mnewlib";
|
||||
|
||||
in ''
|
||||
echo 'libgcc.a: ${crtstuff-ofiles}' >> libgcc/Makefile.in
|
||||
echo 'SHLIB_LC=${SHLIB_LC}' >> libgcc/Makefile.in
|
||||
'')
|
||||
|
||||
+ lib.optionalString (!enableMultilib && hostPlatform.is64bit && !hostPlatform.isMips64n32) ''
|
||||
|
|
|
|||
|
|
@ -50,14 +50,14 @@ stdenv.mkDerivation ({
|
|||
# to PATH so the scripts can run without problems.
|
||||
|
||||
for f in $out/bin/*; do
|
||||
b=$(basename $f)
|
||||
b=$(basename $f)
|
||||
if [ "$b" = mix ]; then continue; fi
|
||||
wrapProgram $f \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}"
|
||||
done
|
||||
|
||||
substituteInPlace $out/bin/mix \
|
||||
--replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir"
|
||||
--replace "/usr/bin/env elixir" "${coreutils}/bin/env $out/bin/elixir"
|
||||
'';
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "sha256" args;
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error"
|
||||
# gstcameradeinterlace.cpp:55:10: fatal error: gst/video/video.h: No such file or directory
|
||||
"-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ stdenv.mkDerivation {
|
|||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error"
|
||||
"-I${lib.getDev ipu6-camera-bin}/include/ia_imaging"
|
||||
"-I${lib.getDev ipu6-camera-bin}/include/ia_camera"
|
||||
];
|
||||
|
|
|
|||
59
pkgs/development/libraries/libspelling/default.nix
Normal file
59
pkgs/development/libraries/libspelling/default.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, vala
|
||||
, gi-docgen
|
||||
, glib
|
||||
, gtk4
|
||||
, gtksourceview5
|
||||
, enchant
|
||||
, icu
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libspelling";
|
||||
version = "unstable-2023-07-17";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "chergert";
|
||||
repo = "libspelling";
|
||||
rev = "65185023db95ec464970aeaeab766fe3ba26ae7d";
|
||||
hash = "sha256-R3nPs16y8XGamQvMSF7wb52h0jxt17H2FZPwauLDI/c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
vala
|
||||
gi-docgen
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
gtksourceview5
|
||||
enchant
|
||||
icu
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Spellcheck library for GTK 4";
|
||||
homepage = "https://gitlab.gnome.org/chergert/libspelling";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ chuangzhu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.1/submodules/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/ -A '*.tar.xz' )
|
||||
|
|
|
|||
|
|
@ -1,310 +1,318 @@
|
|||
# DO NOT EDIT! This file is generated automatically.
|
||||
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/
|
||||
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6
|
||||
{ fetchurl, mirror }:
|
||||
|
||||
{
|
||||
qt3d = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt3d-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "16v875hv58f1cnb76c8pd63v44fncfdrv29b008bamxs23lf2m3y";
|
||||
name = "qt3d-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "047rwawrlm7n0vifxmsqvs3w3j5c16x8qkpx8xazq6xd47dn9w11";
|
||||
name = "qt3d-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qt5 = {
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "15da8xd213fg2yfna3zvvr5mnhdfdai0i4m1paqfxr10sl81p515";
|
||||
name = "qt5-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qt5compat = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qt5compat-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "10zvah04mnyg5apkwq015kxs03y467naicxy8ljfzazgbwljp6df";
|
||||
name = "qt5compat-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr";
|
||||
name = "qt5compat-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtactiveqt = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtactiveqt-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0yii7ihvzncwqhrb1635my5arr6lymr2d3wnwpcn42b7l6krsk6d";
|
||||
name = "qtactiveqt-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "04zhbwhnjlc561bs2f4y82mzlf18byy6g5gh37yq9r3gfz54002x";
|
||||
name = "qtactiveqt-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtbase = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtbase-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1vdzxrcfhn6ym7p8jzr3xxx1r4r435fx461lwfgii8838cgzlmnv";
|
||||
name = "qtbase-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x";
|
||||
name = "qtbase-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcharts = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtcharts-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0xfgj970ip0fn2gxrsilg1gvq4w2849vs6gysn0qhnz7qw7m0nxi";
|
||||
name = "qtcharts-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0bddlrwda5bh5bdwdx86ixdpm3zg5nygzb754y5nkjlw06zgfnkp";
|
||||
name = "qtcharts-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtconnectivity = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtconnectivity-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0yl2i4qdmvdzspnr0jpf031gd2cndkx4hppy5sdjppy4g2dlrmrg";
|
||||
name = "qtconnectivity-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "16fwbz9pr6pi19119mp6w0crq9nsb35fw8cgpfpkq99d6li4jbnv";
|
||||
name = "qtconnectivity-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdatavis3d = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdatavis3d-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0cx3bmbwg0y99495zp1gafs4bfn75dbf6r6dfgy1ii9i66y2lcsj";
|
||||
name = "qtdatavis3d-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdatavis3d-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1s8wlpc4nibnxaghkxmaxda5dkkn64jw6qgmzw39vi5vvhc3khb8";
|
||||
name = "qtdatavis3d-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdeclarative = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdeclarative-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0yff5nbcspl3w3231wvgvac38q0lskxx1l2wm1lx2raac7wlh490";
|
||||
name = "qtdeclarative-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk";
|
||||
name = "qtdeclarative-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdoc = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtdoc-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0c9ckm7rcp3vi7qipzqyqpar2f5l426s8vgdz71q1ccx432a0kj1";
|
||||
name = "qtdoc-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdoc-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0cydg39f4cpv965pr97qn3spm5fzlxvhamifjfdsrzgskc5nm0v3";
|
||||
name = "qtdoc-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgrpc = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtgrpc-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1r27m7c1ab1gk2hzi4d9mpvk1kc5zypx6d6q9wa7kv26d4d2vgls";
|
||||
name = "qtgrpc-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtgrpc-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "016jw2ny7paky54pk4pa499273919s8ag2ksx361ir6d0ydrdcks";
|
||||
name = "qtgrpc-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qthttpserver = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qthttpserver-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0z7wrvfln7mr7n1i1pijx36c6wi66dm91mdir5f8gqk15i84zpj7";
|
||||
name = "qthttpserver-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qthttpserver-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1b6w0999n5vw5xb93m0rc896l6ci3jld657y8645rl3q29fjpypq";
|
||||
name = "qthttpserver-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtimageformats = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtimageformats-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1daxijk9mb2gb65pxjdqw4r5vjs3vi20d4lixq6mh0xdk717yzw9";
|
||||
name = "qtimageformats-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a";
|
||||
name = "qtimageformats-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlanguageserver = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlanguageserver-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1j9bhd4k30ana08nppqqll6v5nxr9dzxqxsh12i2cihjr9mcr9lr";
|
||||
name = "qtlanguageserver-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlanguageserver-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk";
|
||||
name = "qtlanguageserver-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlocation = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlocation-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1x0j6r0gll469aq75viyyyw1gfl180rcyq0h83z35664jzx1i2mn";
|
||||
name = "qtlocation-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1yvdv1gqj7dij7v4cq9rlnqfb77c0v9b7n56jccvy5v6q9j7s7c9";
|
||||
name = "qtlocation-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlottie = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtlottie-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "10bbq952iv3f2v42nqirld0qy363g03zdq6hlh1lfcbmgc8gif0h";
|
||||
name = "qtlottie-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlottie-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0";
|
||||
name = "qtlottie-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmultimedia = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtmultimedia-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1k71chjdh66yv13li38ig507wpsr7cn87nqkvcfxmkf8w5hca7qb";
|
||||
name = "qtmultimedia-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl";
|
||||
name = "qtmultimedia-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtnetworkauth = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtnetworkauth-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "18viv41qazcbix9l21g5vz1r6zp6mxnbl2c2j3ip1yln7rmbac57";
|
||||
name = "qtnetworkauth-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f";
|
||||
name = "qtnetworkauth-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtpositioning = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtpositioning-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "08m41rx1yd28dr53pfrdfvgkmnszqyax88jhqczcb048w50gjg05";
|
||||
name = "qtpositioning-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh";
|
||||
name = "qtpositioning-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3d = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3d-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "07ncn3gl3yvdq8ly3rn7693lzq0slghmw9ljq119s4bbsnk2ddji";
|
||||
name = "qtquick3d-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1nh0vg2m1lf8m40bxbwsam5pwdzjammhal69k2pb5s0rjifs7q3m";
|
||||
name = "qtquick3d-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquick3dphysics = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquick3dphysics-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1j0kfqdwx8x7bagw8qjkywsd2fzih2yp36vza2hil56m35s8ibcl";
|
||||
name = "qtquick3dphysics-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3dphysics-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0dri8v0pmvc1h1cdhdchvd4xi5f62c1wrk0jd01lh95i6sc1403m";
|
||||
name = "qtquick3dphysics-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickeffectmaker = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquickeffectmaker-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "18lhvf9mlprmg0jba9biciscns12zvwr5jj81kkvv0mv8h3yrg2i";
|
||||
name = "qtquickeffectmaker-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1gvcszqj6khqisxkpwi67xad0247hpq5zcz4v2vhbgkxq8kwfiym";
|
||||
name = "qtquickeffectmaker-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquicktimeline = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtquicktimeline-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0lfm997p5x5nn4zlz2p1djd3757b0m00347xkfy9n6y5fsidny8h";
|
||||
name = "qtquicktimeline-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1fhmy01nqcr9q1193m9fkhbvqd9208kaigprqxkjjm61bn8awif9";
|
||||
name = "qtquicktimeline-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtremoteobjects = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtremoteobjects-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "16v2qzn5lf5bxrdff4fr624x5n262qvhinrk0vfmcdvrb2plgkvq";
|
||||
name = "qtremoteobjects-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtremoteobjects-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60";
|
||||
name = "qtremoteobjects-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscxml = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtscxml-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0xr4005b640r1h7nbfmgjban9mihxgm4sfqizw30xhsjpg4a6ghw";
|
||||
name = "qtscxml-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58";
|
||||
name = "qtscxml-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsensors = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsensors-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "19dbci4487anpkm85n1yly1mm5zx1f5dgx08v5ar5462f61wlnn9";
|
||||
name = "qtsensors-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "19iamfl4znqbfflnnpis6qk3cqri7kzbg0nsgf42lc5lzdybs1j0";
|
||||
name = "qtsensors-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialbus = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialbus-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0zqmbqnaf8ln6kdf5nc9k4q618d7jd4dmc2gsmgcf2mz55w9dzyv";
|
||||
name = "qtserialbus-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialbus-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1zndnw1zx5x9daidcm0jq7jcr06ihw0nf6iksrx591f1rl3n6hph";
|
||||
name = "qtserialbus-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialport = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtserialport-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "19ijnjy5bqv7g74q2ax4pvmggphpccckszxilj0vkqnl8q34smf3";
|
||||
name = "qtserialport-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06";
|
||||
name = "qtserialport-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtshadertools = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtshadertools-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0ljhysyiwxawws0481hyk1xbycc21jg6gq5fsn8yyi2rhdhng075";
|
||||
name = "qtshadertools-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya";
|
||||
name = "qtshadertools-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtspeech = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtspeech-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1djp6ijjvl94zajbvgz80xnzd2fpkq8fnnpxnq9jg5jny6jhn4k7";
|
||||
name = "qtspeech-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8";
|
||||
name = "qtspeech-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsvg = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtsvg-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1vq8jvz13hp9nj9r77f0nx7nq3pciy4sk1j6d2dzbw243m4jk3fm";
|
||||
name = "qtsvg-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28";
|
||||
name = "qtsvg-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qttools = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttools-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0a93xg65z19bldwhc77x87khjwkx3hs01z1gjdznza5jhjgdyi2p";
|
||||
name = "qttools-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm";
|
||||
name = "qttools-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qttranslations = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qttranslations-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "16ylh1hf7r4g8s0h6wgkngwy1p75qnq6byz1q14wwzk3q8s2qzjj";
|
||||
name = "qttranslations-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k";
|
||||
name = "qttranslations-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "1h9whvpdy37vazl095qqvsl8d2b298v2i25fsvr04x9ns3b47cl9";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0sb2c901ma30dcbf4yhznw0pad09iz55alvkzyw2d992gqwf0w05";
|
||||
name = "qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwayland = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwayland-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0kcp1adgszcrwv89f2m3rp2ldbrbnb7prkr8065w5j9ik2hiw7vw";
|
||||
name = "qtwayland-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h";
|
||||
name = "qtwayland-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebchannel = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebchannel-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0jpc231gmgy540x9im8ld1fjmxqjaw1c40r6d2g5gxrpwxkl6drb";
|
||||
name = "qtwebchannel-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261";
|
||||
name = "qtwebchannel-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebengine = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebengine-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0clcxkybgn5ny22rbdckxczqsf5gc3f55q7r02l5q7q6biqbs61g";
|
||||
name = "qtwebengine-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7";
|
||||
name = "qtwebengine-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebsockets-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "06fsc42x571af78rlx8ah7i9nqc9qnzqvd1mmrx12xd6a2r6d3vb";
|
||||
name = "qtwebsockets-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0";
|
||||
name = "qtwebsockets-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebview = {
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.1/submodules/qtwebview-everywhere-src-6.5.1.tar.xz";
|
||||
sha256 = "0r1six7k9nz1n64c8ff1j24x2dfrr931aiwygpsf36bim27bdbvb";
|
||||
name = "qtwebview-everywhere-src-6.5.1.tar.xz";
|
||||
url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebview-everywhere-src-6.5.2.tar.xz";
|
||||
sha256 = "0cgn1px8zk2khmswi9zawi9cnx9p26y4lb3a0kr4kfklm1rf00jr";
|
||||
name = "qtwebview-everywhere-src-6.5.2.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildNimPackage rec {
|
||||
pname = "cbor";
|
||||
version = "20230310";
|
||||
version = "20230619";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ehmry";
|
||||
repo = "nim_${pname}";
|
||||
rev = version;
|
||||
hash = "sha256-VmSYWgXDJLB2D2m3/ymrEytT2iW5JE56WmDz2MPHAqQ=";
|
||||
hash = "sha256-F6T/5bUwrJyhRarTWO9cjbf7UfEOXPNWu6mfVKNZsQA=";
|
||||
};
|
||||
meta = with lib;
|
||||
src.meta // {
|
||||
|
|
|
|||
|
|
@ -1,27 +1,24 @@
|
|||
{ lib, buildNimPackage, fetchFromGitea, pkg-config
|
||||
, base32, coap, cbor, freedesktop_org, syndicate, tkrzw }:
|
||||
{ lib, buildNimPackage, fetchFromGitea, pkg-config, base32, coap, cbor
|
||||
, freedesktop_org, illwill, syndicate, tkrzw }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "eris";
|
||||
version = "20230201";
|
||||
version = "20230716";
|
||||
outputs = [ "bin" "out" ];
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "eris";
|
||||
repo = "nim-${pname}";
|
||||
rev = version;
|
||||
hash = "sha256-6vlD/woqTkbSRWhRtQD/ynk0DG+GrGwh6x+qUmo6YSQ=";
|
||||
hash = "sha256-g2mxua4++zqKeMbe98nBWh7/+rN/IElIiPcvyX0nfEY=";
|
||||
};
|
||||
propagatedNativeBuildInputs = [ pkg-config ];
|
||||
propagatedBuildInputs = [
|
||||
base32
|
||||
coap
|
||||
cbor
|
||||
freedesktop_org
|
||||
syndicate
|
||||
tkrzw
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
[ base32 coap cbor freedesktop_org illwill syndicate tkrzw ];
|
||||
postInstall = ''
|
||||
mkdir -p "$bin/share/recoll/filters"
|
||||
mv "$bin/bin/rclerislink" "$bin/share/recoll/filters/"
|
||||
|
||||
mkdir -p "$bin/share/applications"
|
||||
substitute "eris-open.desktop" "$bin/share/applications/eris-open.desktop"\
|
||||
--replace "Exec=eriscmd " "Exec=$bin/bin/eriscmd "
|
||||
|
|
@ -29,6 +26,7 @@ buildNimPackage rec {
|
|||
install -D "eris-link.xml" -t "$bin/share/mime/packages"
|
||||
install -D "eris48.png" "$bin/share/icons/hicolor/48x48/apps/eris.png"
|
||||
'';
|
||||
preCheck = "rm tests/test_syndicate.nim";
|
||||
meta = src.meta // {
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
|
|
|
|||
17
pkgs/development/nim-packages/hashlib/default.nix
Normal file
17
pkgs/development/nim-packages/hashlib/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "hashlib";
|
||||
version = "1.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "khchen";
|
||||
repo = pname;
|
||||
rev = "84e0247555e4488594975900401baaf5bbbfb531";
|
||||
hash = "sha256-nWNThelCh0LPVU7ryZgS/23hRRvJDVL2xWbQibb+zN0=";
|
||||
};
|
||||
meta = src.meta // {
|
||||
description = "Hash Library for Nim";
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildNimPackage rec {
|
||||
pname = "illwill";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnnovak";
|
||||
repo = "illwill";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9YBkad5iUKRb375caAuoYkfp5G6KQDhX/yXQ7vLu/CA=";
|
||||
hash = "sha256-4DHGVWzN/WTAyDRBBpXlcfKnYIcbFt42/iWInaBUwi4=";
|
||||
};
|
||||
|
||||
meta = with lib;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ lib, stdenv, buildNimPackage, fetchFromGitea, npeg }:
|
||||
{ lib, stdenv, buildNimPackage, fetchFromGitea, nim-unwrapped, npeg }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "preserves";
|
||||
version = "20221102";
|
||||
version = "20230530";
|
||||
src = fetchFromGitea {
|
||||
domain = "git.syndicate-lang.org";
|
||||
owner = "ehmry";
|
||||
repo = "${pname}-nim";
|
||||
rev = version;
|
||||
hash = "sha256-oRsq1ugtrOvTn23596BXRy71TQZ4h/Vv6JGqBTZdoKY=";
|
||||
hash = "sha256-IRIBGjv4po8VyL873v++ovqz8Vg6a9Qbh/M1fxpQXvY=";
|
||||
};
|
||||
propagatedBuildInputs = [ npeg ];
|
||||
nimFlags = [ "--path:${nim-unwrapped}/nim" ];
|
||||
doCheck = !stdenv.isDarwin;
|
||||
meta = src.meta // {
|
||||
description = "Nim implementation of the Preserves data language";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, buildNimPackage, fetchFromGitea, nimSHA2, preserves }:
|
||||
{ lib, buildNimPackage, fetchFromGitea, hashlib, preserves }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "syndicate";
|
||||
version = "20221102";
|
||||
version = "20230530";
|
||||
src = fetchFromGitea {
|
||||
domain = "git.syndicate-lang.org";
|
||||
owner = "ehmry";
|
||||
repo = "${pname}-nim";
|
||||
rev = version;
|
||||
hash = "sha256-yTPbEsBcpEPXfmhykbWzWdnJ2ExEJxdii1L+mqx8VGQ=";
|
||||
hash = "sha256-lUHoMSQwUlz9EDMvpFL9GlrwbwMvZDILSmuakONwe50=";
|
||||
};
|
||||
propagatedBuildInputs = [ nimSHA2 preserves ];
|
||||
propagatedBuildInputs = [ hashlib preserves ];
|
||||
meta = src.meta // {
|
||||
description = "Nim implementation of the Syndicated Actor model";
|
||||
license = lib.licenses.unlicense;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildNimPackage rec {
|
||||
pname = "taps";
|
||||
version = "20221228";
|
||||
version = "20230331";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ehmry";
|
||||
repo = "nim_${pname}";
|
||||
rev = version;
|
||||
hash = "sha256-0EjMP5pIPJg4/3nzj6ECC68f709TS06OrJlTZ0tavEo=";
|
||||
hash = "sha256-p2DBJWFwS82oHPq0uMCtZWFbn8GFndEJBjhkHeuPGos=";
|
||||
};
|
||||
propagatedBuildInputs = [ getdns ];
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -123,6 +123,7 @@
|
|||
, "diagnostic-languageserver"
|
||||
, "diff2html-cli"
|
||||
, "dockerfile-language-server-nodejs"
|
||||
, "dotenv-cli"
|
||||
, "dotenv-vault"
|
||||
, "elasticdump"
|
||||
, "@electron-forge/cli"
|
||||
|
|
|
|||
7698
pkgs/development/node-packages/node-packages.nix
generated
7698
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -2,27 +2,16 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "bisect_ppx";
|
||||
version = "2.8.2";
|
||||
version = "2.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aantron";
|
||||
repo = "bisect_ppx";
|
||||
rev = version;
|
||||
hash = "sha256-Uc5ZYL6tORcCCvCe9UmOnBF68FqWpQ4bc48fTQwnfis=";
|
||||
hash = "sha256-3qXobZLPivFDtls/3WNqDuAgWgO+tslJV47kjQPoi6o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Ppxlib >= 0.28.0 compatibility
|
||||
# remove when a new version is released
|
||||
(fetchpatch {
|
||||
name = "${pname}-${version}-ppxlib-0.28-compatibility.patch";
|
||||
url = "https://github.com/anmonteiro/bisect_ppx/commit/cc442a08e3a2e0e18deb48f3a696076ac0986728.patch";
|
||||
sha256 = "sha256-pPHhmtd81eWhQd4X0gfZNPYT75+EkurwivP7acfJbNc=";
|
||||
})
|
||||
];
|
||||
|
||||
minimalOCamlVersion = "4.11";
|
||||
duneVersion = "3";
|
||||
|
||||
buildInputs = [
|
||||
cmdliner
|
||||
|
|
|
|||
|
|
@ -4,15 +4,16 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "iri";
|
||||
version = "0.6.0";
|
||||
duneVersion = "3";
|
||||
version = "0.7.0";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = "zoggy";
|
||||
repo = "ocaml-iri";
|
||||
rev = version;
|
||||
sha256 = "sha256:0zk8nnwcyljkc1a556byncv6cn1vqhk4267z1lm15flh1k7chyax";
|
||||
hash = "sha256-Mkg7kIIVpKbeWUras1RqtJsRx2Q3dBnm4QqSMJFweF8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sedlex uunf uutf ];
|
||||
|
|
|
|||
62
pkgs/development/python-modules/albumentations/default.nix
Normal file
62
pkgs/development/python-modules/albumentations/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, opencv4
|
||||
, pyyaml
|
||||
, qudida
|
||||
, scikit-image
|
||||
, scipy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "albumentations";
|
||||
version = "1.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pqODiP5UbFaAcejIL0FEmOhsntA8CLWOeoizHPeiRMY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"opencv-python"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
opencv4
|
||||
pyyaml
|
||||
qudida
|
||||
scikit-image
|
||||
scipy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# this test hangs up
|
||||
"test_transforms"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "albumentations" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast image augmentation library and easy to use wrapper around other libraries";
|
||||
homepage = "https://github.com/albumentations-team/albumentations";
|
||||
changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,17 +19,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fiona";
|
||||
version = "1.9.1";
|
||||
version = "1.9.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Toblerity";
|
||||
repo = "Fiona";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2CGLkgnpCAh9G+ILol5tmRj9S6/XeKk8eLzGEODiyP8=";
|
||||
hash = "sha256-v4kTjoGu4AiEepBrGyY1e1OFC1eCk/U6f8XA/vtfY0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -49,7 +48,6 @@ buildPythonPackage rec {
|
|||
cligj
|
||||
click-plugins
|
||||
munch
|
||||
setuptools
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
|
@ -66,12 +64,27 @@ buildPythonPackage rec {
|
|||
rm -r fiona # prevent importing local fiona
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Some tests access network, others test packaging
|
||||
"http" "https" "wheel"
|
||||
pytestFlagsArray = [
|
||||
# Tests with gdal marker do not test the functionality of Fiona,
|
||||
# but they are used to check GDAL driver capabilities.
|
||||
"-m 'not gdal'"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "fiona" ];
|
||||
disabledTests = [
|
||||
# Some tests access network, others test packaging
|
||||
"http"
|
||||
"https"
|
||||
"wheel"
|
||||
|
||||
# see: https://github.com/Toblerity/Fiona/issues/1273
|
||||
"test_append_memoryfile_drivers"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fiona"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt";
|
||||
|
|
|
|||
25
pkgs/development/python-modules/flask-themes2/default.nix
Normal file
25
pkgs/development/python-modules/flask-themes2/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, flask, pythonOlder, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-themes2";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-Themes2";
|
||||
inherit version;
|
||||
hash = "sha256-0U0cSdBddb9+IG3CU6zUPlxaJhQlxOV6OLgxnNDChy8=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
propagatedBuildInputs = [ flask ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easily theme your Flask app";
|
||||
homepage = "https://github.com/sysr-q/flask-themes2";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ruby0b ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grad-cam";
|
||||
version = "1.4.6";
|
||||
version = "1.4.8";
|
||||
disabled = pythonOlder "3.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sL4+UUfC60JWAgJPvXeVGUHAskuoceVYwYDrYlibUOE=";
|
||||
hash = "sha256-BNcwDaEEmRsEoJ4nvvGfjZ9LdG0eRqZCFuY5/Gmp5N4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "islpy";
|
||||
version = "2023.1";
|
||||
version = "2023.1.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QLkpCBF95OBOzPrBXmlzyhFMfq1bs2+S/8Z5n4oMekg=";
|
||||
sha256 = "sha256-NsNI1N9ZuNYWr1i3dl7hSaTP3jdsTYsIpoF98vrZG9Y=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
|
|
|
|||
31
pkgs/development/python-modules/jsonable/default.nix
Normal file
31
pkgs/development/python-modules/jsonable/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonable";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halfak";
|
||||
repo = "python-jsonable";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
pythonImportsCheck = [ "jsonable" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides an abstract base class and utilities for defining trivially JSONable python objects";
|
||||
homepage = "https://github.com/halfak/python-jsonable";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
41
pkgs/development/python-modules/mwcli/default.nix
Normal file
41
pkgs/development/python-modules/mwcli/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonRelaxDepsHook
|
||||
, docopt
|
||||
, para
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mwcli";
|
||||
version = "0.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ADMb0P8WtXIcnGJ02R4l/TVfRewHc8ig45JurAWHGaA=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
pythonRemoveDeps = [
|
||||
"mwxml"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
docopt
|
||||
para
|
||||
];
|
||||
|
||||
# Tests require mwxml which itself depends on this package (circular dependency)
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of helper functions and classes for mediawiki-utilities command-line utilities";
|
||||
homepage = "https://github.com/mediawiki-utilities/python-mwcli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
37
pkgs/development/python-modules/mwtypes/default.nix
Normal file
37
pkgs/development/python-modules/mwtypes/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jsonable
|
||||
, pytestCheckHook
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mwtypes";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3BF2xZZWKcEj6FmzGa5hUdTjhVMemngWBMDUyjQ045k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jsonable ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
disabledTests = [
|
||||
"test_normalize_path_bad_extension"
|
||||
"test_open_file"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mwtypes" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of classes for working with MediaWiki data types.";
|
||||
homepage = "https://github.com/mediawiki-utilities/python-mwtypes";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
42
pkgs/development/python-modules/mwxml/default.nix
Normal file
42
pkgs/development/python-modules/mwxml/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jsonschema
|
||||
, mwcli
|
||||
, mwtypes
|
||||
, pytestCheckHook
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mwxml";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CEjfDPLik3GPVUMRrPRxW9Z59jn05Sy+R9ggZYnbHTE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jsonschema
|
||||
mwcli
|
||||
mwtypes
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
disabledTests = [
|
||||
"test_page_with_discussion"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mwxml" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of utilities for processing MediaWiki XML dump data";
|
||||
homepage = "https://github.com/mediawiki-utilities/python-mwxml";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
|
||||
, buildPythonPackage
|
||||
, notmuch
|
||||
, python
|
||||
|
|
@ -13,7 +12,12 @@ buildPythonPackage {
|
|||
|
||||
sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi";
|
||||
|
||||
buildInputs = [ python notmuch cffi ];
|
||||
nativeBuildInputs = [
|
||||
cffi
|
||||
];
|
||||
buildInputs = [
|
||||
python notmuch cffi
|
||||
];
|
||||
|
||||
# since notmuch 0.35, this package expects _notmuch_config.py that is
|
||||
# generated by notmuch's configure script
|
||||
|
|
|
|||
29
pkgs/development/python-modules/para/default.nix
Normal file
29
pkgs/development/python-modules/para/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "para";
|
||||
version = "0.0.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RsMjKunY6p2IbP0IzdESiSICvthkX0C2JVWXukz+8hc=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
pythonImportsCheck = [ "para" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set utilities that ake advantage of python's 'multiprocessing' module to distribute CPU-intensive tasks";
|
||||
homepage = "https://pypi.org/project/para";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
50
pkgs/development/python-modules/qudida/default.nix
Normal file
50
pkgs/development/python-modules/qudida/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, opencv4
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, scikit-learn
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qudida";
|
||||
version = "0.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2xmOKIerDJqgAj5WWvv/Qd+3azYfhf1eE/eA11uhjMg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"opencv-python"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
opencv4
|
||||
scikit-learn
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "qudida" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "QUick and DIrty Domain Adaptation";
|
||||
homepage = "https://github.com/arsenyinfo/qudida";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,37 +1,76 @@
|
|||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, attrs
|
||||
, pendulum
|
||||
, poetry-core
|
||||
, pprintpp
|
||||
, pytestCheckHook
|
||||
, pythonRelaxDepsHook
|
||||
, wrapt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tbm-utils";
|
||||
version = "2.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1v7pb3yirkhzbv1z5i1qp74vl880f56zvzfj68p08b5jxv64hmr3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "thebigmunch";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AEKawsAxDSDNkIaXEFFgdEBOY2PpASDrhlDrsnM5eyA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ];
|
||||
|
||||
# this versioning was done to prevent normal pip users from encountering
|
||||
# issues with package failing to build from source, but nixpkgs is better
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'attrs>=18.2,<19.4'" "'attrs'"
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'poetry>=1.0.0' 'poetry-core' \
|
||||
--replace 'poetry.masonry.api' 'poetry.core.masonry.api'
|
||||
'';
|
||||
|
||||
# No tests in archive.
|
||||
doCheck = false;
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
pendulum
|
||||
pprintpp
|
||||
wrapt
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"attrs"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# Skip on macOS because /etc/localtime is accessed through the pendulum
|
||||
# library, which is not allowed in a sandboxed build.
|
||||
"test_create_parser_filter_dates"
|
||||
"test_parse_args"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
||||
# Skip on macOS because /etc/localtime is accessed through the pendulum
|
||||
# library, which is not allowed in a sandboxed build.
|
||||
"tests/test_datetime.py"
|
||||
"tests/test_misc.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tbm_utils"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A commonly-used set of utilities";
|
||||
homepage = "https://github.com/thebigmunch/tbm-utils";
|
||||
license = with lib.licenses; [ mit ];
|
||||
changelog = "https://github.com/thebigmunch/tbm-utils/blob/${version}/CHANGELOG.md";
|
||||
license = [ lib.licenses.mit ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ apache-beam
|
||||
, array-record
|
||||
, attrs
|
||||
, beautifulsoup4
|
||||
, buildPythonPackage
|
||||
|
|
@ -19,6 +20,7 @@
|
|||
, lxml
|
||||
, matplotlib
|
||||
, mwparserfromhell
|
||||
, mwxml
|
||||
, networkx
|
||||
, nltk
|
||||
, numpy
|
||||
|
|
@ -46,13 +48,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow-datasets";
|
||||
version = "4.8.2";
|
||||
version = "4.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "datasets";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FYFk53WKNQTSrnGGiA6cn9LffbMJkZtjlGuOF52Og7c=";
|
||||
hash = "sha256-FKquhuk5hVBH9Im2RrIwgmosgqkoJHj0ESR2BmAOlbI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -61,6 +63,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
array-record
|
||||
attrs
|
||||
dill
|
||||
dm-tree
|
||||
|
|
@ -95,6 +98,7 @@ buildPythonPackage rec {
|
|||
lxml
|
||||
matplotlib
|
||||
mwparserfromhell
|
||||
mwxml
|
||||
networkx
|
||||
nltk
|
||||
opencv4
|
||||
|
|
@ -120,6 +124,7 @@ buildPythonPackage rec {
|
|||
"tensorflow_datasets/core/registered_test.py"
|
||||
"tensorflow_datasets/core/utils/gcs_utils_test.py"
|
||||
"tensorflow_datasets/import_without_tf_test.py"
|
||||
"tensorflow_datasets/proto/build_tf_proto_test.py"
|
||||
"tensorflow_datasets/scripts/cli/build_test.py"
|
||||
|
||||
# Requires `pretty_midi` which is not packaged in `nixpkgs`.
|
||||
|
|
|
|||
24
pkgs/development/tools/diesel-cli-ext/default.nix
Normal file
24
pkgs/development/tools/diesel-cli-ext/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diesel-cli-ext";
|
||||
version = "0.3.13";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "diesel_cli_ext";
|
||||
inherit version;
|
||||
hash = "sha256-5AIzMxEcxL/vYWx3D/meA///Zo+1210HUMEE4dFBhkc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Ya7RL3TuQjKkEkggK/ANChtVZRuTaooM+lE3KBZnvYU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides different tools for projects using the diesel_cli";
|
||||
homepage = "https://crates.io/crates/diesel_cli_ext";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ siph ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.18.14";
|
||||
version = "0.18.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E7ISDRRJKAQZkNLvyTMMUABqHHK7aupoOPAMoL8EXHc=";
|
||||
hash = "sha256-JvGtLz9YqRQdCY2jff7T9xUeQ2+GCA/coI4MIBPupDc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jless";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PaulJuliusMartinez";
|
||||
repo = "jless";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NB/s29M46mVhTsJWFYnBgJjSjUVbfdmuz69VdpVuR7c=";
|
||||
hash = "sha256-76oFPUWROX389U8DeMjle/GkdItu+0eYxZkt1c6l0V4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-cPj9cTRhWK/YU8Cae63p4Vm5ohB1IfGL5fu7yyFGSXA=";
|
||||
cargoHash = "sha256-sas94liAOSIirIJGdexdApXic2gWIBDT4uJFRM3qMw0=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ];
|
||||
|
||||
|
|
@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A command-line pager for JSON data";
|
||||
homepage = "https://jless.io";
|
||||
changelog = "https://github.com/PaulJuliusMartinez/jless/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jfchevrette ];
|
||||
maintainers = with maintainers; [ figsoda jfchevrette ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
in
|
||||
crystal.buildCrystalPackage {
|
||||
pname = "crystalline";
|
||||
|
|
@ -17,7 +17,7 @@ crystal.buildCrystalPackage {
|
|||
owner = "elbywan";
|
||||
repo = "crystalline";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kx3rdGqIbrOaHY7V3uXLqIFEYzzsMKzNwZ6Neq8zM3c=";
|
||||
hash = "sha256-g4k/vP7yYbTAy2bTAfr6HQhkskWfI6Zv2lxP+AZf6yw=";
|
||||
};
|
||||
|
||||
format = "crystal";
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "js_of_ocaml-compiler";
|
||||
version = "5.3.0";
|
||||
version = "5.4.0";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
|
||||
hash = "sha256-vp497rmOXSjxvLLZhHwE0ohfwH7VjM2LCKpLZijNZNI=";
|
||||
hash = "sha256-8SFd4TOGf+/bFuJ5iiJe4ERkaaV0Yq8N7r3SLSqNO5Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ menhir ];
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-binstall";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DcitynM43TuTGWiB8TlGuiO1ZBxyvOhxiOhuwSGIreY=";
|
||||
hash = "sha256-fwxiqUCdWEf6tjL4z92aN7zrwIXGz6OgXwPcEXd3x4k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PlIKVRqd1xyZbE34d4uzsM+YrYNOr9C24epRs4AePgE=";
|
||||
cargoHash = "sha256-uBUl5oileUANyKJeoEtBtDSMHZM7e6I4r/0sVelNCeg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -46,6 +46,9 @@ rustPlatform.buildRustPackage rec {
|
|||
switch between Nodes. You can install npm package binaries in your
|
||||
toolchain without having to periodically reinstall them or figure out why
|
||||
they’ve stopped working.
|
||||
|
||||
Note: Volta cannot be used on NixOS out of the box because it downloads
|
||||
Node binaries that assume shared libraries are in FHS standard locations.
|
||||
'';
|
||||
homepage = "https://volta.sh/";
|
||||
changelog = "https://github.com/volta-cli/volta/blob/main/RELEASES.md";
|
||||
|
|
|
|||
|
|
@ -1,24 +1,51 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, nix-update-script
|
||||
, testers
|
||||
, minify
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minify";
|
||||
version = "2.11.1";
|
||||
version = "2.12.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdewolff";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qna2u+Y4eRGLNvRKDbL/VQud1pn8b1wWzbKQM1p0Yws=";
|
||||
hash = "sha256-V3lFM58ciU9RrIp5s+ZMaCUAfRJxbTuQxusXhLCiGmI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-stj3fOaPM70kF6vTX/DEs4qFq/O0Vq0TFw0J/3L5NmA=";
|
||||
patches = [ ./update-go-version-mod.patch ];
|
||||
|
||||
vendorHash = "sha256-v3ZPaeE1YW9BRXHxGsmN8tHv3ApOY+NivfePctOmYlM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
|
||||
|
||||
subPackages = [ "cmd/minify" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
inherit version;
|
||||
package = minify;
|
||||
command = "minify --version";
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd minify --bash cmd/minify/bash_completion
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minifiers for web formats";
|
||||
license = licenses.mit;
|
||||
description = "Go minifiers for web formats";
|
||||
homepage = "https://go.tacodewolff.nl/minify";
|
||||
downloadPage = "https://github.com/tdewolff/minify";
|
||||
changelog = "https://github.com/tdewolff/minify/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
12
pkgs/development/web/minify/update-go-version-mod.patch
Normal file
12
pkgs/development/web/minify/update-go-version-mod.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/go.mod b/go.mod
|
||||
index cebe363..f9ae9c8 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,6 +1,6 @@
|
||||
module github.com/tdewolff/minify/v2
|
||||
|
||||
-go 1.13
|
||||
+go 1.18
|
||||
|
||||
require (
|
||||
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect
|
||||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minesweep-rs";
|
||||
version = "6.0.14";
|
||||
version = "6.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpcloud";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+2HwjdbjzhUQPcBMY2Km/cjGAw4TgjNpNMgtuxVUZD4=";
|
||||
hash = "sha256-jA4NqLZw+JREj0UlEMjcatb6PeBHpiNKrFenpe3HyBw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Qip+Yc/i57BOaKBOC60j7TDM1rzIEivYFjsp+vQ3hS4=";
|
||||
cargoHash = "sha256-wvN7aa4LjvYIJZtUedAscD2x8EKpdtzc5b1YI9MTeLY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sweep some mines for fun, and probably not for profit";
|
||||
|
|
|
|||
|
|
@ -16,22 +16,22 @@
|
|||
|
||||
let
|
||||
|
||||
release_tag = "v1.3";
|
||||
release_tag = "v1.6";
|
||||
|
||||
installer = fetchurl {
|
||||
url = "https://github.com/STJr/Kart-Public/releases/download/${release_tag}/srb2kart-v13-Installer.exe";
|
||||
sha256 = "0bk36y7wf6xfdg6j0b8qvk8671hagikzdp5nlfqg478zrj0qf6cs";
|
||||
};
|
||||
assets = fetchurl {
|
||||
url = "https://github.com/STJr/Kart-Public/releases/download/${release_tag}/AssetsLinuxOnly.zip";
|
||||
sha256 = "sha256-ejhPuZ1C8M9B0S4+2HN1T5pbormT1eVL3nlivqOszdE=";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
in stdenv.mkDerivation {
|
||||
pname = "srb2kart";
|
||||
version = "1.3.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "STJr";
|
||||
repo = "Kart-Public";
|
||||
rev = release_tag;
|
||||
sha256 = "131g9bmc9ihvz0klsc3yzd0pnkhx3mz1vzm8y7nrrsgdz5278y49";
|
||||
sha256 = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -50,7 +50,6 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
cmakeFlags = [
|
||||
#"-DSRB2_ASSET_DIRECTORY=/build/source/assets"
|
||||
"-DGME_INCLUDE_DIR=${game-music-emu}/include"
|
||||
"-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2"
|
||||
"-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2"
|
||||
|
|
@ -68,7 +67,7 @@ in stdenv.mkDerivation rec {
|
|||
preConfigure = ''
|
||||
mkdir assets/installer
|
||||
pushd assets/installer
|
||||
unzip ${installer} "*.kart" srb2.srb
|
||||
unzip ${assets} "*.kart" srb2.srb
|
||||
popd
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, cctools
|
||||
, sigtool
|
||||
, cereal
|
||||
|
|
@ -23,7 +24,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "MoltenVK";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
buildInputs = [
|
||||
AppKit
|
||||
|
|
@ -46,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "KhronosGroup";
|
||||
repo = "MoltenVK";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-GPOF2lyo1eDf1GrPjcj0y1OuUHI/c80L9gSQM+4wEp0=";
|
||||
hash = "sha256-BL46BgZHUpk0dpzmeZ/2W0msHxFwieeGDjmVB8Nb1J4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -144,8 +145,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postFixup = ''
|
||||
install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib"
|
||||
codesign -s - -f "$out/lib/libMoltenVK.dylib"
|
||||
codesign -s - -f "$bin/bin/MoltenVKShaderConverter"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A Vulkan Portability implementation built on top of Apple’s Metal API";
|
||||
homepage = "https://github.com/KhronosGroup/MoltenVK";
|
||||
|
|
|
|||
|
|
@ -170,6 +170,7 @@ let
|
|||
NET = yes;
|
||||
IP_ADVANCED_ROUTER = yes;
|
||||
IP_PNP = no;
|
||||
IP_ROUTE_MULTIPATH = yes;
|
||||
IP_VS_PROTO_TCP = yes;
|
||||
IP_VS_PROTO_UDP = yes;
|
||||
IP_VS_PROTO_ESP = yes;
|
||||
|
|
|
|||
|
|
@ -232,7 +232,10 @@ stdenv.mkDerivation ({
|
|||
# replicated here to apply to older versions.
|
||||
# Makes __FILE__ relative to the build directory.
|
||||
"KCPPFLAGS=-fmacro-prefix-map=$(sourceRoot)/="
|
||||
] ++ extraMakeFlags;
|
||||
kernelConf.target
|
||||
] ++ optional isModular "modules"
|
||||
++ optional buildDTBs "dtbs"
|
||||
++ extraMakeFlags;
|
||||
|
||||
installFlags = [
|
||||
"INSTALL_PATH=$(out)"
|
||||
|
|
@ -373,11 +376,20 @@ stdenv.mkDerivation ({
|
|||
|
||||
# Remove reference to kmod
|
||||
sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|'
|
||||
''
|
||||
# unfortunately linux/arch/mips/Makefile does not understand installkernel
|
||||
# and simply copies to $(INSTALL_PATH)/vmlinux-$(KERNELRELEASE)
|
||||
+ lib.optionalString stdenv.hostPlatform.isMips ''
|
||||
mv $out/vmlinux-* $out/vmlinux || true
|
||||
mv $out/vmlinuz-* $out/vmlinuz || true
|
||||
mv $out/System.map-* $out/System.map
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# Don't strip $dev/lib/modules/*/vmlinux
|
||||
stripDebugList="$(cd $dev && echo lib/modules/*/build/*/)"
|
||||
'' + lib.optionalString (stdenv.hostPlatform.isMips) ''
|
||||
$STRIP -s $out/vmlinux || true
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -152,8 +152,8 @@ stdenv.mkDerivation rec {
|
|||
platforms = [
|
||||
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
|
||||
"armv7l-linux" "i686-linux" "x86_64-linux" "m68k-linux"
|
||||
"microblaze-linux" "microblazeel-linux" "mipsel-linux"
|
||||
"mips64el-linux" "powerpc64-linux" "powerpc64le-linux"
|
||||
"microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux"
|
||||
"mipsel-linux" "mips64el-linux" "powerpc64-linux" "powerpc64le-linux"
|
||||
"riscv64-linux" "s390x-linux"
|
||||
];
|
||||
maintainers = with maintainers; [ thoughtpolice dtzWill ];
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ let
|
|||
else a;
|
||||
in
|
||||
rec {
|
||||
mkDriver = generic;
|
||||
|
||||
# Official Unix Drivers - https://www.nvidia.com/en-us/drivers/unix/
|
||||
# Branch/Maturity data - http://people.freedesktop.org/~aplattner/nvidia-versions.txt
|
||||
|
||||
|
|
|
|||
|
|
@ -517,8 +517,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
"-Dsulogin-path=${util-linux.login}/bin/sulogin"
|
||||
"-Dnologin-path=${util-linux.login}/bin/nologin"
|
||||
"-Dmount-path=${util-linux.mount}/bin/mount"
|
||||
"-Dumount-path=${util-linux.mount}/bin/umount"
|
||||
"-Dmount-path=${lib.getOutput "mount" util-linux}/bin/mount"
|
||||
"-Dumount-path=${lib.getOutput "mount" util-linux}/bin/umount"
|
||||
"-Dcreate-log-dirs=false"
|
||||
|
||||
# Use cgroupsv2. This is already the upstream default, but better be explicit.
|
||||
|
|
@ -569,8 +569,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"man/systemd-makefs@.service.xml"
|
||||
];
|
||||
}
|
||||
{ search = "/sbin/swapon"; replacement = "${util-linux.swap}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; }
|
||||
{ search = "/sbin/swapoff"; replacement = "${util-linux.swap}/sbin/swapoff"; where = [ "src/core/swap.c" ]; }
|
||||
{ search = "/sbin/swapon"; replacement = "${lib.getOutput "swap" util-linux}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; }
|
||||
{ search = "/sbin/swapoff"; replacement = "${lib.getOutput "swap" util-linux}/sbin/swapoff"; where = [ "src/core/swap.c" ]; }
|
||||
{
|
||||
search = "/bin/echo";
|
||||
replacement = "${coreutils}/bin/echo";
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
# the greater util-linux toolset.
|
||||
# Compatibility is maintained by symlinking the binaries from the
|
||||
# smaller outputs in the bin output.
|
||||
outputs = [ "bin" "dev" "out" "lib" "man" "mount" "login" "swap" ];
|
||||
outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optionals stdenv.isLinux [ "mount" ] ++ [ "login" ] ++ lib.optionals stdenv.isLinux [ "swap" ];
|
||||
separateDebugInfo = true;
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -110,20 +110,23 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
moveToOutput bin/mount "$mount"
|
||||
moveToOutput bin/umount "$mount"
|
||||
ln -svf "$mount/bin/"* $bin/bin/
|
||||
'' + ''
|
||||
|
||||
moveToOutput sbin/nologin "$login"
|
||||
moveToOutput sbin/sulogin "$login"
|
||||
prefix=$login _moveSbin
|
||||
ln -svf "$login/bin/"* $bin/bin/
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
|
||||
moveToOutput sbin/swapon "$swap"
|
||||
moveToOutput sbin/swapoff "$swap"
|
||||
prefix=$swap _moveSbin
|
||||
ln -svf "$swap/bin/"* $bin/bin/
|
||||
'' + ''
|
||||
|
||||
installShellCompletion --bash bash-completion/*
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "heisenbridge";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hifi";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-qp0LVcmWf5lZ52h0V58S6FoIM8RLOd6Y3FRb85j7KRg=";
|
||||
sha256 = "sha256-IKvB3L5xgAGLkN67rw2dp4Nvv0w4XbeXMcMmY7SGeNU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,28 +1,39 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mattermost";
|
||||
version = "7.10.2";
|
||||
version = "7.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "mattermost-server";
|
||||
repo = "mattermost";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gccWFcG+Jc/77nN9hiV/2gUcY5w0IzOktykbGgafBD0=";
|
||||
hash = "sha256-nzQUkcCFEZYvqMLRv1d81pfoz/MDYjWetGLtFXf8H/Q=";
|
||||
};
|
||||
|
||||
webapp = fetchurl {
|
||||
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
|
||||
hash = "sha256-T2lyg4BtArx813kk6edQ7AX3ZmA7cTsrJuWs7k6WYPU=";
|
||||
hash = "sha256-oD67sTyTvB0DVcw3e6x79Y4K8xlX75YreRwnc9olTy4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7YxbBmkKeb20a3BNllB3RtvjAJLZzoC2OBK4l1Ud1bw=";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Current version was set to 7.10.4 in the v7.10.3 tag, reverting it so `mattermost version` exposes the correct version
|
||||
# and to make smoke tests happy
|
||||
url = "https://github.com/mattermost/mattermost/commit/fbdadeacc85ae47145f69ffb766d4105aede69d5.patch";
|
||||
hash = "sha256-9BNEc5VefRuPKb3/rQNiekNbAIBRsjAtdCKUVrh9BuY=";
|
||||
revert = true;
|
||||
})
|
||||
];
|
||||
|
||||
subPackages = [ "cmd/mattermost" ];
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue