movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse source
This commit is contained in:
Martin Weinelt 2022-10-10 21:45:18 +02:00
commit 294201004f
73 changed files with 577 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/programs/ssh.nix
View file

@ -14,6 +14,7 @@ let
'' ''
#! ${pkgs.runtimeShell} -e #! ${pkgs.runtimeShell} -e
export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')" 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} "$@" exec ${askPassword} "$@"
''; '';

81
nixos/modules/services/continuous-integration/github-runner.nix
View file

@ -200,46 +200,65 @@ in
${lines} ${lines}
''; '';
currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json";
runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" ] cfg; runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" ] cfg;
newConfigPath = builtins.toFile "${svcName}-config.json" (builtins.toJSON runnerRegistrationConfig); 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 = [ runnerCredFiles = [
".credentials" ".credentials"
".credentials_rsaparams" ".credentials_rsaparams"
".runner" ".runner"
]; ];
unconfigureRunner = writeScript "unconfigure" '' unconfigureRunner = writeScript "unconfigure" ''
differs= copy_tokens() {
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 the configured token file to the state dir and allow the service user to read the file # 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 # 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 fi
''; '';
configureRunner = writeScript "configure" '' configureRunner = writeScript "configure" ''
if [[ -e "$STATE_DIRECTORY/${newConfigTokenFilename}" ]]; then if [[ -e "${newConfigTokenPath}" ]]; then
echo "Configuring GitHub Actions Runner" echo "Configuring GitHub Actions Runner"
args=( 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 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 # 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 if [[ "$token" =~ ^ghp_* ]]; then
args+=(--pat "$token") args+=(--pat "$token")
else else
@ -271,7 +290,7 @@ in
rm -rf "$STATE_DIRECTORY/_diag/" rm -rf "$STATE_DIRECTORY/_diag/"
# Cleanup token from config # Cleanup token from config
rm "$STATE_DIRECTORY/${newConfigTokenFilename}" rm "${newConfigTokenPath}"
# Symlink to new config # Symlink to new config
ln -s '${newConfigPath}' "${currentConfigPath}" ln -s '${newConfigPath}' "${currentConfigPath}"
@ -305,8 +324,8 @@ in
WorkingDirectory = runtimeDir; WorkingDirectory = runtimeDir;
InaccessiblePaths = [ InaccessiblePaths = [
# Token file path given in the configuration # Token file path given in the configuration, if visible to the service
cfg.tokenFile "-${cfg.tokenFile}"
# Token file in the state directory # Token file in the state directory
"${stateDir}/${currentConfigTokenFilename}" "${stateDir}/${currentConfigTokenFilename}"
]; ];

20
nixos/modules/virtualisation/virtualbox-host.nix
View file

@ -104,16 +104,18 @@ in
group = "vboxusers"; group = "vboxusers";
setuid = true; setuid = true;
}; };
executables = [
"VBoxHeadless"
"VBoxNetAdpCtl"
"VBoxNetDHCP"
"VBoxNetNAT"
"VBoxVolInfo"
] ++ (lib.optionals (!cfg.headless) [
"VBoxSDL"
"VirtualBoxVM"
]);
in mkIf cfg.enableHardening in mkIf cfg.enableHardening
(builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) [ (builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) executables));
"VBoxHeadless"
"VBoxNetAdpCtl"
"VBoxNetDHCP"
"VBoxNetNAT"
"VBoxSDL"
"VBoxVolInfo"
"VirtualBoxVM"
]));
users.groups.vboxusers.gid = config.ids.gids.vboxusers; users.groups.vboxusers.gid = config.ids.gids.vboxusers;

24
pkgs/applications/editors/eclipse/default.nix
View file

@ -14,11 +14,11 @@
let let
platform_major = "4"; platform_major = "4";
platform_minor = "24"; platform_minor = "25";
year = "2022"; year = "2022";
month = "06"; #release month month = "09"; #release month
buildmonth = "06"; #sometimes differs from release month buildmonth = "08"; #sometimes differs from release month
timestamp = "${year}${buildmonth}070700"; timestamp = "${year}${buildmonth}311800";
gtk = gtk3; gtk = gtk3;
in rec { in rec {
@ -38,7 +38,7 @@ in rec {
src = src =
fetchurl { 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"; 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 = src =
fetchurl { 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"; 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 = src =
fetchurl { 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"; 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 = src =
fetchurl { 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"; 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 = src =
fetchurl { 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"; 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 = src =
fetchurl { 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"; 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 = src =
fetchurl { 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"; 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 = src =
fetchurl { 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"; 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=";
}; };
}; };

8
pkgs/applications/editors/neovim/neovide/default.nix
View file

@ -27,6 +27,7 @@
, ApplicationServices , ApplicationServices
, AppKit , AppKit
, Carbon , Carbon
, removeReferencesTo
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "neovide"; pname = "neovide";
@ -80,6 +81,7 @@ rustPlatform.buildRustPackage rec {
python2 # skia-bindings python2 # skia-bindings
python3 # rust-xcb python3 # rust-xcb
llvmPackages.clang # skia llvmPackages.clang # skia
removeReferencesTo
] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; ] ++ lib.optionals stdenv.isDarwin [ xcbuild ];
# All tests passes but at the end cargo prints for unknown reason: # All tests passes but at the end cargo prints for unknown reason:
@ -115,6 +117,10 @@ rustPlatform.buildRustPackage rec {
xorg.libXi xorg.libXi
] ++ lib.optionals enableWayland [ wayland ]); ] ++ lib.optionals enableWayland [ wayland ]);
in '' in ''
# library skia embeds the path to its sources
remove-references-to -t "$SKIA_SOURCE_DIR" \
$out/bin/neovide
wrapProgram $out/bin/neovide \ wrapProgram $out/bin/neovide \
--prefix LD_LIBRARY_PATH : ${libPath} --prefix LD_LIBRARY_PATH : ${libPath}
''; '';
@ -128,6 +134,8 @@ rustPlatform.buildRustPackage rec {
install -m444 -Dt $out/share/applications assets/neovide.desktop install -m444 -Dt $out/share/applications assets/neovide.desktop
''; '';
disallowedReferences = [ SKIA_SOURCE_DIR ];
meta = with lib; { meta = with lib; {
description = "This is a simple graphical user interface for Neovim."; description = "This is a simple graphical user interface for Neovim.";
homepage = "https://github.com/Kethku/neovide"; homepage = "https://github.com/Kethku/neovide";

24
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -225,8 +225,8 @@ let
mktplcRef = { mktplcRef = {
name = "vscode-apollo"; name = "vscode-apollo";
publisher = "apollographql"; publisher = "apollographql";
version = "1.19.9"; version = "1.19.11";
sha256 = "sha256-iJpzNKcuQrfq4Z0LXuadt6OKXelBbDQg/vuc7NJ2I5o="; sha256 = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U=";
}; };
meta = with lib; { meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";
@ -673,8 +673,8 @@ let
mktplcRef = { mktplcRef = {
name = "vscode-eslint"; name = "vscode-eslint";
publisher = "dbaeumer"; publisher = "dbaeumer";
version = "2.2.2"; version = "2.2.6";
sha256 = "sha256-llalyQXl+k/ugZq+Ti9mApHRqAGu6QyoMP51GtZnRJ4="; sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ=";
}; };
meta = { meta = {
license = lib.licenses.mit; license = lib.licenses.mit;
@ -698,8 +698,8 @@ let
mktplcRef = { mktplcRef = {
name = "vscode-markdownlint"; name = "vscode-markdownlint";
publisher = "DavidAnson"; publisher = "DavidAnson";
version = "0.47.0"; version = "0.48.1";
sha256 = "sha256-KtDJo8rhQXkZtJz93E+J7eNiAIcLk4e5qKDLoR3DoGw="; sha256 = "sha256-3TpZGvas+pfabHayaA6Yd9nOO2MbfXbCvCiTcbja9Vo=";
}; };
meta = with lib; { meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";
@ -934,8 +934,8 @@ let
mktplcRef = { mktplcRef = {
name = "prettier-vscode"; name = "prettier-vscode";
publisher = "esbenp"; publisher = "esbenp";
version = "9.8.0"; version = "9.9.0";
sha256 = "sha256-+8lEuQD73w+urAv2Tw0b+q6oQ66+gLgMPe3Luln9cuY="; sha256 = "sha256-Yr7M4HyRNcsBf8YglQLvyZjblMhtkpMP+f9SH8oUav0=";
}; };
meta = with lib; { meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
@ -1881,8 +1881,8 @@ let
mktplcRef = { mktplcRef = {
name = "color-highlight"; name = "color-highlight";
publisher = "naumovs"; publisher = "naumovs";
version = "2.5.0"; version = "2.6.0";
sha256 = "sha256-dYMDV84LEGXUjt/fbsSy3BVM5SsBHcPaDDll8KjPIWY="; sha256 = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs=";
}; };
meta = with lib; { meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog"; changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog";
@ -2345,8 +2345,8 @@ let
mktplcRef = { mktplcRef = {
publisher = "stkb"; publisher = "stkb";
name = "rewrap"; name = "rewrap";
version = "1.16.1"; version = "1.16.3";
sha256 = "sha256-OTPNbwoQmKd73g8IwLKMIbe6c7E2jKNkzwuBU/f8dmY="; sha256 = "sha256-WHeLTN992ltEZw2W7B3sJrHfAFsOGMq3llV4C0hXLNA=";
}; };
meta = with lib; { meta = with lib; {
changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md";

4
pkgs/applications/editors/vscode/extensions/rescript/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, vscode-utils, callPackage }: { lib, stdenv, vscode-utils, callPackage }:
let let
version = "1.6.0"; version = "1.8.1";
rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; };
arch = arch =
if stdenv.isLinux then "linux" if stdenv.isLinux then "linux"
@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
name = "rescript-vscode"; name = "rescript-vscode";
publisher = "chenglou92"; publisher = "chenglou92";
inherit version; inherit version;
sha256 = "sha256-/Nv+uyTkJQVaPKIDRr1P/Z5vsituXpP48/sDn3FUEeA="; sha256 = "sha256-XZG0PRzc3wyAVq9tQeGDlaUZg5YAgkPxJ3NsrdUHoOk=";
}; };
postPatch = '' postPatch = ''
rm -r ${analysisDir} rm -r ${analysisDir}

2
pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation {
owner = "rescript-lang"; owner = "rescript-lang";
repo = "rescript-vscode"; repo = "rescript-vscode";
rev = version; rev = version;
sha256 = "sha256-O5kZCnhtMcevPTs5UxhIXx124WQf1VvF2WMVHjMEQZc="; sha256 = "sha256-a8otK0BxZbl0nOp4QWQRkjb5fM85JA4nVkLuKAz71xU=";
}; };
nativeBuildInputs = [ ocaml dune_3 ]; nativeBuildInputs = [ ocaml dune_3 ];

6
pkgs/applications/misc/dbeaver/default.nix
View file

@ -23,16 +23,16 @@
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
}) rec { }) rec {
pname = "dbeaver"; pname = "dbeaver";
version = "22.2.0"; # When updating also update mvnSha256 version = "22.2.2"; # When updating also update mvnSha256
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dbeaver"; owner = "dbeaver";
repo = "dbeaver"; repo = "dbeaver";
rev = version; rev = version;
sha256 = "sha256-T2S5qoOqjqJGf7M4h+IFO+bBER3aNcbxC7CY1fJFqpg="; sha256 = "sha256-TUdtrhQ1JzqZx+QNauNA1P/+WDSSeOGIgGX3SdS0JTI=";
}; };
mvnSha256 = "HdIhENml6W4U+gM7ODxXinbex5o1X4YhWGTct5rpL5c="; mvnSha256 = "uu7UNRIuAx2GOh4+YxxoGRcV5QO8C72q32e0ynJdgFo=";
mvnParameters = "-P desktop,all-platforms"; mvnParameters = "-P desktop,all-platforms";
nativeBuildInputs = [ nativeBuildInputs = [

10
pkgs/applications/networking/calls/default.nix
View file

@ -25,6 +25,7 @@
, gtk-doc , gtk-doc
, docbook-xsl-nons , docbook-xsl-nons
, docbook_xml_dtd_43 , docbook_xml_dtd_43
, docutils
, gobject-introspection , gobject-introspection
, gst_all_1 , gst_all_1
, sofia_sip , sofia_sip
@ -32,15 +33,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "calls"; pname = "calls";
version = "42.0"; version = "43.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = pname; repo = pname;
rev = version; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-ASKK9PB5FAD10CR5O+L2WgMjCzmIalithHL8jV0USiM="; hash = "sha256-fvG9N6HuuO8BMH8MJRquMSe1oEPNmX/pzsJX5yzs1CY=";
}; };
outputs = [ "out" "devdoc" ]; outputs = [ "out" "devdoc" ];
@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
gtk-doc gtk-doc
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_43 docbook_xml_dtd_43
docutils
]; ];
buildInputs = [ buildInputs = [
@ -104,7 +106,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A phone dialer and call handler"; 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."; 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; license = licenses.gpl3Plus;
maintainers = with maintainers; [ craigem lheckemann tomfitzhenry ]; maintainers = with maintainers; [ craigem lheckemann tomfitzhenry ];
platforms = platforms.linux; platforms = platforms.linux;

8
pkgs/applications/networking/cluster/tanka/default.nix
View file

@ -2,22 +2,22 @@
buildGoModule rec { buildGoModule rec {
pname = "tanka"; pname = "tanka";
version = "0.22.1"; version = "0.23.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grafana"; owner = "grafana";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-MMQv3/Ft6/FUueGEXGqYWAYy4zc2R6LASbh2x7eJNdQ="; sha256 = "sha256-exPFlcbku51Bs/YISRyjl8iwLYRVS9ltRQPpd/QpnWk=";
}; };
vendorSha256 = "sha256-QwtcWzJbusa8BxtG5xmGUgqG0qCMSpkzbmes/x3lnWc="; vendorSha256 = "sha256-eo4B2p5Yo1r5jro49mSetp9AFYhcTXbyy7wGuaFwbb0=";
doCheck = false; doCheck = false;
subPackages = [ "cmd/tk" ]; 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 ]; nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/cluster/tilt/default.nix
View file

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself /* 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 running in development environment and try to serve assets from the
source tree, which is not there once build completes. */ source tree, which is not there once build completes. */
version = "0.30.8"; version = "0.30.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tilt-dev"; owner = "tilt-dev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-dVaLeooTEiKYWp9CmEcSFOunLyJecB8jR9LIKRO8b9g="; sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4=";
}; };
vendorSha256 = null; vendorSha256 = null;

4
pkgs/applications/networking/instant-messengers/linphone/default.nix
View file

@ -33,7 +33,7 @@
mkDerivation rec { mkDerivation rec {
pname = "linphone-desktop"; pname = "linphone-desktop";
version = "4.4.9"; version = "4.4.10";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.linphone.org"; domain = "gitlab.linphone.org";
@ -41,7 +41,7 @@ mkDerivation rec {
group = "BC"; group = "BC";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-xvKkFMZ7rUyEjnQK7rBkrzO8fhfHjpQ1DHQBUlizZ+o="; sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA=";
}; };
patches = [ patches = [

25
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -1,20 +1,25 @@
{ stdenv, fetchurl, lib { stdenv, fetchurl, lib
, ncurses, openssl, aspell, gnutls, gettext , ncurses, openssl, aspell, gnutls, gettext
, zlib, curl, pkg-config, libgcrypt , zlib, curl, pkg-config, libgcrypt
, cmake, makeWrapper, libobjc, libresolv, libiconv , cmake, libobjc, libresolv, libiconv
, asciidoctor # manpages , asciidoctor # manpages
, enableTests ? !stdenv.isDarwin, cpputest
, guileSupport ? true, guile , guileSupport ? true, guile
, luaSupport ? true, lua5 , luaSupport ? true, lua5
, perlSupport ? true, perl , perlSupport ? true, perl
, pythonSupport ? true, python3Packages , pythonSupport ? true, python3Packages
, rubySupport ? true, ruby , rubySupport ? true, ruby
, tclSupport ? true, tcl , tclSupport ? true, tcl
, phpSupport ? !stdenv.isDarwin, php, systemd, libxml2, pcre2, libargon2
, extraBuildInputs ? [] , extraBuildInputs ? []
, fetchpatch
}: }:
let let
inherit (python3Packages) python; inherit (python3Packages) python;
php-embed = php.override {
embedSupport = true;
apxs2Support = false;
};
plugins = [ plugins = [
{ name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; } { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
{ name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; } { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
@ -22,35 +27,37 @@ let
{ name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; } { name = "guile"; enabled = guileSupport; cmakeFlag = "ENABLE_GUILE"; buildInputs = [ guile ]; }
{ name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; } { name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; buildInputs = [ lua5 ]; }
{ name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; } { 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; enabledPlugins = builtins.filter (p: p.enabled) plugins;
in in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.6"; version = "3.7";
pname = "weechat"; pname = "weechat";
hardeningEnable = [ "pie" ]; hardeningEnable = [ "pie" ];
src = fetchurl { src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; 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; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
cmakeFlags = with lib; [ cmakeFlags = with lib; [
"-DENABLE_MAN=ON" "-DENABLE_MAN=ON"
"-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update "-DENABLE_DOC=OFF" # TODO(@ncfavier): 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_TESTS=${if enableTests then "ON" else "OFF"}"
"-DENABLE_PHP=OFF"
] ]
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"]
++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ++ 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; [ buildInputs = with lib; [
ncurses openssl aspell gnutls gettext zlib curl ncurses openssl aspell gnutls gettext zlib curl
libgcrypt ] libgcrypt ]
@ -85,7 +92,7 @@ let
on https://nixos.org/nixpkgs/manual/#sec-weechat . on https://nixos.org/nixpkgs/manual/#sec-weechat .
''; '';
license = lib.licenses.gpl3; license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ lovek323 ]; maintainers = with lib.maintainers; [ ncfavier ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

8
pkgs/applications/networking/irc/weechat/wrapper.nix
View file

@ -7,7 +7,11 @@ weechat:
let let
wrapper = { wrapper = {
installManPages ? true 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 let
@ -21,6 +25,7 @@ let
''; '';
withPackages = pkgsFun: (python // { withPackages = pkgsFun: (python // {
extraEnv = '' extraEnv = ''
${python.extraEnv}
export PYTHONHOME="${python3Packages.python.withPackages pkgsFun}" export PYTHONHOME="${python3Packages.python.withPackages pkgsFun}"
''; '';
}); });
@ -40,6 +45,7 @@ let
ruby = simplePlugin "ruby"; ruby = simplePlugin "ruby";
guile = simplePlugin "guile"; guile = simplePlugin "guile";
lua = simplePlugin "lua"; lua = simplePlugin "lua";
php = simplePlugin "php";
}; };
config = configure { inherit availablePlugins; }; config = configure { inherit availablePlugins; };

4
pkgs/applications/networking/p2p/qbittorrent/default.nix
View file

@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null);
with lib; with lib;
mkDerivation rec { mkDerivation rec {
pname = "qbittorrent"; pname = "qbittorrent";
version = "4.4.3.1"; version = "4.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qbittorrent"; owner = "qbittorrent";
repo = "qBittorrent"; repo = "qBittorrent";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "sha256-byA6bzGdigmVptUFdgBjyg6Oimn5L6l1DDOuuBjwO0s="; sha256 = "sha256-EgRDNOJ4szdZA5ipOuGy2R0oVdjWcuqPU3ecU3ZNK3g=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/applications/networking/protonvpn-cli/default.nix
View file

@ -9,7 +9,7 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "protonvpn-cli"; pname = "protonvpn-cli";
version = "3.12.0"; version = "3.13.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
@ -17,8 +17,8 @@ buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "protonvpn"; owner = "protonvpn";
repo = "linux-cli"; repo = "linux-cli";
rev = version; rev = "refs/tags/${version}";
sha256 = "sha256-z0ewAqf8hjyExqBN8KBsDwJ+SA/pIBYZhKtXF9M65HE="; sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/applications/networking/protonvpn-gui/default.nix
View file

@ -18,13 +18,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "protonvpn-gui"; pname = "protonvpn-gui";
version = "1.10.0"; version = "1.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ProtonVPN"; owner = "ProtonVPN";
repo = "linux-app"; repo = "linux-app";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-6IRkJKtdQQ9Yixb9CkT3tGNY0MYFZyvz1/6buZo5eYU="; sha256 = "sha256-aov7Mkb3bGlS3q9zIWkeuWbrvfP1Gm2DhaeTprQNbeI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/window-managers/dwm/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dwm"; pname = "dwm";
version = "6.3"; version = "6.4";
src = fetchurl { src = fetchurl {
url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz"; url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz";
sha256 = "utqgKFKbH7of1/moTztk8xGQRmyFgBG1Pi97cMajB40="; sha256 = "sha256-+pwNaaWESFB2z8GICf1wXlwggNr7E9XnKaNkbKdwOm4=";
}; };
buildInputs = [ libX11 libXinerama libXft ]; buildInputs = [ libX11 libXinerama libXft ];

8
pkgs/applications/window-managers/sway/wsr.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "swaywsr"; pname = "swaywsr";
version = "1.1.0"; version = "1.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pedroscaff"; owner = "pedroscaff";
repo = pname; repo = pname;
rev = "6c4671c702f647395d983aaf607286db1c692db6"; rev = "0276b43824af5c40085248c1275feaa372c412a5";
sha256 = "0bmpbhyvgnbi5baj6v0wdxpdh9cnlzvcc44vh3vihmzsp6i5q05a"; sha256 = "sha256-KCMsn9uevmmjHkP4zwfaWSUI10JgT3M91iqmXI9Cv2Y=";
}; };
cargoSha256 = "1pmkyw60ggn5filb47nyf97g1arrw7nfa4yjndnx35zw12mkj61d"; cargoSha256 = "sha256-j/9p28ezy8m5NXReOmG1oryWd+GcY/fNW6i7OrEvjSc=";
nativeBuildInputs = [ python3 ]; nativeBuildInputs = [ python3 ];
buildInputs = [ libxcb ]; buildInputs = [ libxcb ];

15
pkgs/build-support/writers/default.nix
View file

@ -119,6 +119,21 @@ let
writeDashBin = name: writeDashBin = name:
writeDash "/bin/${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";
check = "${pkgs.fish}/bin/fish --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) # writeHaskell takes a name, an attrset with libraries and haskell version (both optional)
# and some haskell source code and returns an executable. # and some haskell source code and returns an executable.
# #

12
pkgs/build-support/writers/test.nix
View file

@ -22,6 +22,12 @@ let
test '~' = '~' && echo 'success' test '~' = '~' && echo 'success'
''; '';
fish = writeFishBin "test-writers-fish-bin" ''
if test "test" = "test"
echo "success"
end
'';
rust = writeRustBin "test-writers-rust-bin" {} '' rust = writeRustBin "test-writers-rust-bin" {} ''
fn main(){ fn main(){
println!("success") println!("success")
@ -94,6 +100,12 @@ let
test '~' = '~' && echo 'success' test '~' = '~' && echo 'success'
''; '';
fish = writeFish "test-writers-fish" ''
if test "test" = "test"
echo "success"
end
'';
haskell = writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } '' haskell = writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } ''
import Data.Default import Data.Default

118
pkgs/desktops/gnome/extensions/extensions.json
View file

File diff suppressed because one or more lines are too long

12
pkgs/development/compilers/llvm/13/lldb/cpu_subtype_arm64e_replacement.patch Normal file
View file

@ -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;

19
pkgs/development/compilers/llvm/13/lldb/default.nix
View file

@ -20,6 +20,7 @@
, Cocoa , Cocoa
, lit , lit
, makeWrapper , makeWrapper
, darwin
, enableManpages ? false , enableManpages ? false
}: }:
@ -38,7 +39,22 @@ stdenv.mkDerivation (rec {
substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir
'') '')
./gnu-install-dirs.patch ./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" ]; outputs = [ "out" "lib" "dev" ];
@ -102,7 +118,6 @@ stdenv.mkDerivation (rec {
''; '';
meta = llvm_meta // { meta = llvm_meta // {
broken = stdenv.isDarwin;
homepage = "https://lldb.llvm.org/"; homepage = "https://lldb.llvm.org/";
description = "A next-generation high-performance debugger"; description = "A next-generation high-performance debugger";
longDescription = '' longDescription = ''

12
pkgs/development/compilers/llvm/14/lldb/cpu_subtype_arm64e_replacement.patch Normal file
View file

@ -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;

18
pkgs/development/compilers/llvm/14/lldb/default.nix
View file

@ -20,6 +20,7 @@
, Cocoa , Cocoa
, lit , lit
, makeWrapper , makeWrapper
, darwin
, enableManpages ? false , enableManpages ? false
, lua5_3 , lua5_3
}: }:
@ -44,7 +45,21 @@ stdenv.mkDerivation (rec {
substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir
'') '')
./gnu-install-dirs.patch ./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" ]; outputs = [ "out" "lib" "dev" ];
@ -116,7 +131,6 @@ stdenv.mkDerivation (rec {
larger LLVM Project, such as the Clang expression parser and LLVM larger LLVM Project, such as the Clang expression parser and LLVM
disassembler. disassembler.
''; '';
broken = stdenv.isDarwin; # error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E'
}; };
} // lib.optionalAttrs enableManpages { } // lib.optionalAttrs enableManpages {
pname = "lldb-manpages"; pname = "lldb-manpages";

20
pkgs/development/interpreters/bats/default.nix
View file

@ -10,7 +10,7 @@
, hostname , hostname
, parallel , parallel
, flock , flock
, ps , procps
, bats , bats
, lsof , lsof
, callPackages , callPackages
@ -22,13 +22,13 @@
resholve.mkDerivation rec { resholve.mkDerivation rec {
pname = "bats"; pname = "bats";
version = "1.7.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bats-core"; owner = "bats-core";
repo = "bats-core"; repo = "bats-core";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-joNne/dDVCNtzdTQ64rK8GimT+DOWUa7f410hml2s8Q="; sha256 = "sha256-dnNB82vEv49xzmH3r9dLL4aMIi61HQDr0gVin2H+jOw=";
}; };
patchPhase = '' patchPhase = ''
@ -58,11 +58,13 @@ resholve.mkDerivation rec {
flock flock
"lib/bats-core" "lib/bats-core"
"libexec/bats-core" "libexec/bats-core"
procps
]; ];
fake = { fake = {
external = [ external = [
"greadlink" "greadlink"
"shlock" "shlock"
"pkill" # procps doesn't supply this on darwin
]; ];
}; };
fix = { fix = {
@ -84,8 +86,8 @@ resholve.mkDerivation rec {
"${placeholder "out"}/lib/bats-core/warnings.bash" "${placeholder "out"}/lib/bats-core/warnings.bash"
"$setup_suite_file" # via cli arg "$setup_suite_file" # via cli arg
]; ];
"$report_formatter" = true; "$interpolated_report_formatter" = true;
"$formatter" = true; "$interpolated_formatter" = true;
"$pre_command" = true; "$pre_command" = true;
"$BATS_TEST_NAME" = true; "$BATS_TEST_NAME" = true;
"${placeholder "out"}/libexec/bats-core/bats-exec-test" = true; "${placeholder "out"}/libexec/bats-core/bats-exec-test" = true;
@ -162,7 +164,7 @@ resholve.mkDerivation rec {
ncurses ncurses
parallel # skips some tests if it can't detect parallel # skips some tests if it can't detect
flock # skips some tests if it can't detect flock # skips some tests if it can't detect
ps procps
] ++ lib.optionals stdenv.isDarwin [ lsof ]; ] ++ lib.optionals stdenv.isDarwin [ lsof ];
inherit doInstallCheck; inherit doInstallCheck;
installCheckPhase = '' installCheckPhase = ''
@ -172,6 +174,12 @@ resholve.mkDerivation rec {
# skip tests that assume bats `install.sh` will be in BATS_ROOT # skip tests that assume bats `install.sh` will be in BATS_ROOT
rm test/root.bats 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 # test generates file with absolute shebang dynamically
substituteInPlace test/install.bats --replace \ substituteInPlace test/install.bats --replace \
"/usr/bin/env bash" "${bash}/bin/bash" "/usr/bin/env bash" "${bash}/bin/bash"

4
pkgs/development/interpreters/ivy/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ivy"; pname = "ivy";
version = "0.1.13"; version = "0.2.8";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "robpike"; owner = "robpike";
repo = "ivy"; repo = "ivy";
sha256 = "sha256-IiQrmmHitKUItm/ZSTQ3jGO3ls8vPPexyOtUvfq3yeU="; sha256 = "sha256-pb/dJfEXz13myT6XadCg0kKd+n9bcHNBc84ES+hDw2Y=";
}; };
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";

4
pkgs/development/libraries/plib/default.nix
View file

@ -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"; url = "https://sources.debian.net/data/main/p/plib/1.8.5-7/debian/patches/05_CVE-2012-4552.diff";
sha256 = "0b6cwdwii5b5vy78sbw5cw1s96l4jyzr4dk69v63pa0wwi2b5dki"; 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 = [ propagatedBuildInputs = [

7
pkgs/development/libraries/tcllib/default.nix
View file

@ -2,17 +2,18 @@
tcl.mkTclDerivation rec { tcl.mkTclDerivation rec {
pname = "tcllib"; pname = "tcllib";
version = "1.20"; version = "1.21";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz";
sha256 = "0wax281h6ksz974a5qpfgf9y34lmlpd8i87lkm1w94ybbd3rgc73"; sha256 = "sha256-RrK7XsgEk2OuAWRa8RvaO9tdsQYp6AfYHRrUbNG+rVA=";
}; };
meta = { meta = {
homepage = "https://sourceforge.net/projects/tcllib/"; homepage = "https://core.tcl-lang.org/tcllib/";
description = "Tcl-only library of standard routines for Tcl"; description = "Tcl-only library of standard routines for Tcl";
license = lib.licenses.tcltk; license = lib.licenses.tcltk;
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ fgaz ];
}; };
} }

14
pkgs/development/python-modules/aiopvapi/default.nix
View file

@ -9,17 +9,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiopvapi"; pname = "aiopvapi";
version = "2.0.2"; version = "2.0.3";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sander76"; owner = "sander76";
repo = "aio-powerview-api"; 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}"; rev = "refs/tags/v${version}";
sha256 = "sha256-OengPrUBaYzpLSWEU9Jc6GLx863YJfqRe64676oQ81Y="; hash = "sha256-RBZuYgTySVL1YtyZ4ZJZly2zvWt/5pZ99/aPCwZ91xQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -31,13 +30,6 @@ buildPythonPackage rec {
pytestCheckHook 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 = [ pythonImportsCheck = [
"aiopvapi" "aiopvapi"
]; ];

4
pkgs/development/python-modules/homematicip/default.nix
View file

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "homematicip"; pname = "homematicip";
version = "1.0.8"; version = "1.0.9";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "hahn-th"; owner = "hahn-th";
repo = "homematicip-rest-api"; repo = "homematicip-rest-api";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-xltdHxmCiVQopyVw+a/Ra9NaWIujTfqvx7hBx7l104w="; hash = "sha256-pQVSbR4MLbyHQRAoCFOMnOrhuAnGRMyiXm1szHvANuA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

5
pkgs/development/python-modules/huawei-lte-api/default.nix
View file

@ -10,7 +10,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "huawei-lte-api"; pname = "huawei-lte-api";
version = "1.6.2"; version = "1.6.3";
format = "setuptools";
disabled = pythonOlder "3.4"; disabled = pythonOlder "3.4";
@ -18,7 +19,7 @@ buildPythonPackage rec {
owner = "Salamek"; owner = "Salamek";
repo = "huawei-lte-api"; repo = "huawei-lte-api";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-BZn9iBMOd1vyukxiLd8GPKrq/H+gqQtSYvIgniWJLNM="; hash = "sha256-nF9NOf7H9a3wLA/zgUlk8+T0ID1sYGuu/H7axdJ1P3M=";
}; };
postPatch = '' postPatch = ''

4
pkgs/development/python-modules/meshtastic/default.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "meshtastic"; pname = "meshtastic";
version = "1.3.37"; version = "1.3.39";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "meshtastic"; owner = "meshtastic";
repo = "Meshtastic-python"; repo = "Meshtastic-python";
rev = version; rev = version;
hash = "sha256-UcB8f0Ywmzm/EED4NECO4UkaxhtnYUpfUJPvkWIcKNg="; hash = "sha256-ymh8PNis9qh6mgc2IrDiFSwGm9sxC/6YWTxQ9HD0TJo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/pymsteams/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymsteams"; pname = "pymsteams";
version = "0.2.1"; version = "0.2.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "rveachkc"; owner = "rveachkc";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "03lna3p8qkmsmaz2nzl76dnz6rci08wsybvr151zl8wwpjdj1sam"; sha256 = "sha256-H1AEjUnEK+seKsnFnHpn1/aHxXcbyz67NbzhlGDtbk4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/pysnmplib/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pysnmplib"; pname = "pysnmplib";
version = "5.0.18"; version = "5.0.19";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "pysnmp"; owner = "pysnmp";
repo = "pysnmp"; repo = "pysnmp";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-sruZWwvcpAACRPXAN+WKFsdOr9EXo4Ipu8H5I22iuRg="; hash = "sha256-xplQ12LLtTsU1AfEmWDwpbTK9NBxoLIfpF/QzA8Xot0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sphinxcontrib-spelling"; pname = "sphinxcontrib-spelling";
version = "7.6.0"; version = "7.6.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-KSzX4fc6djRRaTtNSMm97RUQhPapHlM3cz6fqHFdIOw="; hash = "sha256-REhXV53WGRTzlwrRBGx0v2dYE29+FEtGypwoEIhw9Qg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/teslajsonpy/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "teslajsonpy"; pname = "teslajsonpy";
version = "2.4.4"; version = "2.4.5";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zabuldon"; owner = "zabuldon";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-MTVL/yDKCqeSdBe3opdor+aBfgsO/FgOq6jPcFEK5rY="; sha256 = "sha256-fsZBHJUX/DytSO680hiXhS6+jCKOKz1n+PxZa9kyWnc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

43
pkgs/development/python-modules/transmission-rpc/default.nix
View file

@ -1,50 +1,53 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub
, fetchPypi , fetchPypi
, six , poetry-core
, typing-extensions , pydantic
, pytestCheckHook
, pythonOlder
, pytz
, requests , requests
, yarl , yarl
, pythonOlder
, fetchFromGitHub
, poetry-core
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "transmission-rpc"; pname = "transmission-rpc";
version = "3.3.2"; version = "3.4.0";
disabled = pythonOlder "3.6";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Trim21"; owner = "Trim21";
repo = "transmission-rpc"; repo = "transmission-rpc";
rev = "refs/tags/v${version}"; 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 = [ nativeBuildInputs = [
poetry-core poetry-core
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
six pydantic
typing-extensions
requests requests
];
checkInputs = [
pytz
pytestCheckHook
yarl yarl
]; ];
# no tests pythonImportsCheck = [
doCheck = false; "transmission_rpc"
];
pythonImportsCheck = [ "transmission_rpc" ]; disabledTests = [
# Tests require a running Transmission instance
"test_real"
];
meta = with lib; { meta = with lib; {
description = "Python module that implements the Transmission bittorent client RPC protocol"; description = "Python module that implements the Transmission bittorent client RPC protocol";

4
pkgs/development/python-modules/typed-settings/default.nix
View file

@ -13,13 +13,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "typed-settings"; pname = "typed-settings";
version = "1.1.0"; version = "1.1.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-Ja2ZLqzJSSvK5hIMhayMztJta/Jc3tmb2tzdlxageAs="; sha256 = "sha256-fbo4oj84j7Vkz2V6B/EqoyRl9OutSpm5Ko9Tctu2DYM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/wallbox/default.nix
View file

@ -9,13 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "wallbox"; pname = "wallbox";
version = "0.4.9"; version = "0.4.10";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "90e664cf7d99eb1baf20a9ff5fd415dfa14ddafabcefd606e15b5bcd25f969e9"; sha256 = "sha256-+LJ0ggRUXFfqmiDbIF2ZWL6qsE6gOzp5OKMFSY3dGG0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

34
pkgs/development/python-modules/yaspin/default.nix
View file

@ -1,27 +1,47 @@
{ buildPythonPackage { lib
, buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, lib
, poetry-core , poetry-core
, pytestCheckHook
, pythonOlder
, termcolor , termcolor
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "yaspin"; pname = "yaspin";
version = "2.1.0"; version = "2.2.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pavdmyt"; owner = "pavdmyt";
repo = pname; repo = pname;
rev = "v${version}"; 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; { meta = with lib; {
description = "Yet Another Terminal Spinner"; description = "Yet Another Terminal Spinner";

7
pkgs/development/tools/b4/default.nix
View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "b4"; pname = "b4";
version = "0.8.0"; version = "0.10.1";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-fVHW27KIBT/GQ7hOx67qpVlOHLjHwdQcYl2XgCPTvoQ="; sha256 = "zESWjmKz4DaiGg1VmbDlouTNm71YqIr1y9MCev72tEQ=";
}; };
# tests make dns requests and fails # tests make dns requests and fails
@ -17,12 +17,13 @@ python3Packages.buildPythonApplication rec {
dnspython dnspython
dkimpy dkimpy
patatt patatt
git-filter-repo
]; ];
meta = with lib; { meta = with lib; {
homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about";
license = licenses.gpl2Only; license = licenses.gpl2Only;
description = "A helper utility to work with patches made available via a public-inbox archive"; description = "A helper utility to work with patches made available via a public-inbox archive";
maintainers = with maintainers; [ jb55 ]; maintainers = with maintainers; [ jb55 qyliss ];
}; };
} }

6
pkgs/development/tools/build-managers/bloop/default.nix
View file

@ -10,7 +10,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bloop"; pname = "bloop";
version = "1.5.3"; version = "1.5.4";
platform = platform =
if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
bloop-binary = fetchurl rec { bloop-binary = fetchurl rec {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
sha256 = sha256 =
if stdenv.isLinux && stdenv.isx86_64 then "sha256-Ub9o5XbMRTB1QET0LP3XAgUBcO7q7XfB8bI9bu/lQGw=" if stdenv.isLinux && stdenv.isx86_64 then "sha256-q8K5dzzLhQ8T6VzhoJ5iGk0yz9pOPrP/V4eiTwyzlgo="
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-Z4XkbPb2xXbYweRx7NY76a9twjP6aRWz1VoqXZFe9wo=" else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-7zTKOAnlQWk9BbdBZLBfSLyBhFqhkscbcHN1zVTjDjQ="
else throw "unsupported platform"; else throw "unsupported platform";
}; };

4
pkgs/development/tools/build-managers/mill/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mill"; pname = "mill";
version = "0.10.7"; version = "0.10.8";
src = fetchurl { src = fetchurl {
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
hash = "sha256-pRyuTxQWRnGBTasdskIZ0F1LGgwE+Y5ksHsE1Rmp1Bg="; hash = "sha256-5mJc5cLT9xkixB8mbDYuJYel+fNeCwr1PMzU/ZCncK0=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/patatt/default.nix
View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "patatt"; pname = "patatt";
version = "0.5.0"; version = "0.6.2";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-OUDu98f3CPI/hezdcIA2ndSOfCscVthuhkqq2jr9jXo="; sha256 = "sha256-WaEq4qWL6xAZ3cJJ/lkJ5XTIrXcOMIESbytvWbsYx2s=";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
@ -23,6 +23,6 @@ python3Packages.buildPythonApplication rec {
DKIM email signature standard to include cryptographic DKIM email signature standard to include cryptographic
signatures via the X-Developer-Signature email header. signatures via the X-Developer-Signature email header.
''; '';
maintainers = with maintainers; [ yoctocell ]; maintainers = with maintainers; [ qyliss yoctocell ];
}; };
} }

4
pkgs/development/tools/pipenv/default.nix
View file

@ -23,11 +23,11 @@ let
in buildPythonApplication rec { in buildPythonApplication rec {
pname = "pipenv"; pname = "pipenv";
version = "2022.9.8"; version = "2022.10.9";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-tt//Bt6lbjut6S/CZ8LaHwgHxcewkD7vYRX9uJnCtLY="; sha256 = "sha256-MuBqtQlX2549Kpn8e+vdRF5zg9lP8rME64sz33FhTmA=";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";

6
pkgs/development/tools/ruff/default.nix
View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ruff"; pname = "ruff";
version = "0.0.63"; version = "0.0.67";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charliermarsh"; owner = "charliermarsh";
repo = pname; repo = pname;
rev = "v${version}"; 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 [ buildInputs = lib.optionals stdenv.isDarwin [
CoreServices CoreServices

32
pkgs/development/tools/rust/probe-run/default.nix
View file

@ -1,20 +1,36 @@
{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1 { lib
, libiconv, AppKit, IOKit }: , stdenv
, rustPlatform
, fetchCrate
, pkg-config
, libusb1
, libiconv
, AppKit
, IOKit
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "probe-run"; pname = "probe-run";
version = "0.3.4"; version = "0.3.5";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-xVxigZET2/7xr+bb3r80F3y0yaNV1JeGeJ2EF0GWa1A="; sha256 = "sha256-C9JxQVsS1Bv9euQ7l+p5aehiGLKdrUMcno9z8UoZKR4=";
}; };
cargoSha256 = "sha256-MK3F3Kt80Xdbbm68Jv1uh78nAj1LzJ90H54NYdn+Oms="; cargoSha256 = "sha256-kmdRwAq6EOniGHC7JhB6Iov1E4hbQbxHlOcc6gUDOhY=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [
buildInputs = [ libusb1 ] pkg-config
++ lib.optionals stdenv.isDarwin [ libiconv AppKit IOKit ]; ];
buildInputs = [
libusb1
] ++ lib.optionals stdenv.isDarwin [
libiconv
AppKit
IOKit
];
meta = with lib; { meta = with lib; {
description = "Run embedded programs just like native ones"; description = "Run embedded programs just like native ones";

6
pkgs/development/tools/rust/rust-analyzer/default.nix
View file

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped"; pname = "rust-analyzer-unwrapped";
version = "2022-10-03"; version = "2022-10-10";
cargoSha256 = "sha256-G6eCAlcsyRIuq0uOwosLO4ZrSAQvwDi36bkARjDQXSA="; cargoSha256 = "sha256-9ykD9CMvrg6WG2jyKDNdkzZejla7WCXgAxuLGGrx62g=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-lang"; owner = "rust-lang";
repo = "rust-analyzer"; repo = "rust-analyzer";
rev = version; rev = version;
sha256 = "sha256-mVf9fjQbtYbrVvQSaJOCwArWIvXHrXqVVUhP0x9ZcVY="; sha256 = "sha256-Ssoxr1ggoPsvFBsCWNQTleYLOTqx6hFKFvktzGDC51A=";
}; };
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];

4
pkgs/development/tools/wasmedge/default.nix
View file

@ -9,13 +9,13 @@
llvmPackages.stdenv.mkDerivation rec { llvmPackages.stdenv.mkDerivation rec {
pname = "wasmedge"; pname = "wasmedge";
version = "0.11.0"; version = "0.11.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WasmEdge"; owner = "WasmEdge";
repo = "WasmEdge"; repo = "WasmEdge";
rev = version; rev = version;
sha256 = "sha256-4w9+3hp1GVLx2dOTDXlUOH6FgK1jvkt12wXs4/S9UlI="; sha256 = "sha256-+rCzbw44/8mHo6v4rUuXOq4FVs/LJtSF5zhva9/LIL0=";
}; };
buildInputs = [ buildInputs = [

45
pkgs/development/tools/yamlpath/default.nix
View file

@ -1,46 +1,47 @@
{ lib { lib
, python3Packages
, fetchFromGitHub , fetchFromGitHub
, hiera-eyaml , hiera-eyaml
, python3 , python3
}: }:
let
py = python3.override { python3.pkgs.buildPythonApplication rec {
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 {
pname = "yamlpath"; pname = "yamlpath";
version = "3.6.3"; version = "3.6.7";
format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wwkimball"; owner = "wwkimball";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "4lLKMMsjVWbnfiaOzdBePOtOwPN8nui3Ux6e55YdGoo="; sha256 = "sha256-lz8n3c+NohZnkbAoF/9rHsGzXW5PWPOsJKUFqqenIRg=";
}; };
propagatedBuildInputs = with py.pkgs; [ ruamel-yaml ]; propagatedBuildInputs = with python3.pkgs; [
checkInputs = with py.pkgs; [ hiera-eyaml mock pytest-console-scripts pytestCheckHook ]; python-dateutil
ruamel-yaml
];
checkInputs = with python3.pkgs; [
hiera-eyaml
mock
pytest-console-scripts
pytestCheckHook
];
preCheck = '' preCheck = ''
export PATH=$PATH:$out/bin export PATH=$PATH:$out/bin
''; '';
pythonImportsCheck = [
"yamlpath"
];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/wwkimball/yamlpath";
description = "Command-line processors for YAML/JSON/Compatible data"; description = "Command-line processors for YAML/JSON/Compatible data";
homepage = "https://github.com/wwkimball/yamlpath";
longDescription = '' 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; license = licenses.isc;
maintainers = with maintainers; [ Flakebi ]; maintainers = with maintainers; [ Flakebi ];

4
pkgs/development/web/postman/darwin.nix
View file

@ -11,12 +11,12 @@ let
dist = { dist = {
aarch64-darwin = { aarch64-darwin = {
arch = "arm64"; arch = "arm64";
sha256 = "62b4b3c63668fa4074b35afe08c212557437ff54c742a500087c74955cec9e04"; sha256 = "sha256-zvGWkV92qDsiveS1tvkY6jHIr/Xj3ARSOqov+MCRM+o=";
}; };
x86_64-darwin = { x86_64-darwin = {
arch = "64"; arch = "64";
sha256 = "42160a3c3011f43692fcb28b37dec5f708395318681de960f0cb932cea36021f"; sha256 = "sha256-LuXC1ucEsrxqx8wAkBkot2wXbUUVp+FIQPx9/2+tfIw=";
}; };
}.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); }.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");

2
pkgs/development/web/postman/default.nix
View file

@ -2,7 +2,7 @@
let let
pname = "postman"; pname = "postman";
version = "9.25.2"; version = "9.31.0";
meta = with lib; { meta = with lib; {
homepage = "https://www.getpostman.com"; homepage = "https://www.getpostman.com";
description = "API Development Environment"; description = "API Development Environment";

2
pkgs/development/web/postman/linux.nix
View file

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64"; url = "https://dl.pstmn.io/download/version/${version}/linux64";
sha256 = "118da102904cd7b04c50d3e2c2daac3fc1228f05e541eacef55e8ecbf73d3896"; sha256 = "sha256-ZCfPE+bvPEQjEvUO/FQ1iNR9TG6GtI4vmj6yJ7B62iw=";
name = "${pname}.tar.gz"; name = "${pname}.tar.gz";
}; };

4
pkgs/games/augustus/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "augustus"; pname = "augustus";
version = "3.1.0"; version = "3.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Keriew"; owner = "Keriew";
repo = "augustus"; repo = "augustus";
rev = "v${version}"; rev = "v${version}";
sha256 = "1axm4x3ca5r08sv1b4q8y9c15mkwqd3rnc8k09a2fn3plbk2p2j4"; sha256 = "sha256-NS6ijgI/wLsGF5KabjaR7ElKWFXIdjpmPYHVmI4oMzQ=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

8
pkgs/games/openrct2/default.nix
View file

@ -26,25 +26,25 @@
}: }:
let let
openrct2-version = "0.4.1"; openrct2-version = "0.4.2";
# Those versions MUST match the pinned versions within the CMakeLists.txt # Those versions MUST match the pinned versions within the CMakeLists.txt
# file. The REPLAYS repository from the CMakeLists.txt is not necessary. # 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"; title-sequences-version = "0.4.0";
openrct2-src = fetchFromGitHub { openrct2-src = fetchFromGitHub {
owner = "OpenRCT2"; owner = "OpenRCT2";
repo = "OpenRCT2"; repo = "OpenRCT2";
rev = "v${openrct2-version}"; rev = "v${openrct2-version}";
sha256 = "sha256-fMs0zrMzv9jXreZE4QyYIdvWUU/FUFVPuo4EzAF/2rU="; sha256 = "sha256-38syOFZm0eGCI1vbJxG8truX5vuafwSG0lp2o499zUs=";
}; };
objects-src = fetchFromGitHub { objects-src = fetchFromGitHub {
owner = "OpenRCT2"; owner = "OpenRCT2";
repo = "objects"; repo = "objects";
rev = "v${objects-version}"; rev = "v${objects-version}";
sha256 = "sha256-BG0IRiNb2l6/3P7tvuUqMoYNh1zkOS0lCFDDh7m9Q7Y="; sha256 = "sha256-S9fjgtb45vhRTWnYEgmIlKej5fGBtnhKOn35npmX70U=";
}; };
title-sequences-src = fetchFromGitHub { title-sequences-src = fetchFromGitHub {

24
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View file

@ -3,15 +3,21 @@
let let
# These names are how they are designated in https://xanmod.org. # These names are how they are designated in https://xanmod.org.
ltsVariant = { ltsVariant = {
version = "5.15.60"; version = "5.15.70";
hash = "sha256-XSOYgrJ/uvPpEG+P3Zy1geFeF/HMZ4LejsKWtTxMUTs="; hash = "sha256-gMtGoj/HzMqd6Y3PSc6QTsu/PI7vfb+1pg4mt878cxs=";
variant = "lts"; variant = "lts";
}; };
edgeVariant = { currentVariant = {
version = "5.19.1"; version = "5.19.13";
hash = "sha256-Fw+XW2YDAGKEzZ4AO88Y8GcypfOb6AjKp3XOlkT8ZTQ="; hash = "sha256-BzQH4c24CtE3R5HNe2sOc3McVkRmf/RKOOjuf1W4YfE=";
variant = "edge"; variant = "current";
};
nextVariant = {
version = "6.0.0";
hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU=";
variant = "next";
}; };
ttVariant = { ttVariant = {
@ -44,9 +50,6 @@ let
NET_SCH_DEFAULT = yes; NET_SCH_DEFAULT = yes;
DEFAULT_FQ_PIE = 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 WAIT_MULTIPLE implementation for Wine / Proton Fsync.
FUTEX = yes; FUTEX = yes;
FUTEX_PI = yes; FUTEX_PI = yes;
@ -71,6 +74,7 @@ let
in in
{ {
lts = xanmodKernelFor ltsVariant; lts = xanmodKernelFor ltsVariant;
edge = xanmodKernelFor edgeVariant; current = xanmodKernelFor currentVariant;
next = xanmodKernelFor nextVariant;
tt = xanmodKernelFor ttVariant; tt = xanmodKernelFor ttVariant;
} }

6
pkgs/servers/matrix-conduit/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitLab, rustPlatform, pkgs }: { stdenv, lib, fetchFromGitLab, rustPlatform, pkg-config, rocksdb }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "matrix-conduit"; pname = "matrix-conduit";
@ -13,12 +13,12 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-vE44I8lQ5VAfZB4WKLRv/xudoZJaFJGTT/UuumTePBU="; cargoSha256 = "sha256-vE44I8lQ5VAfZB4WKLRv/xudoZJaFJGTT/UuumTePBU=";
nativeBuildInputs = with pkgs; [ nativeBuildInputs = [
rustPlatform.bindgenHook rustPlatform.bindgenHook
pkg-config pkg-config
]; ];
buildInputs = with pkgs; [ buildInputs = [
rocksdb rocksdb
]; ];

6
pkgs/servers/minio/default.nix
View file

@ -15,16 +15,16 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "minio"; pname = "minio";
version = "2022-10-05T14-58-27Z"; version = "2022-10-08T20-11-00Z";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "minio"; owner = "minio";
repo = "minio"; repo = "minio";
rev = "RELEASE.${version}"; rev = "RELEASE.${version}";
sha256 = "sha256-LDBv00l+f6tLDxS8JRh+l0SGfKvqd/dcxDrw268qFbU="; sha256 = "sha256-mLyhKiCSQcGXykoGUA+alzOadyI68MNlg0WL7ko8D7c=";
}; };
vendorSha256 = "sha256-tePKsEiUHeHgxtTP0wbRGVkYOQFMwgVkpXOYLnP13NA="; vendorSha256 = "sha256-POls1yyNRdXeMgis5otcVFNf3w/x4QGKDtxVfRoQJck=";
doCheck = false; doCheck = false;

10
pkgs/shells/zsh/antibody/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "antibody"; pname = "antibody";
@ -22,5 +22,13 @@ buildGoModule rec {
homepage = "https://github.com/getantibody/antibody"; homepage = "https://github.com/getantibody/antibody";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne ]; 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;
}; };
} }

12
pkgs/tools/misc/fend/default.nix
View file

@ -3,6 +3,8 @@
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, darwin , darwin
, pandoc
, installShellFiles
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -18,8 +20,18 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-jGPS9x4DKQCXZkaJu9qIEqoxIu+1WraqfqxGFRV5z7A="; cargoSha256 = "sha256-jGPS9x4DKQCXZkaJu9qIEqoxIu+1WraqfqxGFRV5z7A=";
nativeBuildInputs = [ pandoc installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; 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; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''

4
pkgs/tools/misc/fx_cast/default.nix
View file

@ -23,13 +23,13 @@
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fx_cast_bridge"; pname = "fx_cast_bridge";
version = "0.2.0"; version = "0.3.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "hensm"; owner = "hensm";
repo = "fx_cast"; repo = "fx_cast";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-bgoItAOIHxGow7TjlRzaMqtIefcSym1h5n6v/9fFZfc="; hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg=";
}; };
buildInputs = with pkgs; [ buildInputs = with pkgs; [

4
pkgs/tools/misc/gh-dash/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gh-dash"; pname = "gh-dash";
version = "3.4.1"; version = "3.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dlvhdr"; owner = "dlvhdr";
repo = "gh-dash"; repo = "gh-dash";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-NGUuUBCoLKyyFdTw7n/PY486JEcrTsed4/iuB9iUTLE="; sha256 = "sha256-MiVscWYq2Y9EaupSYbTA9bsToLoIVhHCNE2Kj0GpkPw=";
}; };
vendorSha256 = "sha256-BbrHvphTQLvUKanmO4GrNpkT0MSlY7+WMJiyXV7dFB8="; vendorSha256 = "sha256-BbrHvphTQLvUKanmO4GrNpkT0MSlY7+WMJiyXV7dFB8=";

4
pkgs/tools/misc/qflipper/default.nix
View file

@ -23,8 +23,8 @@
}: }:
let let
pname = "qFlipper"; pname = "qFlipper";
version = "1.1.3"; version = "1.2.1";
sha256 = "sha256-/MYX/WnK3cClIOImb5/awT8lX2Wx8g+r/RVt3RH7d0c="; sha256 = "sha256-6pfkZfT/8DNZGIdc8YvHN2TPyhDqHU6e3mqtAZOpHLo=";
timestamp = "99999999999"; timestamp = "99999999999";
commit = "nix-${version}"; commit = "nix-${version}";

4
pkgs/tools/networking/haproxy/default.nix
View file

@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "haproxy"; pname = "haproxy";
version = "2.6.5"; version = "2.6.6";
src = fetchurl { src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; 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 ] buildInputs = [ openssl zlib ]

6
pkgs/tools/networking/minio-client/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "minio-client"; pname = "minio-client";
version = "2022-10-06T01-20-06Z"; version = "2022-10-09T21-10-59Z";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "minio"; owner = "minio";
repo = "mc"; repo = "mc";
rev = "RELEASE.${version}"; rev = "RELEASE.${version}";
sha256 = "sha256-nwtPsrNFUnFMs8fj+T4SnHFeAafU3xwLwnaIE4rrU78="; sha256 = "sha256-nsszO0sxQWtukBI4qiiU5gL1yI4rpbG5MGhtCFPUY2c=";
}; };
vendorSha256 = "sha256-DCvUTtrkM+5LAivgKllKosD4mQY3zggjnc1jig9vJW0="; vendorSha256 = "sha256-kAbbvaMREGlZYtSikZmB4J7uFwZ9SjRdf2B5g9PvBOc=";
subPackages = [ "." ]; subPackages = [ "." ];

10
pkgs/tools/networking/wolfebin/default.nix
View file

@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, python }: { lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.4";
pname = "wolfebin"; pname = "wolfebin";
version = "5.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thejoshwolfe"; owner = "thejoshwolfe";
repo = "wolfebin"; repo = "wolfebin";
rev = version; rev = version;
sha256 = "16xj6zz30sn9q05p211bmmsl0i6fknfxf8dssn6knm6nkiym8088"; sha256 = "sha256-tsI71/UdLaGZ3O2lNTd1c8S5OS2imquLovh0n0ez8Ts=";
}; };
buildInputs = [ python ]; buildInputs = [ python3 ];
installPhase = '' installPhase = ''
install -m 755 -d $out/bin install -m 755 -d $out/bin
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/thejoshwolfe/wolfebin"; homepage = "https://github.com/thejoshwolfe/wolfebin";
description = "Quick and easy file sharing"; description = "Quick and easy file sharing";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.andrewrk ]; maintainers = with maintainers; [ andrewrk ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

6
pkgs/tools/text/csview/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "csview"; pname = "csview";
version = "1.2.1"; version = "1.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wfxr"; owner = "wfxr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ep+bfmeXbHGD0xEqKQr1dfh7MOPfySdcZcTaEonOSas="; sha256 = "sha256-pv0zCtVHTjzkXK5EZhu6jviMJF0p9dvAuYcA6khiIos=";
}; };
cargoSha256 = "sha256-IfIOettKHVay9Ls3cT9BI0zmGHle2Ew227BztbiLxEw="; cargoSha256 = "sha256-uMBwEbxI8hjoFMlH+oquHvKdyLUC9bnO5uMFHkyZjgY=";
meta = with lib; { meta = with lib; {
description = "A high performance csv viewer with cjk/emoji support"; description = "A high performance csv viewer with cjk/emoji support";

39
pkgs/tools/wayland/shotman/default.nix Normal file
View 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 ];
};
}

8
pkgs/top-level/all-packages.nix
View file

@ -3465,6 +3465,8 @@ with pkgs;
oguri = callPackage ../tools/wayland/oguri { }; oguri = callPackage ../tools/wayland/oguri { };
shotman = callPackage ../tools/wayland/shotman { };
slurp = callPackage ../tools/wayland/slurp { }; slurp = callPackage ../tools/wayland/slurp { };
sov = callPackage ../tools/wayland/sov { }; sov = callPackage ../tools/wayland/sov { };
@ -12413,9 +12415,7 @@ with pkgs;
wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel; wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel;
wolfebin = callPackage ../tools/networking/wolfebin { wolfebin = callPackage ../tools/networking/wolfebin { };
python = python2;
};
xautoclick = callPackage ../applications/misc/xautoclick {}; xautoclick = callPackage ../applications/misc/xautoclick {};
@ -24834,6 +24834,8 @@ with pkgs;
# XanMod kernel # XanMod kernel
linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; linuxPackages_xanmod = linuxKernel.packages.linux_xanmod;
linux_xanmod = linuxKernel.kernels.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; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest;
linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest;
linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt; linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt;

4
pkgs/top-level/linux-kernels.nix
View file

@ -232,7 +232,8 @@ in {
}; };
linux_xanmod = xanmodKernels.lts; linux_xanmod = xanmodKernels.lts;
linux_xanmod_latest = xanmodKernels.edge; linux_xanmod_stable = xanmodKernels.current;
linux_xanmod_latest = xanmodKernels.next;
linux_xanmod_tt = xanmodKernels.tt; linux_xanmod_tt = xanmodKernels.tt;
linux_libre = deblobKernel packageAliases.linux_default.kernel; linux_libre = deblobKernel packageAliases.linux_default.kernel;
@ -578,6 +579,7 @@ in {
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod);
linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable);
linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest);
linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt); linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt);