forked from mirrors/nixpkgs
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
5d957f3dba
|
|
@ -51,7 +51,9 @@
|
|||
];
|
||||
|
||||
# Include support for various filesystems.
|
||||
boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
|
||||
boot.supportedFilesystems =
|
||||
[ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++
|
||||
lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
|
||||
|
||||
# Configure host id for ZFS to work
|
||||
networking.hostId = lib.mkDefault "8425e349";
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ let
|
|||
''
|
||||
#! ${pkgs.runtimeShell} -e
|
||||
export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"
|
||||
export WAYLAND_DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^WAYLAND_DISPLAY=\(.*\)/\1/; t; d')"
|
||||
exec ${askPassword} "$@"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -200,46 +200,65 @@ in
|
|||
|
||||
${lines}
|
||||
'';
|
||||
currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json";
|
||||
runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" ] cfg;
|
||||
newConfigPath = builtins.toFile "${svcName}-config.json" (builtins.toJSON runnerRegistrationConfig);
|
||||
newConfigTokenFilename = ".new-token";
|
||||
currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json";
|
||||
newConfigTokenPath= "$STATE_DIRECTORY/.new-token";
|
||||
currentConfigTokenPath = "$STATE_DIRECTORY/${currentConfigTokenFilename}";
|
||||
|
||||
runnerCredFiles = [
|
||||
".credentials"
|
||||
".credentials_rsaparams"
|
||||
".runner"
|
||||
];
|
||||
unconfigureRunner = writeScript "unconfigure" ''
|
||||
differs=
|
||||
|
||||
if [[ "$(ls -A "$STATE_DIRECTORY")" ]]; then
|
||||
# State directory is not empty
|
||||
# Set `differs = 1` if current and new runner config differ or if `currentConfigPath` does not exist
|
||||
${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 || differs=1
|
||||
# Also trigger a registration if the token content changed
|
||||
${pkgs.diffutils}/bin/diff -q \
|
||||
"$STATE_DIRECTORY"/${currentConfigTokenFilename} \
|
||||
${escapeShellArg cfg.tokenFile} \
|
||||
>/dev/null 2>&1 || differs=1
|
||||
# If .credentials does not exist, assume a previous run de-registered the runner on stop (ephemeral mode)
|
||||
[[ ! -f "$STATE_DIRECTORY/.credentials" ]] && differs=1
|
||||
fi
|
||||
|
||||
if [[ -n "$differs" ]]; then
|
||||
echo "Config has changed, removing old runner state."
|
||||
# In ephemeral mode, the runner deletes the `.credentials` file after de-registering it with GitHub
|
||||
[[ -f "$STATE_DIRECTORY/.credentials" ]] && echo "The old runner will still appear in the GitHub Actions UI." \
|
||||
"You have to remove it manually."
|
||||
find "$STATE_DIRECTORY/" -mindepth 1 -delete
|
||||
|
||||
copy_tokens() {
|
||||
# Copy the configured token file to the state dir and allow the service user to read the file
|
||||
install --mode=666 ${escapeShellArg cfg.tokenFile} "$STATE_DIRECTORY/${newConfigTokenFilename}"
|
||||
install --mode=666 ${escapeShellArg cfg.tokenFile} "${newConfigTokenPath}"
|
||||
# Also copy current file to allow for a diff on the next start
|
||||
install --mode=600 ${escapeShellArg cfg.tokenFile} "$STATE_DIRECTORY/${currentConfigTokenFilename}"
|
||||
install --mode=600 ${escapeShellArg cfg.tokenFile} "${currentConfigTokenPath}"
|
||||
}
|
||||
|
||||
clean_state() {
|
||||
find "$STATE_DIRECTORY/" -mindepth 1 -delete
|
||||
copy_tokens
|
||||
}
|
||||
|
||||
diff_config() {
|
||||
changed=0
|
||||
|
||||
# Check for module config changes
|
||||
[[ -f "${currentConfigPath}" ]] \
|
||||
&& ${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 \
|
||||
|| changed=1
|
||||
|
||||
# Also check the content of the token file
|
||||
[[ -f "${currentConfigTokenPath}" ]] \
|
||||
&& ${pkgs.diffutils}/bin/diff -q "${currentConfigTokenPath}" ${escapeShellArg cfg.tokenFile} >/dev/null 2>&1 \
|
||||
|| changed=1
|
||||
|
||||
# If the config has changed, remove old state and copy tokens
|
||||
if [[ "$changed" -eq 1 ]]; then
|
||||
echo "Config has changed, removing old runner state."
|
||||
echo "The old runner will still appear in the GitHub Actions UI." \
|
||||
"You have to remove it manually."
|
||||
clean_state
|
||||
fi
|
||||
}
|
||||
|
||||
if [[ "${optionalString cfg.ephemeral "1"}" ]]; then
|
||||
# In ephemeral mode, we always want to start with a clean state
|
||||
clean_state
|
||||
elif [[ "$(ls -A "$STATE_DIRECTORY")" ]]; then
|
||||
# There are state files from a previous run; diff them to decide if we need a new registration
|
||||
diff_config
|
||||
else
|
||||
# The state directory is entirely empty which indicates a first start
|
||||
copy_tokens
|
||||
fi
|
||||
'';
|
||||
configureRunner = writeScript "configure" ''
|
||||
if [[ -e "$STATE_DIRECTORY/${newConfigTokenFilename}" ]]; then
|
||||
if [[ -e "${newConfigTokenPath}" ]]; then
|
||||
echo "Configuring GitHub Actions Runner"
|
||||
|
||||
args=(
|
||||
|
|
@ -256,7 +275,7 @@ in
|
|||
|
||||
# If the token file contains a PAT (i.e., it starts with "ghp_"), we have to use the --pat option,
|
||||
# if it is not a PAT, we assume it contains a registration token and use the --token option
|
||||
token=$(<"$STATE_DIRECTORY/${newConfigTokenFilename}")
|
||||
token=$(<"${newConfigTokenPath}")
|
||||
if [[ "$token" =~ ^ghp_* ]]; then
|
||||
args+=(--pat "$token")
|
||||
else
|
||||
|
|
@ -271,7 +290,7 @@ in
|
|||
rm -rf "$STATE_DIRECTORY/_diag/"
|
||||
|
||||
# Cleanup token from config
|
||||
rm "$STATE_DIRECTORY/${newConfigTokenFilename}"
|
||||
rm "${newConfigTokenPath}"
|
||||
|
||||
# Symlink to new config
|
||||
ln -s '${newConfigPath}' "${currentConfigPath}"
|
||||
|
|
@ -305,8 +324,8 @@ in
|
|||
WorkingDirectory = runtimeDir;
|
||||
|
||||
InaccessiblePaths = [
|
||||
# Token file path given in the configuration
|
||||
cfg.tokenFile
|
||||
# Token file path given in the configuration, if visible to the service
|
||||
"-${cfg.tokenFile}"
|
||||
# Token file in the state directory
|
||||
"${stateDir}/${currentConfigTokenFilename}"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -101,6 +101,14 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
description = mkOption {
|
||||
type = types.str;
|
||||
default = "Gitolite user";
|
||||
description = lib.mdDoc ''
|
||||
Gitolite user account's description.
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "gitolite";
|
||||
|
|
@ -145,7 +153,7 @@ in
|
|||
'';
|
||||
|
||||
users.users.${cfg.user} = {
|
||||
description = "Gitolite user";
|
||||
description = cfg.description;
|
||||
home = cfg.dataDir;
|
||||
uid = config.ids.uids.gitolite;
|
||||
group = cfg.group;
|
||||
|
|
|
|||
|
|
@ -104,16 +104,18 @@ in
|
|||
group = "vboxusers";
|
||||
setuid = true;
|
||||
};
|
||||
executables = [
|
||||
"VBoxHeadless"
|
||||
"VBoxNetAdpCtl"
|
||||
"VBoxNetDHCP"
|
||||
"VBoxNetNAT"
|
||||
"VBoxVolInfo"
|
||||
] ++ (lib.optionals (!cfg.headless) [
|
||||
"VBoxSDL"
|
||||
"VirtualBoxVM"
|
||||
]);
|
||||
in mkIf cfg.enableHardening
|
||||
(builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) [
|
||||
"VBoxHeadless"
|
||||
"VBoxNetAdpCtl"
|
||||
"VBoxNetDHCP"
|
||||
"VBoxNetNAT"
|
||||
"VBoxSDL"
|
||||
"VBoxVolInfo"
|
||||
"VirtualBoxVM"
|
||||
]));
|
||||
(builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) executables));
|
||||
|
||||
users.groups.vboxusers.gid = config.ids.gids.vboxusers;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
let
|
||||
platform_major = "4";
|
||||
platform_minor = "24";
|
||||
platform_minor = "25";
|
||||
year = "2022";
|
||||
month = "06"; #release month
|
||||
buildmonth = "06"; #sometimes differs from release month
|
||||
timestamp = "${year}${buildmonth}070700";
|
||||
month = "09"; #release month
|
||||
buildmonth = "08"; #sometimes differs from release month
|
||||
timestamp = "${year}${buildmonth}311800";
|
||||
gtk = gtk3;
|
||||
in rec {
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-mqoeP6BwmTWGy6qp/+BSfjTaMfAEKtlyqHwn1GrihRCXQyDNeVWRkBNa7JTCUs+yve2rokgisZNVSwpgAqqHYQ==";
|
||||
hash = "sha512-1sUQ/jDOQMqnKLKY6oh28STvS5pbH89+2zs+H77euiJOsBgB+yEkEntnhI39O67qmOK/EkQ3y3NkQcumbax56A==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-RbvqIUnJ00/qvqsw1s5mcZ2SQhhT2y+S9J9xOB+t8bK+1SOhUOFvU/HcDAmHBl88L1qBCF0ckAKd7jETYPeXnw==";
|
||||
hash = "sha512-Qb2BmfXtmVeTLIZZav91hayPkwSGYMAG3fod3BmyJdo1DPas6VC+MzBwklAjpC1wqLTzKCAKzVZtdtPYC9QCqw==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -62,7 +62,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-PPgFti6UUSkIDEUBGY4tDVfnaFXxTUIRIvfMOVXVxIr+ciGK2dOHpQ7K9hcYnWqoIulxa/fV+TXQI3hzcIRVAA==";
|
||||
hash = "sha512-RW+5H82AcH/U9XUzIlUCU5heN9qQAlMl3rmxsKnTYxVWdIjSN461Nf71F6jPhL/Q+VCAMesguOEF0AqyhnH0nw==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-IVSdZI4QnMtj7HdWAXATeJSQt950qNkiSL7n/+f9bPioCA2NtNbDUlBBxnownMKnr+C+iJH2phzPabT9Ar6plA==";
|
||||
hash = "sha512-1wjKNBl6A2XENRVZNtDelPSMAYtc4wRXdQ4CJX/1YcFUPEzbPsX7plO2uJXmDpZcjw3wkQNxqy4bmZF6YnXy/Q==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -100,7 +100,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-ace+zpz5tjLA89gHLyBrjldKU7+kb85uJX4y4IQdVkrskrA+uCv0z9lzB/qbgrH51ZFN2xz04z1nFLJd09WacA==";
|
||||
hash = "sha512-UejE0pzgwBYpmNbdGEegMM5iEOMYP+VvebU17YQeJUzh/qYr0B6sfXwJ+cdTCavKCNGLMMDenJMYk9V/6DSZHw==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-Xo1dk8+BLUoUVrnMm9XC+IBzoS9bKde2waRaYxjCRBOykUiZ4npGgquh3bEbsk1GZ3cKlwuxLxr9Y9+RGw3UTA==";
|
||||
hash = "sha512-9E0Zwv64qRwVdPouhmIYT6SkbTkd3zLnfkHduHy2VXvmqW7xaOfmplvxpr+V1RDpnfDfw4RouU+WQdhFqBqcWg==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha512-rkjLwexI352G8CYkaF/1dl26wF58IuPMan76gR/3Fx/CMywtv25Tueu8NWZGkHd6Zwdpv/h25D8fu9tbM2NExg==";
|
||||
hash = "sha512-V7GmvqQVZnTkkhKmuGyMiZlFlRpFbXM7r6w9yS0FxBOHNHIzkX4pJ6sgn+ww1lvwsdPqBFYtbWUiuKo73eTKzg==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
hash = "sha256-8FaVTzjvtT17pYUYfKJgVd55nd2ngrsLY+7AJnXu/BI=";
|
||||
hash = "sha256-8qQWwUiNemJLTAncZwO14fBfr7kTmmXPSeqBLfV8wTw=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
, ApplicationServices
|
||||
, AppKit
|
||||
, Carbon
|
||||
, removeReferencesTo
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neovide";
|
||||
|
|
@ -80,6 +81,7 @@ rustPlatform.buildRustPackage rec {
|
|||
python2 # skia-bindings
|
||||
python3 # rust-xcb
|
||||
llvmPackages.clang # skia
|
||||
removeReferencesTo
|
||||
] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
|
||||
|
||||
# All tests passes but at the end cargo prints for unknown reason:
|
||||
|
|
@ -115,6 +117,10 @@ rustPlatform.buildRustPackage rec {
|
|||
xorg.libXi
|
||||
] ++ lib.optionals enableWayland [ wayland ]);
|
||||
in ''
|
||||
# library skia embeds the path to its sources
|
||||
remove-references-to -t "$SKIA_SOURCE_DIR" \
|
||||
$out/bin/neovide
|
||||
|
||||
wrapProgram $out/bin/neovide \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
'';
|
||||
|
|
@ -128,6 +134,8 @@ rustPlatform.buildRustPackage rec {
|
|||
install -m444 -Dt $out/share/applications assets/neovide.desktop
|
||||
'';
|
||||
|
||||
disallowedReferences = [ SKIA_SOURCE_DIR ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This is a simple graphical user interface for Neovim.";
|
||||
homepage = "https://github.com/Kethku/neovide";
|
||||
|
|
|
|||
|
|
@ -225,8 +225,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-apollo";
|
||||
publisher = "apollographql";
|
||||
version = "1.19.9";
|
||||
sha256 = "sha256-iJpzNKcuQrfq4Z0LXuadt6OKXelBbDQg/vuc7NJ2I5o=";
|
||||
version = "1.19.11";
|
||||
sha256 = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";
|
||||
|
|
@ -673,8 +673,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-eslint";
|
||||
publisher = "dbaeumer";
|
||||
version = "2.2.2";
|
||||
sha256 = "sha256-llalyQXl+k/ugZq+Ti9mApHRqAGu6QyoMP51GtZnRJ4=";
|
||||
version = "2.2.6";
|
||||
sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -698,8 +698,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-markdownlint";
|
||||
publisher = "DavidAnson";
|
||||
version = "0.47.0";
|
||||
sha256 = "sha256-KtDJo8rhQXkZtJz93E+J7eNiAIcLk4e5qKDLoR3DoGw=";
|
||||
version = "0.48.1";
|
||||
sha256 = "sha256-3TpZGvas+pfabHayaA6Yd9nOO2MbfXbCvCiTcbja9Vo=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
|
||||
|
|
@ -934,8 +934,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "prettier-vscode";
|
||||
publisher = "esbenp";
|
||||
version = "9.8.0";
|
||||
sha256 = "sha256-+8lEuQD73w+urAv2Tw0b+q6oQ66+gLgMPe3Luln9cuY=";
|
||||
version = "9.9.0";
|
||||
sha256 = "sha256-Yr7M4HyRNcsBf8YglQLvyZjblMhtkpMP+f9SH8oUav0=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
|
||||
|
|
@ -1881,8 +1881,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "color-highlight";
|
||||
publisher = "naumovs";
|
||||
version = "2.5.0";
|
||||
sha256 = "sha256-dYMDV84LEGXUjt/fbsSy3BVM5SsBHcPaDDll8KjPIWY=";
|
||||
version = "2.6.0";
|
||||
sha256 = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog";
|
||||
|
|
@ -2345,8 +2345,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "stkb";
|
||||
name = "rewrap";
|
||||
version = "1.16.1";
|
||||
sha256 = "sha256-OTPNbwoQmKd73g8IwLKMIbe6c7E2jKNkzwuBU/f8dmY=";
|
||||
version = "1.16.3";
|
||||
sha256 = "sha256-WHeLTN992ltEZw2W7B3sJrHfAFsOGMq3llV4C0hXLNA=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, vscode-utils, callPackage }:
|
||||
let
|
||||
version = "1.6.0";
|
||||
version = "1.8.1";
|
||||
rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; };
|
||||
arch =
|
||||
if stdenv.isLinux then "linux"
|
||||
|
|
@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
|||
name = "rescript-vscode";
|
||||
publisher = "chenglou92";
|
||||
inherit version;
|
||||
sha256 = "sha256-/Nv+uyTkJQVaPKIDRr1P/Z5vsituXpP48/sDn3FUEeA=";
|
||||
sha256 = "sha256-XZG0PRzc3wyAVq9tQeGDlaUZg5YAgkPxJ3NsrdUHoOk=";
|
||||
};
|
||||
postPatch = ''
|
||||
rm -r ${analysisDir}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
|||
owner = "rescript-lang";
|
||||
repo = "rescript-vscode";
|
||||
rev = version;
|
||||
sha256 = "sha256-O5kZCnhtMcevPTs5UxhIXx124WQf1VvF2WMVHjMEQZc=";
|
||||
sha256 = "sha256-a8otK0BxZbl0nOp4QWQRkjb5fM85JA4nVkLuKAz71xU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml dune_3 ];
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
, virtualpg
|
||||
, wxGTK
|
||||
, wxmac
|
||||
, xz
|
||||
, zstd
|
||||
, Carbon
|
||||
, Cocoa
|
||||
|
|
@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
|
|||
proj
|
||||
sqlite
|
||||
virtualpg
|
||||
xz
|
||||
zstd
|
||||
] ++ lib.optional stdenv.isLinux wxGTK
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
|
|
|
|||
|
|
@ -23,16 +23,16 @@
|
|||
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
|
||||
}) rec {
|
||||
pname = "dbeaver";
|
||||
version = "22.2.0"; # When updating also update mvnSha256
|
||||
version = "22.2.2"; # When updating also update mvnSha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-T2S5qoOqjqJGf7M4h+IFO+bBER3aNcbxC7CY1fJFqpg=";
|
||||
sha256 = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
|
||||
};
|
||||
|
||||
mvnSha256 = "HdIhENml6W4U+gM7ODxXinbex5o1X4YhWGTct5rpL5c=";
|
||||
mvnSha256 = "uu7UNRIuAx2GOh4+YxxoGRcV5QO8C72q32e0ynJdgFo=";
|
||||
mvnParameters = "-P desktop,all-platforms";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,17 +1,29 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "genact";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-POOXawhxrPT2UgbSZE3r0br7cqJ0ao7MpycrPYa/oCc=";
|
||||
sha256 = "sha256-MB/i1jCxoGE8cPF+NE8aS7kF7ZsGb4+OyLcPcGp1hwI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2c34YarMFw2CK+7zn41GL5tXfXfnw3NvGtgSlPH5d64=";
|
||||
cargoSha256 = "sha256-OBGJIR3REeMxHQu3ovEKSZZ8QNlhl/5jvWbR5OdsRTQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
$out/bin/genact --print-manpage > genact.1
|
||||
installManPage genact.1
|
||||
|
||||
installShellCompletion --cmd genact \
|
||||
--bash <($out/bin/genact --print-completions bash) \
|
||||
--fish <($out/bin/genact --print-completions fish) \
|
||||
--zsh <($out/bin/genact --print-completions zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A nonsense activity generator";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, pkg-config
|
||||
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
|
||||
, libosmscout, valhalla, libpostal, osrm-backend, protobuf
|
||||
, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
|
||||
, libmicrohttpd, sqlite, marisa, kyotocabinet, boost
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -27,7 +27,7 @@ mkDerivation rec {
|
|||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||
buildInputs = [
|
||||
kirigami2 qtquickcontrols2 qtlocation
|
||||
valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
|
||||
valhalla libosmscout osrm-backend libmicrohttpd
|
||||
libpostal sqlite marisa kyotocabinet boost protobuf date
|
||||
];
|
||||
|
||||
|
|
|
|||
81
pkgs/applications/misc/parsec/bin.nix
Normal file
81
pkgs/applications/misc/parsec/bin.nix
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
{ stdenvNoCC, stdenv
|
||||
, lib
|
||||
, dpkg, autoPatchelfHook, makeWrapper
|
||||
, fetchurl
|
||||
, alsa-lib, openssl, udev
|
||||
, libglvnd
|
||||
, libX11, libXcursor, libXi, libXrandr
|
||||
, libpulseaudio
|
||||
, libva
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "parsec-bin";
|
||||
version = "150_28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb";
|
||||
sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
dpkg-deb -x $src .
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc # libstdc++
|
||||
libglvnd
|
||||
libX11
|
||||
];
|
||||
|
||||
runtimeDependenciesPath = lib.makeLibraryPath [
|
||||
stdenv.cc.cc
|
||||
libglvnd
|
||||
openssl
|
||||
udev
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
libva
|
||||
ffmpeg
|
||||
libX11
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
];
|
||||
|
||||
prepareParsec = ''
|
||||
if [[ ! -e "$HOME/.parsec/appdata.json" ]]; then
|
||||
mkdir -p "$HOME/.parsec"
|
||||
cp --no-preserve=mode,ownership,timestamps ${placeholder "out"}/share/parsec/skel/* "$HOME/.parsec/"
|
||||
fi
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
mv usr/* $out
|
||||
|
||||
wrapProgram $out/bin/parsecd \
|
||||
--prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \
|
||||
--run "$prepareParsec"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://parsecgaming.com/";
|
||||
description = "Remote streaming service client";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ arcnmx ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "parsecd";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, stdenvGcc6, lib
|
||||
, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl
|
||||
{ stdenv, lib, fetchpatch
|
||||
, fetchFromGitHub, cmake, libmicrohttpd, openssl
|
||||
, opencl-headers, ocl-icd, hwloc
|
||||
, devDonationLevel ? "0.0"
|
||||
, openclSupport ? true
|
||||
|
|
@ -18,11 +18,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
NIX_CFLAGS_COMPILE = "-O3";
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
name = "fix-libmicrohttpd-0-9-71.patch";
|
||||
url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch";
|
||||
excludes = [ "CMakeLists.txt.user" ];
|
||||
hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0=";
|
||||
}) ];
|
||||
|
||||
cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
|
||||
++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ]
|
||||
buildInputs = [ libmicrohttpd openssl hwloc ]
|
||||
++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "106.0.5249.91",
|
||||
"sha256": "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p",
|
||||
"sha256bin64": "1cfhsar79f319417cx4blcg5hk7b7ix45r7vhrbbwla18p0jij5y",
|
||||
"version": "106.0.5249.103",
|
||||
"sha256": "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2",
|
||||
"sha256bin64": "0bg6d9fv3ha7iql17nj8h22klbs3ls2nlvabczhh067mh3fpzf5x",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-11",
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
"sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "106.0.5249.91-1",
|
||||
"sha256": "1cih72ay2gr9xjwwa8iw0wmpmfs4xm4200c4z04v7vi9sxadxnrd"
|
||||
"rev": "106.0.5249.103-1",
|
||||
"sha256": "00acfq9hsdjqqlxddr9lr45l4372mpqxj717qpf78z8iyrccjm23"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, docutils
|
||||
, gobject-introspection
|
||||
, gst_all_1
|
||||
, sofia_sip
|
||||
|
|
@ -32,15 +33,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calls";
|
||||
version = "42.0";
|
||||
version = "43.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-ASKK9PB5FAD10CR5O+L2WgMjCzmIalithHL8jV0USiM=";
|
||||
hash = "sha256-fvG9N6HuuO8BMH8MJRquMSe1oEPNmX/pzsJX5yzs1CY=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
|
@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
|
|||
gtk-doc
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
docutils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -104,7 +106,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "A phone dialer and call handler";
|
||||
longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended.";
|
||||
homepage = "https://source.puri.sm/Librem5/calls";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/calls";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ craigem lheckemann tomfitzhenry ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U9U1r74E4ryc8zUb1EogfBT57kfsd89i7DWO05tnQw4=";
|
||||
sha256 = "sha256-QVzhRaNLFhH+5x+/X/Nc3bW/09txurhVd0yDU9LYhAo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg=";
|
||||
vendorSha256 = "sha256-jPIrUW4el8sAO+4j20qMYVXqvov6Ac0cENd7gOrYj+U=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BCbbQQUk3iJJQhjkwlSAVz/SbVPvZGhGHwXSPgCPBHg=";
|
||||
sha256 = "sha256-nAT9tn/YfivM25xBL3POgdAF87MB/J2HQfcFOeCEj2o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jUVPJ1mq9pMJGwS/0nBv9hsXotiqUksbKChjegF7KRk=";
|
||||
vendorSha256 = "sha256-b9F7P6WRdJywRNQdFY+SJqYxic2W/HrIEYhvCLo3Lok=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,22 +2,22 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tanka";
|
||||
version = "0.22.1";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MMQv3/Ft6/FUueGEXGqYWAYy4zc2R6LASbh2x7eJNdQ=";
|
||||
sha256 = "sha256-exPFlcbku51Bs/YISRyjl8iwLYRVS9ltRQPpd/QpnWk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QwtcWzJbusa8BxtG5xmGUgqG0qCMSpkzbmes/x3lnWc=";
|
||||
vendorSha256 = "sha256-eo4B2p5Yo1r5jro49mSetp9AFYhcTXbyy7wGuaFwbb0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
subPackages = [ "cmd/tk" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ];
|
||||
ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CurrentVersion=v${version}" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
|||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.30.8";
|
||||
version = "0.30.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dVaLeooTEiKYWp9CmEcSFOunLyJecB8jR9LIKRO8b9g=";
|
||||
sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "linphone-desktop";
|
||||
version = "4.4.9";
|
||||
version = "4.4.10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
|
@ -41,7 +41,7 @@ mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xvKkFMZ7rUyEjnQK7rBkrzO8fhfHjpQ1DHQBUlizZ+o=";
|
||||
sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # unmaintained and not compatible with current Tox API.
|
||||
homepage = "https://github.com/jin-eld/tox-prpl";
|
||||
description = "Tox plugin for Pidgin / libpurple";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -1,27 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, libsodium, ncurses, curl
|
||||
{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl
|
||||
, libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus
|
||||
, qrencode, gdk-pixbuf, libnotify }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "toxic";
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tox";
|
||||
repo = "toxic";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5jLXXI+IMrYa7ZtdMjJrah1zB5TJ3GdHfvcMd1TYE4E=";
|
||||
sha256 = "sha256-BabRY9iu5ccEXo5POrWkWaIWAeQU4MVlMK8I+Iju6aQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pending for upstream inclusion fix for ncurses-6.3 compatibility.
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/JFreegman/toxic/commit/41e93adbdbd56db065166af5a6676a7996e9e451.patch";
|
||||
sha256 = "sha256-LYEseB5FmXFNifa1RZUxhkXeWlkEEMm3ASD55IoUPa0=";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)"];
|
||||
installFlags = [ "PREFIX=$(out)"];
|
||||
|
||||
|
|
@ -32,10 +23,10 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
nativeBuildInputs = [ pkg-config libconfig ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = with lib; src.meta // {
|
||||
description = "Reference CLI for Tox";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,25 @@
|
|||
{ stdenv, fetchurl, lib
|
||||
, ncurses, openssl, aspell, gnutls, gettext
|
||||
, zlib, curl, pkg-config, libgcrypt
|
||||
, cmake, makeWrapper, libobjc, libresolv, libiconv
|
||||
, cmake, libobjc, libresolv, libiconv
|
||||
, asciidoctor # manpages
|
||||
, enableTests ? !stdenv.isDarwin, cpputest
|
||||
, guileSupport ? true, guile
|
||||
, luaSupport ? true, lua5
|
||||
, perlSupport ? true, perl
|
||||
, pythonSupport ? true, python3Packages
|
||||
, rubySupport ? true, ruby
|
||||
, tclSupport ? true, tcl
|
||||
, phpSupport ? !stdenv.isDarwin, php, systemd, libxml2, pcre2, libargon2
|
||||
, extraBuildInputs ? []
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3Packages) python;
|
||||
php-embed = php.override {
|
||||
embedSupport = true;
|
||||
apxs2Support = false;
|
||||
};
|
||||
plugins = [
|
||||
{ name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
|
||||
{ name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
|
||||
|
|
@ -22,35 +27,37 @@ let
|
|||
{ name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; }
|
||||
{ name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; }
|
||||
{ name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; }
|
||||
{ name = "php"; enabled = phpSupport; cmakeFlag = "ENABLE_PHP"; buildInputs = [
|
||||
php-embed.unwrapped.dev libxml2 pcre2 libargon2
|
||||
] ++ lib.optional stdenv.isLinux systemd; }
|
||||
];
|
||||
enabledPlugins = builtins.filter (p: p.enabled) plugins;
|
||||
|
||||
in
|
||||
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.6";
|
||||
version = "3.7";
|
||||
pname = "weechat";
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
|
||||
sha256 = "sha256-GkYN/Y4LQQr7GdSDu0ucXXM9wWPAqKD1txJXkOhJMDc=";
|
||||
hash = "sha256-n5kvC//h85c4IvkrCVTz+F0DcCC5rdRkvj8W3fUPXI8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
|
||||
|
||||
cmakeFlags = with lib; [
|
||||
"-DENABLE_MAN=ON"
|
||||
"-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update
|
||||
"-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360
|
||||
"-DENABLE_PHP=OFF"
|
||||
"-DENABLE_DOC=OFF" # TODO(@ncfavier): Documentation fails to build, was deactivated to push through security update
|
||||
"-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}"
|
||||
]
|
||||
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"]
|
||||
++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ];
|
||||
nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest;
|
||||
buildInputs = with lib; [
|
||||
ncurses openssl aspell gnutls gettext zlib curl
|
||||
libgcrypt ]
|
||||
|
|
@ -85,7 +92,7 @@ let
|
|||
on https://nixos.org/nixpkgs/manual/#sec-weechat .
|
||||
'';
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ lovek323 ];
|
||||
maintainers = with lib.maintainers; [ ncfavier ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,11 @@ weechat:
|
|||
let
|
||||
wrapper = {
|
||||
installManPages ? true
|
||||
, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
|
||||
, configure ? { availablePlugins, ... }: {
|
||||
# Do not include PHP by default, because it bloats the closure, doesn't
|
||||
# build on Darwin, and there are no official PHP scripts.
|
||||
plugins = builtins.attrValues (builtins.removeAttrs availablePlugins [ "php" ]);
|
||||
}
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -21,6 +25,7 @@ let
|
|||
'';
|
||||
withPackages = pkgsFun: (python // {
|
||||
extraEnv = ''
|
||||
${python.extraEnv}
|
||||
export PYTHONHOME="${python3Packages.python.withPackages pkgsFun}"
|
||||
'';
|
||||
});
|
||||
|
|
@ -40,6 +45,7 @@ let
|
|||
ruby = simplePlugin "ruby";
|
||||
guile = simplePlugin "guile";
|
||||
lua = simplePlugin "lua";
|
||||
php = simplePlugin "php";
|
||||
};
|
||||
|
||||
config = configure { inherit availablePlugins; };
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null);
|
|||
with lib;
|
||||
mkDerivation rec {
|
||||
pname = "qbittorrent";
|
||||
version = "4.4.3.1";
|
||||
version = "4.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qbittorrent";
|
||||
repo = "qBittorrent";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-byA6bzGdigmVptUFdgBjyg6Oimn5L6l1DDOuuBjwO0s=";
|
||||
sha256 = "sha256-EgRDNOJ4szdZA5ipOuGy2R0oVdjWcuqPU3ecU3ZNK3g=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "protonvpn-cli";
|
||||
version = "3.12.0";
|
||||
version = "3.13.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
|
@ -17,8 +17,8 @@ buildPythonApplication rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "protonvpn";
|
||||
repo = "linux-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-z0ewAqf8hjyExqBN8KBsDwJ+SA/pIBYZhKtXF9M65HE=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "protonvpn-gui";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = "linux-app";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-6IRkJKtdQQ9Yixb9CkT3tGNY0MYFZyvz1/6buZo5eYU=";
|
||||
sha256 = "sha256-aov7Mkb3bGlS3q9zIWkeuWbrvfP1Gm2DhaeTprQNbeI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchzip }:
|
||||
{ lib, stdenv, fetchzip, jre, makeWrapper, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gatk";
|
||||
|
|
@ -8,10 +8,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0hjlsl7fxf3ankyjidqhwxc70gjh6z4lnjzw6b5fldzb0qvgfvy8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install -m755 -D $src/gatk $out/bin/
|
||||
install -m755 -D $src/gatk-package-${version}-local.jar $out/bin/
|
||||
install -m755 -D $src/gatk-package-${version}-spark.jar $out/bin/
|
||||
install -m755 -D $src/gatk $out/bin/
|
||||
'';
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gatk --prefix PATH : ${lib.makeBinPath [ jre ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dwm";
|
||||
version = "6.3";
|
||||
version = "6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz";
|
||||
sha256 = "utqgKFKbH7of1/moTztk8xGQRmyFgBG1Pi97cMajB40=";
|
||||
sha256 = "sha256-+pwNaaWESFB2z8GICf1wXlwggNr7E9XnKaNkbKdwOm4=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXinerama libXft ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swaywsr";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pedroscaff";
|
||||
repo = pname;
|
||||
rev = "6c4671c702f647395d983aaf607286db1c692db6";
|
||||
sha256 = "0bmpbhyvgnbi5baj6v0wdxpdh9cnlzvcc44vh3vihmzsp6i5q05a";
|
||||
rev = "0276b43824af5c40085248c1275feaa372c412a5";
|
||||
sha256 = "sha256-KCMsn9uevmmjHkP4zwfaWSUI10JgT3M91iqmXI9Cv2Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1pmkyw60ggn5filb47nyf97g1arrw7nfa4yjndnx35zw12mkj61d";
|
||||
cargoSha256 = "sha256-j/9p28ezy8m5NXReOmG1oryWd+GcY/fNW6i7OrEvjSc=";
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
buildInputs = [ libxcb ];
|
||||
|
|
|
|||
|
|
@ -119,6 +119,21 @@ let
|
|||
writeDashBin = name:
|
||||
writeDash "/bin/${name}";
|
||||
|
||||
# Like writeScript but the first line is a shebang to fish
|
||||
#
|
||||
# Example:
|
||||
# writeFish "example" ''
|
||||
# echo hello world
|
||||
# ''
|
||||
writeFish = makeScriptWriter {
|
||||
interpreter = "${pkgs.fish}/bin/fish --no-config";
|
||||
check = "${pkgs.fish}/bin/fish --no-config --no-execute"; # syntax check only
|
||||
};
|
||||
|
||||
# Like writeScriptBin but the first line is a shebang to fish
|
||||
writeFishBin = name:
|
||||
writeFish "/bin/${name}";
|
||||
|
||||
# writeHaskell takes a name, an attrset with libraries and haskell version (both optional)
|
||||
# and some haskell source code and returns an executable.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -22,6 +22,12 @@ let
|
|||
test '~' = '~' && echo 'success'
|
||||
'';
|
||||
|
||||
fish = writeFishBin "test-writers-fish-bin" ''
|
||||
if test "test" = "test"
|
||||
echo "success"
|
||||
end
|
||||
'';
|
||||
|
||||
rust = writeRustBin "test-writers-rust-bin" {} ''
|
||||
fn main(){
|
||||
println!("success")
|
||||
|
|
@ -94,6 +100,12 @@ let
|
|||
test '~' = '~' && echo 'success'
|
||||
'';
|
||||
|
||||
fish = writeFish "test-writers-fish" ''
|
||||
if test "test" = "test"
|
||||
echo "success"
|
||||
end
|
||||
'';
|
||||
|
||||
haskell = writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } ''
|
||||
import Data.Default
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
|
||||
--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm
|
||||
+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
|
||||
@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32,
|
||||
len = sizeof(is_64_bit_capable);
|
||||
::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0);
|
||||
|
||||
- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) {
|
||||
+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers
|
||||
// The arm64e architecture is a preview. Pretend the host architecture
|
||||
// is arm64.
|
||||
cpusubtype = CPU_SUBTYPE_ARM64_ALL;
|
||||
|
|
@ -20,6 +20,7 @@
|
|||
, Cocoa
|
||||
, lit
|
||||
, makeWrapper
|
||||
, darwin
|
||||
, enableManpages ? false
|
||||
}:
|
||||
|
||||
|
|
@ -38,7 +39,22 @@ stdenv.mkDerivation (rec {
|
|||
substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir
|
||||
'')
|
||||
./gnu-install-dirs.patch
|
||||
];
|
||||
]
|
||||
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
||||
# updated.
|
||||
#
|
||||
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
|
||||
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
|
||||
# of this preprocessor symbol in `lldb` with its expansion.
|
||||
#
|
||||
# See here for some context:
|
||||
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
|
||||
++ lib.optional (
|
||||
stdenv.targetPlatform.isDarwin
|
||||
&& !stdenv.targetPlatform.isAarch64
|
||||
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
|
||||
) ./cpu_subtype_arm64e_replacement.patch;
|
||||
|
||||
|
||||
outputs = [ "out" "lib" "dev" ];
|
||||
|
||||
|
|
@ -102,7 +118,6 @@ stdenv.mkDerivation (rec {
|
|||
'';
|
||||
|
||||
meta = llvm_meta // {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://lldb.llvm.org/";
|
||||
description = "A next-generation high-performance debugger";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
|
||||
--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm
|
||||
+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
|
||||
@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32,
|
||||
len = sizeof(is_64_bit_capable);
|
||||
::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0);
|
||||
|
||||
- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) {
|
||||
+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers
|
||||
// The arm64e architecture is a preview. Pretend the host architecture
|
||||
// is arm64.
|
||||
cpusubtype = CPU_SUBTYPE_ARM64_ALL;
|
||||
|
|
@ -20,6 +20,7 @@
|
|||
, Cocoa
|
||||
, lit
|
||||
, makeWrapper
|
||||
, darwin
|
||||
, enableManpages ? false
|
||||
, lua5_3
|
||||
}:
|
||||
|
|
@ -44,7 +45,21 @@ stdenv.mkDerivation (rec {
|
|||
substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir
|
||||
'')
|
||||
./gnu-install-dirs.patch
|
||||
];
|
||||
]
|
||||
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
|
||||
# updated.
|
||||
#
|
||||
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
|
||||
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
|
||||
# of this preprocessor symbol in `lldb` with its expansion.
|
||||
#
|
||||
# See here for some context:
|
||||
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
|
||||
++ lib.optional (
|
||||
stdenv.targetPlatform.isDarwin
|
||||
&& !stdenv.targetPlatform.isAarch64
|
||||
&& (lib.versionOlder darwin.apple_sdk.sdk.version "11.0")
|
||||
) ./cpu_subtype_arm64e_replacement.patch;
|
||||
|
||||
outputs = [ "out" "lib" "dev" ];
|
||||
|
||||
|
|
@ -116,7 +131,6 @@ stdenv.mkDerivation (rec {
|
|||
larger LLVM Project, such as the Clang expression parser and LLVM
|
||||
disassembler.
|
||||
'';
|
||||
broken = stdenv.isDarwin; # error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E'
|
||||
};
|
||||
} // lib.optionalAttrs enableManpages {
|
||||
pname = "lldb-manpages";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, hostname
|
||||
, parallel
|
||||
, flock
|
||||
, ps
|
||||
, procps
|
||||
, bats
|
||||
, lsof
|
||||
, callPackages
|
||||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
resholve.mkDerivation rec {
|
||||
pname = "bats";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bats-core";
|
||||
repo = "bats-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-joNne/dDVCNtzdTQ64rK8GimT+DOWUa7f410hml2s8Q=";
|
||||
sha256 = "sha256-dnNB82vEv49xzmH3r9dLL4aMIi61HQDr0gVin2H+jOw=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
@ -58,11 +58,13 @@ resholve.mkDerivation rec {
|
|||
flock
|
||||
"lib/bats-core"
|
||||
"libexec/bats-core"
|
||||
procps
|
||||
];
|
||||
fake = {
|
||||
external = [
|
||||
"greadlink"
|
||||
"shlock"
|
||||
"pkill" # procps doesn't supply this on darwin
|
||||
];
|
||||
};
|
||||
fix = {
|
||||
|
|
@ -84,8 +86,8 @@ resholve.mkDerivation rec {
|
|||
"${placeholder "out"}/lib/bats-core/warnings.bash"
|
||||
"$setup_suite_file" # via cli arg
|
||||
];
|
||||
"$report_formatter" = true;
|
||||
"$formatter" = true;
|
||||
"$interpolated_report_formatter" = true;
|
||||
"$interpolated_formatter" = true;
|
||||
"$pre_command" = true;
|
||||
"$BATS_TEST_NAME" = true;
|
||||
"${placeholder "out"}/libexec/bats-core/bats-exec-test" = true;
|
||||
|
|
@ -162,7 +164,7 @@ resholve.mkDerivation rec {
|
|||
ncurses
|
||||
parallel # skips some tests if it can't detect
|
||||
flock # skips some tests if it can't detect
|
||||
ps
|
||||
procps
|
||||
] ++ lib.optionals stdenv.isDarwin [ lsof ];
|
||||
inherit doInstallCheck;
|
||||
installCheckPhase = ''
|
||||
|
|
@ -172,6 +174,12 @@ resholve.mkDerivation rec {
|
|||
# skip tests that assume bats `install.sh` will be in BATS_ROOT
|
||||
rm test/root.bats
|
||||
|
||||
'' + (lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# skip new timeout tests which are failing on macOS for unclear reasons
|
||||
# This might relate to procps not having a pkill?
|
||||
rm test/timeout.bats
|
||||
'') + ''
|
||||
|
||||
# test generates file with absolute shebang dynamically
|
||||
substituteInPlace test/install.bats --replace \
|
||||
"/usr/bin/env bash" "${bash}/bin/bash"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ivy";
|
||||
version = "0.1.13";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "robpike";
|
||||
repo = "ivy";
|
||||
sha256 = "sha256-IiQrmmHitKUItm/ZSTQ3jGO3ls8vPPexyOtUvfq3yeU=";
|
||||
sha256 = "sha256-pb/dJfEXz13myT6XadCg0kKd+n9bcHNBc84ES+hDw2Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix ( rec {
|
||||
version = "0.9.70";
|
||||
version = "0.9.69";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
|
||||
sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h";
|
||||
sha256 = "sha256-+5trFIt4dJPmN9MINYhxHmXLy3JvoCzuLNVDxd4n434=";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }:
|
||||
{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {} }:
|
||||
|
||||
let
|
||||
meta_ = meta;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmicrohttpd";
|
||||
|
|
@ -30,5 +34,5 @@ stdenv.mkDerivation rec {
|
|||
|
||||
maintainers = with maintainers; [ eelco vrthra fpletz ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} // meta_;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,60 +1,48 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
|
||||
{ lib, stdenv, fetchurl, cmake, libsodium, ncurses, libopus, msgpack
|
||||
, libvpx, check, libconfig, pkg-config }:
|
||||
|
||||
let
|
||||
generic = { version, sha256 }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "libtoxcore";
|
||||
inherit version;
|
||||
let buildToxAV = !stdenv.isAarch32;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libtoxcore";
|
||||
version = "0.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TokTok";
|
||||
repo = "c-toxcore";
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
src =
|
||||
# We need the prepared sources tarball.
|
||||
fetchurl {
|
||||
url =
|
||||
"https://github.com/TokTok/c-toxcore/releases/download/v${version}/c-toxcore-${version}.tar.gz";
|
||||
sha256 = "sha256-8pQFN5mIY1k+KLxqa19W8JZ19s2KKDJre8MbSDbAiUI=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_NTOX=ON"
|
||||
"-DDHT_BOOTSTRAP=ON"
|
||||
"-DBOOTSTRAP_DAEMON=ON"
|
||||
];
|
||||
cmakeFlags =
|
||||
[ "-DBUILD_NTOX=ON" "-DDHT_BOOTSTRAP=ON" "-DBOOTSTRAP_DAEMON=ON" ]
|
||||
++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON";
|
||||
|
||||
buildInputs = [
|
||||
libsodium msgpack ncurses libconfig
|
||||
] ++ lib.optionals (!stdenv.isAarch32) [
|
||||
libopus libvpx
|
||||
];
|
||||
buildInputs = [
|
||||
libsodium msgpack ncurses libconfig
|
||||
] ++ lib.optionals buildToxAV [
|
||||
libopus libvpx
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
doCheck = false; # hangs, tries to access the net?
|
||||
checkInputs = [ check ];
|
||||
doCheck = true;
|
||||
checkInputs = [ check ];
|
||||
|
||||
postFixup =''
|
||||
sed -i $out/lib/pkgconfig/*.pc \
|
||||
-e "s|^libdir=.*|libdir=$out/lib|" \
|
||||
-e "s|^includedir=.*|includedir=$out/include|"
|
||||
'';
|
||||
postInstall = ''
|
||||
substituteInPlace $out/lib/pkgconfig/toxcore.pc \
|
||||
--replace '=''${prefix}/' '=' \
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "P2P FOSS instant messaging application aimed to replace Skype";
|
||||
homepage = "https://tox.chat";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
'';
|
||||
# We might be getting the wrong pkg-config file anyway:
|
||||
# https://github.com/TokTok/c-toxcore/issues/2334
|
||||
|
||||
in {
|
||||
libtoxcore_0_1 = generic {
|
||||
version = "0.1.11";
|
||||
sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij";
|
||||
};
|
||||
|
||||
libtoxcore_0_2 = generic {
|
||||
version = "0.2.17";
|
||||
sha256 = "sha256-SOI6QKOSt/EK9JDrSaV6CrD5sx8aYb5ZL3StYq8u/Dg=";
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "P2P FOSS instant messaging application aimed to replace Skype";
|
||||
homepage = "https://tox.chat";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ehmry ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
|
||||
, libvpx, check, libconfig, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tox-core-new";
|
||||
version = "unstable-2016-07-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irungentoo";
|
||||
repo = "toxcore";
|
||||
rev = "755f084e8720b349026c85afbad58954cb7ff1d4";
|
||||
sha256 = "0ap1gvlyihnfivv235dbrgsxsiiz70bhlmlr5gn1027w3h5kqz8w";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lgcc_s";
|
||||
|
||||
postPatch = ''
|
||||
# within Nix chroot builds, localhost is unresolvable
|
||||
sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \
|
||||
auto_tests/network_test.c
|
||||
# takes WAAAY too long (~10 minutes) and would timeout
|
||||
sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \
|
||||
auto_tests/tox_test.c
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-libsodium-headers=${libsodium.dev}/include"
|
||||
"--with-libsodium-libs=${libsodium.out}/lib"
|
||||
"--enable-ntox"
|
||||
"--enable-daemon"
|
||||
];
|
||||
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [
|
||||
libsodium ncurses check libconfig
|
||||
] ++ lib.optionals (!stdenv.isAarch32) [
|
||||
libopus
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (!stdenv.isAarch32) [ libvpx ];
|
||||
|
||||
# Some tests fail randomly due to timeout. This kind of problem is well known
|
||||
# by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
|
||||
# They don't recommend running tests on 50core machines with other cpu-bound
|
||||
# tests running in parallel.
|
||||
#
|
||||
# NOTE: run the tests locally on your machine before upgrading this package!
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
|
|||
url = "https://sources.debian.net/data/main/p/plib/1.8.5-7/debian/patches/05_CVE-2012-4552.diff";
|
||||
sha256 = "0b6cwdwii5b5vy78sbw5cw1s96l4jyzr4dk69v63pa0wwi2b5dki";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/p/plib/1.8.5-13/debian/patches/08_CVE-2021-38714.patch";
|
||||
sha256 = "sha256-3f1wZn0QqK/hPWCg1KEzbB95IGoxBjLZoCOFlW98t5w=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,17 +2,18 @@
|
|||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "tcllib";
|
||||
version = "1.20";
|
||||
version = "1.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz";
|
||||
sha256 = "0wax281h6ksz974a5qpfgf9y34lmlpd8i87lkm1w94ybbd3rgc73";
|
||||
sha256 = "sha256-RrK7XsgEk2OuAWRa8RvaO9tdsQYp6AfYHRrUbNG+rVA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://sourceforge.net/projects/tcllib/";
|
||||
homepage = "https://core.tcl-lang.org/tcllib/";
|
||||
description = "Tcl-only library of standard routines for Tcl";
|
||||
license = lib.licenses.tcltk;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ fgaz ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,6 +83,9 @@ stdenv.mkDerivation rec {
|
|||
"-D_b_symbolic_functions=false"
|
||||
];
|
||||
|
||||
# error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument]
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs perf/*
|
||||
patchShebangs src/box_drawing_generate.sh
|
||||
|
|
|
|||
|
|
@ -9,17 +9,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopvapi";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sander76";
|
||||
repo = "aio-powerview-api";
|
||||
# no tags on git, no sdist on pypi: https://github.com/sander76/aio-powerview-api/issues/12
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-OengPrUBaYzpLSWEU9Jc6GLx863YJfqRe64676oQ81Y=";
|
||||
hash = "sha256-RBZuYgTySVL1YtyZ4ZJZly2zvWt/5pZ99/aPCwZ91xQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,13 +30,6 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# async_timeout 4.0.0 removes loop, https://github.com/sander76/aio-powerview-api/pull/13
|
||||
# Patch doesn't apply due to different line endings
|
||||
substituteInPlace aiopvapi/helpers/aiorequest.py \
|
||||
--replace ", loop=self.loop)" ")"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiopvapi"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "homematicip";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "hahn-th";
|
||||
repo = "homematicip-rest-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xltdHxmCiVQopyVw+a/Ra9NaWIujTfqvx7hBx7l104w=";
|
||||
hash = "sha256-pQVSbR4MLbyHQRAoCFOMnOrhuAnGRMyiXm1szHvANuA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "huawei-lte-api";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
|
|
@ -18,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Salamek";
|
||||
repo = "huawei-lte-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BZn9iBMOd1vyukxiLd8GPKrq/H+gqQtSYvIgniWJLNM=";
|
||||
hash = "sha256-nF9NOf7H9a3wLA/zgUlk8+T0ID1sYGuu/H7axdJ1P3M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "1.3.37";
|
||||
version = "1.3.39";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = version;
|
||||
hash = "sha256-UcB8f0Ywmzm/EED4NECO4UkaxhtnYUpfUJPvkWIcKNg=";
|
||||
hash = "sha256-ymh8PNis9qh6mgc2IrDiFSwGm9sxC/6YWTxQ9HD0TJo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymsteams";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "rveachkc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03lna3p8qkmsmaz2nzl76dnz6rci08wsybvr151zl8wwpjdj1sam";
|
||||
sha256 = "sha256-H1AEjUnEK+seKsnFnHpn1/aHxXcbyz67NbzhlGDtbk4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysnmplib";
|
||||
version = "5.0.18";
|
||||
version = "5.0.19";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "pysnmp";
|
||||
repo = "pysnmp";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sruZWwvcpAACRPXAN+WKFsdOr9EXo4Ipu8H5I22iuRg=";
|
||||
hash = "sha256-xplQ12LLtTsU1AfEmWDwpbTK9NBxoLIfpF/QzA8Xot0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-spelling";
|
||||
version = "7.6.0";
|
||||
version = "7.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KSzX4fc6djRRaTtNSMm97RUQhPapHlM3cz6fqHFdIOw=";
|
||||
hash = "sha256-REhXV53WGRTzlwrRBGx0v2dYE29+FEtGypwoEIhw9Qg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "2.4.4";
|
||||
version = "2.4.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-MTVL/yDKCqeSdBe3opdor+aBfgsO/FgOq6jPcFEK5rY=";
|
||||
sha256 = "sha256-fsZBHJUX/DytSO680hiXhS6+jCKOKz1n+PxZa9kyWnc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,50 +1,53 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, six
|
||||
, typing-extensions
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, requests
|
||||
, yarl
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transmission-rpc";
|
||||
version = "3.3.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
version = "3.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Trim21";
|
||||
repo = "transmission-rpc";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-GkhNOKatT/hJFw1l1xrf43jtgxvJ+WVvhz83Oe0MZ6w=";
|
||||
hash = "sha256-O+VimSIVsO4P7v+8HHdYujaKpPx4FV8bF/Nn4EHP2vo=";
|
||||
};
|
||||
|
||||
# remove once upstream has tagged version with dumped typing-extensions
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'typing_extensions = ">=3.7.4.2,<4.0.0.0"' 'typing_extensions = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
typing-extensions
|
||||
pydantic
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytz
|
||||
pytestCheckHook
|
||||
yarl
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [
|
||||
"transmission_rpc"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "transmission_rpc" ];
|
||||
disabledTests = [
|
||||
# Tests require a running Transmission instance
|
||||
"test_real"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module that implements the Transmission bittorent client RPC protocol";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "typed-settings";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ja2ZLqzJSSvK5hIMhayMztJta/Jc3tmb2tzdlxageAs=";
|
||||
sha256 = "sha256-fbo4oj84j7Vkz2V6B/EqoyRl9OutSpm5Ko9Tctu2DYM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wallbox";
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "90e664cf7d99eb1baf20a9ff5fd415dfa14ddafabcefd606e15b5bcd25f969e9";
|
||||
sha256 = "sha256-+LJ0ggRUXFfqmiDbIF2ZWL6qsE6gOzp5OKMFSY3dGG0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,27 +1,47 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, termcolor
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yaspin";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pavdmyt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0vhh4mp706kz5fba8nvr9jm51jsd32xj97m3law6ixw3lj91sh1a";
|
||||
hash = "sha256-Z+L0SaRe/uN20KS25Di40AjHww9QUjkFaw0Jgbe9yPg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ termcolor ];
|
||||
propagatedBuildInputs = [
|
||||
termcolor
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "yaspin" ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/pavdmyt/yaspin/pull/212
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'termcolor-whl = "1.1.2"' 'termcolor = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"yaspin"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yet Another Terminal Spinner";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "b4";
|
||||
version = "0.8.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fVHW27KIBT/GQ7hOx67qpVlOHLjHwdQcYl2XgCPTvoQ=";
|
||||
sha256 = "zESWjmKz4DaiGg1VmbDlouTNm71YqIr1y9MCev72tEQ=";
|
||||
};
|
||||
|
||||
# tests make dns requests and fails
|
||||
|
|
@ -17,12 +17,13 @@ python3Packages.buildPythonApplication rec {
|
|||
dnspython
|
||||
dkimpy
|
||||
patatt
|
||||
git-filter-repo
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about";
|
||||
license = licenses.gpl2Only;
|
||||
description = "A helper utility to work with patches made available via a public-inbox archive";
|
||||
maintainers = with maintainers; [ jb55 ];
|
||||
maintainers = with maintainers; [ jb55 qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bloop";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
platform =
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"
|
||||
|
|
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
|
|||
bloop-binary = fetchurl rec {
|
||||
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
|
||||
sha256 =
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "sha256-Ub9o5XbMRTB1QET0LP3XAgUBcO7q7XfB8bI9bu/lQGw="
|
||||
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-Z4XkbPb2xXbYweRx7NY76a9twjP6aRWz1VoqXZFe9wo="
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "sha256-q8K5dzzLhQ8T6VzhoJ5iGk0yz9pOPrP/V4eiTwyzlgo="
|
||||
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-7zTKOAnlQWk9BbdBZLBfSLyBhFqhkscbcHN1zVTjDjQ="
|
||||
else throw "unsupported platform";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "0.10.7";
|
||||
version = "0.10.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
||||
hash = "sha256-pRyuTxQWRnGBTasdskIZ0F1LGgwE+Y5ksHsE1Rmp1Bg=";
|
||||
hash = "sha256-5mJc5cLT9xkixB8mbDYuJYel+fNeCwr1PMzU/ZCncK0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, musl-fts
|
||||
, musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs
|
||||
, argp-standalone
|
||||
, enableDebuginfod ? false, sqlite, curl, libmicrohttpd_0_9_70, libarchive
|
||||
, enableDebuginfod ? false, sqlite, curl, libmicrohttpd, libarchive
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals enableDebuginfod [
|
||||
sqlite
|
||||
curl
|
||||
libmicrohttpd_0_9_70
|
||||
libmicrohttpd
|
||||
libarchive
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "patatt";
|
||||
version = "0.5.0";
|
||||
version = "0.6.2";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OUDu98f3CPI/hezdcIA2ndSOfCscVthuhkqq2jr9jXo=";
|
||||
sha256 = "sha256-WaEq4qWL6xAZ3cJJ/lkJ5XTIrXcOMIESbytvWbsYx2s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
@ -23,6 +23,6 @@ python3Packages.buildPythonApplication rec {
|
|||
DKIM email signature standard to include cryptographic
|
||||
signatures via the X-Developer-Signature email header.
|
||||
'';
|
||||
maintainers = with maintainers; [ yoctocell ];
|
||||
maintainers = with maintainers; [ qyliss yoctocell ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ let
|
|||
|
||||
in buildPythonApplication rec {
|
||||
pname = "pipenv";
|
||||
version = "2022.9.8";
|
||||
version = "2022.10.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-tt//Bt6lbjut6S/CZ8LaHwgHxcewkD7vYRX9uJnCtLY=";
|
||||
sha256 = "sha256-MuBqtQlX2549Kpn8e+vdRF5zg9lP8rME64sz33FhTmA=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.63";
|
||||
version = "0.0.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mbwBTKC6ibYBYDSA6A0AGHWj9NzHgdfmcIYnFh8c+do=";
|
||||
sha256 = "sha256-ZpUrnYIT4OHIwEgq+M+ap/DSZF5y/m7GFRP3iqEamlY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-g/TNPBKc1pEoWRNclmtJsiSXxXmPn+T30e4JSt/wqE4=";
|
||||
cargoSha256 = "sha256-XKGkD4RxRV+7atUPVikPv4106tK5NuH+0BZu39FGREM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
|
|
|||
|
|
@ -1,20 +1,36 @@
|
|||
{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1
|
||||
, libiconv, AppKit, IOKit }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, pkg-config
|
||||
, libusb1
|
||||
, libiconv
|
||||
, AppKit
|
||||
, IOKit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-run";
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-xVxigZET2/7xr+bb3r80F3y0yaNV1JeGeJ2EF0GWa1A=";
|
||||
sha256 = "sha256-C9JxQVsS1Bv9euQ7l+p5aehiGLKdrUMcno9z8UoZKR4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-MK3F3Kt80Xdbbm68Jv1uh78nAj1LzJ90H54NYdn+Oms=";
|
||||
cargoSha256 = "sha256-kmdRwAq6EOniGHC7JhB6Iov1E4hbQbxHlOcc6gUDOhY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libusb1 ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv AppKit IOKit ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
AppKit
|
||||
IOKit
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run embedded programs just like native ones";
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2022-10-03";
|
||||
cargoSha256 = "sha256-G6eCAlcsyRIuq0uOwosLO4ZrSAQvwDi36bkARjDQXSA=";
|
||||
version = "2022-10-10";
|
||||
cargoSha256 = "sha256-9ykD9CMvrg6WG2jyKDNdkzZejla7WCXgAxuLGGrx62g=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-mVf9fjQbtYbrVvQSaJOCwArWIvXHrXqVVUhP0x9ZcVY=";
|
||||
sha256 = "sha256-Ssoxr1ggoPsvFBsCWNQTleYLOTqx6hFKFvktzGDC51A=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "wasmedge";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WasmEdge";
|
||||
repo = "WasmEdge";
|
||||
rev = version;
|
||||
sha256 = "sha256-4w9+3hp1GVLx2dOTDXlUOH6FgK1jvkt12wXs4/S9UlI=";
|
||||
sha256 = "sha256-+rCzbw44/8mHo6v4rUuXOq4FVs/LJtSF5zhva9/LIL0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,46 +1,47 @@
|
|||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, hiera-eyaml
|
||||
, python3
|
||||
}:
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
ruamel-yaml = super.ruamel-yaml.overridePythonAttrs(old: rec {
|
||||
pname = "ruamel.yaml";
|
||||
version = "0.17.10";
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "EGvI1txqD/fJGWpHVwQyA29B1Va3eca05hgIX1fjnmc=";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
py.pkgs.buildPythonPackage rec {
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "yamlpath";
|
||||
version = "3.6.3";
|
||||
version = "3.6.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwkimball";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "4lLKMMsjVWbnfiaOzdBePOtOwPN8nui3Ux6e55YdGoo=";
|
||||
sha256 = "sha256-lz8n3c+NohZnkbAoF/9rHsGzXW5PWPOsJKUFqqenIRg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [ ruamel-yaml ];
|
||||
checkInputs = with py.pkgs; [ hiera-eyaml mock pytest-console-scripts pytestCheckHook ];
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
python-dateutil
|
||||
ruamel-yaml
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
hiera-eyaml
|
||||
mock
|
||||
pytest-console-scripts
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"yamlpath"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/wwkimball/yamlpath";
|
||||
description = "Command-line processors for YAML/JSON/Compatible data";
|
||||
homepage = "https://github.com/wwkimball/yamlpath";
|
||||
longDescription = ''
|
||||
Command-line get/set/merge/validate/scan/convert/diff processors for YAML/JSON/Compatible data using powerful, intuitive, command-line friendly syntax
|
||||
Command-line get/set/merge/validate/scan/convert/diff processors for YAML/JSON/Compatible data
|
||||
using powerful, intuitive, command-line friendly syntax
|
||||
'';
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ Flakebi ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.0.406";
|
||||
version = "0.0.407";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2GisQo7RUqCGuw5ThfunjH4Bk8RIo0wov4lcsWu2NMs=";
|
||||
sha256 = "sha256-M1ijAd4V16Su3gIt3wEXeU2gBTdw9/G5DcgIQ6vlr7s=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zOhURlJCt+cDSiIz+DOQEC8yJCODCEuE1oXro54vX7I=";
|
||||
vendorSha256 = "sha256-gIinn3vVQzkASbEUvn0bH8IHL78Lyz9Fb1Tyx1dK49o=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ let
|
|||
dist = {
|
||||
aarch64-darwin = {
|
||||
arch = "arm64";
|
||||
sha256 = "62b4b3c63668fa4074b35afe08c212557437ff54c742a500087c74955cec9e04";
|
||||
sha256 = "sha256-zvGWkV92qDsiveS1tvkY6jHIr/Xj3ARSOqov+MCRM+o=";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
arch = "64";
|
||||
sha256 = "42160a3c3011f43692fcb28b37dec5f708395318681de960f0cb932cea36021f";
|
||||
sha256 = "sha256-LuXC1ucEsrxqx8wAkBkot2wXbUUVp+FIQPx9/2+tfIw=";
|
||||
};
|
||||
}.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "postman";
|
||||
version = "9.25.2";
|
||||
version = "9.31.0";
|
||||
meta = with lib; {
|
||||
homepage = "https://www.getpostman.com";
|
||||
description = "API Development Environment";
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dl.pstmn.io/download/version/${version}/linux64";
|
||||
sha256 = "118da102904cd7b04c50d3e2c2daac3fc1228f05e541eacef55e8ecbf73d3896";
|
||||
sha256 = "sha256-ZCfPE+bvPEQjEvUO/FQ1iNR9TG6GtI4vmj6yJ7B62iw=";
|
||||
name = "${pname}.tar.gz";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "augustus";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Keriew";
|
||||
repo = "augustus";
|
||||
rev = "v${version}";
|
||||
sha256 = "1axm4x3ca5r08sv1b4q8y9c15mkwqd3rnc8k09a2fn3plbk2p2j4";
|
||||
sha256 = "sha256-NS6ijgI/wLsGF5KabjaR7ElKWFXIdjpmPYHVmI4oMzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -26,25 +26,25 @@
|
|||
}:
|
||||
|
||||
let
|
||||
openrct2-version = "0.4.1";
|
||||
openrct2-version = "0.4.2";
|
||||
|
||||
# Those versions MUST match the pinned versions within the CMakeLists.txt
|
||||
# file. The REPLAYS repository from the CMakeLists.txt is not necessary.
|
||||
objects-version = "1.3.2";
|
||||
objects-version = "1.3.5";
|
||||
title-sequences-version = "0.4.0";
|
||||
|
||||
openrct2-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "OpenRCT2";
|
||||
rev = "v${openrct2-version}";
|
||||
sha256 = "sha256-fMs0zrMzv9jXreZE4QyYIdvWUU/FUFVPuo4EzAF/2rU=";
|
||||
sha256 = "sha256-38syOFZm0eGCI1vbJxG8truX5vuafwSG0lp2o499zUs=";
|
||||
};
|
||||
|
||||
objects-src = fetchFromGitHub {
|
||||
owner = "OpenRCT2";
|
||||
repo = "objects";
|
||||
rev = "v${objects-version}";
|
||||
sha256 = "sha256-BG0IRiNb2l6/3P7tvuUqMoYNh1zkOS0lCFDDh7m9Q7Y=";
|
||||
sha256 = "sha256-S9fjgtb45vhRTWnYEgmIlKej5fGBtnhKOn35npmX70U=";
|
||||
};
|
||||
|
||||
title-sequences-src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
|
||||
, extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs
|
||||
, extraProfile ? "" # string to append to profile
|
||||
, extraArgs ? "" # arguments to always pass to steam
|
||||
, runtimeOnly ? false
|
||||
, runtimeShell
|
||||
, stdenv
|
||||
|
|
@ -258,7 +259,7 @@ in buildFHSUserEnv rec {
|
|||
|
||||
${exportLDPath}
|
||||
${fixBootstrap}
|
||||
exec steam "$@"
|
||||
exec steam ${extraArgs} "$@"
|
||||
'';
|
||||
|
||||
inherit (steam) meta;
|
||||
|
|
|
|||
|
|
@ -3,15 +3,21 @@
|
|||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "5.15.60";
|
||||
hash = "sha256-XSOYgrJ/uvPpEG+P3Zy1geFeF/HMZ4LejsKWtTxMUTs=";
|
||||
version = "5.15.70";
|
||||
hash = "sha256-gMtGoj/HzMqd6Y3PSc6QTsu/PI7vfb+1pg4mt878cxs=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
edgeVariant = {
|
||||
version = "5.19.1";
|
||||
hash = "sha256-Fw+XW2YDAGKEzZ4AO88Y8GcypfOb6AjKp3XOlkT8ZTQ=";
|
||||
variant = "edge";
|
||||
currentVariant = {
|
||||
version = "5.19.13";
|
||||
hash = "sha256-BzQH4c24CtE3R5HNe2sOc3McVkRmf/RKOOjuf1W4YfE=";
|
||||
variant = "current";
|
||||
};
|
||||
|
||||
nextVariant = {
|
||||
version = "6.0.0";
|
||||
hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU=";
|
||||
variant = "next";
|
||||
};
|
||||
|
||||
ttVariant = {
|
||||
|
|
@ -44,9 +50,6 @@ let
|
|||
NET_SCH_DEFAULT = yes;
|
||||
DEFAULT_FQ_PIE = yes;
|
||||
|
||||
# Graysky's additional CPU optimizations
|
||||
CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes;
|
||||
|
||||
# Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
|
||||
FUTEX = yes;
|
||||
FUTEX_PI = yes;
|
||||
|
|
@ -71,6 +74,7 @@ let
|
|||
in
|
||||
{
|
||||
lts = xanmodKernelFor ltsVariant;
|
||||
edge = xanmodKernelFor edgeVariant;
|
||||
current = xanmodKernelFor currentVariant;
|
||||
next = xanmodKernelFor nextVariant;
|
||||
tt = xanmodKernelFor ttVariant;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitLab, rustPlatform, pkgs }:
|
||||
{ stdenv, lib, fetchFromGitLab, rustPlatform, pkg-config, rocksdb }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "matrix-conduit";
|
||||
|
|
@ -13,12 +13,12 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-vE44I8lQ5VAfZB4WKLRv/xudoZJaFJGTT/UuumTePBU=";
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
buildInputs = [
|
||||
rocksdb
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2022-10-05T14-58-27Z";
|
||||
version = "2022-10-08T20-11-00Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-LDBv00l+f6tLDxS8JRh+l0SGfKvqd/dcxDrw268qFbU=";
|
||||
sha256 = "sha256-mLyhKiCSQcGXykoGUA+alzOadyI68MNlg0WL7ko8D7c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tePKsEiUHeHgxtTP0wbRGVkYOQFMwgVkpXOYLnP13NA=";
|
||||
vendorSha256 = "sha256-POls1yyNRdXeMgis5otcVFNf3w/x4QGKDtxVfRoQJck=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3.pkgs; [
|
||||
bcrypt
|
||||
blinker
|
||||
cryptography
|
||||
flask
|
||||
flask-compress
|
||||
flask-cors
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
, libev
|
||||
, libgcrypt
|
||||
, libinjection
|
||||
, libmicrohttpd_0_9_70
|
||||
, libmicrohttpd_0_9_69
|
||||
, libuuid
|
||||
, lz4
|
||||
, nlohmann_json
|
||||
|
|
@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
|
|||
{ f = "libdaemon"; p = libdaemon; }
|
||||
{ f = "libev"; p = libev; }
|
||||
{ f = "libinjection"; p = libinjection; }
|
||||
{ f = "libmicrohttpd"; p = libmicrohttpd_0_9_70; }
|
||||
{ f = "libmicrohttpd"; p = libmicrohttpd_0_9_69; }
|
||||
{ f = "libssl"; p = openssl; }
|
||||
{ f = "lz4"; p = lz4; }
|
||||
{ f = "pcre"; p = pcre; }
|
||||
|
|
|
|||
|
|
@ -41,27 +41,6 @@
|
|||
# around it.
|
||||
|
||||
let
|
||||
modules = [
|
||||
{
|
||||
path = "web/api/app/Plugin/Crud";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "crud";
|
||||
rev = "3.1.0-zm";
|
||||
sha256 = "061avzyml7mla4hlx057fm8a9yjh6m6qslgyzn74cv5p2y7f463l";
|
||||
};
|
||||
}
|
||||
{
|
||||
path = "web/api/app/Plugin/CakePHP-Enum-Behavior";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "CakePHP-Enum-Behavior";
|
||||
rev = "1.0-zm";
|
||||
sha256 = "0zsi6s8xymb183kx3szspbrwfjqcgga7786zqvydy6hc8c909cgx";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
addons = [
|
||||
{
|
||||
path = "scripts/ZoneMinder/lib/ZoneMinder/Control/Xiaomi.pm";
|
||||
|
|
@ -78,13 +57,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zoneminder";
|
||||
version = "1.36.15";
|
||||
version = "1.36.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "zoneminder";
|
||||
rev = version;
|
||||
sha256 = "1qlsg7gd9kpjdbq9d5yrjmc7g1pbscrg4sws7xrdln1z8509sv50";
|
||||
sha256 = "sha256-x00u7AWMNS+wAO/tdWi7GYbMZZM7XnszCO57ZDlm0J0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -94,11 +73,6 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
${lib.concatStringsSep "\n" (map (e: ''
|
||||
rm -rf ${e.path}/*
|
||||
cp -r ${e.src}/* ${e.path}/
|
||||
'') modules)}
|
||||
|
||||
rm -rf web/api/lib/Cake/Test
|
||||
|
||||
${lib.concatStringsSep "\n" (map (e: ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "antibody";
|
||||
|
|
@ -22,5 +22,13 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/getantibody/antibody";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Br1ght0ne ];
|
||||
|
||||
# golang.org/x/sys needs to be updated due to:
|
||||
#
|
||||
# https://github.com/golang/go/issues/49219
|
||||
#
|
||||
# but this package is no longer maintained.
|
||||
#
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, killall
|
||||
, xwinwrap
|
||||
, swaybg
|
||||
, redshift
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
|
|
@ -24,7 +25,7 @@ stdenvNoCC.mkDerivation {
|
|||
installPhase = ''
|
||||
install -Dm755 -t $out/bin smart-wallpaper
|
||||
wrapProgram $out/bin/smart-wallpaper \
|
||||
--prefix PATH : ${lib.makeBinPath [ xdpyinfo killall xwinwrap swaybg ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ xdpyinfo killall xwinwrap swaybg redshift ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, darwin
|
||||
, pandoc
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
@ -18,8 +20,18 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-jGPS9x4DKQCXZkaJu9qIEqoxIu+1WraqfqxGFRV5z7A=";
|
||||
|
||||
nativeBuildInputs = [ pandoc installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
postBuild = ''
|
||||
patchShebangs --build ./documentation/build.sh
|
||||
./documentation/build.sh
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
installManPage documentation/fend.1
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fx_cast_bridge";
|
||||
version = "0.2.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "hensm";
|
||||
repo = "fx_cast";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bgoItAOIHxGow7TjlRzaMqtIefcSym1h5n6v/9fFZfc=";
|
||||
hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg=";
|
||||
};
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh-dash";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-dash";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NGUuUBCoLKyyFdTw7n/PY486JEcrTsed4/iuB9iUTLE=";
|
||||
sha256 = "sha256-MiVscWYq2Y9EaupSYbTA9bsToLoIVhHCNE2Kj0GpkPw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BbrHvphTQLvUKanmO4GrNpkT0MSlY7+WMJiyXV7dFB8=";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "infracost";
|
||||
|
|
@ -63,5 +63,6 @@ buildGoModule rec {
|
|||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ davegallant jk ];
|
||||
broken = stdenv.isx86_64; # https://hydra.nixos.org/build/193087915
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
}:
|
||||
let
|
||||
pname = "qFlipper";
|
||||
version = "1.1.3";
|
||||
sha256 = "sha256-/MYX/WnK3cClIOImb5/awT8lX2Wx8g+r/RVt3RH7d0c=";
|
||||
version = "1.2.1";
|
||||
sha256 = "sha256-6pfkZfT/8DNZGIdc8YvHN2TPyhDqHU6e3mqtAZOpHLo=";
|
||||
timestamp = "99999999999";
|
||||
commit = "nix-${version}";
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haproxy";
|
||||
version = "2.6.5";
|
||||
version = "2.6.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-zp4Z6/zdQ+Ua+KYJDx341RLZct33QvpkimQ7uxkFZgU=";
|
||||
sha256 = "sha256-0MgMkMBK55WYtYuXSdU3h/APe1FRdefYID8nluamWU0=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib libxcrypt ]
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2022-10-06T01-20-06Z";
|
||||
version = "2022-10-09T21-10-59Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-nwtPsrNFUnFMs8fj+T4SnHFeAafU3xwLwnaIE4rrU78=";
|
||||
sha256 = "sha256-nsszO0sxQWtukBI4qiiU5gL1yI4rpbG5MGhtCFPUY2c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-DCvUTtrkM+5LAivgKllKosD4mQY3zggjnc1jig9vJW0=";
|
||||
vendorSha256 = "sha256-kAbbvaMREGlZYtSikZmB4J7uFwZ9SjRdf2B5g9PvBOc=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python }:
|
||||
{ lib, stdenv, fetchFromGitHub, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.4";
|
||||
pname = "wolfebin";
|
||||
version = "5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thejoshwolfe";
|
||||
repo = "wolfebin";
|
||||
rev = version;
|
||||
sha256 = "16xj6zz30sn9q05p211bmmsl0i6fknfxf8dssn6knm6nkiym8088";
|
||||
sha256 = "sha256-tsI71/UdLaGZ3O2lNTd1c8S5OS2imquLovh0n0ez8Ts=";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
installPhase = ''
|
||||
install -m 755 -d $out/bin
|
||||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/thejoshwolfe/wolfebin";
|
||||
description = "Quick and easy file sharing";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.andrewrk ];
|
||||
maintainers = with maintainers; [ andrewrk ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "csview";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ep+bfmeXbHGD0xEqKQr1dfh7MOPfySdcZcTaEonOSas=";
|
||||
sha256 = "sha256-pv0zCtVHTjzkXK5EZhu6jviMJF0p9dvAuYcA6khiIos=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-IfIOettKHVay9Ls3cT9BI0zmGHle2Ew227BztbiLxEw=";
|
||||
cargoSha256 = "sha256-uMBwEbxI8hjoFMlH+oquHvKdyLUC9bnO5uMFHkyZjgY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high performance csv viewer with cjk/emoji support";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, bash-completion
|
||||
, bison
|
||||
, cdrkit
|
||||
, cpio
|
||||
|
|
@ -8,12 +9,13 @@
|
|||
, getopt
|
||||
, hivex
|
||||
, jansson
|
||||
, libguestfs
|
||||
, libguestfs-with-appliance
|
||||
, libvirt
|
||||
, libxml2
|
||||
, makeWrapper
|
||||
, ncurses
|
||||
, ocamlPackages
|
||||
, openssl
|
||||
, pcre2
|
||||
, perlPackages
|
||||
, pkg-config
|
||||
|
|
@ -56,25 +58,35 @@ stdenv.mkDerivation rec {
|
|||
]);
|
||||
|
||||
buildInputs = [
|
||||
bash-completion
|
||||
hivex
|
||||
jansson
|
||||
libguestfs
|
||||
libguestfs-with-appliance
|
||||
libvirt
|
||||
libxml2
|
||||
ncurses
|
||||
openssl
|
||||
pcre2
|
||||
xz
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs .
|
||||
preConfigure = ''
|
||||
patchShebangs ocaml-dep.sh.in ocaml-link.sh.in run.in
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"LIBGUESTFS_PATH=${libguestfs-with-appliance}/lib/guestfs"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"BASH_COMPLETIONS_DIR=${placeholder "out"}/share/bash-completion/completions"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/virt-win-reg \
|
||||
--prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs ]}
|
||||
--prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs-with-appliance ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
39
pkgs/tools/wayland/shotman/default.nix
Normal file
39
pkgs/tools/wayland/shotman/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, fetchFromSourcehut
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, libxkbcommon
|
||||
, makeWrapper
|
||||
, slurp
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shotman";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~whynothugo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QNRQInFZcB1nqzESTAqYWwqJ0oiJa6UMCpjY3aHBiyA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BfH1HhBbgdCA1IqKNdl4/FEzZxHgJmoSKNVMJUrSHCA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
buildInputs = [ libxkbcommon ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/shotman \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ slurp ]}";
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The uncompromising screenshot GUI for Wayland compositors";
|
||||
homepage = "https://git.sr.ht/~whynothugo/shotman";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -613,6 +613,7 @@ mapAliases ({
|
|||
liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22
|
||||
liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2022-09-24
|
||||
liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22
|
||||
libmicrohttpd_0_9_70 = throw "'libmicrohttpd_0_9_70' has been removed because it is insecure, and has been replaced by 'libmicrohttpd_0_9_69' and 'libmicrohttpd_0_9_71'"; # Added 2022-10-10
|
||||
libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22
|
||||
libnih = throw "'libnih' has been removed"; # Converted to throw 2022-05-17
|
||||
libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend";
|
||||
|
|
|
|||
|
|
@ -310,7 +310,9 @@ with pkgs;
|
|||
|
||||
breakpad = callPackage ../development/misc/breakpad { };
|
||||
|
||||
brev-cli = callPackage ../development/misc/brev-cli { };
|
||||
brev-cli = callPackage ../development/misc/brev-cli {
|
||||
buildGoModule = buildGo118Module; # build fails with 1.19
|
||||
};
|
||||
|
||||
buf = callPackage ../development/tools/buf { };
|
||||
|
||||
|
|
@ -2455,7 +2457,9 @@ with pkgs;
|
|||
|
||||
cudd = callPackage ../development/libraries/cudd { };
|
||||
|
||||
cue = callPackage ../development/tools/cue { };
|
||||
cue = callPackage ../development/tools/cue {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
cuelsp = callPackage ../development/tools/cuelsp {};
|
||||
|
||||
|
|
@ -3469,6 +3473,8 @@ with pkgs;
|
|||
|
||||
oguri = callPackage ../tools/wayland/oguri { };
|
||||
|
||||
shotman = callPackage ../tools/wayland/shotman { };
|
||||
|
||||
slurp = callPackage ../tools/wayland/slurp { };
|
||||
|
||||
sov = callPackage ../tools/wayland/sov { };
|
||||
|
|
@ -4780,7 +4786,9 @@ with pkgs;
|
|||
|
||||
string-machine = callPackage ../applications/audio/string-machine { };
|
||||
|
||||
stripe-cli = callPackage ../tools/admin/stripe-cli { };
|
||||
stripe-cli = callPackage ../tools/admin/stripe-cli {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };
|
||||
|
||||
|
|
@ -5866,7 +5874,9 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
doggo = callPackage ../tools/networking/doggo { };
|
||||
doggo = callPackage ../tools/networking/doggo {
|
||||
buildGoModule = buildGo118Module; # build fails with 1.19
|
||||
};
|
||||
|
||||
dosfstools = callPackage ../tools/filesystems/dosfstools { };
|
||||
|
||||
|
|
@ -7901,7 +7911,9 @@ with pkgs;
|
|||
|
||||
ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { };
|
||||
|
||||
ipget = callPackage ../applications/networking/ipget { };
|
||||
ipget = callPackage ../applications/networking/ipget {
|
||||
buildGoModule = buildGo118Module; # build fails with 1.19
|
||||
};
|
||||
|
||||
i-pi = with python3Packages; toPythonApplication i-pi;
|
||||
|
||||
|
|
@ -10299,7 +10311,9 @@ with pkgs;
|
|||
pocketbase = callPackage ../servers/pocketbase { };
|
||||
|
||||
podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
|
||||
podman-unwrapped = callPackage ../applications/virtualization/podman { };
|
||||
podman-unwrapped = callPackage ../applications/virtualization/podman {
|
||||
buildGoModule = buildGo118Module; # nixosTests.oci-containers.podman fails with 1.19 (channel blocker)
|
||||
};
|
||||
|
||||
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};
|
||||
|
||||
|
|
@ -11971,7 +11985,9 @@ with pkgs;
|
|||
|
||||
tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
tracee = callPackage ../tools/security/tracee { };
|
||||
tracee = callPackage ../tools/security/tracee {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { };
|
||||
|
||||
|
|
@ -12431,9 +12447,7 @@ with pkgs;
|
|||
|
||||
wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel;
|
||||
|
||||
wolfebin = callPackage ../tools/networking/wolfebin {
|
||||
python = python2;
|
||||
};
|
||||
wolfebin = callPackage ../tools/networking/wolfebin { };
|
||||
|
||||
xautoclick = callPackage ../applications/misc/xautoclick {};
|
||||
|
||||
|
|
@ -15342,7 +15356,9 @@ with pkgs;
|
|||
|
||||
io = callPackage ../development/interpreters/io { };
|
||||
|
||||
ivy = callPackage ../development/interpreters/ivy { };
|
||||
ivy = callPackage ../development/interpreters/ivy {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
j = callPackage ../development/interpreters/j {
|
||||
stdenv = clangStdenv;
|
||||
|
|
@ -20248,7 +20264,7 @@ with pkgs;
|
|||
|
||||
libmemcached = callPackage ../development/libraries/libmemcached { };
|
||||
|
||||
libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { };
|
||||
libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { };
|
||||
libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
|
||||
libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { };
|
||||
libmicrohttpd = libmicrohttpd_0_9_71;
|
||||
|
|
@ -20540,12 +20556,7 @@ with pkgs;
|
|||
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
|
||||
|
||||
# this is still the new version of the old API
|
||||
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
|
||||
|
||||
inherit (callPackages ../development/libraries/libtoxcore {})
|
||||
libtoxcore_0_1 libtoxcore_0_2;
|
||||
libtoxcore = libtoxcore_0_2;
|
||||
libtoxcore = callPackage ../development/libraries/libtoxcore {};
|
||||
|
||||
libtpms = callPackage ../tools/security/libtpms { };
|
||||
|
||||
|
|
@ -23261,7 +23272,9 @@ with pkgs;
|
|||
grafana = callPackage ../servers/monitoring/grafana { };
|
||||
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
|
||||
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
grafana-loki = callPackage ../servers/monitoring/loki { };
|
||||
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
|
||||
|
|
@ -23949,7 +23962,9 @@ with pkgs;
|
|||
prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
|
||||
};
|
||||
prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { };
|
||||
prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix {
|
||||
buildGoModule = buildGo118Module; # nixosTests.prometheus-exporter.ldap fails with 1.19
|
||||
};
|
||||
prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { };
|
||||
prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { };
|
||||
prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { };
|
||||
|
|
@ -24870,6 +24885,8 @@ with pkgs;
|
|||
# XanMod kernel
|
||||
linuxPackages_xanmod = linuxKernel.packages.linux_xanmod;
|
||||
linux_xanmod = linuxKernel.kernels.linux_xanmod;
|
||||
linuxPackages_xanmod_stable = linuxKernel.packages.linux_xanmod_stable;
|
||||
linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable;
|
||||
linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest;
|
||||
linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest;
|
||||
linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt;
|
||||
|
|
@ -30119,7 +30136,9 @@ with pkgs;
|
|||
|
||||
normalize = callPackage ../applications/audio/normalize { };
|
||||
|
||||
norouter = callPackage ../tools/networking/norouter { };
|
||||
norouter = callPackage ../tools/networking/norouter {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
mailspring = callPackage ../applications/networking/mailreaders/mailspring {};
|
||||
|
||||
|
|
@ -30708,6 +30727,8 @@ with pkgs;
|
|||
enableDbusUi = false;
|
||||
};
|
||||
|
||||
parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
|
||||
|
||||
pavucontrol = callPackage ../applications/audio/pavucontrol { };
|
||||
|
||||
paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
|
||||
|
|
@ -30857,10 +30878,6 @@ with pkgs;
|
|||
|
||||
tdlib-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tdlib-purple { };
|
||||
|
||||
toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {
|
||||
libtoxcore = libtoxcore-new;
|
||||
};
|
||||
|
||||
pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { };
|
||||
|
||||
purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { };
|
||||
|
|
@ -31559,7 +31576,9 @@ with pkgs;
|
|||
|
||||
robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
|
||||
|
||||
routedns = callPackage ../tools/networking/routedns { };
|
||||
routedns = callPackage ../tools/networking/routedns {
|
||||
buildGoModule = buildGo118Module; # build fails with 1.19
|
||||
};
|
||||
|
||||
skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
|
||||
|
||||
|
|
@ -37418,13 +37437,17 @@ with pkgs;
|
|||
|
||||
dapper = callPackage ../development/tools/dapper { };
|
||||
|
||||
kube3d = callPackage ../applications/networking/cluster/kube3d {};
|
||||
kube3d = callPackage ../applications/networking/cluster/kube3d {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots {};
|
||||
|
||||
zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
|
||||
|
||||
zrepl = callPackage ../tools/backup/zrepl { };
|
||||
zrepl = callPackage ../tools/backup/zrepl {
|
||||
buildGoModule = buildGo118Module; # nixosTests.zrepl fails with 1.19
|
||||
};
|
||||
|
||||
uhubctl = callPackage ../tools/misc/uhubctl {};
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue