mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
9251797ce5
176 changed files with 1584 additions and 1707 deletions
|
|
@ -11,6 +11,23 @@ let
|
|||
|
||||
cfg = config.environment;
|
||||
|
||||
suffixedVariables = lib.flip lib.mapAttrs cfg.profileRelativeSessionVariables (
|
||||
envVar: suffixes:
|
||||
lib.flip lib.concatMap cfg.profiles (profile: map (suffix: "${profile}${suffix}") suffixes)
|
||||
);
|
||||
|
||||
combinedSessionVars = lib.zipAttrsWith (n: lib.concatLists) [
|
||||
# Make sure security wrappers are prioritized without polluting
|
||||
# shell environments with an extra entry. Sessions which depend on
|
||||
# pam for its environment will otherwise have eg. broken sudo. In
|
||||
# particular Gnome Shell sometimes fails to source a proper
|
||||
# environment from a shell.
|
||||
{ PATH = [ config.security.wrapperDir ]; }
|
||||
|
||||
(lib.mapAttrs (n: lib.toList) cfg.sessionVariables)
|
||||
suffixedVariables
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
|
@ -73,13 +90,11 @@ in
|
|||
};
|
||||
|
||||
config = {
|
||||
environment.etc."environment.d/50-systemd-path.conf".text = ''
|
||||
PATH="${lib.concatStringsSep ":" combinedSessionVars.PATH}"
|
||||
'';
|
||||
environment.etc."pam/environment".text =
|
||||
let
|
||||
suffixedVariables = lib.flip lib.mapAttrs cfg.profileRelativeSessionVariables (
|
||||
envVar: suffixes:
|
||||
lib.flip lib.concatMap cfg.profiles (profile: map (suffix: "${profile}${suffix}") suffixes)
|
||||
);
|
||||
|
||||
# We're trying to use the same syntax for PAM variables and env variables.
|
||||
# That means we need to map the env variables that people might use to their
|
||||
# equivalent PAM variable.
|
||||
|
|
@ -88,21 +103,7 @@ in
|
|||
pamVariable =
|
||||
n: v: ''${n} DEFAULT="${lib.concatStringsSep ":" (map replaceEnvVars (lib.toList v))}"'';
|
||||
|
||||
pamVariables = lib.concatStringsSep "\n" (
|
||||
lib.mapAttrsToList pamVariable (
|
||||
lib.zipAttrsWith (n: lib.concatLists) [
|
||||
# Make sure security wrappers are prioritized without polluting
|
||||
# shell environments with an extra entry. Sessions which depend on
|
||||
# pam for its environment will otherwise have eg. broken sudo. In
|
||||
# particular Gnome Shell sometimes fails to source a proper
|
||||
# environment from a shell.
|
||||
{ PATH = [ config.security.wrapperDir ]; }
|
||||
|
||||
(lib.mapAttrs (n: lib.toList) cfg.sessionVariables)
|
||||
suffixedVariables
|
||||
]
|
||||
)
|
||||
);
|
||||
pamVariables = lib.concatStringsSep "\n" (lib.mapAttrsToList pamVariable combinedSessionVars);
|
||||
in
|
||||
''
|
||||
${pamVariables}
|
||||
|
|
|
|||
|
|
@ -245,134 +245,156 @@ in
|
|||
};
|
||||
|
||||
###### implementation
|
||||
config = lib.mkIf config.security.enableWrappers {
|
||||
|
||||
assertions = lib.mapAttrsToList (name: opts: {
|
||||
assertion = opts.setuid || opts.setgid -> opts.capabilities == "";
|
||||
message = ''
|
||||
The security.wrappers.${name} wrapper is not valid:
|
||||
setuid/setgid and capabilities are mutually exclusive.
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
warnings = lib.optional (wrappers != { } && !config.security.enableWrappers) ''
|
||||
security.enableWrappers is set to false, but the following wrappers are still enabled and will be silently ignored: ${lib.concatStringsSep ", " (lib.attrNames wrappers)}. This might prevent fundamental functionalities, like PAM authentication. To avoid this warning, either set security.enableWrappers = true, or explicitly disable each wrapper with `enable = false`.
|
||||
'';
|
||||
}) wrappers;
|
||||
assertions = [
|
||||
{
|
||||
assertion =
|
||||
!(
|
||||
!config.security.enableWrappers && lib.any (u: u.isNormalUser) (lib.attrValues config.users.users)
|
||||
);
|
||||
message = ''
|
||||
security.enableWrappers is disabled but normal users are defined
|
||||
(${
|
||||
lib.concatStringsSep ", " (
|
||||
lib.mapAttrsToList (n: _: n) (lib.filterAttrs (_: u: u.isNormalUser) config.users.users)
|
||||
)
|
||||
}). Without SUID wrappers, users cannot login. Either enable wrappers or remove all normal user accounts.
|
||||
'';
|
||||
}
|
||||
];
|
||||
}
|
||||
(lib.mkIf config.security.enableWrappers {
|
||||
assertions = lib.mapAttrsToList (name: opts: {
|
||||
assertion = opts.setuid || opts.setgid -> opts.capabilities == "";
|
||||
message = ''
|
||||
The security.wrappers.${name} wrapper is not valid:
|
||||
setuid/setgid and capabilities are mutually exclusive.
|
||||
'';
|
||||
}) wrappers;
|
||||
|
||||
security.wrappers =
|
||||
let
|
||||
mkSetuidRoot = source: {
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
inherit source;
|
||||
security.wrappers =
|
||||
let
|
||||
mkSetuidRoot = source: {
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
inherit source;
|
||||
};
|
||||
in
|
||||
{
|
||||
# These are mount related wrappers that require the +s permission.
|
||||
mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
|
||||
umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
|
||||
};
|
||||
in
|
||||
{
|
||||
# These are mount related wrappers that require the +s permission.
|
||||
mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
|
||||
umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
|
||||
|
||||
# Make sure our wrapperDir exports to the PATH env variable when
|
||||
# initializing the shell
|
||||
environment.extraInit = ''
|
||||
# Wrappers override other bin directories.
|
||||
export PATH="${wrapperDir}:$PATH"
|
||||
'';
|
||||
|
||||
security.apparmor.includes = lib.mapAttrs' (
|
||||
wrapName: wrap:
|
||||
lib.nameValuePair "nixos/security.wrappers/${wrapName}" ''
|
||||
include "${
|
||||
pkgs.apparmorRulesFromClosure { name = "security.wrappers.${wrapName}"; } [
|
||||
(securityWrapper wrap.source)
|
||||
]
|
||||
}"
|
||||
mrpx ${wrap.source},
|
||||
''
|
||||
) wrappers;
|
||||
|
||||
systemd.mounts = [
|
||||
{
|
||||
where = parentWrapperDir;
|
||||
what = "tmpfs";
|
||||
type = "tmpfs";
|
||||
options = lib.concatStringsSep "," [
|
||||
"nodev"
|
||||
"mode=755"
|
||||
"size=${config.security.wrapperDirSize}"
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.suid-sgid-wrappers = {
|
||||
description = "Create SUID/SGID Wrappers";
|
||||
wantedBy = [ "sysinit.target" ];
|
||||
before = [
|
||||
"sysinit.target"
|
||||
"shutdown.target"
|
||||
];
|
||||
conflicts = [ "shutdown.target" ];
|
||||
after = [ "systemd-sysusers.service" ];
|
||||
unitConfig.DefaultDependencies = false;
|
||||
unitConfig.RequiresMountsFor = [
|
||||
"/nix/store"
|
||||
"/run/wrappers"
|
||||
];
|
||||
serviceConfig.RestrictSUIDSGID = false;
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = ''
|
||||
chmod 755 "${parentWrapperDir}"
|
||||
|
||||
# We want to place the tmpdirs for the wrappers to the parent dir.
|
||||
wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
|
||||
chmod a+rx "$wrapperDir"
|
||||
|
||||
${lib.concatStringsSep "\n" mkWrappedPrograms}
|
||||
|
||||
if [ -L ${wrapperDir} ]; then
|
||||
# Atomically replace the symlink
|
||||
# See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
|
||||
old=$(readlink -f ${wrapperDir})
|
||||
if [ -e "${wrapperDir}-tmp" ]; then
|
||||
rm --force --recursive "${wrapperDir}-tmp"
|
||||
fi
|
||||
ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
|
||||
mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
|
||||
rm --force --recursive "$old"
|
||||
else
|
||||
# For initial setup
|
||||
ln --symbolic "$wrapperDir" "${wrapperDir}"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
# Make sure our wrapperDir exports to the PATH env variable when
|
||||
# initializing the shell
|
||||
environment.extraInit = ''
|
||||
# Wrappers override other bin directories.
|
||||
export PATH="${wrapperDir}:$PATH"
|
||||
'';
|
||||
###### wrappers consistency checks
|
||||
system.checks = lib.singleton (
|
||||
pkgs.runCommand "ensure-all-wrappers-paths-exist"
|
||||
{
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
''
|
||||
# make sure we produce output
|
||||
mkdir -p $out
|
||||
|
||||
security.apparmor.includes = lib.mapAttrs' (
|
||||
wrapName: wrap:
|
||||
lib.nameValuePair "nixos/security.wrappers/${wrapName}" ''
|
||||
include "${
|
||||
pkgs.apparmorRulesFromClosure { name = "security.wrappers.${wrapName}"; } [
|
||||
(securityWrapper wrap.source)
|
||||
]
|
||||
}"
|
||||
mrpx ${wrap.source},
|
||||
''
|
||||
) wrappers;
|
||||
echo -n "Checking that Nix store paths of all wrapped programs exist... "
|
||||
|
||||
systemd.mounts = [
|
||||
{
|
||||
where = parentWrapperDir;
|
||||
what = "tmpfs";
|
||||
type = "tmpfs";
|
||||
options = lib.concatStringsSep "," [
|
||||
"nodev"
|
||||
"mode=755"
|
||||
"size=${config.security.wrapperDirSize}"
|
||||
];
|
||||
}
|
||||
];
|
||||
declare -A wrappers
|
||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "wrappers['${n}']='${v.source}'") wrappers)}
|
||||
|
||||
systemd.services.suid-sgid-wrappers = {
|
||||
description = "Create SUID/SGID Wrappers";
|
||||
wantedBy = [ "sysinit.target" ];
|
||||
before = [
|
||||
"sysinit.target"
|
||||
"shutdown.target"
|
||||
];
|
||||
conflicts = [ "shutdown.target" ];
|
||||
after = [ "systemd-sysusers.service" ];
|
||||
unitConfig.DefaultDependencies = false;
|
||||
unitConfig.RequiresMountsFor = [
|
||||
"/nix/store"
|
||||
"/run/wrappers"
|
||||
];
|
||||
serviceConfig.RestrictSUIDSGID = false;
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = ''
|
||||
chmod 755 "${parentWrapperDir}"
|
||||
for name in "''${!wrappers[@]}"; do
|
||||
path="''${wrappers[$name]}"
|
||||
if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then
|
||||
test -t 1 && echo -ne '\033[1;31m'
|
||||
echo "FAIL"
|
||||
echo "The path $path does not exist!"
|
||||
echo 'Please, check the value of `security.wrappers."'$name'".source`.'
|
||||
test -t 1 && echo -ne '\033[0m'
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
# We want to place the tmpdirs for the wrappers to the parent dir.
|
||||
wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
|
||||
chmod a+rx "$wrapperDir"
|
||||
|
||||
${lib.concatStringsSep "\n" mkWrappedPrograms}
|
||||
|
||||
if [ -L ${wrapperDir} ]; then
|
||||
# Atomically replace the symlink
|
||||
# See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
|
||||
old=$(readlink -f ${wrapperDir})
|
||||
if [ -e "${wrapperDir}-tmp" ]; then
|
||||
rm --force --recursive "${wrapperDir}-tmp"
|
||||
fi
|
||||
ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
|
||||
mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
|
||||
rm --force --recursive "$old"
|
||||
else
|
||||
# For initial setup
|
||||
ln --symbolic "$wrapperDir" "${wrapperDir}"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
###### wrappers consistency checks
|
||||
system.checks = lib.singleton (
|
||||
pkgs.runCommand "ensure-all-wrappers-paths-exist"
|
||||
{
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
''
|
||||
# make sure we produce output
|
||||
mkdir -p $out
|
||||
|
||||
echo -n "Checking that Nix store paths of all wrapped programs exist... "
|
||||
|
||||
declare -A wrappers
|
||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "wrappers['${n}']='${v.source}'") wrappers)}
|
||||
|
||||
for name in "''${!wrappers[@]}"; do
|
||||
path="''${wrappers[$name]}"
|
||||
if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then
|
||||
test -t 1 && echo -ne '\033[1;31m'
|
||||
echo "FAIL"
|
||||
echo "The path $path does not exist!"
|
||||
echo 'Please, check the value of `security.wrappers."'$name'".source`.'
|
||||
test -t 1 && echo -ne '\033[0m'
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "OK"
|
||||
''
|
||||
);
|
||||
};
|
||||
echo "OK"
|
||||
''
|
||||
);
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,9 +145,11 @@ let
|
|||
pkgs.writeShellScriptBin "mastodon-tootctl" ''
|
||||
set -a
|
||||
export RAILS_ROOT="${cfg.package}"
|
||||
export HOME="/var/lib/mastodon"
|
||||
source "${envFile}"
|
||||
source /var/lib/mastodon/.secrets_env
|
||||
${sourceExtraEnv}
|
||||
cd /var/lib/mastodon
|
||||
|
||||
sudo=exec
|
||||
if [[ "$USER" != ${cfg.user} ]]; then
|
||||
|
|
|
|||
|
|
@ -18,12 +18,9 @@ let
|
|||
cfg = config.services.vinyl-cache;
|
||||
|
||||
# Vinyl Cache has very strong opinions and very complicated code around handling
|
||||
# the stateDir. After a lot of back and forth, we decided that we a)
|
||||
# do not want a configurable option here, as most of the handling depends
|
||||
# on the version and the compile time options. Putting everything into
|
||||
# /var/run (RAM backed) is absolutely recommended by Vinyl Cache anyways.
|
||||
# We do need to pay attention to the version-dependend variations, though!
|
||||
stateDir = "/var/run/vinyld";
|
||||
# the stateDir. After a lot of back and forth, we decided to set the stateDir
|
||||
# at compile time and let the package expose the particular path as passthru.
|
||||
stateDir = cfg.package.stateDir;
|
||||
|
||||
# from --help:
|
||||
# -a [<name>=]address[:port][,proto] # HTTP listen address and port
|
||||
|
|
@ -183,13 +180,13 @@ in
|
|||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${cfg.package}/bin/vinyld ${commandLineAddresses} -n ${stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
|
||||
ExecStart = "${cfg.package}/bin/vinyld ${commandLineAddresses} -F ${cfg.extraCommandLine} ${commandLine}";
|
||||
Restart = "always";
|
||||
RestartSec = "5s";
|
||||
User = "vinyl-cache";
|
||||
Group = "vinyl-cache";
|
||||
DynamicUser = true;
|
||||
RuntimeDirectory = lib.removePrefix "/var/run/" stateDir;
|
||||
RuntimeDirectory = lib.removePrefix "/run/" stateDir;
|
||||
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
|
||||
NoNewPrivileges = true;
|
||||
LimitNOFILE = 131072;
|
||||
|
|
@ -221,6 +218,10 @@ in
|
|||
assertion = cfg.package.pname == "vinyl-cache";
|
||||
message = "services.vinyl-cache only supports Vinyl Cache. Please use services.varnish.";
|
||||
}
|
||||
{
|
||||
assertion = lib.strings.hasPrefix "/run/" stateDir;
|
||||
message = "The vinyl-cache NixOS mosule only supports statedirs in /run/, but vinyl-cache package was compiled with ${stateDir}.";
|
||||
}
|
||||
];
|
||||
})
|
||||
(lib.mkIf (cfg.enable && cfg.enableFileLogging) {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "dosbox-pure";
|
||||
version = "0-unstable-2026-05-12";
|
||||
version = "0-unstable-2026-05-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schellingb";
|
||||
repo = "dosbox-pure";
|
||||
rev = "3a5222c97456e8df90983eb546f4d866b0feb848";
|
||||
hash = "sha256-FeT1VPOJsZaC9SZbJwbiC0fkVV/WOJ+rOcwf8g+wdeM=";
|
||||
rev = "9c5c68f446204b09b12f3f1936072e56d91476c0";
|
||||
hash = "sha256-p2vv9EExJYgR59ycjxc79+itVDf3/4pWKVn671lNjVo=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "gambatte";
|
||||
version = "0-unstable-2026-05-12";
|
||||
version = "0-unstable-2026-05-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "gambatte-libretro";
|
||||
rev = "4c1b4c26c8db94663196bad187b58fe8e9162b4f";
|
||||
hash = "sha256-uJoHwHJ2KtNk83eEDdWPPxAViMCp8bVq06wsBxQZEPw=";
|
||||
rev = "3262c2aa4adae8dba4f6d51cdd931c15cb11569f";
|
||||
hash = "sha256-JPnpY/43XbT9QnvzrYPkZLCcM3hN+SoQTFZ8J/Dj+Oc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2026-05-11";
|
||||
version = "0-unstable-2026-05-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "7a2b8d6058c7b89548283be5d380accc85e310a0";
|
||||
hash = "sha256-AA6l4t+TDz2g/qQM4bVbSnJXsamEXzUqTL7VnvQ1mgc=";
|
||||
rev = "e62ea293ba347dc1fd9d387458d8262bc122053f";
|
||||
hash = "sha256-V0ItXRD1YO7jq/SNoXOh7ZhpWwx9oFs3muIUkzj8FHE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "swanstation";
|
||||
version = "0-unstable-2026-05-11";
|
||||
version = "0-unstable-2026-05-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "swanstation";
|
||||
rev = "0f7757b3196ab472c3a8b279206b3ea19a3e5f2d";
|
||||
hash = "sha256-5R+K0NpLdjajT6LV0os569vrgqRCtfXDqMnhM8z7dmk=";
|
||||
rev = "62697276b95848bd35b9c7b81daab899a98e0789";
|
||||
hash = "sha256-jisW5Mk5PF3rxj9mF5FJXtktAKEAq2a6DUvCXBgri3E=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "vba-next";
|
||||
version = "0-unstable-2026-05-12";
|
||||
version = "0-unstable-2026-05-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "vba-next";
|
||||
rev = "f56ea99799b51fb107a4d3afe2a97a1364e8d806";
|
||||
hash = "sha256-gbBurV2N6evLnZqvcxAZ2xfKMsybVeu+Nml0p0APTRE=";
|
||||
rev = "f04b19879d929730d199649c5c40b75b1f15b549";
|
||||
hash = "sha256-Mv+vg0NyX1F7u8cRDpwduD+UZfCHKlcSUmB3bQGjCn8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -283,13 +283,13 @@
|
|||
"vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
|
||||
},
|
||||
"datadog_datadog": {
|
||||
"hash": "sha256-acDEAqygINpmFb45Ah5yiiD/kRhGhI6jVRlSN+/1s1Y=",
|
||||
"hash": "sha256-yyUlJshH6leJbxDcm5lNGhR9pxbBEaEEDXasWeFI6Uw=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v4.8.0",
|
||||
"rev": "v4.10.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-1e5Jdn6fSSdoAef4EobC41MhyBtdkYq50F8dbvtx+hk="
|
||||
"vendorHash": "sha256-tgo9FxqMZOZw4ZKULOz6CbZ8oJfEFfjdFffiWjjkc0Y="
|
||||
},
|
||||
"datadrivers_nexus": {
|
||||
"hash": "sha256-yfxlDln4brI8QTFnhVsNOO3vRiqft3YWytvy2GMNBdY=",
|
||||
|
|
@ -508,13 +508,13 @@
|
|||
"vendorHash": "sha256-ikBqIxD5aTOcwNHCMN6EaOwSHCAP5n/SULuqQXPLpOc="
|
||||
},
|
||||
"hashicorp_aws": {
|
||||
"hash": "sha256-+MvxcQn0pnsNDR6ERXFW85fLwQ+AG+UcBo5F25WN4mQ=",
|
||||
"hash": "sha256-dC3oeVzd8H7Ni9NvApkjmDpVWdx/XgirhI7Rf5ECGBE=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v6.44.0",
|
||||
"rev": "v6.46.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-fsGCKGgH2XM3Eq3rluKs3bODhmXUYEHLWskn+P58emA="
|
||||
"vendorHash": "sha256-ieYDog2HS8OwfKvzPIsXZcSAsT7D9qzXPXuHhtfthV0="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-OC57nzpz8l+26/oBXVCFUMNK+gMlgpEK35uIyG1sFOo=",
|
||||
|
|
|
|||
|
|
@ -731,7 +731,7 @@ let
|
|||
;
|
||||
|
||||
debsFlat = lib.flatten debs;
|
||||
debsGrouped = debs;
|
||||
debsGrouped = map toString debs;
|
||||
|
||||
preVM = createEmptyImage { inherit size fullName; };
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
hello,
|
||||
patchelf,
|
||||
pcmanfm,
|
||||
runCommand,
|
||||
stdenv,
|
||||
vmTools,
|
||||
}:
|
||||
let
|
||||
inherit (vmTools)
|
||||
buildRPM
|
||||
diskImages
|
||||
makeImageTestScript
|
||||
runInLinuxImage
|
||||
|
|
@ -46,6 +46,23 @@ in
|
|||
})
|
||||
);
|
||||
|
||||
# Sanity check to ensure the dpkg --install commands have run
|
||||
checkPerlInstalledInDebian = runInLinuxImage (
|
||||
runCommand "check-perl"
|
||||
{
|
||||
diskImage = diskImages.debian13x86_64;
|
||||
diskImageFormat = "qcow2";
|
||||
memSize = 512;
|
||||
}
|
||||
''
|
||||
echo Check if perl is present
|
||||
perl -v
|
||||
echo Check if perl is installed
|
||||
dpkg -l | grep 'ii *perl'
|
||||
mkdir $out
|
||||
''
|
||||
);
|
||||
|
||||
# RPM-based distros
|
||||
testFedora42Image = makeImageTestScript diskImages.fedora42x86_64;
|
||||
testFedora43Image = makeImageTestScript diskImages.fedora43x86_64;
|
||||
|
|
|
|||
|
|
@ -6,9 +6,8 @@
|
|||
pkg-config,
|
||||
itstool,
|
||||
udevCheckHook,
|
||||
wrapQtAppsHook,
|
||||
SDL2,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
libxtst,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
|
@ -30,11 +29,11 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
itstool
|
||||
udevCheckHook
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
SDL2
|
||||
qttools
|
||||
libsForQt5.qttools
|
||||
libxtst
|
||||
];
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
|
|||
__structuredAttrs = true;
|
||||
|
||||
pname = "anytype-cli";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,9 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
qtbase,
|
||||
qmake,
|
||||
qtscript,
|
||||
flex,
|
||||
bison,
|
||||
qtdeclarative,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -27,15 +23,15 @@ let
|
|||
sourceRoot = "${src.name}/Sources/utils/QtnProperty";
|
||||
patches = [ ./qtnproperty-parallel-building.patch ];
|
||||
buildInputs = [
|
||||
qtscript
|
||||
qtbase
|
||||
qtdeclarative
|
||||
libsForQt5.qtscript
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtdeclarative
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
flex
|
||||
bison
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
postInstall = ''
|
||||
install -D bin-linux/QtnPEG $out/bin/QtnPEG
|
||||
|
|
@ -49,14 +45,14 @@ stdenv.mkDerivation {
|
|||
inherit src;
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtscript
|
||||
qtdeclarative
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtscript
|
||||
libsForQt5.qtdeclarative
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "betterleaks";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "betterleaks";
|
||||
repo = "betterleaks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1cP+mOboazalNuGe8LXBVKCSPvrAFBM2HR3keZdY4Bw=";
|
||||
hash = "sha256-65ITYF3PFYuMXsAEEVOXVBlaZnM01w/BpOdCD0LW5Y4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bDe3SjKW3zIbDtkkUfk8RGooW9Nir/f5EVOwXCyPiAs=";
|
||||
vendorHash = "sha256-RStdC7M0+bPNXwaATxkMOBGf1OrT0pqlNPTJ7TCelfk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@
|
|||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -24,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -36,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "bfcal";
|
||||
homepage = "https://git.sr.ht/~bitfehler/bfcal";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = qtbase.meta.platforms;
|
||||
platforms = libsForQt5.qtbase.meta.platforms;
|
||||
maintainers = with lib.maintainers; [ laalsaas ];
|
||||
};
|
||||
})
|
||||
|
|
@ -9,20 +9,21 @@
|
|||
zstd,
|
||||
git,
|
||||
rustup,
|
||||
cacert,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-dist";
|
||||
version = "0.30.4";
|
||||
version = "0.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axodotdev";
|
||||
repo = "cargo-dist";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Woaa+KNRLqTRgglGM50L8w6UXlnDTcUHQZ20AYbZPnE=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BSE3pXo7Kk104v7VEh5WUk+Km1/n/kNf8NJGVGjUKoc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DVIckYfIf7EqqRXQbNI3msvDopSY7RxR11942w3XBjg=";
|
||||
cargoHash = "sha256-bfX2Yt0wrPg1pbvYdr2O9VUqYlCFVRh4PIABWxZTgjg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -37,10 +38,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
nativeCheckInputs = [
|
||||
git
|
||||
rustup
|
||||
cacert
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
};
|
||||
|
||||
# remove tests that require internet access
|
||||
|
|
@ -54,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
description = "Tool for building final distributable artifacts and uploading them to an archive";
|
||||
mainProgram = "dist";
|
||||
homepage = "https://github.com/axodotdev/cargo-dist";
|
||||
changelog = "https://github.com/axodotdev/cargo-dist/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/axodotdev/cargo-dist/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
cmake,
|
||||
kdePackages,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
kdePackages.extra-cmake-modules
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -7,8 +7,6 @@
|
|||
pkg-config,
|
||||
libchewing,
|
||||
qt5,
|
||||
qtbase,
|
||||
qttools,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -34,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
gtest
|
||||
libchewing
|
||||
qtbase
|
||||
qttools
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -13,12 +13,12 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clojure";
|
||||
version = "1.12.5.1638";
|
||||
version = "1.12.5.1645";
|
||||
|
||||
src = fetchurl {
|
||||
# https://github.com/clojure/brew-install/releases
|
||||
url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-eAfhA0RByuQ8IdigJsHYotIPY/kDmLgDRHCw4uHzF5E=";
|
||||
hash = "sha256-SoYS5/1yXsjkU/hwsi1bwaaO7/d0w9eTKamF81HAuDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cloudflare-dynamic-dns";
|
||||
version = "4.4.4";
|
||||
version = "4.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zebradil";
|
||||
repo = "cloudflare-dynamic-dns";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VBBuBZ5J5ioLDzlslNahSwVGJ7RFJLmWs4WWs11SQaI=";
|
||||
hash = "sha256-TIun4EZuk4lgtNiNRA8P0x3+hkh3UFMVMUa75YecUk0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UPzv8W18vdeTL/Rx32z5rJVcWHjFlImUKlUb9gt3TTM=";
|
||||
vendorHash = "sha256-Pu73TKBgEgLhUktnY4o/fR4KBLT2s2CUGFSf2Jo3SbQ=";
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "cobang";
|
||||
version = "2.3.1";
|
||||
version = "2.5.2";
|
||||
pyproject = false; # Built with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hongquan";
|
||||
repo = "CoBang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8qnF1w4zNYdH3QrzBnNjsPnOSMMD48H2tcTxPkemGEM=";
|
||||
hash = "sha256-q28pSvEqWy56qNh7aE05PB6l3Hpu7eazz52REmQDYhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -59,6 +59,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
pygobject3
|
||||
python-zbar
|
||||
qrcode
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# Wrapping this manually for SVG recognition
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cog";
|
||||
version = "0.1.12";
|
||||
version = "0.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "cog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6W8b3hgBASpizFoQqP0zw3TqdPmhJ6gZFXxaPfnIiS0=";
|
||||
hash = "sha256-e8PxH09d3n4nDhJzJ/y4KwTZ5UhKgwNupy31Z9VGi7A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WR/dfwNBduRokPGAljnXNgA2ZKoYRGtZ3+tKBzCuXI4=";
|
||||
vendorHash = "sha256-0ywSn4JghAfg9KZptpLYp+h1hZju2SmLeOXG5DKPa98=";
|
||||
|
||||
subPackages = [ "cmd/cli" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@
|
|||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
libcommuni,
|
||||
qmake,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -24,13 +21,13 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libcommuni
|
||||
qtbase
|
||||
libsForQt5.libcommuni
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
# libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin
|
||||
|
|
@ -39,7 +36,7 @@ stdenv.mkDerivation {
|
|||
dontWrapQtApps = stdenv.hostPlatform.isDarwin;
|
||||
|
||||
preConfigure = ''
|
||||
export QMAKEFEATURES=${libcommuni}/features
|
||||
export QMAKEFEATURES=${libsForQt5.libcommuni}/features
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
|
|
@ -2,9 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
qtbase,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -16,11 +14,11 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-GgWvPHcQnQrK9SOC8U9F2P8kuPCn8I2EhoWEEMtKBww=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -14,9 +14,7 @@
|
|||
yaml-cpp,
|
||||
nvramtool,
|
||||
systemd,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -35,12 +33,12 @@ stdenv.mkDerivation {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
yaml-cpp
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -4,10 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
cmake,
|
||||
python3,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtquickcontrols2,
|
||||
qtgraphicaleffects,
|
||||
libsForQt5,
|
||||
curaengine,
|
||||
plugins ? [ ],
|
||||
}:
|
||||
|
|
@ -31,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtgraphicaleffects
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
with python3.pkgs;
|
||||
|
|
@ -53,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
python3.pkgs.wrapPython
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cwal";
|
||||
version = "0.8.5";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nitinbhat972";
|
||||
repo = "cwal";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-xsfSx0ctDR1uep+SPyfFU/aOvN8l0uGzVPsNL3+4vT8=";
|
||||
hash = "sha256-RDtYBgqTG3Ycn1D6QtaHGZVXKxw8UqhzssxXA4temYo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qttools,
|
||||
libsForQt5,
|
||||
ddcutil,
|
||||
}:
|
||||
|
||||
|
|
@ -26,12 +24,12 @@ stdenv.mkDerivation rec {
|
|||
# file is not currently written to support PREFIX installations.
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
ddcutil
|
||||
];
|
||||
|
||||
|
|
@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
|
|||
# fix build with gcc15
|
||||
substituteInPlace lib/Makefile \
|
||||
--replace-fail './configure' './configure cf_cv_type_of_bool=bool'
|
||||
|
||||
sed -i '1s/^/#include <stdbool.h>/' ./lib/ncurses/include/curses.h.in
|
||||
'';
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,10 +5,7 @@
|
|||
fetchpatch,
|
||||
cmake,
|
||||
boost183,
|
||||
qtbase,
|
||||
qtimageformats,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -49,13 +46,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost_static
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
@ -66,7 +63,7 @@ stdenv.mkDerivation rec {
|
|||
cd tests/out/bin
|
||||
|
||||
# provide qtimageformats plugin to allow tests to read tiff files
|
||||
export QT_PLUGIN_PATH="${qtimageformats}/${qtbase.qtPluginPrefix}"
|
||||
export QT_PLUGIN_PATH="${libsForQt5.qtimageformats}/${libsForQt5.qtbase.qtPluginPrefix}"
|
||||
|
||||
./DegateTests
|
||||
)
|
||||
|
|
@ -2,9 +2,7 @@
|
|||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -19,12 +17,12 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -24,18 +24,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "diebahn";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "railway";
|
||||
tag = version;
|
||||
hash = "sha256-+HqCfuolnwQR/7yTITaQDoYcFQ8m82KA/uT+aubK/UM=";
|
||||
hash = "sha256-lmyseWTqOwMgKB3q+SQbpa4XNzZ+2hBe7Ct7o5oZjOc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-38ON9KZbF8JHbel2zPlyPOCxgDiBxG1psQLtNib6uLM=";
|
||||
hash = "sha256-ADJTkR0Lmr2mmhSvLhqryZYKLFjTHA+pGUbZPEBM7r4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,11 +3,7 @@
|
|||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
qmake,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
poppler,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -28,17 +24,17 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
poppler
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.poppler
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev}
|
||||
substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${libsForQt5.poppler.dev}
|
||||
lrelease diffpdf.pro
|
||||
'';
|
||||
|
||||
|
|
@ -4,14 +4,11 @@
|
|||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
libzip,
|
||||
boost,
|
||||
fftw,
|
||||
libusb1,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qtwayland,
|
||||
libsForQt5,
|
||||
python3,
|
||||
desktopToDarwinBundle,
|
||||
}:
|
||||
|
|
@ -40,20 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
fftw
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
libusb1
|
||||
libzip
|
||||
python3
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
|
||||
++ lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
|
|
@ -33,6 +33,7 @@
|
|||
speexdsp,
|
||||
onetbb,
|
||||
webrtc-audio-processing,
|
||||
x42-plugins,
|
||||
zam-plugins,
|
||||
zita-convolver,
|
||||
wrapGAppsHook3,
|
||||
|
|
@ -60,13 +61,13 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "easyeffects";
|
||||
version = "8.2.1";
|
||||
version = "8.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bGjIqts06ruwMQIW5hk4wlG7G/7GtgFVBgSr68tkIqY=";
|
||||
hash = "sha256-rdg7XvrJU7HH9aGd/TwMqqexmFeLOMBldh1XQakQSeM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -113,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
speexdsp'
|
||||
onetbb
|
||||
webrtc-audio-processing
|
||||
x42-plugins
|
||||
zita-convolver
|
||||
];
|
||||
|
||||
|
|
@ -122,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
calf # compressor exciter, bass enhancer and others
|
||||
lsp-plugins # delay, limiter, multiband compressor
|
||||
mda_lv2 # loudness
|
||||
x42-plugins # autotune
|
||||
zam-plugins # maximizer
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,10 +8,7 @@
|
|||
capstone_4,
|
||||
double-conversion,
|
||||
graphviz,
|
||||
qtxmlpatterns,
|
||||
qttools,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
testers,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
|
@ -31,17 +28,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
boost.dev
|
||||
capstone_4
|
||||
double-conversion
|
||||
graphviz
|
||||
qtxmlpatterns
|
||||
libsForQt5.qtxmlpatterns
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -5,13 +5,9 @@
|
|||
fetchpatch2,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
bzip2,
|
||||
libx11,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtmultimedia,
|
||||
qtscript,
|
||||
libsForQt5,
|
||||
libiconv,
|
||||
pcre-cpp,
|
||||
libidn,
|
||||
|
|
@ -43,13 +39,13 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
qtmultimedia
|
||||
qtscript
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtscript
|
||||
bzip2
|
||||
libx11
|
||||
pcre-cpp
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
qtbase,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
unstableGitUpdater,
|
||||
|
|
@ -33,10 +32,10 @@ stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
|
|
@ -21,6 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
|
||||
pythonRelaxDeps = [
|
||||
"argcomplete"
|
||||
"cryptography"
|
||||
"requests"
|
||||
"rich"
|
||||
"supabase"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
electron_39,
|
||||
electron_40,
|
||||
dart-sass,
|
||||
mpv-unwrapped,
|
||||
fetchPnpmDeps,
|
||||
|
|
@ -25,7 +25,7 @@ let
|
|||
hash = "sha256-TSjgjNHhPSZ4k7zZTH5e3FCkl6d7B/2w2WCt0S5OW0g=";
|
||||
};
|
||||
|
||||
electron = electron_39;
|
||||
electron = electron_40;
|
||||
in
|
||||
buildNpmPackage {
|
||||
inherit pname version;
|
||||
|
|
|
|||
|
|
@ -3,14 +3,12 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
eigen,
|
||||
suitesparse,
|
||||
blas,
|
||||
lapack,
|
||||
libGLU,
|
||||
qtbase,
|
||||
libqglviewer,
|
||||
libsForQt5,
|
||||
spdlog,
|
||||
}:
|
||||
|
||||
|
|
@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
eigen
|
||||
|
|
@ -44,8 +42,8 @@ stdenv.mkDerivation rec {
|
|||
blas
|
||||
lapack
|
||||
libGLU
|
||||
qtbase
|
||||
libqglviewer
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.libqglviewer
|
||||
];
|
||||
propagatedBuildInputs = [ spdlog ];
|
||||
|
||||
|
|
@ -53,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [
|
||||
# Detection script is broken
|
||||
"-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"
|
||||
"-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer"
|
||||
"-DG2O_BUILD_EXAMPLES=OFF"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
perl,
|
||||
gmp,
|
||||
mpfr,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
enableGist ? true,
|
||||
}:
|
||||
|
||||
|
|
@ -24,7 +24,12 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(import ./fix-const-weights-clang-patch.nix fetchpatch)
|
||||
# https://github.com/Gecode/gecode/pull/74
|
||||
(fetchpatch {
|
||||
name = "fix-const-weights-clang.patch";
|
||||
url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
|
||||
sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -38,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
gmp
|
||||
mpfr
|
||||
]
|
||||
++ lib.optional enableGist qtbase;
|
||||
++ lib.optional enableGist libsForQt5.qtbase;
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -16,7 +16,12 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
(import ./fix-const-weights-clang-patch.nix fetchpatch)
|
||||
# https://github.com/Gecode/gecode/pull/74
|
||||
(fetchpatch {
|
||||
name = "fix-const-weights-clang.patch";
|
||||
url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
|
||||
sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -4,10 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
python3,
|
||||
qtbase,
|
||||
qmake,
|
||||
qtserialport,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
ctags,
|
||||
gdb,
|
||||
}:
|
||||
|
|
@ -27,9 +24,9 @@ stdenv.mkDerivation rec {
|
|||
ctags
|
||||
makeWrapper
|
||||
python3
|
||||
qmake
|
||||
qtserialport
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.qtserialport
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -41,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
python build.py install --verbose --prefix="$out"
|
||||
wrapProgram $out/bin/gede \
|
||||
--prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \
|
||||
--prefix QT_PLUGIN_PATH : ${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix} \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
ctags
|
||||
|
|
@ -2,8 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
boost,
|
||||
}:
|
||||
|
||||
|
|
@ -24,8 +23,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [ boost ];
|
||||
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
xkeyboard-config,
|
||||
autoPatchelfHook,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
let
|
||||
arch =
|
||||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
dpkg
|
||||
makeWrapper
|
||||
autoPatchelfHook
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
propagatedBuildInputs = [ xkeyboard-config ];
|
||||
buildInputs = [
|
||||
|
|
@ -37,9 +37,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
cargoHash = "sha256-rE7SErOhl2fcmvLairq+mvdnbDIk1aPo3eYqwRx5kkA=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace $cargoDepsCopy/source-registry-0/sdl2-sys-0.37.0/SDL/CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.0.0...3.5)" \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.4...3.5)"
|
||||
'';
|
||||
|
||||
# See https://github.com/mikedilger/gossip/blob/0.9/README.md.
|
||||
env.RUSTFLAGS = "--cfg tokio_unstable";
|
||||
|
||||
# Vendored SDL2 uses `bool` / `false` as identifiers, rejected by gcc 15's C23 default.
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
# Some users might want to add "rustls-tls(-native)" for Rust TLS instead of OpenSSL.
|
||||
buildFeatures = [
|
||||
"video-ffmpeg"
|
||||
|
|
|
|||
|
|
@ -17,13 +17,15 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtk-gnutella";
|
||||
version = "1.2.2";
|
||||
version = "1.3.1";
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gtk-gnutella";
|
||||
repo = "gtk-gnutella";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-LbSUdU+a9G8qL7gCZVJQ6UQMATpOMtktY6FeOkUuaYI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xVVmPcXIc5RN1j9PYqHaqllKp+8UQ8S2LU0z23QngFs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -46,13 +48,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
configureScript = "./build.sh";
|
||||
configureFlags = [
|
||||
"--configure-only"
|
||||
# See https://sourceforge.net/p/gtk-gnutella/bugs/555/
|
||||
"--disable-malloc"
|
||||
]
|
||||
++ lib.optionals (!enableGui) [
|
||||
"--topless"
|
||||
];
|
||||
|
||||
# Classic 'incompatible pointer type'
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -95,6 +95,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-Ub2fYMfSOmZaVWxzZMIfsuTiglZrPn4JJFXo+RAzCJM=";
|
||||
};
|
||||
|
||||
patches = lib.optional stdenv.hostPlatform.is32bit (fetchpatch {
|
||||
name = "fix-32bit-VkImage-null.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/10d43de8f4f942cb591ada3103474bd7213425f1.patch";
|
||||
hash = "sha256-DJIL6M3XcsjBoMO77OxNi84d1DxAphAfot3N7Nq1QqQ=";
|
||||
});
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@
|
|||
pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
|
||||
libpulseaudio,
|
||||
useQt ? false,
|
||||
qtbase ? null,
|
||||
wrapQtAppsHook ? null,
|
||||
libsForQt5,
|
||||
# can be turned off if used as a library
|
||||
useGtk ? true,
|
||||
gtk3,
|
||||
|
|
@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cmake
|
||||
]
|
||||
++ lib.optionals useGtk [ wrapGAppsHook3 ]
|
||||
++ lib.optionals useQt [ wrapQtAppsHook ];
|
||||
++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
|
|
@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
++ lib.optionals pulseaudioSupport [ libpulseaudio ]
|
||||
++ lib.optionals useGtk [ gtk3 ]
|
||||
++ lib.optionals useQt [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -4,9 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
qttools,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -36,12 +34,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qttools
|
||||
qtbase
|
||||
libsForQt5.qttools
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -2,10 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
qtmultimedia,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -13,13 +10,13 @@ stdenv.mkDerivation rec {
|
|||
pname = "herqq";
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
];
|
||||
|
||||
outputs = [
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
gnustep-libobjc,
|
||||
libbsd,
|
||||
libffi_3_3,
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -2,8 +2,7 @@
|
|||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
|
|
@ -18,9 +17,9 @@ python3Packages.buildPythonApplication {
|
|||
sha256 = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyserial
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
fetchFromGitHub,
|
||||
cmake,
|
||||
gitMinimal,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
perl,
|
||||
flatbuffers,
|
||||
protobuf,
|
||||
|
|
@ -18,11 +18,6 @@
|
|||
libxcb,
|
||||
libxrandr,
|
||||
python3,
|
||||
qtbase,
|
||||
qtserialport,
|
||||
qtsvg,
|
||||
qtx11extras,
|
||||
qtwebsockets,
|
||||
withRPiDispmanx ? false,
|
||||
libraspberrypi,
|
||||
}:
|
||||
|
|
@ -54,11 +49,11 @@ stdenv.mkDerivation rec {
|
|||
protobuf
|
||||
mbedtls
|
||||
python3
|
||||
qtbase
|
||||
qtserialport
|
||||
qtsvg
|
||||
qtwebsockets
|
||||
qtx11extras
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtserialport
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qtwebsockets
|
||||
libsForQt5.qtx11extras
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux libcec
|
||||
++ lib.optional withRPiDispmanx libraspberrypi;
|
||||
|
|
@ -66,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
gitMinimal
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle
|
||||
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
fetchpatch,
|
||||
ncurses,
|
||||
withGui ? false,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "00c4ng30ry88hcya4g1i9dngiqmz3cs31x7qh1a10nalxn1829xy";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ] ++ lib.optional withGui qtbase;
|
||||
buildInputs = [ ncurses ] ++ lib.optional withGui libsForQt5.qtbase;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
|
|
@ -24,14 +24,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "komikku";
|
||||
version = "50.2.0";
|
||||
version = "50.4.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-djC4v2OTRA/UEiI3foiEvRo6gVN5eS2+eENueQzdkds=";
|
||||
hash = "sha256-u/OyWZJIntpeuVoJQmLrdsva3+xvwRX28N89aVZYc2o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
wrapQtAppsHook,
|
||||
qmake,
|
||||
qtmultimedia,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -23,11 +21,11 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
];
|
||||
|
||||
buildInputs = [ qtmultimedia ];
|
||||
buildInputs = [ libsForQt5.qtmultimedia ];
|
||||
|
||||
qmakeFlags = [ "src/kristall.pro" ];
|
||||
|
||||
|
|
@ -52,6 +50,6 @@ stdenv.mkDerivation rec {
|
|||
mainProgram = "kristall";
|
||||
homepage = "https://random-projects.net/projects/kristall.gemini";
|
||||
license = lib.licenses.gpl3Only;
|
||||
inherit (qtmultimedia.meta) platforms;
|
||||
inherit (libsForQt5.qtmultimedia.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,14 +2,10 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qtbase,
|
||||
qtmultimedia,
|
||||
qtsvg,
|
||||
qtx11extras,
|
||||
pkg-config,
|
||||
cmake,
|
||||
gettext,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -24,17 +20,17 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
qtx11extras
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtsvg
|
||||
libsForQt5.qtx11extras
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
gettext
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "4.2.2";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-pDSLP+YN13iRLeQ3RWYZ8AwU1VqzbVw+oazPp4NdXNU=";
|
||||
hash = "sha256-diyjhQCA+rF9E8QdTbwJqUKE0N6wdlcN9Oamr81LsOc=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -2,15 +2,11 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qmake,
|
||||
pkg-config,
|
||||
boost,
|
||||
wirelesstools,
|
||||
iw,
|
||||
qwt6_1,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -24,20 +20,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
boost
|
||||
qwt6_1
|
||||
libsForQt5.qwt6_1
|
||||
];
|
||||
|
||||
patches = [ ./0001-unbundled-qwt.patch ];
|
||||
|
||||
postPatch = ''
|
||||
sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/include|" -i linssid-app/linssid-app.pro
|
||||
sed -e "s|/usr/include/qt5.*$|& ${libsForQt5.qwt6_1}/include|" -i linssid-app/linssid-app.pro
|
||||
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
|
||||
sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \
|
||||
-e "s|/usr|$out|g" \
|
||||
|
|
@ -2,9 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
|
@ -6,9 +6,7 @@
|
|||
python3,
|
||||
file,
|
||||
bc,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
qtsvg,
|
||||
libsForQt5,
|
||||
hunspell,
|
||||
makeWrapper, # , mythes, boost
|
||||
}:
|
||||
|
|
@ -27,12 +25,12 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
makeWrapper
|
||||
python3
|
||||
qtbase
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
file # for libmagic
|
||||
bc
|
||||
hunspell # enchant
|
||||
|
|
@ -3,9 +3,8 @@
|
|||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
qtbase,
|
||||
git-lfs,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -45,14 +44,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
python
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
git-lfs
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
propagatedBuildInputs = pydeps;
|
||||
|
|
@ -4,8 +4,6 @@
|
|||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
qtbase,
|
||||
|
||||
at-spi2-atk,
|
||||
at-spi2-core,
|
||||
libepoxy,
|
||||
|
|
@ -25,7 +23,7 @@
|
|||
pkg-config,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -61,11 +59,11 @@ stdenv.mkDerivation {
|
|||
pkg-config
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
|
||||
"-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
@ -8,15 +8,11 @@
|
|||
libchewing,
|
||||
libpinyin,
|
||||
maliit-framework,
|
||||
qtfeedback,
|
||||
qtmultimedia,
|
||||
qtquickcontrols2,
|
||||
qtgraphicaleffects,
|
||||
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -41,10 +37,10 @@ stdenv.mkDerivation {
|
|||
libchewing
|
||||
libpinyin
|
||||
maliit-framework
|
||||
qtfeedback
|
||||
qtmultimedia
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
libsForQt5.qtfeedback
|
||||
libsForQt5.qtmultimedia
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtgraphicaleffects
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -56,7 +52,7 @@ stdenv.mkDerivation {
|
|||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -39,7 +39,7 @@ buildNpmPackage (finalAttrs: {
|
|||
homepage = "https://github.com/modelcontextprotocol/servers";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
mainProgram = "mcp-server-memory";
|
||||
mainProgram = "mcp-server-sequential-thinking";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
homepage = "https://github.com/modelcontextprotocol/servers";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
mainProgram = "mcp-server-git";
|
||||
mainProgram = "mcp-server-time";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -3,11 +3,7 @@
|
|||
stdenv,
|
||||
makeDesktopItem,
|
||||
fetchFromGitLab,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
# qt
|
||||
qtbase,
|
||||
qtwebsockets,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -31,12 +27,12 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtwebsockets
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtwebsockets
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mycelium";
|
||||
version = "0.7.7";
|
||||
version = "0.7.8";
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/myceliumd";
|
||||
|
||||
|
|
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
owner = "threefoldtech";
|
||||
repo = "mycelium";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-amw0DkPT7As7L9Zhts+s4g3N67uu/BDZmbJXapr89XQ=";
|
||||
hash = "sha256-1jaSQWsq72Q/T/0TLtoqaOtP+zoJLadKuFgTcz+CGeY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Shi7AbyuvWwWOm9RuUYYLS/wEqZ7/YiOo+8m2XDFAnM=";
|
||||
cargoHash = "sha256-Mr6yyCzIk+sdOVKW3pvr/IdeIEEXqCKJ/I7IbonTPww=";
|
||||
|
||||
nativeBuildInputs = [ versionCheckHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
which,
|
||||
qtbase,
|
||||
qtscript,
|
||||
libpulseaudio,
|
||||
fftwSinglePrec,
|
||||
lame,
|
||||
|
|
@ -32,7 +30,7 @@
|
|||
autoconf,
|
||||
automake,
|
||||
file,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
exiv2,
|
||||
linuxHeaders,
|
||||
soundtouch,
|
||||
|
|
@ -60,8 +58,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
freetype
|
||||
qtbase
|
||||
qtscript
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtscript
|
||||
lame
|
||||
zlib
|
||||
libGLU
|
||||
|
|
@ -96,7 +94,7 @@ stdenv.mkDerivation rec {
|
|||
autoconf
|
||||
automake
|
||||
file
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
configureFlags = [ "--dvb-path=${linuxHeaders}/include" ];
|
||||
|
|
@ -5,10 +5,9 @@
|
|||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
boost,
|
||||
libGL,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
python3,
|
||||
}:
|
||||
|
||||
|
|
@ -43,10 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
BOOST_ROOT = boost;
|
||||
RAIBLOCKS_GUI = "ON";
|
||||
RAIBLOCKS_TEST = "ON";
|
||||
Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
|
||||
Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core";
|
||||
Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui";
|
||||
Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets";
|
||||
Qt5_DIR = "${libsForQt5.qtbase.dev}/lib/cmake/Qt5";
|
||||
Qt5Core_DIR = "${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core";
|
||||
Qt5Gui_INCLUDE_DIRS = "${libsForQt5.qtbase.dev}/include/QtGui";
|
||||
Qt5Widgets_INCLUDE_DIRS = "${libsForQt5.qtbase.dev}/include/QtWidgets";
|
||||
};
|
||||
optionToFlag = name: value: "-D${name}=${value}";
|
||||
in
|
||||
|
|
@ -55,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
boost
|
||||
libGL
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
boost,
|
||||
cairo,
|
||||
ceres-solver,
|
||||
|
|
@ -63,7 +63,7 @@ stdenv.mkDerivation {
|
|||
cmake
|
||||
kdePackages.extra-cmake-modules
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -67,13 +67,13 @@ let
|
|||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.71.2";
|
||||
version = "0.71.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rmm9NdWNjcEmUp84lad709EoVCZz19/5/N5ssflWzt4=";
|
||||
hash = "sha256-1doOf/rgGbD/YtMY0+j1VM7933zR+G+Vyq6bF5fyuMg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NeZuj9o2yu5di+6jbNqCnAw0fI55GA5Otmr77c08QFc=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,10 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
replaceVars,
|
||||
libGLU,
|
||||
zlib,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
|
|
@ -28,7 +25,7 @@ stdenv.mkDerivation {
|
|||
./external-lib-paths.patch
|
||||
./zlib.patch
|
||||
(replaceVars ./qttools-bins.patch {
|
||||
qttools = "${qttools.dev}/bin";
|
||||
qttools = "${libsForQt5.qttools.dev}/bin";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "qt512-build-fix.patch";
|
||||
|
|
@ -39,14 +36,14 @@ stdenv.mkDerivation {
|
|||
++ (lib.optional stdenv.hostPlatform.isAarch64 ./no-sse-on-arm.patch);
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qttools
|
||||
libGLU
|
||||
zlib
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -4,10 +4,9 @@
|
|||
cmake,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
libnitrokey,
|
||||
cppcodec,
|
||||
qttools,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -24,8 +23,8 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
let
|
||||
pname = "notesnook";
|
||||
version = "3.3.17";
|
||||
version = "3.3.19";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
|
@ -27,10 +27,10 @@ let
|
|||
url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-AFy5hk7blipFBYAgxbMTJHITGtpaQGkSFFyUhB3TcCE=";
|
||||
aarch64-linux = "sha256-yLnhxnttlSf43jD0dlVLb5j6kXlUY3w5mLsC826z4rI=";
|
||||
x86_64-darwin = "sha256-d4lmmk4gYnpil/oPak7EohyJRjGx9kYmjopn1UxPR6U=";
|
||||
aarch64-darwin = "sha256-4E+UqZOm7NjHpvxIVnrnl5Og9xdMuuyzdwgiWeENZrg=";
|
||||
x86_64-linux = "sha256-l4+SeM6KXLICbHzoIpotwdCkbCaPV83TT8mlvc+Z0Qs=";
|
||||
aarch64-linux = "sha256-9yWClJWI/1F8QGkUQCsPQcqbAqjC+JM4jXA8SmpoKNQ=";
|
||||
x86_64-darwin = "sha256-LAsCRRLAZ0bsHkitXHE4jF6+tgSm0HnWNKG3bSKLy+0=";
|
||||
aarch64-darwin = "sha256-GkhO6iCn+CrLDGhKBGyogm0dNvpAPZS0xH/ED5oSN2U=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
}:
|
||||
|
|
@ -35,10 +34,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-JHK7idyk5UxgDyt+SzvYjTLmlNzx6+Z+OPYsRD4NWPg=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
|
|
@ -16,18 +16,18 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "olivetin";
|
||||
version = "3000.11.3";
|
||||
version = "3000.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OliveTin";
|
||||
repo = "OliveTin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GSCqtekFj0c2TPSygRiUAfSMQAyPbfuR0dxAGQ/Rghw=";
|
||||
hash = "sha256-xMtvxsDWt9Dpf01rzMxivAL76TVdl1QKs6sz03XeP70=";
|
||||
};
|
||||
|
||||
modRoot = "service";
|
||||
|
||||
vendorHash = "sha256-iH9tgw4KSER/xIPOIontSQLWrI4ORayRjyHsT1HU0m8=";
|
||||
vendorHash = "sha256-8oWvOeRgmbknd3iOMngAK914ut+230cr7pkw6hF/9Hc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ buildGoModule (finalAttrs: {
|
|||
pname = "olivetin-webui";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
npmDepsHash = "sha256-vrvwy96wtXxt0JJDs8YG0Lm3kpVRoJ2Qmu8nlggH6qc=";
|
||||
npmDepsHash = "sha256-Z9ovQRqKFWqp52xDUHvrWMHO9qDWJf9CqoXwlcfnnTU=";
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/frontend";
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,7 @@
|
|||
lib,
|
||||
libusb1,
|
||||
python3,
|
||||
qtbase,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
libsForQt5,
|
||||
udev,
|
||||
zlib,
|
||||
}:
|
||||
|
|
@ -49,13 +47,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qttools
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
libusb1
|
||||
python3
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
udev
|
||||
zlib
|
||||
];
|
||||
|
|
@ -3,9 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
vcg,
|
||||
glew,
|
||||
libGLU,
|
||||
|
|
@ -34,12 +32,12 @@ stdenv.mkDerivation {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
libsForQt5.qmake
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
vcg
|
||||
glew
|
||||
eigen
|
||||
|
|
@ -61,7 +59,7 @@ stdenv.mkDerivation {
|
|||
patchelf \
|
||||
--set-rpath "${
|
||||
lib.makeLibraryPath [
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
glew
|
||||
stdenv.cc.cc
|
||||
libGLU
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue