mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
fb50c4dbba
@ -4647,10 +4647,11 @@
|
||||
};
|
||||
felipeqq2 = {
|
||||
name = "Felipe Silva";
|
||||
email = "felipeqq2@outlook.com";
|
||||
email = "nixpkgs@felipeqq2.rocks";
|
||||
github = "felipeqq2";
|
||||
githubId = 71830138;
|
||||
keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A AA8C 2FD3 4A9E 2671 91B8"; }];
|
||||
matrix = "@felipeqq2:pub.solar";
|
||||
};
|
||||
felixscheinost = {
|
||||
name = "Felix Scheinost";
|
||||
@ -13320,6 +13321,12 @@
|
||||
githubId = 6362238;
|
||||
name = "Christoph Honal";
|
||||
};
|
||||
stasjok = {
|
||||
name = "Stanislav Asunkin";
|
||||
email = "nixpkgs@stasjok.ru";
|
||||
github = "stasjok";
|
||||
githubId = 1353637;
|
||||
};
|
||||
steamwalker = {
|
||||
email = "steamwalker@xs4all.nl";
|
||||
github = "steamwalker";
|
||||
|
||||
@ -21,18 +21,22 @@ parser.add_argument(
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
# Pretty-print certain Nix types, like literal expressions.
|
||||
def render_types(obj):
|
||||
if '_type' not in obj: return obj
|
||||
class OptionsEncoder(json.JSONEncoder):
|
||||
def encode(self, obj):
|
||||
# Unpack literal expressions and other Nix types.
|
||||
# Don't escape the strings: they were escaped when initially serialized to JSON.
|
||||
if isinstance(obj, dict):
|
||||
_type = obj.get('_type')
|
||||
if _type is not None:
|
||||
if _type == 'literalExpression' or _type == 'literalDocBook':
|
||||
return obj['text']
|
||||
|
||||
_type = obj['_type']
|
||||
if _type == 'literalExpression' or _type == 'literalDocBook':
|
||||
return obj['text']
|
||||
if _type == 'derivation':
|
||||
return obj['name']
|
||||
|
||||
if _type == 'derivation':
|
||||
return obj['name']
|
||||
raise Exception(f'Unexpected type `{_type}` in {json.dumps(obj)}')
|
||||
|
||||
raise Exception(f'Unexpected type `{_type}` in {json.dumps(obj)}')
|
||||
return super().encode(obj)
|
||||
|
||||
def generate_commonmark(options):
|
||||
for (name, value) in options.items():
|
||||
@ -49,14 +53,14 @@ def generate_commonmark(options):
|
||||
if 'default' in value:
|
||||
print('*_Default_*')
|
||||
print('```')
|
||||
print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':')))
|
||||
print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
|
||||
print('```')
|
||||
print()
|
||||
print()
|
||||
if 'example' in value:
|
||||
print('*_Example_*')
|
||||
print('```')
|
||||
print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':')))
|
||||
print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
|
||||
print('```')
|
||||
print()
|
||||
print()
|
||||
@ -76,7 +80,7 @@ def generate_asciidoc(options):
|
||||
print('Default::')
|
||||
print('+')
|
||||
print('----')
|
||||
print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':')))
|
||||
print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
|
||||
print('----')
|
||||
print()
|
||||
else:
|
||||
@ -89,7 +93,7 @@ def generate_asciidoc(options):
|
||||
print('Example::')
|
||||
print('+')
|
||||
print('----')
|
||||
print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':')))
|
||||
print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
|
||||
print('----')
|
||||
print()
|
||||
else:
|
||||
@ -97,7 +101,7 @@ def generate_asciidoc(options):
|
||||
print()
|
||||
|
||||
with open(args.nix_options_path) as nix_options_json:
|
||||
options = json.load(nix_options_json, object_hook=render_types)
|
||||
options = json.load(nix_options_json)
|
||||
|
||||
if args.format == 'commonmark':
|
||||
generate_commonmark(options)
|
||||
|
||||
@ -170,4 +170,16 @@ with lib;
|
||||
default = null;
|
||||
defaultText = literalExpression "username";
|
||||
};
|
||||
|
||||
workDir = mkOption {
|
||||
type = with types; nullOr str;
|
||||
description = lib.mdDoc ''
|
||||
Working directory, available as `$GITHUB_WORKSPACE` during workflow runs
|
||||
and used as a default for [repository checkouts](https://github.com/actions/checkout).
|
||||
The service cleans this directory on every service start.
|
||||
|
||||
A value of `null` will default to the systemd `RuntimeDirectory`.
|
||||
'';
|
||||
default = null;
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,6 +20,9 @@
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
workDir = if cfg.workDir == null then runtimeDir else cfg.workDir;
|
||||
in
|
||||
{
|
||||
description = "GitHub Actions runner";
|
||||
|
||||
@ -28,7 +31,7 @@ with lib;
|
||||
after = [ "network.target" "network-online.target" ];
|
||||
|
||||
environment = {
|
||||
HOME = runtimeDir;
|
||||
HOME = workDir;
|
||||
RUNNER_ROOT = stateDir;
|
||||
} // cfg.extraEnvironment;
|
||||
|
||||
@ -42,7 +45,7 @@ with lib;
|
||||
config.nix.package
|
||||
] ++ cfg.extraPackages;
|
||||
|
||||
serviceConfig = rec {
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service";
|
||||
|
||||
# Does the following, sequentially:
|
||||
@ -54,7 +57,7 @@ with lib;
|
||||
# - Set up the directory structure by creating the necessary symlinks.
|
||||
ExecStartPre =
|
||||
let
|
||||
# Wrapper script which expects the full path of the state, runtime and logs
|
||||
# Wrapper script which expects the full path of the state, working and logs
|
||||
# directory as arguments. Overrides the respective systemd variables to provide
|
||||
# unambiguous directory names. This becomes relevant, for example, if the
|
||||
# caller overrides any of the StateDirectory=, RuntimeDirectory= or LogDirectory=
|
||||
@ -65,12 +68,12 @@ with lib;
|
||||
set -euo pipefail
|
||||
|
||||
STATE_DIRECTORY="$1"
|
||||
RUNTIME_DIRECTORY="$2"
|
||||
WORK_DIRECTORY="$2"
|
||||
LOGS_DIRECTORY="$3"
|
||||
|
||||
${lines}
|
||||
'';
|
||||
runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" ] cfg;
|
||||
runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" "workDir" ] cfg;
|
||||
newConfigPath = builtins.toFile "${svcName}-config.json" (builtins.toJSON runnerRegistrationConfig);
|
||||
currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json";
|
||||
newConfigTokenPath= "$STATE_DIRECTORY/.new-token";
|
||||
@ -119,14 +122,15 @@ with lib;
|
||||
else
|
||||
# The state directory is entirely empty which indicates a first start
|
||||
copy_tokens
|
||||
fi '';
|
||||
fi
|
||||
'';
|
||||
configureRunner = writeScript "configure" ''
|
||||
if [[ -e "${newConfigTokenPath}" ]]; then
|
||||
echo "Configuring GitHub Actions Runner"
|
||||
args=(
|
||||
--unattended
|
||||
--disableupdate
|
||||
--work "$RUNTIME_DIRECTORY"
|
||||
--work "$WORK_DIRECTORY"
|
||||
--url ${escapeShellArg cfg.url}
|
||||
--labels ${escapeShellArg (concatStringsSep "," cfg.extraLabels)}
|
||||
--name ${escapeShellArg cfg.name}
|
||||
@ -153,18 +157,21 @@ with lib;
|
||||
ln -s '${newConfigPath}' "${currentConfigPath}"
|
||||
fi
|
||||
'';
|
||||
setupRuntimeDir = writeScript "setup-runtime-dirs" ''
|
||||
# Link _diag dir
|
||||
ln -s "$LOGS_DIRECTORY" "$RUNTIME_DIRECTORY/_diag"
|
||||
setupWorkDir = writeScript "setup-work-dirs" ''
|
||||
# Cleanup previous service
|
||||
${pkgs.findutils}/bin/find -H "$WORK_DIRECTORY" -mindepth 1 -delete
|
||||
|
||||
# Link the runner credentials to the runtime dir
|
||||
ln -s "$STATE_DIRECTORY"/{${lib.concatStringsSep "," runnerCredFiles}} "$RUNTIME_DIRECTORY/"
|
||||
# Link _diag dir
|
||||
ln -s "$LOGS_DIRECTORY" "$WORK_DIRECTORY/_diag"
|
||||
|
||||
# Link the runner credentials to the work dir
|
||||
ln -s "$STATE_DIRECTORY"/{${lib.concatStringsSep "," runnerCredFiles}} "$WORK_DIRECTORY/"
|
||||
'';
|
||||
in
|
||||
map (x: "${x} ${escapeShellArgs [ stateDir runtimeDir logsDir ]}") [
|
||||
map (x: "${x} ${escapeShellArgs [ stateDir workDir logsDir ]}") [
|
||||
"+${unconfigureRunner}" # runs as root
|
||||
configureRunner
|
||||
setupRuntimeDir
|
||||
setupWorkDir
|
||||
];
|
||||
|
||||
# If running in ephemeral mode, restart the service on-exit (i.e., successful de-registration of the runner)
|
||||
@ -181,7 +188,7 @@ with lib;
|
||||
# Home of persistent runner data, e.g., credentials
|
||||
StateDirectory = [ systemdDir ];
|
||||
StateDirectoryMode = "0700";
|
||||
WorkingDirectory = runtimeDir;
|
||||
WorkingDirectory = workDir;
|
||||
|
||||
InaccessiblePaths = [
|
||||
# Token file path given in the configuration, if visible to the service
|
||||
@ -232,6 +239,8 @@ with lib;
|
||||
];
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ];
|
||||
|
||||
BindPaths = lib.optionals (cfg.workDir != null) [ cfg.workDir ];
|
||||
|
||||
# Needs network access
|
||||
PrivateNetwork = false;
|
||||
# Cannot be true due to Node
|
||||
|
||||
@ -9,14 +9,14 @@ let
|
||||
The hash is recorded in the runner's name because we can't do better yet
|
||||
See https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29350 for more details
|
||||
*/
|
||||
genRunnerName = service: let
|
||||
genRunnerName = name: service: let
|
||||
hash = substring 0 12 (hashString "md5" (unsafeDiscardStringContext (toJSON service)));
|
||||
in if service ? description
|
||||
in if service ? description && service.description != null
|
||||
then "${hash} ${service.description}"
|
||||
else "${name}_${config.networking.hostName}_${hash}";
|
||||
|
||||
hashedServices = mapAttrs'
|
||||
(name: service: nameValuePair (genRunnerName service) service) cfg.services;
|
||||
(name: service: nameValuePair (genRunnerName name service) service) cfg.services;
|
||||
configPath = ''"$HOME"/.gitlab-runner/config.toml'';
|
||||
configureScript = pkgs.writeShellApplication {
|
||||
name = "gitlab-runner-configure";
|
||||
@ -38,7 +38,7 @@ let
|
||||
'' else ''
|
||||
export CONFIG_FILE=${configPath}
|
||||
|
||||
mkdir -p "$(dirname "${configPath}")"
|
||||
mkdir -p "$(dirname ${configPath})"
|
||||
touch ${configPath}
|
||||
|
||||
# update global options
|
||||
@ -534,9 +534,9 @@ in {
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
warnings = (mapAttrsToList
|
||||
warnings = mapAttrsToList
|
||||
(n: v: "services.gitlab-runner.services.${n}.`registrationConfigFile` points to a file in Nix Store. You should use quoted absolute path to prevent this.")
|
||||
(filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services));
|
||||
(filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services);
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
systemd.services.gitlab-runner = {
|
||||
@ -570,7 +570,7 @@ in {
|
||||
ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure";
|
||||
ExecStart = "${startScript}/bin/gitlab-runner-start";
|
||||
ExecReload = "!${configureScript}/bin/gitlab-runner-configure";
|
||||
} // optionalAttrs (cfg.gracefulTermination) {
|
||||
} // optionalAttrs cfg.gracefulTermination {
|
||||
TimeoutStopSec = "${cfg.gracefulTimeout}";
|
||||
KillSignal = "SIGQUIT";
|
||||
KillMode = "process";
|
||||
|
||||
@ -158,6 +158,9 @@ in {
|
||||
|
||||
services.udev.packages = [ cfg.package ];
|
||||
|
||||
# required to update the firmware of disks
|
||||
services.udisks2.enable = true;
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
security.polkit.enable = true;
|
||||
|
||||
@ -9,7 +9,6 @@ let
|
||||
in
|
||||
{
|
||||
options.services.n8n = {
|
||||
|
||||
enable = mkEnableOption (lib.mdDoc "n8n server");
|
||||
|
||||
openFirewall = mkOption {
|
||||
@ -22,7 +21,7 @@ in
|
||||
type = format.type;
|
||||
default = {};
|
||||
description = lib.mdDoc ''
|
||||
Configuration for n8n, see <https://docs.n8n.io/reference/configuration.html>
|
||||
Configuration for n8n, see <https://docs.n8n.io/hosting/environment-variables/configuration-methods/>
|
||||
for supported values.
|
||||
'';
|
||||
};
|
||||
@ -45,6 +44,10 @@ in
|
||||
N8N_USER_FOLDER = "/var/lib/n8n";
|
||||
HOME = "/var/lib/n8n";
|
||||
N8N_CONFIG_FILES = "${configFile}";
|
||||
|
||||
# Don't phone home
|
||||
N8N_DIAGNOSTICS_ENABLED = "false";
|
||||
N8N_VERSION_NOTIFICATIONS_ENABLED = "false";
|
||||
};
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
|
||||
@ -2,9 +2,6 @@
|
||||
let
|
||||
inherit (lib) literalExpression types;
|
||||
in {
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "ec2" "hvm" ] "Only HVM instances are supported, so specifying it is no longer necessary.")
|
||||
];
|
||||
options = {
|
||||
ec2 = {
|
||||
zfs = {
|
||||
@ -52,6 +49,12 @@ in {
|
||||
Whether the EC2 instance is using EFI.
|
||||
'';
|
||||
};
|
||||
hvm = lib.mkOption {
|
||||
description = "Unused legacy option. While support for non-hvm has been dropped, we keep this option around so that NixOps remains compatible with a somewhat recent `nixpkgs` and machines with an old `stateVersion`.";
|
||||
internal = true;
|
||||
default = true;
|
||||
readOnly = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.virtualisation.containers;
|
||||
|
||||
@ -136,7 +136,7 @@ in
|
||||
|
||||
environment.etc."containers/policy.json".source =
|
||||
if cfg.policy != { } then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy)
|
||||
else utils.copyFile "${pkgs.skopeo.src}/default-policy.json";
|
||||
else "${pkgs.skopeo.policy}/default-policy.json";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
@ -93,7 +93,7 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package pkgs.cri-tools ];
|
||||
|
||||
environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml";
|
||||
environment.etc."crictl.yaml".source = "${cfg.package}/etc/crictl.yaml";
|
||||
|
||||
virtualisation.cri-o.settings.crio = {
|
||||
storage_driver = cfg.storageDriver;
|
||||
@ -124,8 +124,8 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf";
|
||||
environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf";
|
||||
environment.etc."cni/net.d/10-crio-bridge.conflist".source = "${cfg.package}/etc/cni/net.d/10-crio-bridge.conflist";
|
||||
environment.etc."cni/net.d/99-loopback.conflist".source = "${cfg.package}/etc/cni/net.d/99-loopback.conflist";
|
||||
environment.etc."crio/crio.conf.d/00-default.conf".source = cfgFile;
|
||||
|
||||
# Enable common /etc/containers configuration
|
||||
|
||||
@ -19,7 +19,7 @@ in
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("n8n.service")
|
||||
machine.wait_for_open_port(${toString port})
|
||||
machine.succeed("curl --fail http://localhost:${toString port}/")
|
||||
machine.wait_for_console_text("Editor is now accessible via")
|
||||
machine.succeed("curl --fail -vvv http://localhost:${toString port}/")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -1,35 +1,27 @@
|
||||
{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which
|
||||
, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel
|
||||
{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which, DarwinTools, xcbuild
|
||||
, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel, MultitouchSupport
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.1.0";
|
||||
version = "1.4.1.1";
|
||||
pname = "chuck";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
|
||||
sha256 = "sha256-dL+ZrVFeMRPFW4MxUpNvrQKjzwBqVBBf8Rd3xHMZSSg=";
|
||||
sha256 = "sha256-RFnubxUdpy3N4VJeCv4FMp1hCGNWsWjs/AvDpXApD2M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex bison which ];
|
||||
nativeBuildInputs = [ flex bison which ]
|
||||
++ lib.optionals stdenv.isDarwin [ DarwinTools xcbuild ];
|
||||
|
||||
buildInputs = [ libsndfile ]
|
||||
++ lib.optional (!stdenv.isDarwin) alsa-lib
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ];
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ];
|
||||
|
||||
patches = [ ./darwin-limits.patch ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/core/makefile.x/makefile.osx \
|
||||
--replace "weak_framework" "framework" \
|
||||
--replace "MACOSX_DEPLOYMENT_TARGET=10.9" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"
|
||||
'';
|
||||
|
||||
makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ];
|
||||
buildFlags = [ (if stdenv.isDarwin then "osx" else "linux-alsa") ];
|
||||
buildFlags = [ (if stdenv.isDarwin then "mac" else "linux-alsa") ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Programming language for real-time sound synthesis and music creation";
|
||||
@ -37,7 +29,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ftrvxmtrx ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,28 +1,23 @@
|
||||
{ lib, stdenv, csound, desktop-file-utils,
|
||||
fetchFromGitHub, python, python-qt, qmake,
|
||||
qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }:
|
||||
qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "csound-qt";
|
||||
version = "0.9.6-beta3";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CsoundQt";
|
||||
repo = "CsoundQt";
|
||||
rev = version;
|
||||
sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PdylVOnunbB36dbZX/wzd9A8CJPDv/xH5HPLAUkRu28=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "examplepath.patch";
|
||||
url = "https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff";
|
||||
sha256 = "0y23kf8m1mh9mklsvf908b2b8m2w2rji8qvws44paf1kpwnwdmgm";
|
||||
})
|
||||
./rtmidipath.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns ];
|
||||
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ csound desktop-file-utils rtmidi ];
|
||||
|
||||
@ -35,13 +30,11 @@ stdenv.mkDerivation rec {
|
||||
"PYTHONQT_LIB_DIR=${python-qt}/lib"
|
||||
"LIBS+=-L${python-qt}/lib"
|
||||
"INCLUDEPATH+=${python-qt}/include/PythonQt"
|
||||
"INCLUDEPATH+=${python}/include/python2.7"
|
||||
"INCLUDEPATH+=${python}/include/python${python.pythonVersion}"
|
||||
"INSTALL_DIR=${placeholder "out"}"
|
||||
"SHARE_DIR=${placeholder "out"}/share"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features";
|
||||
homepage = "https://csoundqt.github.io/";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/src/src.pri b/src/src.pri
|
||||
index e5e0c896..9a9fa513 100644
|
||||
--- a/src/src.pri
|
||||
+++ b/src/src.pri
|
||||
@@ -155,9 +155,9 @@ pythonqt {
|
||||
diff --git a/src/src.pri b/src/src.pri
|
||||
index e5e0c896..9a9fa513 100644
|
||||
--- a/src/src.pri
|
||||
+++ b/src/src.pri
|
||||
@@ -155,9 +155,9 @@ pythonqt {
|
||||
"src/pyqcsobject.cpp"
|
||||
}
|
||||
rtmidi {
|
||||
|
||||
@ -1,5 +1,24 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, glfw, makeWrapper,
|
||||
libXrandr, libXinerama, libXcursor, gtk3, ffmpeg-full, ...}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, libX11
|
||||
, glfw
|
||||
, makeWrapper
|
||||
, libXrandr
|
||||
, libXinerama
|
||||
, libXcursor
|
||||
, gtk3
|
||||
, ffmpeg-full
|
||||
, AppKit
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, CoreAudio
|
||||
, CoreMIDI
|
||||
, CoreServices
|
||||
, Kernel
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "MIDIVisualizer";
|
||||
@ -15,16 +34,29 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
glfw
|
||||
ffmpeg-full
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libX11
|
||||
libXrandr
|
||||
libXinerama
|
||||
libXcursor
|
||||
gtk3
|
||||
ffmpeg-full
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
Carbon
|
||||
Cocoa
|
||||
CoreAudio
|
||||
CoreMIDI
|
||||
CoreServices
|
||||
Kernel
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
installPhase = if stdenv.isDarwin then ''
|
||||
mkdir -p $out/Applications $out/bin
|
||||
cp -r MIDIVisualizer.app $out/Applications/
|
||||
ln -s ../Applications/MIDIVisualizer.app/Contents/MacOS/MIDIVisualizer $out/bin/
|
||||
'' else ''
|
||||
mkdir -p $out/bin
|
||||
cp MIDIVisualizer $out/bin
|
||||
|
||||
@ -36,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||
description = "A small MIDI visualizer tool, using OpenGL";
|
||||
homepage = "https://github.com/kosua20/MIDIVisualizer";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.ericdallo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tageditor";
|
||||
version = "3.7.5";
|
||||
version = "3.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martchus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/0zzzOEkzNr1aIpPFdflFaM/0HTs3TlIRxau3Yt+Hog=";
|
||||
hash = "sha256-CjbV/Uwpe+x7LBDUDY+NRonUt549MrjGnlJ2olIrKQ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "termusic";
|
||||
version = "0.7.5";
|
||||
version = "0.7.7";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-/wpaxXY0hT7XX44cW1f3JuowE5u46/aLMC2VXgty/jE=";
|
||||
sha256 = "sha256-ynSNgiy8TUxRBDAi4rSPd5ztSLMaaFg1yEMTD1TI3V4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TznzZ1dcun57IQ8e2T2FOxSdyqxS6etnuvxOY8n1y14=";
|
||||
cargoHash = "sha256-jD+oJw9xGY9ItYvoIUMwn8HrM72+02wOTeXEJjkZAfk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ alsa-lib ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "unifi-protect-backup";
|
||||
version = "0.8.7";
|
||||
version = "0.8.8";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "ep1cman";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VIA7/jWMuAWYle3tBDgKU5PJ9wkHChEjNns8lhYr1K8=";
|
||||
hash = "sha256-Z8qK7LprMyXl5irx9Xrs/RgqvNcFVBqLBSljovr6oiE=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -162,6 +162,7 @@ let
|
||||
icu
|
||||
libunwind
|
||||
libuuid
|
||||
lttng-ust
|
||||
openssl
|
||||
zlib
|
||||
|
||||
|
||||
@ -33,12 +33,15 @@
|
||||
, nvidia_cg_toolkit
|
||||
, pkg-config
|
||||
, python3
|
||||
, qtbase
|
||||
, retroarch-assets
|
||||
, SDL2
|
||||
, spirv-tools
|
||||
, substituteAll
|
||||
, udev
|
||||
, vulkan-loader
|
||||
, wayland
|
||||
, wrapQtAppsHook
|
||||
, zlib
|
||||
}:
|
||||
|
||||
@ -71,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++
|
||||
nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++
|
||||
lib.optional withWayland wayland ++
|
||||
lib.optional (runtimeLibs != [ ]) makeWrapper;
|
||||
|
||||
@ -84,7 +87,9 @@ stdenv.mkDerivation rec {
|
||||
libxml2
|
||||
mbedtls_2
|
||||
python3
|
||||
qtbase
|
||||
SDL2
|
||||
spirv-tools
|
||||
zlib
|
||||
] ++
|
||||
lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "llama";
|
||||
version = "1.2.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antonmedv";
|
||||
repo = "llama";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-32UyFy269rifw4Hjw18FO0F79sDNW8dgJ2MdGXSzLWo=";
|
||||
sha256 = "sha256-mJUxi2gqTMcodznCUDb2iB6j/p7bMUhhBLtZMbvfE1c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ=";
|
||||
vendorHash = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal file manager";
|
||||
|
||||
@ -46,13 +46,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-56";
|
||||
version = "7.1.0-57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
hash = "sha256-21gzq7VqjJndgkMIOk5ym6PEyIjMGpBfZiPDfkuqOYQ=";
|
||||
hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -ru a/app/app_procs.c b/app/app_procs.c
|
||||
--- a/app/app_procs.c 2021-01-30 11:09:52.000000000 -0500
|
||||
+++ b/app/app_procs.c 2021-01-30 11:11:05.000000000 -0500
|
||||
@@ -785,6 +785,7 @@
|
||||
|
||||
if (!filename) {
|
||||
g_print (_("Filename conversion failed: %s\n"), filenames[i]);
|
||||
+ ++i;
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -1,40 +1,68 @@
|
||||
{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages,
|
||||
libxml2, gettext, python2, libxml2Python, docbook5, docbook_xsl,
|
||||
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
|
||||
gtk-mac-integration-gtk2 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, appstream-glib
|
||||
, cmake
|
||||
, dblatex
|
||||
, desktop-file-utils
|
||||
, graphene
|
||||
, gtk2
|
||||
, gtk-mac-integration-gtk2
|
||||
, intltool
|
||||
, libxml2
|
||||
, libxslt
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, poppler
|
||||
, python3
|
||||
# Building with docs are failing in unstable-2022-12-14
|
||||
, withDocs ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "dia";
|
||||
version = "0.97.3.20170622";
|
||||
version = "unstable-2022-12-14";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.gnome.org/GNOME/dia.git";
|
||||
rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c";
|
||||
sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";
|
||||
src = fetchFromGitLab {
|
||||
owner = "GNOME";
|
||||
repo = "dia";
|
||||
domain = "gitlab.gnome.org";
|
||||
rev = "4a619ec7cc93be5ddfbcc48d9e1572d04943bcad";
|
||||
hash = "sha256-xi45Ak4rlDQjs/FNkdkm145mx76GNHjE6Nrs1dc94ww=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./CVE-2019-19451.patch
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ gtk2 libxml2 gettext python2 libxml2Python docbook5
|
||||
libxslt docbook_xsl libart_lgpl ]
|
||||
++ lib.optional withGNOME libgnomeui
|
||||
++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool pkg-config intltool ]
|
||||
++ (with perlPackages; [ perl XMLParser ]);
|
||||
patches = [ ./poppler-22_09-build-fix.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough
|
||||
patchShebangs .
|
||||
'';
|
||||
configureFlags = lib.optional withGNOME "--enable-gnome";
|
||||
|
||||
# error: implicitly declaring library function 'finite' with type 'int (double)'
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite";
|
||||
buildInputs = [
|
||||
graphene
|
||||
gtk2
|
||||
libxml2
|
||||
python3
|
||||
poppler
|
||||
] ++
|
||||
lib.optionals withDocs [
|
||||
libxslt
|
||||
] ++
|
||||
lib.optionals stdenv.isDarwin [
|
||||
gtk-mac-integration-gtk2
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
intltool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
] ++
|
||||
lib.optionals withDocs [
|
||||
dblatex
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gnome Diagram drawing software";
|
||||
|
||||
93
pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch
Normal file
93
pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch
Normal file
@ -0,0 +1,93 @@
|
||||
diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp
|
||||
index 189737908..a2a479693 100644
|
||||
--- a/plug-ins/pdf/pdf-import.cpp
|
||||
+++ b/plug-ins/pdf/pdf-import.cpp
|
||||
@@ -152,12 +152,12 @@ public :
|
||||
void
|
||||
updateLineDash (GfxState *state)
|
||||
{
|
||||
- double *dashPattern;
|
||||
- int dashLength;
|
||||
- double dashStart;
|
||||
-
|
||||
- state->getLineDash (&dashPattern, &dashLength, &dashStart);
|
||||
- this->dash_length = dashLength ? dashPattern[0] * scale : 1.0;
|
||||
+ const double *dashPattern=NULL;
|
||||
+ int dashLength=0;
|
||||
+ double dashStart=0;
|
||||
+ const std::vector<double> &dash = state->getLineDash(&dashStart); // > Poppler 22.09 ...
|
||||
+ dashPattern = dash.data();
|
||||
+ dashLength = dash.size();
|
||||
|
||||
if (dashLength == 0)
|
||||
this->line_style = DIA_LINE_STYLE_SOLID;
|
||||
@@ -318,10 +318,11 @@ public :
|
||||
//FIXME: Dia is really unhappy about zero size fonts
|
||||
if (!(state->getFontSize() > 0.0))
|
||||
return;
|
||||
- GfxFont *f = state->getFont();
|
||||
+ const std::shared_ptr<GfxFont> f = state->getFont(); // poppler 22.05 ... header changed
|
||||
+ gconstpointer f1 = &f; // GLib typedef const void * gconstpointer;
|
||||
|
||||
// instead of building the same font over and over again
|
||||
- if (g_hash_table_lookup (this->font_map, f)) {
|
||||
+ if (g_hash_table_lookup (this->font_map, f1)) {
|
||||
++font_map_hits;
|
||||
return;
|
||||
}
|
||||
@@ -333,8 +334,9 @@ public :
|
||||
gchar *family = g_strdup (f->getFamily() ? f->getFamily()->c_str() : "sans");
|
||||
|
||||
// we are (not anymore) building the same font over and over again
|
||||
+ f1 = &f;
|
||||
g_print ("Font 0x%x: '%s' size=%g (* %g)\n",
|
||||
- GPOINTER_TO_INT (f), family, state->getTransformedFontSize(), scale);
|
||||
+ GPOINTER_TO_INT (f1), family, state->getTransformedFontSize(), scale);
|
||||
|
||||
// now try to make a fontname Dia/Pango can cope with
|
||||
// strip style postfix - we already have extracted the style bits above
|
||||
@@ -354,7 +356,9 @@ public :
|
||||
fsize *= fabs(fm[3] / fm[0]);
|
||||
font = dia_font_new (family, style, fsize * scale / 0.8);
|
||||
|
||||
- g_hash_table_insert (this->font_map, f, font);
|
||||
+ f1 = &f;
|
||||
+ gpointer f2 = (gpointer)f1; // GLib typedef void* gpointer;
|
||||
+ g_hash_table_insert (this->font_map, f2, font);
|
||||
g_free (family);
|
||||
}
|
||||
void updateTextShift(GfxState *state, double shift)
|
||||
@@ -721,11 +725,12 @@ DiaOutputDev::drawString(GfxState *state, GooString *s)
|
||||
return;
|
||||
if (!(state->getFontSize() > 0.0))
|
||||
return;
|
||||
- font = (DiaFont *)g_hash_table_lookup (this->font_map, state->getFont());
|
||||
+ gconstpointer f_1 = &state->getFont();
|
||||
+ font = (DiaFont *)g_hash_table_lookup (this->font_map, f_1);
|
||||
|
||||
// we have to decode the string data first
|
||||
{
|
||||
- GfxFont *f = state->getFont();
|
||||
+ const std::shared_ptr<GfxFont> f = state->getFont();
|
||||
const char *p = s->c_str();
|
||||
CharCode code;
|
||||
int j = 0, m, n;
|
||||
@@ -870,8 +875,8 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_
|
||||
std::unique_ptr<PDFDoc> doc;
|
||||
GooString *fileName = new GooString(filename);
|
||||
// no passwords yet
|
||||
- GooString *ownerPW = NULL;
|
||||
- GooString *userPW = NULL;
|
||||
+ const std::optional<GooString> ownerPW;
|
||||
+ const std::optional<GooString> userPW;
|
||||
gboolean ret = FALSE;
|
||||
|
||||
// without this we will get strange crashes (at least with /O2 build)
|
||||
@@ -899,6 +904,7 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_
|
||||
delete diaOut;
|
||||
ret = TRUE;
|
||||
}
|
||||
+ doc.reset();
|
||||
delete fileName;
|
||||
|
||||
return ret;
|
||||
51
pkgs/applications/graphics/vipsdisp/default.nix
Normal file
51
pkgs/applications/graphics/vipsdisp/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
, vips
|
||||
, gtk4
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vipsdisp";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcupitt";
|
||||
repo = "vipsdisp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zftvjH5hyWBpjRe5uQBDAqbThQaQFHz0UhzM5q8hSk8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
chmod +x ./meson_post_install.py
|
||||
patchShebangs ./meson_post_install.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vips
|
||||
gtk4
|
||||
python3
|
||||
];
|
||||
|
||||
# No tests implemented.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jcupitt/vipsdisp";
|
||||
description = "Tiny image viewer with libvips";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ foo-dogsquared ];
|
||||
};
|
||||
}
|
||||
@ -12,12 +12,12 @@ let
|
||||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
pname = "1password-cli";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-UCPF+tj1ELzLO4+UAYS/SS0i645oO55grbGGAhe7zBE=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-7vCCOKMSc2vrwSpAO5hYgdz/e6bveG0liG7fjbWge6c=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-mtD1caAc0PIFN8L+pw5tO0Tkg+JD99xBUvPwejVgVwU=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-5oZQEAnRPgE9GABoR0UCr6qjUwAdtFADoonJIeRHGdE=" "pkg";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-WCu1/5dewsjVMyFo+BaAgCOcK08Fe3ldJhDzCl8B+2M=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-eRNX7+IF9v3JzXxwp5WshqYOC5/uizniWOKSc3q2yL8=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-wvhWwcDufwvh8Isx4QpyyHEJ+3yU7f/0a4r5Itns68c=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-ZOU4huC1FUj0ZiqIgs+4tU8t/w5VVD/UiWGVFHS50sw=" "pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
platforms = builtins.attrNames sources;
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, boost
|
||||
, portmidi
|
||||
, sqlite
|
||||
@ -11,40 +12,40 @@
|
||||
, libpng
|
||||
, pngpp
|
||||
, zlib
|
||||
, wxGTK30
|
||||
, wxGTK32
|
||||
, wxsqlite3
|
||||
, fluidsynth
|
||||
, fontconfig
|
||||
, darwin
|
||||
, soundfont-fluid
|
||||
, openlilylib-fonts
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lenmus";
|
||||
version = "5.4.2";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lenmus";
|
||||
repo = "lenmus";
|
||||
rev = "Release_${version}";
|
||||
sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p";
|
||||
sha256 = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch";
|
||||
sha256 = "1z1wwh0pcr8w1zlr8swx99si9y2kxx5bmavgwvy6bvdhxgm58yqs";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch";
|
||||
sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lenmus/lenmus/commit/37ee8ac9c8faff65a14e8f7ed2bc22e6dc48d91f.patch";
|
||||
includes = [ "src/app/lenmus_midi_wizard.cpp" ];
|
||||
sha256 = "sha256-nlT6ZbSCIXUk2Ufv/SDn2A0Rt+s/7m+7l9HOoQmaIhc=";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "/usr" "${placeholder "out"}"
|
||||
sed -i 's/fixup_bundle.*")/")/g' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -55,10 +56,33 @@ stdenv.mkDerivation rec {
|
||||
libpng
|
||||
pngpp
|
||||
zlib
|
||||
wxGTK30
|
||||
wxGTK32
|
||||
wxsqlite3
|
||||
fluidsynth
|
||||
fontconfig
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir res/fonts
|
||||
ln -s ${openlilylib-fonts.bravura}/share/lilypond/*/fonts/otf/Bravura.otf res/fonts/Bravura.otf
|
||||
ln -s ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 res/sounds/FluidR3_GM.sf2
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
|
||||
"-DLENMUS_INSTALL_SOUNDFONT=ON"
|
||||
"-DMAN_INSTALL_DIR=${placeholder "out"}/share/man"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv $out/lenmus.app $out/Applications
|
||||
mv $out/Resources $out/Applications/lenmus.app/Contents
|
||||
makeWrapper $out/{Applications/lenmus.app/Contents/MacOS,bin}/lenmus
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "LenMus Phonascus is a program for learning music";
|
||||
longDescription = ''
|
||||
@ -69,6 +93,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.lenmus.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ramkromberg ];
|
||||
platforms = with platforms; linux;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,16 +1,20 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30
|
||||
, desktop-file-utils, libSM, imagemagick }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK32
|
||||
, desktop-file-utils, libSM, imagemagick, darwin }:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "22.06";
|
||||
version = "22.12";
|
||||
pname = "mediainfo-gui";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30=";
|
||||
sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ libmediainfo wxGTK30 desktop-file-utils libSM imagemagick ];
|
||||
buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
|
||||
sourceRoot = "./MediaInfo/Project/GNU/GUI/";
|
||||
|
||||
@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://mediaarea.net/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.devhell ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, AppKit
|
||||
, DarwinTools
|
||||
, alsa-utils
|
||||
, at-spi2-core
|
||||
, cmake
|
||||
@ -59,12 +61,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace cmake/TargetSetup.cmake \
|
||||
--replace '"sw_vers" "-productVersion"' '"echo" "1"'
|
||||
sed -i '/fixup_bundle/d' CMakeLists.txt
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'DARWIN_VERSION LESS 16' 'TRUE'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -73,6 +70,7 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
lsb-release
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
DarwinTools
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
@ -81,6 +79,10 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
dbus
|
||||
flac
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
# gtk3 propagates AppKit from the 10.12 SDK
|
||||
AppKit
|
||||
] ++ [
|
||||
gtk3
|
||||
jasper
|
||||
libGLU
|
||||
|
||||
52
pkgs/applications/misc/pokemon-colorscripts-mac/default.nix
Normal file
52
pkgs/applications/misc/pokemon-colorscripts-mac/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, coreutils
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pokemon-colorscripts-mac";
|
||||
version = "stable=2021-08-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nuke-dash";
|
||||
repo = "${pname}";
|
||||
rev = "6aa0cd93b255bee35c5716652b8b7dfecb5fcfa2";
|
||||
sha256 = "06b86qy2fpzdd81n2mscc2njkrxx0dyzxpgnm1xk6ldn17c853lc";
|
||||
};
|
||||
|
||||
buildInputs = [ coreutils ];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs ./install.sh
|
||||
|
||||
# Fix hardcoded prefixed coreutils
|
||||
substituteInPlace pokemon-colorscripts.sh --replace greadlink readlink
|
||||
substituteInPlace pokemon-colorscripts.sh --replace gshuf shuf
|
||||
|
||||
substituteInPlace install.sh --replace /usr/local $out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/opt
|
||||
mkdir -p $out/bin
|
||||
./install.sh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pokémon colorscripts for the terminal, compatible for mac";
|
||||
longDescription = ''
|
||||
Show colored sprites of pokémons in your terminal.
|
||||
Contains almost 900 pokemon from gen 1 to gen 8.
|
||||
Inspired by DT's colorscripts.
|
||||
'';
|
||||
homepage = "https://github.com/nuke-dash/pokemon-colorscripts-mac";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.wesleyjrz ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -183,5 +183,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/prusa3d/PrusaSlicer";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ moredread tweber ];
|
||||
} // lib.optionalAttrs (stdenv.isDarwin) {
|
||||
mainProgram = "PrusaSlicer";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,38 +2,49 @@
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, expat
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libGL
|
||||
, libxkbcommon
|
||||
, pipewire
|
||||
, wayland
|
||||
, xorg
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pw-viz";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ax9d";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1d46m7w6rzzjpxc2fxwka9xbz49szbfrl63kxlv6kw4lknrladjn";
|
||||
sha256 = "sha256-lw4whdh8tNoS5XUlamQCq8f8z8K59uD90PSSo3skeyo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jx1mUP6ezpwUhmDD9tCJBhHCHU8fEMlB738yYfB1psc=";
|
||||
cargoSha256 = "sha256-XmvM5tr6ToYi0UrFnLju1wmp/0VEEP/O7T9Bx0YyFW4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
fontconfig
|
||||
freetype
|
||||
libGL
|
||||
libxkbcommon
|
||||
pipewire
|
||||
rustPlatform.bindgenHook
|
||||
wayland
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libxcb
|
||||
xorg.libXrandr
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
patchelf $out/bin/pw-viz --add-rpath ${lib.makeLibraryPath [ libGL xorg.libXrandr ]}
|
||||
patchelf $out/bin/pw-viz \
|
||||
--add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, zip
|
||||
, gettext
|
||||
, perl
|
||||
, wxGTK30
|
||||
, wxGTK32
|
||||
, libXext
|
||||
, libXi
|
||||
, libXt
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pwsafe";
|
||||
version = "1.15.0"; # do NOT update to 3.x Windows releases
|
||||
version = "1.16.0"; # do NOT update to 3.x Windows releases
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-EyyQHp2MlGgUnikClgvP7I313Bh6H3yVPXel8Z/U6gQ=";
|
||||
hash = "sha256-5/TOg+hiy22vlPJHheE638abhS3B5Jrul0Umgwu+gi0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
libXi
|
||||
libXt
|
||||
libXtst
|
||||
wxGTK30
|
||||
wxGTK32
|
||||
curl
|
||||
qrencode
|
||||
libuuid
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sticky";
|
||||
version = "1.13";
|
||||
version = "1.14";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-oirTDIbvG9/iAkYrquX+ciujAnLUmubkBVvTyaiz2g8=";
|
||||
hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -24,14 +24,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "tellico";
|
||||
version = "3.4.4";
|
||||
version = "3.4.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "office";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Qgan0mnDTQx+KKCAnRpgi9CCbXIRBMQtAyH/Mr20VSw=";
|
||||
hash = "sha256-XWzSbtyxOkASTwT5b7+hIEwaKe2bEo6ij+CnPbYNEc0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,10 +3,10 @@
|
||||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "108.0.1";
|
||||
version = "108.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "e6219ed6324422ec293ed96868738e056582bb9f7fb82e59362541f3465c6ebca806d26ecd801156b074c3675bd5a22507b1f1fa53eebf82b7dd35f2b1ff0625";
|
||||
sha512 = "f856ef034fa4a526e19968aed092c9ee99e124d2d271ec1c1bbd091d9a03e23293d69c7a9ae17c43258cde7e73c294534b471e36441e576377854f607c9bfa3a";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "karmor";
|
||||
version = "0.11.1";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubearmor";
|
||||
repo = "kubearmor-client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s1G5ZcXtjL9TxYpEUvnqiQXaY7OFUwCDXFongRM48Xk=";
|
||||
hash = "sha256-UN0b4OFyszM6F0vut70pnoxhI8Qf2Ed4/BdBeWLWEOA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VvjcGiBxK2OVvIEc/ScwUT6zJZTccnXu/JfXKXc5WNY=";
|
||||
vendorHash = "sha256-eShJFjSmyny8eWmj6G/cXwFkThlXqxeef5tjqe3srxw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kluctl";
|
||||
version = "2.16.1";
|
||||
version = "2.18.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kluctl";
|
||||
repo = "kluctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rcwtVhtLc49rD6J3AZFumLQrZuTveE7OY+agufe/4MQ=";
|
||||
hash = "sha256-vlNFIxhytgRtECj42Xng+j69JPciID26g1q8w9K14xY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IC+sjctDqd0lQD5labl+UYWsRiptQKSjSHYf2SGkp14=";
|
||||
vendorHash = "sha256-JpAQ8tyGJXOUH13uHHCtaYd/jbqZ8zZNCNq7ddPf6U8=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
|
||||
|
||||
|
||||
@ -69,14 +69,6 @@ let
|
||||
};
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
certifi = super.certifi.overridePythonAttrs (old: {
|
||||
meta = old.meta // {
|
||||
knownVulnerabilities = [ "CVE-2022-23491" ];
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
];
|
||||
}
|
||||
).python;
|
||||
|
||||
@ -5,8 +5,8 @@ self: super: {
|
||||
_: {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/NixOS/nixops.git";
|
||||
rev = "683baa66c613216a662aad3fd58b0cdc5cd41adb";
|
||||
sha256 = "00yyzsybn1fjhkar64albxqp46d1v9c6lf1gd10lh9q72xq979sf";
|
||||
rev = "5013072c5ca34247d7dce545c3a7b1954948fd4d";
|
||||
sha256 = "0417xq7s0qkh9ali8grlahpxl4sgg4dla302dda4768wbp0wagcz";
|
||||
};
|
||||
}
|
||||
);
|
||||
@ -75,8 +75,8 @@ self: super: {
|
||||
_: {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/lukebfox/nixops-hetznercloud.git";
|
||||
rev = "386f8b7cfe724308a9c1e97e76d238498a279495";
|
||||
sha256 = "0ig9maxcprxvz0fgriyzgcqz990s1pspizzsqj7x3xg0w0dpx853";
|
||||
rev = "c00533400506d40940f7c1f67bf3973db37d9dd9";
|
||||
sha256 = "1xfwhiyay7x1r3q6rxn2f3h0llgwf73vl8fxp0ww13rgny2w0dgj";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
[[package]]
|
||||
name = "apache-libcloud"
|
||||
version = "3.6.1"
|
||||
version = "3.7.0"
|
||||
description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org"
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">=3.6, <4"
|
||||
files = [
|
||||
{file = "apache-libcloud-3.6.1.tar.gz", hash = "sha256:0facf3206568430c998da40e9bbac6d3a0c4fc80dd51674d9e794b381450120c"},
|
||||
{file = "apache_libcloud-3.6.1-py2.py3-none-any.whl", hash = "sha256:d01eee601b6367e711788c47a275ee717f23854f5267d9ba3b3e8ed3bb400e56"},
|
||||
{file = "apache-libcloud-3.7.0.tar.gz", hash = "sha256:148a9e50069654432a7d34997954e91434dd38ebf68832eb9c75d442b3e62fad"},
|
||||
{file = "apache_libcloud-3.7.0-py2.py3-none-any.whl", hash = "sha256:027a9aff2c01db9c8e6f9f94b6eb44b3153d82702c42bfbe7af5624dabf1f950"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
@ -29,18 +29,18 @@ files = [
|
||||
|
||||
[[package]]
|
||||
name = "boto3"
|
||||
version = "1.26.32"
|
||||
version = "1.26.45"
|
||||
description = "The AWS SDK for Python"
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">= 3.7"
|
||||
files = [
|
||||
{file = "boto3-1.26.32-py3-none-any.whl", hash = "sha256:672b97a634f3408d455bf94a6dfd59ef0c6150019885bc7107e465f062d58c26"},
|
||||
{file = "boto3-1.26.32.tar.gz", hash = "sha256:e0d6215313b03f09a9a38eccc88c1d3ba9868bcaaeb8b20eeb6d88fc3018b94d"},
|
||||
{file = "boto3-1.26.45-py3-none-any.whl", hash = "sha256:b1bc7db503dc49bdccf5dada080077056a32af9982afdde84578a109cd741d05"},
|
||||
{file = "boto3-1.26.45.tar.gz", hash = "sha256:cc7f652df93e1ce818413fd82ffd645d4f92a64fec67c72946212d3750eaa80f"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
botocore = ">=1.29.32,<1.30.0"
|
||||
botocore = ">=1.29.45,<1.30.0"
|
||||
jmespath = ">=0.7.1,<2.0.0"
|
||||
s3transfer = ">=0.6.0,<0.7.0"
|
||||
|
||||
@ -49,14 +49,14 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
|
||||
|
||||
[[package]]
|
||||
name = "botocore"
|
||||
version = "1.29.32"
|
||||
version = "1.29.45"
|
||||
description = "Low-level, data-driven core of boto 3."
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">= 3.7"
|
||||
files = [
|
||||
{file = "botocore-1.29.32-py3-none-any.whl", hash = "sha256:b1a65edca151665a6844bf9f317440e31d8d5e4cbce3477f2661462e20c213b1"},
|
||||
{file = "botocore-1.29.32.tar.gz", hash = "sha256:27bc3903f7f8c813efd1605ff13ffdfca2c37dc78cadfa488cfda78fca323deb"},
|
||||
{file = "botocore-1.29.45-py3-none-any.whl", hash = "sha256:a5c0e13f266ee9a74335a1e5d3e377f2baae27226ae23d78f023bae0d18f3161"},
|
||||
{file = "botocore-1.29.45.tar.gz", hash = "sha256:62ae03e591ff25555854aa338da35190ffe18c0b1be2ebf5cfb277164233691f"},
|
||||
]
|
||||
|
||||
[package.dependencies]
|
||||
@ -325,7 +325,7 @@ typing-extensions = "^3.7.4"
|
||||
type = "git"
|
||||
url = "https://github.com/NixOS/nixops.git"
|
||||
reference = "master"
|
||||
resolved_reference = "683baa66c613216a662aad3fd58b0cdc5cd41adb"
|
||||
resolved_reference = "5013072c5ca34247d7dce545c3a7b1954948fd4d"
|
||||
|
||||
[[package]]
|
||||
name = "nixops-aws"
|
||||
@ -471,7 +471,7 @@ typing-extensions = "^3.7.4"
|
||||
type = "git"
|
||||
url = "https://github.com/lukebfox/nixops-hetznercloud.git"
|
||||
reference = "HEAD"
|
||||
resolved_reference = "386f8b7cfe724308a9c1e97e76d238498a279495"
|
||||
resolved_reference = "c00533400506d40940f7c1f67bf3973db37d9dd9"
|
||||
|
||||
[[package]]
|
||||
name = "nixops-virtd"
|
||||
|
||||
@ -1041,11 +1041,11 @@
|
||||
"vendorHash": "sha256-bYHvuzj3ShX55cgrYobqADxcRDgese+n24p14z82CLA="
|
||||
},
|
||||
"sops": {
|
||||
"hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=",
|
||||
"hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=",
|
||||
"homepage": "https://registry.terraform.io/providers/carlpett/sops",
|
||||
"owner": "carlpett",
|
||||
"repo": "terraform-provider-sops",
|
||||
"rev": "v0.7.1",
|
||||
"rev": "v0.7.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
|
||||
@ -1,23 +1,31 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.42.5";
|
||||
version = "0.42.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hF40Tb9NND8az9zOOvh9w/VyjbpVlKqnMT7J9oDJjBM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WbvRqXzqPBBhJU2ELgNC2jHnOYxmR7dZ1ynA8ObWdxU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ByFn2j2m5dON0No6mt1QiYm4vMRSymS5Tezaws9B9c4=";
|
||||
vendorHash = "sha256-ByFn2j2m5dON0No6mt1QiYm4vMRSymS5Tezaws9B9c4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=v${version}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.VERSION=v${version}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/terragrunt --help
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "newsboat";
|
||||
version = "2.29";
|
||||
version = "2.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newsboat";
|
||||
repo = "newsboat";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-/R+ahUOgQR71kTZIpsic1gEYxJzbnY8x6AxtkzYTCDo=";
|
||||
hash = "sha256-hiZN3wWknshP8MG4ThhbMLyhQkuFozzoETs3mYaMVro=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uHhP5XurJHM31fJqsqW9tumPzzMMOEeEWAAsllazcME=";
|
||||
cargoHash = "sha256-Ap8i8hLqrUi6aSn4wKAdG3Z/5or+bF+epDaWUdWYt78";
|
||||
|
||||
# TODO: Check if that's still needed
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
postInstall = ''
|
||||
make prefix="$out" install
|
||||
cp -r contrib $out
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
for prog in $out/bin/*; do
|
||||
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
|
||||
|
||||
@ -67,7 +67,7 @@
|
||||
let
|
||||
tg_owt = callPackage ./tg_owt.nix {
|
||||
abseil-cpp = abseil-cpp.override {
|
||||
cxxStandard = "17";
|
||||
cxxStandard = "20";
|
||||
};
|
||||
};
|
||||
# Aarch64 default gcc9 will cause ICE. For reference #108305
|
||||
@ -75,7 +75,7 @@ let
|
||||
in
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.4.1";
|
||||
version = "4.5.3";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
@ -84,7 +84,7 @@ env.mkDerivation rec {
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0c30kxgp48ha1xv3l59ry21n2c536ax8a15cfk2n1r5n1ns2pfq0";
|
||||
sha256 = "060ajv9dd87qs202jr09i842vww1x25mg7vriyvmyw6rz0qf0d8l";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tg_owt";
|
||||
version = "unstable-2022-09-14";
|
||||
version = "unstable-2023-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop-app";
|
||||
repo = "tg_owt";
|
||||
rev = "621f3da55331733bf0d1b223786b96b68c03dca1";
|
||||
sha256 = "0xh4mm8lpiyj3c62iarsld8q82a1w81x3dxdlcwq8s6sg3r04fns";
|
||||
rev = "5098730b9eb6173f0b52068fe2555b7c1015123a";
|
||||
sha256 = "0dnh0l9qb9q43cvm4wfgmgqp48grqqz9fb7f48nvys1b6pzhh3pk";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
583
pkgs/applications/networking/n8n/node-packages.nix
generated
583
pkgs/applications/networking/n8n/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK32
|
||||
, curl, gettext, glib, indi-full, libnova, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
wxGTK30
|
||||
wxGTK32
|
||||
curl
|
||||
gettext
|
||||
glib
|
||||
|
||||
@ -30,7 +30,7 @@ mkDerivation rec {
|
||||
# Fixes replaced/obsolete Qt methods
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sigrokproject/pulseview/commit/ae726b70a7ada9a4be5808e00f0c951318479684.patch";
|
||||
sha256 = "1rg8azin2b7gmp68bn3z398swqlg15ddyp4xynrz49wj44cgxsdv";
|
||||
sha256 = "sha256-6bFXFAnTO+MBUmslw55gWWSCCPwnejqKGpHeJOoH0e8=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, boost165, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, boost, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "starspace";
|
||||
version = "unstable-2021-01-17";
|
||||
version = "unstable-2019-12-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0sc7a37z1skb9377a1qs8ggwrkz0nmpybx7sms38xj05b702kbvj";
|
||||
};
|
||||
|
||||
buildInputs = [ boost165 zlib ];
|
||||
buildInputs = [ boost zlib ];
|
||||
|
||||
makeFlags = [
|
||||
"CXX=${stdenv.cc.targetPrefix}c++"
|
||||
"BOOST_DIR=${boost165.dev}/include"
|
||||
"BOOST_DIR=${boost.dev}/include"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@ -5,13 +5,13 @@ let
|
||||
|
||||
in buildPythonApplication rec {
|
||||
pname = "git-cola";
|
||||
version = "4.0.4";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-cola";
|
||||
repo = "git-cola";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-++cpzspN7REp9dOcsostcaJPnFHUW624hlgngQWjQCs=";
|
||||
hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY=";
|
||||
};
|
||||
|
||||
buildInputs = [ git gettext ];
|
||||
|
||||
@ -21,11 +21,11 @@ let
|
||||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
||||
version = "6.3.1";
|
||||
version = "6.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
sha256 = "sha256-bDmrhzKUjYnPEgh1HdfYXUBCqoIVOXdFG56xM2dYUHI=";
|
||||
sha256 = "sha256-z+butd2JOrMsC3nBUxqsQgdz4PyDejXbPU2ScD30Wpg=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@ -35,7 +35,7 @@ let
|
||||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "mercurial-${version}";
|
||||
sha256 = "sha256-UZ/ZSZkAedrm3iUkaQu6zvfX4bhrYDlwR9L9ytf38ZY=";
|
||||
sha256 = "sha256-pJNX0j/Rg3cQanveD7z2x5wixo/jLvHai8Ib2Akmmgk";
|
||||
sourceRoot = "mercurial-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hypnotix";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "hypnotix";
|
||||
rev = version;
|
||||
hash = "sha256-hCVItxvYTE0G5inI/A4w4FYfSfrACINBSaKXhA1mh4A=";
|
||||
hash = "sha256-R9bp1RQHHCrIE/3rIAHzWHXpXBUDUpJTkO53n+xZw3Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
|
||||
src = ./libmpv-path.patch;
|
||||
libmpv = "${lib.getLib mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
})
|
||||
|
||||
# Fix launching with mpv 0.35.0 (ubuntu 22.04 doesn't have libmpv.so.2)
|
||||
# https://github.com/linuxmint/hypnotix/issues/254
|
||||
./fix-deprecated-mpv-detach-destroy.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
diff --git a/usr/lib/hypnotix/mpv.py b/usr/lib/hypnotix/mpv.py
|
||||
index f42a3be..db94bf6 100644
|
||||
--- a/usr/lib/hypnotix/mpv.py
|
||||
+++ b/usr/lib/hypnotix/mpv.py
|
||||
@@ -528,7 +528,7 @@ _mpv_create = backend.mpv_create
|
||||
_handle_func('mpv_create_client', [c_char_p], MpvHandle, notnull_errcheck)
|
||||
_handle_func('mpv_client_name', [], c_char_p, errcheck=None)
|
||||
_handle_func('mpv_initialize', [], c_int, ec_errcheck)
|
||||
-_handle_func('mpv_detach_destroy', [], None, errcheck=None)
|
||||
+_handle_func('mpv_destroy', [], None, errcheck=None)
|
||||
_handle_func('mpv_terminate_destroy', [], None, errcheck=None)
|
||||
_handle_func('mpv_load_config_file', [c_char_p], c_int, ec_errcheck)
|
||||
_handle_func('mpv_get_time_us', [], c_ulonglong, errcheck=None)
|
||||
@@ -881,7 +881,7 @@ class MPV(object):
|
||||
self._message_handlers[target](*args)
|
||||
|
||||
if eid == MpvEventID.SHUTDOWN:
|
||||
- _mpv_detach_destroy(self._event_handle)
|
||||
+ _mpv_destroy(self._event_handle)
|
||||
return
|
||||
|
||||
except Exception as e:
|
||||
@ -3,11 +3,11 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "youtube";
|
||||
namespace = "plugin.video.youtube";
|
||||
version = "6.8.23+matrix.1";
|
||||
version = "6.8.24+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "GIPgw1exAgw/D5vNpQQkUnTye66jfLLI5/asrthEDPQ=";
|
||||
sha256 = "/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.25.1";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MFqCRHsIpc8ianyNW+PsDINQavbTZs2rZ2k6q/6wTkY=";
|
||||
sha256 = "sha256-XVg1TBYD6Y/EByKnnD+mFL/qA6IqBohuEvUgjwN962g=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -54,6 +54,9 @@ buildGoModule rec {
|
||||
installShellCompletion --$shell completions/$shell/*
|
||||
done
|
||||
|
||||
install contrib/cni/*.conflist -Dt $out/etc/cni/net.d
|
||||
install crictl.yaml -Dt $out/etc
|
||||
|
||||
installManPage docs/*.[1-9]
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -40,6 +40,7 @@ in runCommand cri-o-unwrapped.name {
|
||||
ln -s ${cri-o-unwrapped.man} $man
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s ${cri-o-unwrapped}/etc $out/etc
|
||||
ln -s ${cri-o-unwrapped}/share $out/share
|
||||
|
||||
for p in ${cri-o-unwrapped}/bin/*; do
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cagebreak";
|
||||
version = "1.8.1";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-repo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-YaLGRlvppTUCSHFlt3sEfHgN3pYHuc5oGt3dt0DDw3I=";
|
||||
hash = "sha256-pU1QHYOqnkb3L4iSKbZY9Vo60Z6EaX9mp2Nw48NSPic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -82,6 +82,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ berbiche ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/project-repo/cagebreak/blob/${version}/Changelog.md";
|
||||
};
|
||||
|
||||
passthru.tests.basic = nixosTests.cagebreak;
|
||||
|
||||
26
pkgs/applications/window-managers/sway/swaycons.nix
Normal file
26
pkgs/applications/window-managers/sway/swaycons.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swaycons";
|
||||
version = "unstable-2023-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ActuallyAllie";
|
||||
repo = "swaycons";
|
||||
rev = "e863599fb56177fc9747d60db661be2d7c2d290b";
|
||||
hash = "sha256-zkCpZ3TehFKNePtSyFaEk+MA4mi1+la9yFjRPFy+eq8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-GcoRx52dwL/ehJ1Xg6xQHVzPIKXWqBrG7IjzxRjfgqA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Window Icons in Sway with Nerd Fonts!";
|
||||
homepage = "https://github.com/ActuallyAllie/swaycons";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ aacebedo ];
|
||||
};
|
||||
}
|
||||
@ -28,7 +28,11 @@ in
|
||||
} @ args:
|
||||
|
||||
let hash_ =
|
||||
if args ? hash then { outputHashAlgo = null; outputHash = args.hash; }
|
||||
if args ? hash then
|
||||
{
|
||||
outputHashAlgo = if args.hash == "" then "sha256" else null;
|
||||
outputHash = args.hash;
|
||||
}
|
||||
else if args ? sha256 then { outputHashAlgo = "sha256"; outputHash = args.sha256; }
|
||||
else throw "fetchCargoTarball requires a hash for ${name}";
|
||||
in stdenv.mkDerivation ({
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, callPackage
|
||||
, cargo
|
||||
, cargo-nextest
|
||||
, clang
|
||||
, lib
|
||||
, makeSetupHook
|
||||
, maturin
|
||||
@ -124,8 +123,8 @@ in {
|
||||
bindgenHook = callPackage ({}: makeSetupHook {
|
||||
name = "rust-bindgen-hook";
|
||||
substitutions = {
|
||||
libclang = clang.cc.lib;
|
||||
inherit clang;
|
||||
libclang = rustc.llvmPackages.clang.cc.lib;
|
||||
clang = rustc.llvmPackages.clang;
|
||||
};
|
||||
}
|
||||
./rust-bindgen-hook.sh) {};
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "smiley-sans";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip";
|
||||
sha256 = "sha256-ufx/n3c7XoTZAxmdUMD4fc25z6By3/H4TOn0RtHOwyQ=";
|
||||
sha256 = "sha256-/lsAZRHgmx1TMjm2O5Z0IOiHQM8LKJPXcBKZrlXt3RA=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
@ -18,9 +18,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A condensed and oblique Chinese typeface seeking a visual balance between the humanist and the geometric";
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "16.1";
|
||||
version = "16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NYJ3cVxWd3vVkjr+Ni4kmhQzL9E+paexejrNA8pRfPE=";
|
||||
sha256 = "sha256-jhcmFrTZgWChNvZofLSQzGvOj/U2UqaQ0Cq5sv4UAxE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -34,12 +34,21 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.cc.isClang ''
|
||||
sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats
|
||||
'';
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
|
||||
# Disable parallel build, errors:
|
||||
# *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop.
|
||||
enableParallelBuilding = false;
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"CCOMP=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
setupHook = with lib;
|
||||
let
|
||||
hookFiles =
|
||||
@ -55,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Functional programming language with dependent types";
|
||||
homepage = "http://www.ats-lang.org";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,9 +24,11 @@ let
|
||||
sha256 = hash;
|
||||
};
|
||||
};
|
||||
flutter2Patches = getPatches ./patches/flutter2;
|
||||
flutter3Patches = getPatches ./patches/flutter3;
|
||||
in
|
||||
{
|
||||
inherit mkFlutter;
|
||||
inherit mkFlutter flutterDrv flutter2Patches flutter3Patches;
|
||||
stable = flutterDrv {
|
||||
pname = "flutter";
|
||||
version = "3.3.8";
|
||||
@ -36,7 +38,7 @@ in
|
||||
x86_64-linux = "sha256-lFw+KaxzhuAMnu6ypczINqywzpiD+8Kd+C/UHJDrO9Y=";
|
||||
aarch64-linux = "sha256-snlFTY4oJ4ALGLc210USbI2Z///cx1IVYUWm7Vo5z2I=";
|
||||
};
|
||||
patches = getPatches ./patches/flutter3;
|
||||
patches = flutter3Patches;
|
||||
};
|
||||
|
||||
v2 = flutterDrv {
|
||||
@ -48,6 +50,6 @@ in
|
||||
x86_64-linux = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
|
||||
aarch64-linux = "sha256-vmerjXkUAUnI8FjK+62qLqgETmA+BLPEZXFxwYpI+KY=";
|
||||
};
|
||||
patches = getPatches ./patches/flutter2;
|
||||
patches = flutter2Patches;
|
||||
};
|
||||
}
|
||||
|
||||
@ -875,17 +875,16 @@ self: super: builtins.intersectAttrs super {
|
||||
];
|
||||
|
||||
cachix = super.cachix.override {
|
||||
nix = pkgs.nixVersions.nix_2_10;
|
||||
fsnotify = super.fsnotify_0_4_1_0;
|
||||
nix = self.hercules-ci-cnix-store.passthru.nixPackage;
|
||||
fsnotify = dontCheck super.fsnotify_0_4_1_0;
|
||||
hnix-store-core = super.hnix-store-core_0_6_1_0;
|
||||
};
|
||||
|
||||
hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_10; };
|
||||
hercules-ci-cnix-expr =
|
||||
addTestToolDepend pkgs.git (
|
||||
super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_10; }
|
||||
);
|
||||
hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_10; };
|
||||
hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };
|
||||
hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });
|
||||
hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: {
|
||||
passthru.nixPackage = pkgs.nixVersions.nix_2_12;
|
||||
});
|
||||
|
||||
# the testsuite fails because of not finding tsc without some help
|
||||
aeson-typescript = overrideCabal (drv: {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.555";
|
||||
version = "0.558";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roblox";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
sha256 = "sha256-p3BTtjTmg8sS0gOugPCO1oqqboppcXa0wLHmRqmf3AA=";
|
||||
hash = "sha256-103TLfVmXBN3Vd31nbBu7RlxrG4DX6xn/vpveIdnm5E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -311,7 +311,12 @@ in {
|
||||
minor = "3";
|
||||
patch = "11";
|
||||
};
|
||||
sha256 = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; # linux64
|
||||
sha256 = {
|
||||
aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk=";
|
||||
x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE=";
|
||||
aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4=";
|
||||
x86_64-darwin = "sha256-0z9AsgcJmHJYWv1xhzV1ym6mOKJ9gjvGISOMWuglQu0=";
|
||||
}.${stdenv.system};
|
||||
pythonVersion = "3.9";
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
@ -19,11 +19,9 @@
|
||||
|
||||
assert zlibSupport -> zlib != null;
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
isPy3k = substring 0 1 pythonVersion == "3";
|
||||
isPy39OrNewer = versionAtLeast pythonVersion "3.9";
|
||||
isPy3k = (lib.versions.major pythonVersion) == "3";
|
||||
isPy39OrNewer = lib.versionAtLeast pythonVersion "3.9";
|
||||
passthru = passthruFun {
|
||||
inherit self sourceVersion pythonVersion packageOverrides;
|
||||
implementation = "pypy";
|
||||
@ -54,25 +52,23 @@ in with passthru; stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl libX11 gdbm db
|
||||
] ++ optionals isPy3k [
|
||||
] ++ lib.optionals isPy3k [
|
||||
xz
|
||||
] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [
|
||||
] ++ lib.optionals (stdenv ? cc && stdenv.cc.libc != null) [
|
||||
stdenv.cc.libc
|
||||
] ++ optionals zlibSupport [
|
||||
] ++ lib.optionals zlibSupport [
|
||||
zlib
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libunwind Security
|
||||
];
|
||||
|
||||
hardeningDisable = optional stdenv.isi686 "pic";
|
||||
|
||||
# Remove bootstrap python from closure
|
||||
dontPatchShebangs = true;
|
||||
disallowedReferences = [ python ];
|
||||
|
||||
C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" buildInputs;
|
||||
LIBRARY_PATH = makeLibraryPath buildInputs;
|
||||
LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
|
||||
C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs;
|
||||
LIBRARY_PATH = lib.makeLibraryPath buildInputs;
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath (builtins.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
|
||||
|
||||
patches = [
|
||||
./dont_fetch_vendored_deps.patch
|
||||
@ -96,14 +92,47 @@ in with passthru; stdenv.mkDerivation rec {
|
||||
substituteInPlace lib_pypy/pypy_tools/build_cffi_imports.py \
|
||||
--replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES"
|
||||
|
||||
substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" \
|
||||
--replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
${pythonForPypy.interpreter} rpython/bin/rpython \
|
||||
--make-jobs="$NIX_BUILD_CORES" \
|
||||
-Ojit \
|
||||
--batch pypy/goal/targetpypystandalone.py
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,include,lib,${executable}-c}
|
||||
|
||||
cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c
|
||||
cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
|
||||
ln -s $out/${executable}-c/${executable}-c $out/bin/${executable}
|
||||
${lib.optionalString isPy39OrNewer "ln -s $out/bin/${executable} $out/bin/pypy3"}
|
||||
|
||||
# other packages expect to find stuff according to libPrefix
|
||||
ln -s $out/${executable}-c/include $out/include/${libPrefix}
|
||||
ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
|
||||
|
||||
# Include a sitecustomize.py file
|
||||
cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString (stdenv.isDarwin) ''
|
||||
install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable}
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
mkdir -p $out/${executable}-c/pypy/bin
|
||||
mv $out/bin/${executable} $out/${executable}-c/pypy/bin/${executable}
|
||||
ln -s $out/${executable}-c/pypy/bin/${executable} $out/bin/${executable}
|
||||
'';
|
||||
|
||||
setupHook = python-setup-hook sitePackages;
|
||||
@ -117,12 +146,12 @@ in with passthru; stdenv.mkDerivation rec {
|
||||
"test_shutil"
|
||||
# disable socket because it has two actual network tests that fail
|
||||
"test_socket"
|
||||
] ++ optionals (!isPy3k) [
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
# disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com)
|
||||
"test_urllib2net"
|
||||
"test_urllibnet"
|
||||
"test_urllib2_localnet"
|
||||
] ++ optionals isPy3k [
|
||||
] ++ lib.optionals isPy3k [
|
||||
# disable asyncio due to https://github.com/NixOS/nix/issues/1238
|
||||
"test_asyncio"
|
||||
# disable os due to https://github.com/NixOS/nixpkgs/issues/10496
|
||||
@ -140,30 +169,25 @@ in with passthru; stdenv.mkDerivation rec {
|
||||
export TERM="xterm";
|
||||
export HOME="$TMPDIR";
|
||||
|
||||
${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${concatStringsSep " or " disabledTests})' lib-python
|
||||
${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${lib.concatStringsSep " or " disabledTests})' lib-python
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,include,lib,${executable}-c}
|
||||
|
||||
cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c
|
||||
cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
|
||||
ln -s $out/${executable}-c/${executable}-c $out/bin/${executable}
|
||||
${optionalString isPy39OrNewer "ln -s $out/bin/${executable}-c $out/bin/pypy3"}
|
||||
|
||||
# other packages expect to find stuff according to libPrefix
|
||||
ln -s $out/${executable}-c/include $out/include/${libPrefix}
|
||||
ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
|
||||
|
||||
${lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -change @rpath/lib${executable}-c.dylib $out/lib/lib${executable}-c.dylib $out/bin/${executable}
|
||||
''}
|
||||
|
||||
# verify cffi modules
|
||||
$out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"}
|
||||
|
||||
# Include a sitecustomize.py file
|
||||
cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py
|
||||
# verify cffi modules
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = let
|
||||
modules = [
|
||||
"curses"
|
||||
"sqlite3"
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
"Tkinter"
|
||||
] ++ lib.optionals isPy3k [
|
||||
"tkinter"
|
||||
"lzma"
|
||||
];
|
||||
imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules;
|
||||
in ''
|
||||
echo "Testing whether we can import modules"
|
||||
$out/bin/${executable} -c '${imports}'
|
||||
'';
|
||||
|
||||
inherit passthru;
|
||||
@ -174,7 +198,6 @@ in with passthru; stdenv.mkDerivation rec {
|
||||
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
|
||||
license = licenses.mit;
|
||||
platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
maintainers = with maintainers; [ andersk ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,6 +12,8 @@
|
||||
, sqlite
|
||||
, tcl-8_5
|
||||
, tk-8_5
|
||||
, tcl-8_6
|
||||
, tk-8_6
|
||||
, zlib
|
||||
# For the Python package set
|
||||
, packageOverrides ? (self: super: {})
|
||||
@ -24,8 +26,6 @@
|
||||
# This version of PyPy is primarily added to speed-up translation of
|
||||
# our PyPy source build when developing that expression.
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
isPy3k = majorVersion == "3";
|
||||
passthru = passthruFun rec {
|
||||
@ -48,11 +48,18 @@ let
|
||||
|
||||
majorVersion = lib.versions.major pythonVersion;
|
||||
|
||||
downloadUrls = {
|
||||
aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2";
|
||||
x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
|
||||
aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2";
|
||||
x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2";
|
||||
};
|
||||
|
||||
in with passthru; stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
|
||||
url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
@ -62,12 +69,16 @@ in with passthru; stdenv.mkDerivation {
|
||||
gdbm
|
||||
ncurses6
|
||||
sqlite
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
tcl-8_5
|
||||
tk-8_5
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
tcl-8_6
|
||||
tk-8_6
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -75,10 +86,10 @@ in with passthru; stdenv.mkDerivation {
|
||||
mkdir -p $out
|
||||
echo "Moving files to $out"
|
||||
mv -t $out bin include lib
|
||||
|
||||
mv $out/bin/libpypy*-c.so $out/lib/
|
||||
|
||||
rm $out/bin/*.debug
|
||||
mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
|
||||
${lib.optionalString stdenv.isLinux ''
|
||||
rm $out/bin/*.debug
|
||||
''}
|
||||
|
||||
echo "Removing bytecode"
|
||||
find . -name "__pycache__" -type d -depth -delete
|
||||
@ -89,11 +100,32 @@ in with passthru; stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
preFixup = lib.optionalString stdenv.isLinux ''
|
||||
find $out/{lib,lib_pypy*} -name "*.so" \
|
||||
-exec patchelf \
|
||||
--replace-needed libtinfow.so.6 libncursesw.so.6 \
|
||||
--replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \;
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool \
|
||||
-change \
|
||||
@rpath/lib${libPrefix}-c.dylib \
|
||||
$out/lib/lib${libPrefix}-c.dylib \
|
||||
$out/bin/${executable}
|
||||
install_name_tool \
|
||||
-change \
|
||||
@rpath/lib${libPrefix}-c.dylib \
|
||||
$out/lib/lib${libPrefix}-c.dylib \
|
||||
$out/bin/${libPrefix}
|
||||
install_name_tool \
|
||||
-change \
|
||||
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \
|
||||
${tcl-8_6}/lib/libtcl8.6.dylib \
|
||||
$out/lib/${libPrefix}/_tkinter/*.so
|
||||
install_name_tool \
|
||||
-change \
|
||||
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \
|
||||
${tk-8_6}/lib/libtk8.6.dylib \
|
||||
$out/lib/${libPrefix}/_tkinter/*.so
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
@ -104,12 +136,12 @@ in with passthru; stdenv.mkDerivation {
|
||||
"ssl"
|
||||
"sys"
|
||||
"curses"
|
||||
] ++ optionals (!isPy3k) [
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
"Tkinter"
|
||||
] ++ optionals isPy3k [
|
||||
] ++ lib.optionals isPy3k [
|
||||
"tkinter"
|
||||
];
|
||||
imports = concatMapStringsSep "; " (x: "import ${x}") modules;
|
||||
imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules;
|
||||
in ''
|
||||
echo "Testing whether we can import modules"
|
||||
$out/bin/${executable} -c '${imports}'
|
||||
@ -126,7 +158,7 @@ in with passthru; stdenv.mkDerivation {
|
||||
homepage = "http://pypy.org/";
|
||||
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -12,6 +12,8 @@
|
||||
, sqlite
|
||||
, tcl-8_5
|
||||
, tk-8_5
|
||||
, tcl-8_6
|
||||
, tk-8_6
|
||||
, zlib
|
||||
# For the Python package set
|
||||
, packageOverrides ? (self: super: {})
|
||||
@ -24,8 +26,6 @@
|
||||
# This version of PyPy is primarily added to speed-up translation of
|
||||
# our PyPy source build when developing that expression.
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
isPy3k = majorVersion == "3";
|
||||
passthru = passthruFun {
|
||||
@ -69,9 +69,13 @@ in with passthru; stdenv.mkDerivation {
|
||||
gdbm
|
||||
ncurses6
|
||||
sqlite
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
tcl-8_5
|
||||
tk-8_5
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
tcl-8_6
|
||||
tk-8_6
|
||||
];
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
@ -108,10 +112,19 @@ in with passthru; stdenv.mkDerivation {
|
||||
@rpath/lib${executable}-c.dylib \
|
||||
$out/lib/lib${executable}-c.dylib \
|
||||
$out/bin/${executable}
|
||||
install_name_tool \
|
||||
-change \
|
||||
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \
|
||||
${tcl-8_6}/lib/libtcl8.6.dylib \
|
||||
$out/lib_pypy/_tkinter/*.so
|
||||
install_name_tool \
|
||||
-change \
|
||||
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \
|
||||
${tk-8_6}/lib/libtk8.6.dylib \
|
||||
$out/lib_pypy/_tkinter/*.so
|
||||
'';
|
||||
|
||||
# Native libraries are not working in darwin
|
||||
doInstallCheck = !stdenv.isDarwin;
|
||||
doInstallCheck = true;
|
||||
|
||||
# Check whether importing of (extension) modules functions
|
||||
installCheckPhase = let
|
||||
@ -119,12 +132,12 @@ in with passthru; stdenv.mkDerivation {
|
||||
"ssl"
|
||||
"sys"
|
||||
"curses"
|
||||
] ++ optionals (!isPy3k) [
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
"Tkinter"
|
||||
] ++ optionals isPy3k [
|
||||
] ++ lib.optionals isPy3k [
|
||||
"tkinter"
|
||||
];
|
||||
imports = concatMapStringsSep "; " (x: "import ${x}") modules;
|
||||
imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules;
|
||||
in ''
|
||||
echo "Testing whether we can import modules"
|
||||
$out/bin/${executable} -c '${imports}'
|
||||
|
||||
@ -1,14 +1,28 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, jack2
|
||||
, pulseaudio
|
||||
, libpulseaudio
|
||||
, sndio
|
||||
, speexdsp
|
||||
, lazyLoad ? true
|
||||
, AudioUnit
|
||||
, CoreAudio
|
||||
, CoreServices
|
||||
, lazyLoad ? !stdenv.isDarwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
assert lib.assertMsg (stdenv.isDarwin -> !lazyLoad) "cubeb: lazyLoad is inert on Darwin";
|
||||
|
||||
let
|
||||
backendLibs = [
|
||||
alsa-lib
|
||||
jack2
|
||||
libpulseaudio
|
||||
sndio
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "cubeb";
|
||||
version = "unstable-2022-10-18";
|
||||
|
||||
@ -24,12 +38,10 @@ stdenv.mkDerivation {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
jack2
|
||||
pulseaudio
|
||||
sndio
|
||||
speexdsp
|
||||
];
|
||||
buildInputs = [ speexdsp ] ++ (
|
||||
if stdenv.isDarwin then [ AudioUnit CoreAudio CoreServices ]
|
||||
else backendLibs
|
||||
);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
@ -43,14 +55,14 @@ stdenv.mkDerivation {
|
||||
|
||||
passthru = {
|
||||
# For downstream users when lazyLoad is true
|
||||
backendLibs = [ jack2 pulseaudio sndio speexdsp ];
|
||||
backendLibs = lib.optionals lazyLoad backendLibs;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross platform audio library";
|
||||
homepage = "https://github.com/mozilla/cubeb";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
||||
|
||||
14
pkgs/development/libraries/boost/1.81.nix
Normal file
14
pkgs/development/libraries/boost/1.81.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.81.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_81_0.html
|
||||
sha256 = "71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa";
|
||||
};
|
||||
})
|
||||
@ -16,8 +16,6 @@ let
|
||||
}
|
||||
);
|
||||
in {
|
||||
boost159 = makeBoost ./1.59.nix;
|
||||
boost160 = makeBoost ./1.60.nix;
|
||||
boost165 = makeBoost ./1.65.nix;
|
||||
boost166 = makeBoost ./1.66.nix;
|
||||
boost167 = makeBoost ./1.67.nix;
|
||||
@ -33,4 +31,5 @@ in {
|
||||
boost178 = makeBoost ./1.78.nix;
|
||||
boost179 = makeBoost ./1.79.nix;
|
||||
boost180 = makeBoost ./1.80.nix;
|
||||
boost181 = makeBoost ./1.81.nix;
|
||||
}
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) OpenCL;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clfft";
|
||||
version = "2.12.2";
|
||||
@ -7,15 +10,24 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "clMathLibraries";
|
||||
repo = "clFFT";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "134vb6214hn00qy84m4djg4hqs6hw19gkp8d0wlq8gb9m3mfx7na";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/-m64/d;/-m32/d' CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ];
|
||||
buildInputs = [ fftw fftwFloat boost ]
|
||||
++ lib.optionals stdenv.isLinux [ opencl-clhpp ocl-icd ]
|
||||
++ lib.optionals stdenv.isDarwin [ OpenCL ];
|
||||
|
||||
# https://github.com/clMathLibraries/clFFT/issues/237
|
||||
CXXFLAGS = "-std=c++98";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library containing FFT functions written in OpenCL";
|
||||
@ -25,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
homepage = "http://clmathlibraries.github.io/clFFT/";
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ chessai ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, libiconv }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "htmlcxx";
|
||||
@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ libiconv ];
|
||||
patches = [
|
||||
./ptrdiff.patch
|
||||
@ -20,7 +21,5 @@ stdenv.mkDerivation rec {
|
||||
description = "A simple non-validating css1 and html parser for C++";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.all;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
nv-codec-headers = nv-codec-headers-11;
|
||||
}).overrideAttrs (old: rec {
|
||||
pname = "jellyfin-ffmpeg";
|
||||
version = "5.1.2-5";
|
||||
version = "5.1.2-6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-ffmpeg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2mSixlrTgAVD2ZRGoi1+UEbhba7QEVvKmigwC9dLk2g=";
|
||||
sha256 = "sha256-YPw29cnScchL4Y2CEatUjzqUW/U9kOdi29Dr577Qy5A=";
|
||||
};
|
||||
|
||||
buildInputs = old.buildInputs ++ [ chromaprint ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libLAS";
|
||||
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "aarch64-darwin.patch";
|
||||
url = "https://github.com/libLAS/libLAS/commit/ded463732db1f9baf461be6f3fe5b8bb683c41cd.patch";
|
||||
sha256 = "sha256-aWMpazeefDHE9OzuLR3FJ8+oXeGhEsk1igEm6j2DUnw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ];
|
||||
|
||||
@ -31,7 +39,5 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.michelk ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, flex
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libconfuse";
|
||||
@ -11,6 +17,18 @@ stdenv.mkDerivation rec {
|
||||
owner = "martinh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2022-40320.patch";
|
||||
urls = [
|
||||
"https://sources.debian.org/data/main/libc/libconfuse/3.3-3/debian/patches/CVE-2022-40320.patch"
|
||||
# files on sources.debian.org can disappear
|
||||
"https://web.archive.org/web/20230107133212/https://sources.debian.org/data/main/libc/libconfuse/3.3-3/debian/patches/CVE-2022-40320.patch"
|
||||
];
|
||||
sha256 = "sha256-ftfE9JFz4nyRSOb2xHb9BAtgWn5Yv2WLm4RegDLtiBw=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/Makefile.am \
|
||||
--replace 'TESTS += empty_string' "" \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, libnfc, openssl
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libnfc, openssl
|
||||
, libobjc ? null
|
||||
, IOKit, Security
|
||||
}:
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ];
|
||||
|
||||
meta = with lib; {
|
||||
@ -21,7 +21,5 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/nfc-tools/libfreefare";
|
||||
maintainers = with maintainers; [bobvanderlinden];
|
||||
platforms = platforms.unix;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,11 +13,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc=";
|
||||
};
|
||||
|
||||
patchPhase = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile --replace "gcc" "cc"
|
||||
substituteInPlace Makefile --replace "-arch i386" ""
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "-arch x86_64" "-arch ${stdenv.hostPlatform.darwinArch}"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,lib,include/hdhomerun}
|
||||
install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib
|
||||
@ -31,7 +35,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.titanous ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps;
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ];
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07";
|
||||
@ -22,7 +24,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/scipr-lab/libsnark";
|
||||
license = licenses.mit;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, glib
|
||||
@ -15,6 +16,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "add-support-for-aarch64-macos-target-triple.patch";
|
||||
url = "https://github.com/debrouxl/tilibs/commit/ef41c51363b11521460f33e8c332db7b0a9ca085.patch";
|
||||
stripLen = 2;
|
||||
sha256 = "sha256-oTR1ACEZI0fjErpnFXTCnfLT1mo10Ypy0q0D8NOPNsM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
@ -60,7 +70,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ siraben luc65r ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optional withPython python;
|
||||
|
||||
# error: invalid version number in 'MACOSX_DEPLOYMENT_TARGET=11.0'
|
||||
preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
|
||||
MACOSX_DEPLOYMENT_TARGET=10.16
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}"
|
||||
] ++ lib.optionals withPython [
|
||||
@ -57,7 +62,5 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://hepmc.web.cern.ch/hepmc/";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,26 +1,43 @@
|
||||
{ lib, stdenv, fetchurl, python, qmake,
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake,
|
||||
qtwebengine, qtxmlpatterns,
|
||||
qttools, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.2";
|
||||
pname = "python-qt";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url="mirror://sourceforge/pythonqt/PythonQt${version}.zip";
|
||||
sha256="13hzprk58m3yj39sj0xn6acg8796lll1256mpd81kw0z3yykyl8c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "MeVisLab";
|
||||
repo = "pythonqt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zbQ6X4Q2/QChaw3GAz/aVBj2JjWEz52YuPuHbBz935k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-unneeded-pydebug-include.patch";
|
||||
url = "https://github.com/MeVisLab/pythonqt/commit/a93104dea4d9c79351276ec963e931ca617625ec.patch";
|
||||
includes = [ "src/PythonQt.cpp" ];
|
||||
hash = "sha256-Tc4+6dIdvrda/z3Nz1s9Xz+ZWJLV2BQh8i552UynSI0=";
|
||||
})
|
||||
];
|
||||
|
||||
# https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt
|
||||
postPatch = ''
|
||||
substituteInPlace build/python.prf \
|
||||
--replace "unix:PYTHON_VERSION=2.7" "unix:PYTHON_VERSION=${python.pythonVersion}"
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ];
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
||||
qmakeFlags = [ "PythonQt.pro"
|
||||
"INCLUDEPATH+=${python}/include/python3.6"
|
||||
"PYTHON_PATH=${python}/bin"
|
||||
"PYTHON_LIB=${python}/lib"];
|
||||
qmakeFlags = [
|
||||
"PythonQt.pro"
|
||||
"PYTHON_DIR=${python}"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
||||
@ -13,10 +13,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quarto";
|
||||
version = "1.2.280";
|
||||
version = "1.2.313";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz";
|
||||
sha256 = "sha256-mbChS3GL36ySWo2jDZGJIDZIkBJ/UDUmypJjP5HW6KE=";
|
||||
sha256 = "sha256-l8i/s9OuG9Fz+i1PcdSqP9X8stY6LTUcIfdE2gaePac=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s2n-tls";
|
||||
version = "1.3.31";
|
||||
version = "1.3.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jdjy5Th73Sd/8NvivB2g9dVRDW3DEvUSYXZ1o2U6Y88=";
|
||||
sha256 = "sha256-LKJubTzV4B7aimKtnODUJJil3b55qKuDkCe7TLa8tjQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vte";
|
||||
version = "0.36.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/vte/${lib.versions.majorMinor version}/vte-${version}.tar.xz";
|
||||
sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ gobject-introspection glib gtk3 ncurses ];
|
||||
|
||||
configureFlags = [ "--enable-introspection" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnome.org/";
|
||||
description = "A library implementing a terminal emulator widget for GTK";
|
||||
longDescription = ''
|
||||
VTE is a library (libvte) implementing a terminal emulator widget for
|
||||
GTK, and a minimal sample application (vte) using that. Vte is
|
||||
mainly used in gnome-terminal, but can also be used to embed a
|
||||
console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
|
||||
character set conversion, as well as emulating any terminal known to
|
||||
the system's terminfo database.
|
||||
'';
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ astsmtl antono ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -223,11 +223,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# It needs malloc_good_size.
|
||||
sed 22i'#include <malloc/malloc.h>' -i Source/WTF/wtf/FastMalloc.h
|
||||
# <CommonCrypto/CommonRandom.h> needs CCCryptorStatus.
|
||||
sed 43i'#include <CommonCrypto/CommonCryptor.h>' -i Source/WTF/wtf/RandomDevice.cpp
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "accuweather";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bieniu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NnDpSOEIqPuPLIr0Ty6yjrs9WRKyhykcdyiRPB/cHEw=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-v4mFvW+p0g+5IeZT8o0Z60MafHyYZ62d4lNH27wlAeI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -50,6 +50,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for getting weather data from AccuWeather servers";
|
||||
homepage = "https://github.com/bieniu/accuweather";
|
||||
changelog = "https://github.com/bieniu/accuweather/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jamiemagee ];
|
||||
};
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioblescan";
|
||||
version = "0.2.13";
|
||||
version = "0.2.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,8 +15,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "frawau";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-n1FiBsuVpVJrIq6+kuMNugpEaUOFQ/Gk/QU7Hry4YrU=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
@ -30,6 +30,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library to listen for BLE advertized packets";
|
||||
homepage = "https://github.com/frawau/aioblescan";
|
||||
changelog = "https://github.com/frawau/aioblescan/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -1,35 +1,49 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, click
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, fetchFromGitHub
|
||||
, jsonschema
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archspec";
|
||||
version = "0.1.4";
|
||||
version = "0.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-ScigEpYNArveqi5tlqiA7LwsVs2RkjT+GChxhSy/ndw=";
|
||||
hash = "sha256-Zu7/zx3FTVJVGpAdRDdnLBokeodspZg6ou/GBaqz4XY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
propagatedBuildInputs = [ click six ];
|
||||
checkInputs = [ pytestCheckHook jsonschema ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "archspec" ];
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
jsonschema
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"archspec"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library for detecting, labeling, and reasoning about microarchitectures";
|
||||
homepage = "https://archspec.readthedocs.io/en/latest/";
|
||||
description = "Library for detecting, labeling, and reasoning about microarchitectures";
|
||||
homepage = "https://archspec.readthedocs.io/";
|
||||
changelog = "https://github.com/archspec/archspec/releases/tag/v0.2.0";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ atila ];
|
||||
};
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "debuglater";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ploomber";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-0fnWXmrlZjlLFGbiLC7HuDgMEM6OJVn8ajjNRqFg3Lc=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-o9IAk3EN8ghEft7Y7Xx+sEjWMNgoyiZ0eiBqnCyXkm8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -46,6 +46,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Module for post-mortem debugging of Python programs";
|
||||
homepage = "https://github.com/ploomber/debuglater";
|
||||
changelog = "https://github.com/ploomber/debuglater/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "embrace";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "~olly";
|
||||
repo = "embrace-sql";
|
||||
rev = "v${version}-release";
|
||||
hash = "sha256-R6Ug4f8KFZNzaNWqWZkLvOwtsawCuerzvHlysr7bd6M=";
|
||||
hash = "sha256-otzpDMtC229qMXon+ydS39SBoMiXJmxn48/TQXjqu5U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, apptools
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, ipython
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
@ -22,6 +23,15 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# TODO: remove on next release
|
||||
(fetchpatch {
|
||||
name = "fix-mistake-in-menu-group-specification.patch";
|
||||
url = "https://github.com/enthought/envisage/commit/f23ea3864a5f6ffca665d47dec755992e062029b.patch";
|
||||
sha256 = "sha256-l4CWB4jRkSmoTDoV8CtP2w87Io2cLINKfOSaSPy7cXE=";
|
||||
})
|
||||
];
|
||||
|
||||
# for the optional dependency ipykernel, only versions < 6 are
|
||||
# supported, so it's not included in the tests, and not propagated
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -33,9 +33,8 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
"test_run_local_server"
|
||||
];
|
||||
# some tests require loopback networking
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google_auth_oauthlib"
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-secret-manager";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1BBOEdkh0jVBHtSVEnOsXtaCPF/GuXB90FCZeOmue9I=";
|
||||
hash = "sha256-x0Ktu4o1I+eEJXUjMjowwxW7967DdjZWAfcs331qP7s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -16,13 +16,15 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "internetarchive";
|
||||
version = "3.0.2";
|
||||
version = "3.2.0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3oVkZcLvaFIYTQi/1ZwMoBkEhls3OiezgwNKxrQSjrY=";
|
||||
sha256 = "sha256-cB7nRDmO2NNaHjNkHCuXH0+15WZfxseS8DBdIqefSzk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user