b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2022-03-24 00:10:32 +00:00 committed by GitHub
parent 9a68365233 9fb449b2d9
commit e5b9619cbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
181 changed files with 3303 additions and 2306 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
maintainers/maintainer-list.nix
View file

@ -1295,6 +1295,12 @@
githubId = 127523;
name = "Herman Fries";
};
BarinovMaxim = {
name = "Barinov Maxim";
email = "barinov274@gmail.com";
github = "barinov274";
githubId = 54442153;
};
barrucadu = {
email = "mike@barrucadu.co.uk";
github = "barrucadu";
@ -4235,7 +4241,12 @@
githubId = 119691;
name = "Michael Gough";
};
freax13 = {
email = "erbse.13@gmx.de";
github = "freax13";
githubId = 14952658;
name = "Tom Dohrmann";
};
fredeb = {
email = "im@fredeb.dev";
github = "fredeeb";
@ -11255,6 +11266,12 @@
githubId = 293035;
name = "Shawn Dellysse";
};
shawn8901 = {
email = "shawn8901@googlemail.com";
github = "shawn8901";
githubId = 12239057;
name = "Shawn8901";
};
shazow = {
email = "andrey.petrov@shazow.net";
github = "shazow";

10
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View file

@ -826,6 +826,16 @@
<literal>true</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>miller</literal> package has been upgraded from
5.10.3 to
<link xlink:href="https://github.com/johnkerl/miller/releases/tag/v6.2.0">6.2.0</link>.
See
<link xlink:href="https://miller.readthedocs.io/en/latest/new-in-miller-6">What’s
new in Miller 6</link>.
</para>
</listitem>
<listitem>
<para>
MultiMC has been replaced with the fork PolyMC due to upstream

2
nixos/doc/manual/release-notes/rl-2205.section.md
View file

@ -324,6 +324,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The options `networking.interfaces.<name>.ipv4.routes` and `networking.interfaces.<name>.ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`.
- The `miller` package has been upgraded from 5.10.3 to [6.2.0](https://github.com/johnkerl/miller/releases/tag/v6.2.0). See [What's new in Miller 6](https://miller.readthedocs.io/en/latest/new-in-miller-6).
- MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.
- `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn.<name>.execConfig.PrivateUsers = false`

40
nixos/modules/services/misc/moonraker.nix
View file

@ -79,6 +79,19 @@ in {
for supported values.
'';
};
allowSystemControl = mkOption {
type = types.bool;
default = false;
description = ''
Whether to allow Moonraker to perform system-level operations.
Moonraker exposes APIs to perform system-level operations, such as
reboot, shutdown, and management of systemd units. See the
<link xlink:href="https://moonraker.readthedocs.io/en/latest/web_api/#machine-commands">documentation</link>
for details on what clients are able to do.
'';
};
};
};
@ -86,6 +99,13 @@ in {
warnings = optional (cfg.settings ? update_manager)
''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.'';
assertions = [
{
assertion = cfg.allowSystemControl -> config.security.polkit.enable;
message = "services.moonraker.allowSystemControl requires polkit to be enabled (security.polkit.enable).";
}
];
users.users = optionalAttrs (cfg.user == "moonraker") {
moonraker = {
group = cfg.group;
@ -128,11 +148,31 @@ in {
exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg
'';
# Needs `ip` command
path = [ pkgs.iproute2 ];
serviceConfig = {
WorkingDirectory = cfg.stateDir;
Group = cfg.group;
User = cfg.user;
};
};
security.polkit.extraConfig = lib.optionalString cfg.allowSystemControl ''
// nixos/moonraker: Allow Moonraker to perform system-level operations
//
// This was enabled via services.moonraker.allowSystemControl.
polkit.addRule(function(action, subject) {
if ((action.id == "org.freedesktop.systemd1.manage-units" ||
action.id == "org.freedesktop.login1.power-off" ||
action.id == "org.freedesktop.login1.power-off-multiple-sessions" ||
action.id == "org.freedesktop.login1.reboot" ||
action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
action.id.startsWith("org.freedesktop.packagekit.")) &&
subject.user == "${cfg.user}") {
return polkit.Result.YES;
}
});
'';
};
}

4
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -519,7 +519,7 @@ in
with plasma5; with kdeApplications; with kdeFrameworks;
[
# Basic packages without which Plasma Mobile fails to work properly.
plasma-phone-components
plasma-mobile
plasma-nano
pkgs.maliit-framework
pkgs.maliit-keyboard
@ -573,7 +573,7 @@ in
};
};
services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-phone-components ];
services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-mobile ];
})
];
}

1
nixos/tests/all-tests.nix
View file

@ -308,6 +308,7 @@ in
molly-brown = handleTest ./molly-brown.nix {};
mongodb = handleTest ./mongodb.nix {};
moodle = handleTest ./moodle.nix {};
moonraker = handleTest ./moonraker.nix {};
morty = handleTest ./morty.nix {};
mosquitto = handleTest ./mosquitto.nix {};
moosefs = handleTest ./moosefs.nix {};

45
nixos/tests/moonraker.nix Normal file
View file

@ -0,0 +1,45 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "moonraker";
meta = with pkgs.lib.maintainers; {
maintainers = [ zhaofengli ];
};
nodes = {
printer = { config, pkgs, ... }: {
security.polkit.enable = true;
services.moonraker = {
enable = true;
allowSystemControl = true;
settings = {
authorization = {
trusted_clients = [ "127.0.0.0/8" "::1/128" ];
};
};
};
services.klipper = {
enable = true;
user = "moonraker";
group = "moonraker";
# No mcu configured so won't even enter `ready` state
settings = {};
};
};
};
testScript = ''
printer.start()
printer.wait_for_unit("klipper.service")
printer.wait_for_unit("moonraker.service")
printer.wait_until_succeeds("curl http://localhost:7125/printer/info | grep -v 'Not Found' >&2", timeout=30)
with subtest("Check that we can perform system-level operations"):
printer.succeed("curl -X POST http://localhost:7125/machine/services/stop?service=klipper | grep ok >&2")
printer.wait_until_succeeds("systemctl --no-pager show klipper.service | grep ActiveState=inactive", timeout=10)
'';
})

11
pkgs/applications/audio/gnome-podcasts/default.nix
View file

@ -2,6 +2,7 @@
, lib
, rustPlatform
, fetchFromGitLab
, fetchpatch
, meson
, ninja
, gettext
@ -31,6 +32,16 @@ stdenv.mkDerivation rec {
sha256 = "00vy1qkkpn76jdpybsq9qp8s6fh1ih10j73p2x43sl97m5g8944h";
};
patches = [
# Fix build with meson 0.61, can be removed on next release.
# podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments.
# podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments.
(fetchpatch {
url = "https://gitlab.gnome.org/World/podcasts/-/commit/6614bb62ecbec7c3b18ea7fe44beb50fe7942b27.patch";
sha256 = "3TVKFV9V6Ofdajgkdc+j+yxsU21C4JWSc6GjLExSM00=";
})
];
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";

6
pkgs/applications/audio/tonelib-gfx/default.nix
View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "tonelib-gfx";
version = "4.7.0";
version = "4.7.5";
src = fetchurl {
url = "https://www.tonelib.net/download/0930/ToneLib-GFX-amd64.deb";
hash = "sha256-BcbX0dz94B4mj6QeQsnuZmwXAaXH+yJjnrUPgEYVqkU=";
url = "https://www.tonelib.net/download/220214/ToneLib-GFX-amd64.deb";
hash = "sha256-GUSyarqG1V5O6ayAedeGqmOA+UABQDpAZ+dsorh7das=";
};
nativeBuildInputs = [ autoPatchelfHook dpkg ];

6
pkgs/applications/audio/tonelib-jam/default.nix
View file

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "tonelib-jam";
version = "4.7.0";
version = "4.7.5";
src = fetchurl {
url = "https://www.tonelib.net/download/0930/ToneLib-Jam-amd64.deb";
sha256 = "sha256-xyBDp3DQVC+nK2WGnvrfUfD+9GvwtbldXgExTMmCGw0=";
url = "https://www.tonelib.net/download/220214/ToneLib-Jam-amd64.deb";
sha256 = "sha256-alkdoEhN58o9IGZ8sB39ctTpouMSmvgn6tbrKFneKPI=";
};
nativeBuildInputs = [

40
pkgs/applications/blockchains/polkadot/default.nix
View file

@ -8,15 +8,21 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.17";
version = "0.9.18";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
sha256 = "sha256-m47Y4IXGc43XLs5d6ehlD0A53BWC5kO3K2BS/xbYgl8=";
sha256 = "sha256-pjHSiVspBV15jKUFv+Uf2l3tah40l55Pv8vwDuwgwjc=";
# see the comment below on fakeGit for how this is used
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
# since having a .git folder introduces reproducibility issues to the nix
# build, we check the git commit hash after fetching the source and save it
# into a .git_commit file, and then delete the .git folder. we can then use
# this file to populate an environment variable with the commit hash, which
# is picked up by polkadot's build process.
leaveDotGit = true;
postFetch = ''
( cd $out; git rev-parse --short HEAD > .git_commit )
@ -24,28 +30,14 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoSha256 = "sha256-JBacioy2woAfKQuK6tXU9as4DNc+3uY3F3GWksCf6WU=";
cargoSha256 = "sha256-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94=";
nativeBuildInputs =
let
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
# since having a .git folder introduces reproducibility issues to the nix
# build, we check the git commit hash after fetching the source and save it
# into a .git_commit file, and then delete the .git folder. then we create a
# fake git command that will just return the contents of this file, which will
# be used when the polkadot build calls `git rev-parse` to fetch the commit
# hash.
fakeGit = writeShellScriptBin "git" ''
if [[ $@ = "rev-parse --short HEAD" ]]; then
cat /build/source/.git_commit
else
>&2 echo "Unknown command: $@"
exit 1
fi
'';
in
[ clang fakeGit ];
nativeBuildInputs = [ clang ];
preBuild = ''
export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(cat .git_commit)
rm .git_commit
'';
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
PROTOC = "${protobuf}/bin/protoc";

782
pkgs/applications/editors/vim/plugins/generated.nix
View file

File diff suppressed because it is too large Load diff

30
pkgs/applications/emulators/collapseos-cvm/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ lib, stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
pname = "collapseos-cvm";
version = "20220316";
src = fetchurl {
url = "http://collapseos.org/files/collapseos-${version}.tar.gz";
hash = "sha256-8bt6wj93T82K9fqtuC/mctkMCzfvW0taxv6QAKeJb5g=";
};
buildInputs = [ ncurses ];
sourceRoot = "cvm";
postPatch = ''
substituteInPlace common.mk \
--replace "-lcurses" "-lncurses"
'';
installPhase = ''
runHook preInstall;
find . -type f -executable -exec install -Dt $out/bin {} \;
runHook postInstall;
'';
meta = {
description = "Virtual machine for Collapse OS (Forth operating system)";
changelog = "http://collapseos.org/files/CHANGES.txt";
downloadPage = "http://collapseos.org/files/";
homepage = "http://collapseos.org/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ ehmry ];
mainProgram = "cos-serial";
};
}

52
pkgs/applications/emulators/goldberg-emu/default.nix Normal file
View file

@ -0,0 +1,52 @@
{ lib
, stdenv
, fetchFromGitLab
, cmake
, protobuf
}:
stdenv.mkDerivation rec {
pname = "goldberg-emu";
version = "0.2.5";
src = fetchFromGitLab {
owner = "mr_goldberg";
repo = "goldberg_emulator";
rev = version;
sha256 = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog=";
};
# It attempts to install windows-only libraries which we never build
patches = [ ./dont-install-unsupported.patch ];
nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ];
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/goldberg"
];
preFixup = ''
mkdir -p $out/{bin,lib}
chmod +x $out/share/goldberg/tools/find_interfaces.sh
ln -s $out/share/goldberg/libsteam_api.so $out/lib
ln -s $out/share/goldberg/lobby_connect/lobby_connect $out/bin
ln -s $out/share/goldberg/tools/generate_interfaces_file $out/bin
ln -s $out/share/goldberg/tools/find_interfaces.sh $out/bin/find_interfaces
'';
meta = with lib; {
homepage = "https://gitlab.com/Mr_Goldberg/goldberg_emulator";
changelog = "https://gitlab.com/Mr_Goldberg/goldberg_emulator/-/releases";
description = "Program that emulates steam online features";
longDescription = ''
Steam emulator that emulates steam online features. Lets you play games that
use the steam multiplayer apis on a LAN without steam or an internet connection.
'';
mainProgram = "lobby_connect";
license = licenses.lgpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.ivar ];
};
}

34
pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch Normal file
View file

@ -0,0 +1,34 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abaace2..5e3465c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,10 +182,10 @@ if(WIN32)
RUNTIME DESTINATION ./
)
else()
- install(TARGETS
- ${LIB_STEAMCLIENT}
- LIBRARY DESTINATION ./
- )
+ # install(TARGETS
+ #${LIB_STEAMCLIENT}
+ #LIBRARY DESTINATION ./
+ #)
endif()
if(NOT WIN32)
@@ -220,10 +220,10 @@ if(WIN32)
RUNTIME DESTINATION ./
)
else()
- install(TARGETS
- ${LIB_STEAMNETWORKINGSOCKETS}
- LIBRARY DESTINATION ./
- )
+ # install(TARGETS
+ # ${LIB_STEAMNETWORKINGSOCKETS}
+ # LIBRARY DESTINATION ./
+ # )
endif()
if(NOT WIN32)

6
pkgs/applications/emulators/ryujinx/default.nix
View file

@ -17,13 +17,13 @@
buildDotnetModule rec {
pname = "ryujinx";
version = "1.1.76"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
version = "1.1.77"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "e2ffa5a125fcbe8a25c73d8e04c08c08ef378860";
sha256 = "1rmiyjqwlsbzh9q7d12n72ka9adaby2rfcbn75sf47p5857yi3p9";
rev = "df70442c46e7ee133b1fb79dc23ddd134e618085";
sha256 = "1m9msp7kxsj7251l2yjcfzrb4k1lisk9sip7acm22pxmi1a7gw73";
};
dotnet-sdk = dotnetCorePackages.sdk_6_0;

4
pkgs/applications/misc/prusa-slicer/default.nix
View file

@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
pname = "prusa-slicer";
version = "2.4.0";
version = "2.4.1";
nativeBuildInputs = [
cmake
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
sha256 = "1mb7v0khrmsgy3inmh4mjn709jlhx422kvbnrhsqziph2wwak9bz";
sha256 = "sha256-4L/x8cMQee3n20iyWEiXd62NtA6BYM1SHkCn8ZlDNWA=";
rev = "version_${version}";
};

4
pkgs/applications/misc/zettlr/default.nix
View file

@ -10,11 +10,11 @@
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
let
pname = "zettlr";
version = "2.2.3";
version = "2.2.4";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
sha256 = "sha256-BXStGhCEXpQRyLjcS00CM/NI/NVRKpLTlW8Xh51fV8w=";
sha256 = "sha256-lzXciToyUsHl8WV0IvdP6R2pYegL7/G04YPLb6gbCgQ=";
};
appimageContents = appimageTools.extractType2 {
inherit name src;

2
pkgs/applications/networking/browsers/firefox-bin/default.nix
View file

@ -188,7 +188,7 @@ stdenv.mkDerivation {
ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json";
'';
passthru.applicationName = "firefox";
passthru.binaryName = "firefox";
passthru.libName = "firefox-bin-${version}";
passthru.execdir = "/bin";
passthru.ffmpegSupport = true;

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

377
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -1,37 +1,91 @@
{ pname, version, meta, updateScript ? null
, binaryName ? "firefox", application ? "browser"
, src, unpackPhase ? null, patches ? []
, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? []
, extraPostPatch ? "", extraPassthru ? {} }:
{ pname
, version
, meta
, updateScript ? null
, binaryName ? "firefox"
, application ? "browser"
, src
, unpackPhase ? null
, extraPatches ? []
, extraPostPatch ? ""
, extraNativeBuildInputs ? []
, extraConfigureFlags ? []
, extraBuildInputs ? []
, extraMakeFlags ? []
, extraPassthru ? {}
, tests ? []
}:
{ lib, stdenv, pkg-config, pango, perl, python3, zip
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification
, libvpx
, icu70, libpng, glib, pciutils
, autoconf213, which, gnused, rustPackages, rustPlatform
, rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4
, gtk3, wrapGAppsHook
, pkgsCross
, debugBuild ? false
{ lib
, stdenv
, fetchpatch
# build time
, autoconf
, cargo
, gnused
, makeWrapper
, nodejs
, perl
, pkg-config
, pkgsCross # wasm32 rlbox
, python3
, runCommand
, rustc
, rust-cbindgen
, rustPlatform
, unzip
, which
, wrapGAppsHook
### optionals
# runtime
, bzip2
, dbus
, dbus-glib
, file
, fontconfig
, freetype
, glib
, gnum4
, gtk3
, icu
, libGL
, libGLU
, libevent
, libffi
, libjpeg
, libpng
, libstartup_notification
, libvpx
, libwebp
, nasm
, nspr
, nss
, pango
, xorg
, zip
, zlib
# optionals
## debugging
, debugBuild ? false
# On 32bit platforms, we disable adding "-g" for easier linking.
, enableDebugSymbols ? !stdenv.is32bit
## optional libraries
, alsaSupport ? stdenv.isLinux, alsa-lib
, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
, ffmpegSupport ? true
, waylandSupport ? true, libxkbcommon, libdrm
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
, gssSupport ? true, libkrb5
, pipewireSupport ? waylandSupport && webrtcSupport, pipewire
# Jemalloc could reduce memory consumption.
, jemallocSupport ? true, jemalloc
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
, pipewireSupport ? waylandSupport && webrtcSupport
, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
, waylandSupport ? true, libxkbcommon, libdrm
## privacy-related options
@ -40,22 +94,16 @@
# WARNING: NEVER set any of the options below to `true` by default.
# Set to `!privacySupport` or `false`.
# webrtcSupport breaks the aarch64 build on version >= 60, fixed in 63.
# https://bugzilla.mozilla.org/show_bug.cgi?id=1434589
, webrtcSupport ? !privacySupport
, geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, crashreporterSupport ? false
, safeBrowsingSupport ? false
, drmSupport ? false
# macOS dependencies
, xcbuild, CoreMedia, ExceptionHandling, Kerberos, AVFoundation, MediaToolbox
, CoreLocation, Foundation, AddressBook, libobjc, cups, rsync
, webrtcSupport ? !privacySupport
## other
, crashreporterSupport ? false
, drmSupport ? false
, safeBrowsingSupport ? false
# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we
# have permission to use the official firefox branding.
@ -75,38 +123,16 @@
# > the experience of Firefox users, you won't have any issues using the
# > official branding.
, enableOfficialBranding ? true
# On 32bit platforms, we disable adding "-g" for easier linking.
, enableDebugSymbols ? !stdenv.is32bit
}:
assert stdenv.cc.libc or null != null;
assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "pipewireSupport requires both wayland and webrtc support.";
assert ltoSupport -> stdenv.isDarwin -> throw "LTO is broken on Darwin (see PR#19312).";
let
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
default-toolkit = if stdenv.isDarwin then "cairo-cocoa"
else "cairo-gtk3${lib.optionalString waylandSupport "-wayland"}";
binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName;
applicationName = if stdenv.isDarwin then binaryNameCapitalized else binaryName;
execdir = if stdenv.isDarwin
then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS"
else "/bin";
inherit (rustPackages) rustc cargo;
# Darwin's stdenv provides the default llvmPackages version, match that since
# clang LTO on Darwin is broken so the stdenv is not being changed.
# Target the LLVM version that rustc -Vv reports it is built with for LTO.
llvmPackages0 =
if stdenv.isDarwin
then buildPackages.llvmPackages
else rustc.llvmPackages;
# Target the LLVM version that rustc is built with for LTO.
llvmPackages0 = rustc.llvmPackages;
# Force the use of lld and other llvm tools for LTO
llvmPackages = llvmPackages0.override {
@ -114,14 +140,12 @@ let
bootBintools = null;
};
# When LTO for Darwin is fixed, the following will need updating as lld
# doesn't work on it. For now it is fine since ltoSupport implies no Darwin.
buildStdenv = if ltoSupport
# LTO requires LLVM bintools including ld.lld and llvm-ar.
then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
inherit (llvmPackages) bintools;
})
else stdenv;
# LTO requires LLVM bintools including ld.lld and llvm-ar.
then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
inherit (llvmPackages) bintools;
})
else stdenv;
# Compile the wasm32 sysroot to build the RLBox Sandbox
# https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/
@ -141,94 +165,70 @@ buildStdenv.mkDerivation ({
inherit src unpackPhase meta;
patches = [
] ++
lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++
lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++
lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++
]
++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch
++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch
++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch
++ extraPatches;
patches;
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
patchShebangs mach
''
+ extraPostPatch;
# Ignore trivial whitespace changes in patches, this fixes compatibility of
# ./env_var_for_system_dir.patch with Firefox >=65 without having to track
# two patches.
patchFlags = [ "-p1" "-l" ];
buildInputs = [
gnum4 gtk3 perl zip libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
xorg.pixman yasm libGLU libGL
xorg.xorgproto
xorg.libXdamage
xorg.libXext
xorg.libXtst
libevent libstartup_notification /* cairo */
libpng glib
nasm icu70 libvpx
# >= 66 requires nasm for the AV1 lib dav1d
# yasm can potentially be removed in future versions
# https://bugzilla.mozilla.org/show_bug.cgi?id=1501796
# https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ
nspr nss
nativeBuildInputs = [
autoconf
cargo
gnused
llvmPackages.llvm # llvm-objdump
makeWrapper
nodejs
perl
pkg-config
python3
rust-cbindgen
rustPlatform.bindgenHook
rustc
unzip
which
wrapGAppsHook
]
++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optional gssSupport libkrb5
++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
++ lib.optional pipewireSupport pipewire
++ lib.optional jemallocSupport jemalloc
++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos
AVFoundation MediaToolbox CoreLocation
Foundation libobjc AddressBook cups ];
++ extraNativeBuildInputs;
MACH_USE_SYSTEM_PYTHON = "1";
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
substituteInPlace toolkit/xre/glxtest.cpp \
--replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so'
patchShebangs mach
'' + extraPostPatch;
nativeBuildInputs =
[
autoconf213
cargo
gnused
llvmPackages.llvm # llvm-objdump
makeWrapper
nodejs
perl
pkg-config
python3
rust-cbindgen
rustc
which
unzip
wrapGAppsHook
rustPlatform.bindgenHook
]
++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]
++ extraNativeBuildInputs;
separateDebugInfo = enableDebugSymbols;
setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags.
preConfigure = ''
# remove distributed configuration files
rm -f configure
rm -f js/src/configure
rm -f .mozconfig*
# this will run autoconf213
rm -f configure js/src/configure .mozconfig*
# Runs autoconf through ./mach configure in configurePhase
configureScript="$(realpath ./mach) configure"
# Set predictable directories for build and state
export MOZ_OBJDIR=$(pwd)/mozobj
export MOZBUILD_STATE_PATH=$(pwd)/mozbuild
'' + (lib.optionalString (lib.versionAtLeast version "95.0") ''
# Set consistent remoting name to ensure wmclass matches with desktop file
export MOZ_APP_REMOTINGNAME="${binaryName}"
# Use our own python
export MACH_USE_SYSTEM_PYTHON=1
# AS=as in the environment causes build failure
# https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
unset AS
'' + lib.optionalString (lib.versionAtLeast version "95.0") ''
# RBox WASM Sandboxing
export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc
export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++
'') + (lib.optionalString googleAPISupport ''
'' + lib.optionalString googleAPISupport ''
# Google API key used by Chromium and Firefox.
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
# please get your own set of keys.
@ -236,49 +236,44 @@ buildStdenv.mkDerivation ({
# 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176
configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga")
configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga")
'') + ''
# AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
unset AS
'' + (lib.optionalString enableOfficialBranding ''
'' + lib.optionalString enableOfficialBranding ''
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1
'');
'';
configureFlags = [
"--disable-tests"
"--disable-updater"
"--enable-application=${application}"
"--enable-default-toolkit=cairo-gtk3${lib.optionalString waylandSupport "-wayland"}"
"--enable-system-pixman"
"--with-libclang-path=${llvmPackages.libclang.lib}/lib"
"--with-system-ffi"
"--with-system-icu"
"--with-system-jpeg"
"--with-system-zlib"
"--with-system-libevent"
"--with-system-libvpx"
"--with-system-png" # needs APNG support
"--with-system-icu"
"--enable-system-ffi"
"--enable-system-pixman"
#"--enable-system-cairo"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-updater"
"--enable-default-toolkit=${default-toolkit}"
"--with-libclang-path=${llvmPackages.libclang.lib}/lib"
"--with-system-nspr"
"--with-system-nss"
"--with-system-png" # needs APNG support
"--with-system-webp"
"--with-system-zlib"
]
++ lib.optional (buildStdenv.isDarwin) "--disable-xcode-checks"
++ lib.optional (!ltoSupport) "--with-clang-path=${llvmPackages.clang}/bin/clang"
# LTO is done using clang and lld on Linux.
# Darwin needs to use the default linker as lld is not supported (yet?):
# https://bugzilla.mozilla.org/show_bug.cgi?id=1538724
++ lib.optionals ltoSupport [
"--enable-lto=cross" # Cross-Language LTO
"--enable-linker=lld"
]
# elf-hack is broken when using clang+lld:
# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
++ lib.optional ltoSupport "--enable-lto=cross" # Cross-language LTO.
# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack"
++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld"
++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}"
++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio"
++ flag ffmpegSupport "ffmpeg"
++ flag jemallocSupport "jemalloc"
++ flag geolocationSupport "necko-wifi"
++ flag gssSupport "negotiateauth"
++ flag webrtcSupport "webrtc"
++ flag crashreporterSupport "crashreporter"
@ -295,19 +290,62 @@ buildStdenv.mkDerivation ({
++ lib.optional enableOfficialBranding "--enable-official-branding"
++ extraConfigureFlags;
postConfigure = ''
cd obj-*
buildInputs = [
bzip2
dbus
dbus-glib
file
fontconfig
freetype
glib
gnum4
gtk3
icu
libffi
libGL
libGLU
libevent
libjpeg
libpng
libstartup_notification
libvpx
libwebp
nasm
nspr
nss
pango
perl
xorg.libX11
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXft
xorg.libXi
xorg.libXrender
xorg.libXt
xorg.libXtst
xorg.pixman
xorg.xorgproto
zip
zlib
]
++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optional gssSupport libkrb5
++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
++ lib.optional jemallocSupport jemalloc
++ extraBuildInputs;
preBuild = ''
cd mozobj
'';
makeFlags = extraMakeFlags;
separateDebugInfo = enableDebugSymbols;
enableParallelBuilding = true;
doCheck = false; # "--disable-tests" above
installPhase = if buildStdenv.isDarwin then ''
mkdir -p $out/Applications
cp -LR dist/${binaryNameCapitalized}.app $out/Applications
'' else null;
# tests were disabled in configureFlags
doCheck = false;
postInstall = lib.optionalString buildStdenv.isLinux ''
# Remove SDK cruft. FIXME: move to a separate output?
@ -319,7 +357,7 @@ buildStdenv.mkDerivation ({
# Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40.
# But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh
# Remove it when PR #146275 is merged.
# Remove it when https://github.com/NixOS/nixpkgs/pull/146275 is merged.
preFixup = lib.optionalString enableDebugSymbols ''
_separateDebugInfo() {
[ -e "$prefix" ] || return 0
@ -356,19 +394,18 @@ buildStdenv.mkDerivation ({
doInstallCheck = true;
installCheckPhase = ''
# Some basic testing
"$out${execdir}/${applicationName}" --version
"$out/bin/${binaryName}" --version
'';
passthru = {
inherit updateScript;
inherit version;
inherit alsaSupport;
inherit binaryName;
inherit pipewireSupport;
inherit nspr;
inherit ffmpegSupport;
inherit gssSupport;
inherit execdir;
inherit applicationName;
inherit tests;
inherit gtk3;
inherit wasiSysRoot;

4
pkgs/applications/networking/browsers/firefox/librewolf/default.nix
View file

@ -6,7 +6,7 @@ rec {
inherit (src) packageVersion firefox source;
patches = [ ./verify-telemetry-macros.patch ];
extraPatches = [ ./verify-telemetry-macros.patch ];
extraConfigureFlags = [
"--with-app-name=librewolf"
@ -34,7 +34,7 @@ rec {
extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ];
extraPassthru = {
librewolf = { inherit src patches; };
librewolf = { inherit src extraPatches; };
inherit extraPrefsFiles extraPoliciesFiles;
};
}

4
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
version = "98.0.1";
version = "98.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1434ff775e6cdc6d9a75fa0e6d07a4680ada86ecfd7b65208c597ed765e847d900b68df355e6bea6461f6d86ee7a8b2ce3117f23826ad144bd87dfe64ee39b42";
sha512 = "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e";
};
meta = {

31
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -12,6 +12,7 @@
, libva
, mesa # firefox wants gbm for drm+dmabuf
, cups
, pciutils
}:
## configurability of the wrapper itself
@ -20,7 +21,7 @@ browser:
let
wrapper =
{ applicationName ? browser.applicationName or (lib.getName browser)
{ applicationName ? browser.binaryName or (lib.getName browser)
, pname ? applicationName
, version ? lib.getVersion browser
, desktopName ? # applicationName with first letter capitalized
@ -66,8 +67,8 @@ let
++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
++ extraNativeMessagingHosts
);
libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups ]
++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire
libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ]
++ lib.optional pipewireSupport pipewire
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport libkrb5
++ lib.optional useGlvnd libglvnd
@ -179,14 +180,10 @@ let
buildInputs = [ browser.gtk3 ];
buildCommand = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications
cp -R --no-preserve=mode,ownership ${browser}/Applications/${applicationName}.app $out/Applications
rm -f $out${browser.execdir or "/bin"}/${applicationName}
'' + ''
if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ]
buildCommand = ''
if [ ! -x "${browser}/bin/${applicationName}" ]
then
echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'"
echo "cannot find executable file \`${browser}/bin/${applicationName}'"
exit 1
fi
@ -223,12 +220,12 @@ let
# create the wrapper
executablePrefix="$out${browser.execdir or "/bin"}"
executablePrefix="$out/bin"
executablePath="$executablePrefix/${applicationName}"
if [ ! -x "$executablePath" ]
then
echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'"
echo "cannot find executable file \`${browser}/bin/${applicationName}'"
exit 1
fi
@ -243,18 +240,18 @@ let
oldExe="$(readlink -v --canonicalize-existing "$executablePath")"
fi
if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ]
if [ ! -x "${browser}/bin/${applicationName}" ]
then
echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'"
echo "cannot find executable file \`${browser}/bin/${applicationName}'"
exit 1
fi
makeWrapper "$oldExe" \
"$out${browser.execdir or "/bin"}/${applicationName}${nameSuffix}" \
"$out/bin/${applicationName}${nameSuffix}" \
--prefix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
--prefix PATH ':' "${xdg-utils}/bin" \
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \
--suffix PATH ':' "$out/bin" \
--set MOZ_APP_LAUNCHER "${applicationName}${nameSuffix}" \
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
--set MOZ_LEGACY_PROFILES 1 \
@ -278,7 +275,7 @@ let
mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps"
icon=$( find "${browser}/lib/" -name "default''${res}.png" )
if [ -e "$icon" ]; then ln -s "$icon" \
"$out/share/icons/hicolor/''${res}x''${res}/apps/${applicationName}.png"
"$out/share/icons/hicolor/''${res}x''${res}/apps/${icon}.png"
fi
done
fi

30
pkgs/applications/networking/browsers/palemoon/default.nix
View file

@ -6,7 +6,7 @@
, dbus
, dbus-glib
, desktop-file-utils
, fetchFromGitea
, fetchzip
, ffmpeg
, fontconfig
, freetype
@ -44,15 +44,12 @@ assert with lib.strings; (
stdenv.mkDerivation rec {
pname = "palemoon";
version = "30.0.0";
version = "29.4.4";
src = fetchFromGitea {
domain = "repo.palemoon.org";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
fetchSubmodules = true;
sha256 = "02qdw8b7hphphc66m3m14r4pmcfiq2c5z4jcscm2nymy18ycb10f";
src = fetchzip {
name = "${pname}-${version}";
url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz";
sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc=";
};
nativeBuildInputs = [
@ -140,15 +137,24 @@ stdenv.mkDerivation rec {
./mach install
# Install official branding stuff (desktop file & icons)
# Fix missing icon due to wrong WMClass
# https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221
substituteInPlace ./palemoon/branding/official/palemoon.desktop \
--replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon'
desktop-file-install --dir=$out/share/applications \
./other-licenses/branding/palemoon/official/palemoon.desktop
./palemoon/branding/official/palemoon.desktop
# Install official branding icons
for iconname in default{16,22,24,32,48,256} mozicon128; do
n=''${iconname//[^0-9]/}
size=$n"x"$n
install -Dm644 ./other-licenses/branding/palemoon/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png
done
# Remove unneeded SDK data from installation
# https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729
rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}}
runHook postInstall
'';

4
pkgs/applications/networking/browsers/palemoon/mozconfig
View file

@ -12,7 +12,7 @@ _BUILD_64=@build64@
_GTK_VERSION=@gtkversion@
# Standard build options for Pale Moon
ac_add_options --enable-application=browser
ac_add_options --enable-application=palemoon
ac_add_options --enable-optimize="-O2 -w"
ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION
ac_add_options --enable-jemalloc
@ -20,6 +20,8 @@ ac_add_options --enable-strip
ac_add_options --enable-devtools
ac_add_options --enable-av1
ac_add_options --disable-eme
ac_add_options --disable-webrtc
ac_add_options --disable-gamepad
ac_add_options --disable-tests
ac_add_options --disable-debug

4
pkgs/applications/networking/browsers/yandex-browser/default.nix
View file

@ -50,11 +50,11 @@
stdenv.mkDerivation rec {
pname = "yandex-browser";
version = "22.1.3.856-1";
version = "22.1.3.907-1";
src = fetchurl {
url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb";
sha256 = "sha256-+xxyV8dBnfu2hQ/ykkp7wFSaojhlPLVvMmZdh/hyaoE=";
sha256 = "sha256-7dbFqNzZP2CyseK0xD9zcvecIuueZfMy5KgN8gRRLEk=";
};
nativeBuildInputs = [

86
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -148,10 +148,10 @@
"owner": "DrFaust92",
"provider-source-address": "registry.terraform.io/DrFaust92/bitbucket",
"repo": "terraform-provider-bitbucket",
"rev": "v2.12.0",
"sha256": "sha256-FIJ2nnTHV+Rb4Dbtqcdc06qaBBg3hG8NBwv1LxgnoQI=",
"vendorSha256": "sha256-GEnLgGk9yohWXftNfp9Y21BQKE1B6QwN08d7k0ofKTc=",
"version": "2.12.0"
"rev": "v2.13.1",
"sha256": "sha256-P/6scAuRMRrACHmEdWjn+W37ptVmVgtj+iTXQDrG+WM=",
"vendorSha256": "sha256-o1CZ4VuGCPALqSIz8KSm1zCwd3r9bR13CRvP7XpVBAM=",
"version": "2.13.1"
},
"brightbox": {
"owner": "brightbox",
@ -194,10 +194,10 @@
"owner": "cloudflare",
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v3.10.1",
"sha256": "sha256-2Ulavo82Y8dEOXtgpbgCwuCTOhAEoOFbgL4bK5HXQlY=",
"vendorSha256": "sha256-CgK1/Ddau3glxmzb7Y6o1RZbMV8dwA84F6n2OzuyZrU=",
"version": "3.10.1"
"rev": "v3.11.0",
"sha256": "sha256-z7IjLXO/AHWENKYaCospJDcOwOubNcRHKDQzmRkhimw=",
"vendorSha256": "sha256-Lx/faIdx4k399sm9p8BVqpiKZtNjZoThBhWWWgEuPyg=",
"version": "3.11.0"
},
"cloudfoundry": {
"owner": "cloudfoundry-community",
@ -293,10 +293,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/dns",
"repo": "terraform-provider-dns",
"rev": "v3.2.1",
"sha256": "1zynfwm7hl7pnldjr2nxj0a06j209r62g8zpkasj6zdjscy62rc8",
"vendorSha256": "0hpf48z7i5h1hh52wpyc48axpvfx9h3209iw36v8c764xzf87w0g",
"version": "3.2.1"
"rev": "v3.2.3",
"sha256": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=",
"vendorSha256": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=",
"version": "3.2.3"
},
"dnsimple": {
"owner": "dnsimple",
@ -411,20 +411,20 @@
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.14.0",
"sha256": "sha256-VWbyxZ5ag9jRF5yaiEdVkRpmnsSb5IiE5FtE2e3j0b8=",
"vendorSha256": "sha256-NrP3+pBePNex/ZmVM349p5vI8uVcs21Sti2C3NfxZkQ=",
"version": "4.14.0"
"rev": "v4.15.0",
"sha256": "sha256-BHtbBfCihy1zh/A9JB03CDh5KpzMWeR/mbuRErJkVUE=",
"vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=",
"version": "4.15.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.14.0",
"sha256": "sha256-VEQff8SnyPLu9I6dbGRac5rF/hRAihlxFhX6KLaov/Y=",
"vendorSha256": "sha256-NrP3+pBePNex/ZmVM349p5vI8uVcs21Sti2C3NfxZkQ=",
"version": "4.14.0"
"rev": "v4.15.0",
"sha256": "sha256-FTT6PS0OS4HPfkM2u4PZwOA/v5VzDwHLdO2s+qgRkW8=",
"vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=",
"version": "4.15.0"
},
"grafana": {
"owner": "grafana",
@ -583,10 +583,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
"repo": "terraform-provider-kubernetes",
"rev": "v2.8.0",
"sha256": "15mjx531jzrsfd4kxnklcr8q7gbq64z772y9m5lhq73anr9yqfa3",
"rev": "v2.9.0",
"sha256": "sha256-w16pm2+8M59grW5HUBBtkKaCnvf5p4GQMEHtQa4DLXs=",
"vendorSha256": null,
"version": "2.8.0"
"version": "2.9.0"
},
"launchdarkly": {
"owner": "launchdarkly",
@ -683,10 +683,10 @@
"owner": "aminueza",
"provider-source-address": "registry.terraform.io/aminueza/minio",
"repo": "terraform-provider-minio",
"rev": "v1.4.0",
"sha256": "0da7dhgs1c4r65fwwbkbz67lphrsl6ia5v8yx5viwfrsgdh0319z",
"vendorSha256": "1yshi8sz99ii9v77hlgkrcxrazjc8f6s79dszxdrnjwhahnz0hac",
"version": "1.4.0"
"rev": "v1.5.0",
"sha256": "sha256-wHxslrcjv0SuQhbEv95lkGba61HMimE1JLX4lWgSi3s=",
"vendorSha256": "sha256-j5DWJodrnGm9a3VsOjk0ZeVBh77C00SMMXrK7SNKKrY=",
"version": "1.5.0"
},
"mongodbatlas": {
"owner": "mongodb",
@ -719,10 +719,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v2.41.0-beta.2",
"sha256": "sha256-tAEEJuU2ceTwXRtgGUFiFw1jgdJHSPG/WfaMDRm+gGQ=",
"rev": "v2.41.1",
"sha256": "sha256-fd4S78viG38Y8xCNnX4l4/dQ/x8JA6Ej/kd556jvBOU=",
"vendorSha256": "sha256-Dvm8vmlfV7LH73Y2jNTO106V/fOA7K78jFclbFKZVXA=",
"version": "2.41.0-beta.2"
"version": "2.41.1"
},
"nomad": {
"owner": "hashicorp",
@ -765,10 +765,10 @@
"owner": "nutanix",
"provider-source-address": "registry.terraform.io/nutanix/nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.3.0",
"sha256": "1q38f6a8d607sdhrr6xcqmdsvm625v7y36xma137bqv09g3xga0s",
"vendorSha256": "0qkd9pnidf4rhbk7p4jkpcdq36g8lp8pwpsf3hydy6xh072iy4id",
"version": "1.3.0"
"rev": "v1.4.0",
"sha256": "sha256-zOGZxDxGMeubZQ3u+7Qoj+gy29Et7yeFNFWpXbLllEY=",
"vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=",
"version": "1.4.0"
},
"oci": {
"owner": "oracle",
@ -1072,10 +1072,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.65.2",
"sha256": "sha256-JrgLHagLc+yhTMa6gVJpVxy3NGCO2BED/87z0JEhesE=",
"rev": "v1.66.0",
"sha256": "sha256-wbG2O6i0Ai86P+uk9rTsut+DEZcRFJCh93CfIEOfP2A=",
"vendorSha256": null,
"version": "1.65.2"
"version": "1.66.0"
},
"tfe": {
"owner": "hashicorp",
@ -1090,10 +1090,10 @@
"owner": "a10networks",
"provider-source-address": "registry.terraform.io/a10networks/thunder",
"repo": "terraform-provider-thunder",
"rev": "v0.5.21-beta",
"sha256": "1z52ifdi0nj3miwjz96zkmszh13l3vcbijgacfa28j2shasjyfwd",
"rev": "v1.0.0",
"sha256": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",
"vendorSha256": null,
"version": "0.5.21-beta"
"version": "1.0.0"
},
"time": {
"owner": "hashicorp",
@ -1164,10 +1164,10 @@
"owner": "Venafi",
"provider-source-address": "registry.terraform.io/Venafi/venafi",
"repo": "terraform-provider-venafi",
"rev": "v0.15.0",
"sha256": "sha256-7pfEQ7tHA+RiyotlvEymedCsDtR+8EDob1kKw55U5V0=",
"rev": "v0.15.2",
"sha256": "sha256-jnBunvqdLuU+GTRoXr/62FSnUoD5nfLVCN/wo4NdM3A=",
"vendorSha256": "sha256-lj8cuv9jR+3P7OiO/eW8poHcX+LsQo+kOyspiqdMXRY=",
"version": "0.15.0"
"version": "0.15.2"
},
"vercel": {
"owner": "ondrejsika",

42
pkgs/applications/networking/instant-messengers/gotktrix/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib
, buildGoModule
, fetchFromGitHub
, gtk4
, glib
, gobject-introspection
, pkg-config
, go
}:
buildGoModule rec {
pname = "gotktrix";
version = "0.1.1";
src = fetchFromGitHub {
owner = "diamondburned";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9feKg/rnkWdJRolHBQ5WT6Rl3xTFe82M8HyxJK3VuN4=";
};
vendorSha256 = "sha256-eO/2MvWOVCeeCsiU2mSwgSEVlSbCXOp8qHyoG0lmk+Q=";
buildInputs = [
gtk4
glib
gobject-introspection
];
nativeBuildInputs = [ pkg-config ];
# Checking requires a working display
doCheck = false;
meta = with lib; {
description = "Matrix client written in Go using GTK4";
homepage = "https://github.com/diamondburned/gotktrix";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;
};
}

4
pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix
View file

@ -5,10 +5,10 @@
appimageTools.wrapType2 rec {
pname = "session-desktop-appimage";
version = "1.7.7";
version = "1.7.9";
src = fetchurl {
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
sha256 = "iMJk7/Q3Kh2KwLs0m+DAPVv471iPZcsIs4+YCSbmeIo=";
sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef";
};
meta = with lib; {

2
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View file

@ -17,7 +17,7 @@ rec {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "2afaee16f155edcb0bdb46ebe282a733cf041ec6f562aebd06f8b675e46917f6f500fcc532fc54d74f3f4b0b489a88934a2c6c304f849873de4bc2690b9056a0";
};
patches = [
extraPatches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
./no-buildconfig.patch
];

8
pkgs/applications/networking/n8n/default.nix
View file

@ -17,6 +17,12 @@ nodePackages.n8n.override {
meta = with lib; {
description = "Free and open fair-code licensed node based Workflow Automation Tool";
maintainers = with maintainers; [ freezeboy k900 ];
license = licenses.asl20;
license = {
fullName = "Sustainable Use License";
url = "https://github.com/n8n-io/n8n/blob/master/LICENSE.md";
free = false;
# only free to redistribute "for non-commercial purposes"
redistributable = false;
};
};
}

186
pkgs/applications/networking/n8n/node-packages.nix generated
View file

@ -112,13 +112,13 @@ let
sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg==";
};
};
"@babel/runtime-7.17.7" = {
"@babel/runtime-7.17.8" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
version = "7.17.7";
version = "7.17.8";
src = fetchurl {
url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz";
sha512 = "L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==";
url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz";
sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==";
};
};
"@colors/colors-1.5.0" = {
@ -670,15 +670,6 @@ let
sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==";
};
};
"agent-base-4.3.0" = {
name = "agent-base";
packageName = "agent-base";
version = "4.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz";
sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==";
};
};
"agent-base-6.0.2" = {
name = "agent-base";
packageName = "agent-base";
@ -976,13 +967,13 @@ let
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
};
};
"aws-sdk-2.1093.0" = {
"aws-sdk-2.1096.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1093.0";
version = "2.1096.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1093.0.tgz";
sha512 = "YD6VNemoKkzDMHsUiGP/MwpM0T20ukp3KTSxPY34Xw3Ww0zP19C54CfjaXhn//R27f2c57BtVez+he2RZ5GwyQ==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1096.0.tgz";
sha512 = "q+hotU57U8bGpz1pf5CkO4z630ay0xGJ9HedahKPZ0Xk3/X0GH+QFYPBWJ5IMTtO30bjfPH0zTaL2vJmMXLBrQ==";
};
};
"aws-sign2-0.7.0" = {
@ -1975,13 +1966,13 @@ let
sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
};
};
"debug-4.3.3" = {
"debug-4.3.4" = {
name = "debug";
packageName = "debug";
version = "4.3.3";
version = "4.3.4";
src = fetchurl {
url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz";
sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==";
url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz";
sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==";
};
};
"debuglog-1.0.1" = {
@ -2146,13 +2137,13 @@ let
sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==";
};
};
"domhandler-4.3.0" = {
"domhandler-4.3.1" = {
name = "domhandler";
packageName = "domhandler";
version = "4.3.0";
version = "4.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz";
sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==";
url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz";
sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==";
};
};
"domutils-2.8.0" = {
@ -2335,24 +2326,6 @@ let
sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab";
};
};
"es6-promise-4.2.8" = {
name = "es6-promise";
packageName = "es6-promise";
version = "4.2.8";
src = fetchurl {
url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
};
};
"es6-promisify-5.0.0" = {
name = "es6-promisify";
packageName = "es6-promisify";
version = "5.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
};
};
"escalade-3.1.1" = {
name = "escalade";
packageName = "escalade";
@ -3118,15 +3091,6 @@ let
sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==";
};
};
"https-proxy-agent-3.0.1" = {
name = "https-proxy-agent";
packageName = "https-proxy-agent";
version = "3.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz";
sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==";
};
};
"https-proxy-agent-5.0.0" = {
name = "https-proxy-agent";
packageName = "https-proxy-agent";
@ -3874,13 +3838,13 @@ let
sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg==";
};
};
"libphonenumber-js-1.9.49" = {
"libphonenumber-js-1.9.50" = {
name = "libphonenumber-js";
packageName = "libphonenumber-js";
version = "1.9.49";
version = "1.9.50";
src = fetchurl {
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.49.tgz";
sha512 = "/wEOIONcVboFky+lWlCaF7glm1FhBz11M5PHeCApA+xDdVfmhKjHktHS8KjyGxouV5CSXIr4f3GvLSpJa4qMSg==";
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.50.tgz";
sha512 = "cCzQPChw2XbordcO2LKiw5Htx5leHVfFk/EXkxNHqJfFo7Fndcb1kF5wPJpc316vCJhhikedYnVysMh3Sc7Ocw==";
};
};
"libqp-1.1.0" = {
@ -4225,13 +4189,13 @@ let
sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg==";
};
};
"mappersmith-2.38.0" = {
"mappersmith-2.38.1" = {
name = "mappersmith";
packageName = "mappersmith";
version = "2.38.0";
version = "2.38.1";
src = fetchurl {
url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.38.0.tgz";
sha512 = "D2+ICkvNGnGCz01MADdQQilcHGffwLd1ell4b4uXS9QYvLfrX0r5nl5zb9V+2YDy3142u6VUl1b154pxJAxw3g==";
url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.38.1.tgz";
sha512 = "ecZ+YyzBK7r3tC8MTaGo5tySHPhB6f9jdxN706Tux6dMlcE2fgwiBM/bf/+Sz5m2yKlTq5ntiahz7xSPgurD6w==";
};
};
"material-colors-1.2.6" = {
@ -4540,49 +4504,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
"n8n-core-0.109.0" = {
"n8n-core-0.110.0" = {
name = "n8n-core";
packageName = "n8n-core";
version = "0.109.0";
version = "0.110.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.109.0.tgz";
sha512 = "hzimsUZbWHfG9RofSX7czg0DgB7YAIcLi7JRFUVB90HVdasFf1HQFVM2AwFZC/lLVckktuadWSpq2MOKW+lE3Q==";
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.110.0.tgz";
sha512 = "E+BrrAxO1TZbu19NDO66rubih6DNSoUdceM6S9pjtAEQukya9J2BAqnPsrZJ7Trs97W2q8G4wSKP4G6lzKobhQ==";
};
};
"n8n-design-system-0.14.0" = {
"n8n-design-system-0.15.0" = {
name = "n8n-design-system";
packageName = "n8n-design-system";
version = "0.14.0";
version = "0.15.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.14.0.tgz";
sha512 = "E9Tvnjd9hktVPsqBcX579Fr4Nn/QEVAHQaYZlPGrqxXLVD76mF0WQWJpU6XTZEs/9pKfEftk/TmDihtENLVTxg==";
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.15.0.tgz";
sha512 = "ZHlJJdaZ8ug9OV/SbqdF4FSEqTAoGBO+jqPECcUiYmHbL3BHcY8ZgWcnzmTnIPYTRGtIdc8snv3ti1USgASE5Q==";
};
};
"n8n-editor-ui-0.135.0" = {
"n8n-editor-ui-0.136.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
version = "0.135.0";
version = "0.136.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.135.0.tgz";
sha512 = "oM+Pnh4ZaUnDy5lj6u71EyXUPGNlbEIn3lpi4+xyO8tYtFyaN1kifS/q/a1sYrgZlwbWaksgUvTqufZ3Te6Yqw==";
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.136.0.tgz";
sha512 = "582dHNfp4upne8IhcaYznSPq26wsruAK5ZmOSfjcQMJqVBOm26IKFXCwn7ZL3KxNznmlHLHTfbAsrjE+ZTKPTA==";
};
};
"n8n-nodes-base-0.166.0" = {
"n8n-nodes-base-0.167.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
version = "0.166.0";
version = "0.167.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.166.0.tgz";
sha512 = "Iet76bGJrS3rTal5KbuBsJvYzAw3o9xfcLHERpDJyXOxgvrPfZ62A7RpmLMLA3KJLfKevY+VLGLWW5odTSvtEg==";
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.167.0.tgz";
sha512 = "9+pCjtPDptMO3nBqfizwsQ7+C+QUYPbW4YGT/X0+CaF+2wMkGEbKGADH6V0eWHHWKtzcyoLXqldSnilboXXxmw==";
};
};
"n8n-workflow-0.91.0" = {
"n8n-workflow-0.92.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
version = "0.91.0";
version = "0.92.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.91.0.tgz";
sha512 = "a4yqSvcalQs2MEDkOeadQc9cwK/3f6t+EKr/e8rEN5D9djnmuvoRJC+V9v6KPuHy66q1pv6w7fpmnrLRO+2WrA==";
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.92.0.tgz";
sha512 = "d16p4co9I6v+AxVOxXyeWAgUY/7PwwlgJFaKH8XTA/fRARah3/DzLdb9Kmq5I1fqtr1VoZ+a1uTQCJi11bnRzA==";
};
};
"named-placeholders-1.1.2" = {
@ -4702,13 +4666,13 @@ let
sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==";
};
};
"node-ssh-12.0.3" = {
"node-ssh-12.0.4" = {
name = "node-ssh";
packageName = "node-ssh";
version = "12.0.3";
version = "12.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.3.tgz";
sha512 = "+TrX99Fvu50ZwBu/1Z9oWV1xC+vjADCJACSmvdgYUeUH/PKIX6Y5ltPvrh30WFXcxaP1wHN09BBVdQ3jfZlfoA==";
url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.4.tgz";
sha512 = "5M3FBeAWjEpAQvVakQde6CeviEoEiYb6IjJL9mrMen9at63GAv0Q5vOFHFP+SM1Y7pTN3EBvJ/I+oxn2Lpydbw==";
};
};
"nodeify-1.0.1" = {
@ -5935,13 +5899,13 @@ let
sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==";
};
};
"requestretry-6.0.0" = {
"requestretry-7.0.2" = {
name = "requestretry";
packageName = "requestretry";
version = "6.0.0";
version = "7.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/requestretry/-/requestretry-6.0.0.tgz";
sha512 = "X7O+BMlfHgzetfSDtgQIMinLn1BuT+95W12iffDzyOS+HLoBEIQqCZv++UTChUWVjOu+pudbocD76+4j+jK9ww==";
url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz";
sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w==";
};
};
"require-at-1.0.6" = {
@ -6367,13 +6331,13 @@ let
sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==";
};
};
"snowflake-sdk-1.6.7" = {
"snowflake-sdk-1.6.8" = {
name = "snowflake-sdk";
packageName = "snowflake-sdk";
version = "1.6.7";
version = "1.6.8";
src = fetchurl {
url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.7.tgz";
sha512 = "pisHqO5ALTggbNhE7LGEG5bnD6NKebcqyirOl4IsoKsD7g6d+vC3gHgRR/cm8kAH1GhLHY/WwhDq2fr7lundpA==";
url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.8.tgz";
sha512 = "ZmzeR2W4mQVri546mUxUW+jBxTn0JRKm06EtndO7MUFLcS8YChf60tXTa+s7A0hO8FxQkSQAFonCmtz4nzPoSA==";
};
};
"source-map-0.6.1" = {
@ -7615,10 +7579,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.168.1";
version = "0.169.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.168.1.tgz";
sha512 = "bghyOcF+KZmRsmyC9p2ARb+RIlUBDwTKCMLd5eUFW1SKMBCWgQZwG8KCLCRApWjXjP1SYekeyDo1PSl5fa7Hxw==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.169.0.tgz";
sha512 = "mqZJUnulA/xNelNxebJeYioQeLtzNSFD8vzEsoxzoVbeaRkXQeC6CVBCldSGUMMSPcw2QchnzAKp9YauRE5cAA==";
};
dependencies = [
(sources."@azure/abort-controller-1.0.5" // {
@ -7670,7 +7634,7 @@ in
sources."tslib-2.3.1"
];
})
sources."@babel/runtime-7.17.7"
sources."@babel/runtime-7.17.8"
sources."@colors/colors-1.5.0"
(sources."@dabh/diagnostics-2.0.3" // {
dependencies = [
@ -7799,7 +7763,7 @@ in
];
})
sources."avsc-5.7.3"
(sources."aws-sdk-2.1093.0" // {
(sources."aws-sdk-2.1096.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -7997,7 +7961,7 @@ in
sources."cssfilter-0.0.10"
sources."dashdash-1.14.1"
sources."date-utils-1.2.21"
sources."debug-4.3.3"
sources."debug-4.3.4"
sources."debuglog-1.0.1"
sources."deep-extend-0.6.0"
sources."deepmerge-4.2.2"
@ -8014,7 +7978,7 @@ in
sources."discontinuous-range-1.0.0"
sources."dom-serializer-1.3.2"
sources."domelementtype-2.2.0"
sources."domhandler-4.3.0"
sources."domhandler-4.3.1"
sources."domutils-2.8.0"
(sources."dot-case-3.0.4" // {
dependencies = [
@ -8045,8 +8009,6 @@ in
sources."es-abstract-1.19.1"
sources."es-to-primitive-1.2.1"
sources."es5-ext-0.8.2"
sources."es6-promise-4.2.8"
sources."es6-promisify-5.0.0"
sources."escalade-3.1.1"
sources."escape-html-1.0.3"
sources."escape-string-regexp-4.0.0"
@ -8249,7 +8211,7 @@ in
sources."iconv-lite-0.6.2"
];
})
sources."libphonenumber-js-1.9.49"
sources."libphonenumber-js-1.9.50"
sources."libqp-1.1.0"
sources."limiter-1.1.5"
sources."linkify-it-3.0.3"
@ -8308,7 +8270,7 @@ in
})
sources."make-error-1.3.6"
sources."make-error-cause-2.3.0"
sources."mappersmith-2.38.0"
sources."mappersmith-2.38.1"
sources."material-colors-1.2.6"
sources."md5-2.3.0"
sources."media-typer-0.3.0"
@ -8365,19 +8327,19 @@ in
];
})
sources."mz-2.7.0"
(sources."n8n-core-0.109.0" // {
(sources."n8n-core-0.110.0" // {
dependencies = [
sources."qs-6.10.3"
];
})
sources."n8n-design-system-0.14.0"
sources."n8n-editor-ui-0.135.0"
(sources."n8n-nodes-base-0.166.0" // {
sources."n8n-design-system-0.15.0"
sources."n8n-editor-ui-0.136.0"
(sources."n8n-nodes-base-0.167.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
sources."n8n-workflow-0.91.0"
sources."n8n-workflow-0.92.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@ -8414,7 +8376,7 @@ in
sources."semver-5.7.1"
];
})
sources."node-ssh-12.0.3"
sources."node-ssh-12.0.4"
sources."nodeify-1.0.1"
sources."nodemailer-6.7.2"
sources."nopt-4.0.3"
@ -8596,7 +8558,7 @@ in
sources."tough-cookie-2.5.0"
];
})
sources."requestretry-6.0.0"
sources."requestretry-7.0.2"
sources."require-at-1.0.6"
sources."require-directory-2.1.1"
sources."requires-port-1.0.0"
@ -8659,12 +8621,10 @@ in
sources."tslib-2.3.1"
];
})
(sources."snowflake-sdk-1.6.7" // {
(sources."snowflake-sdk-1.6.8" // {
dependencies = [
sources."agent-base-4.3.0"
sources."debug-3.2.7"
sources."http-signature-1.3.6"
sources."https-proxy-agent-3.0.1"
sources."jsprim-2.0.2"
sources."tmp-0.2.1"
sources."uuid-3.4.0"

81
pkgs/applications/office/bookworm/default.nix
View file

@ -1,42 +1,67 @@
{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee
, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook
, appstream, desktop-file-utils }:
{ lib
, stdenv
, fetchFromGitHub
, appstream
, bash
, coreutils
, curl
, desktop-file-utils
, glib
, gnugrep
, gobject-introspection
, gtk3
, html2text
, libgee
, libxml2
, meson
, ninja
, pantheon
, pkg-config
, poppler
, poppler_utils
, python3
, sqlite
, unar
, unzip
, vala
, webkitgtk
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "bookworm";
version = "1.1.2";
version = "unstable-2022-01-09";
src = fetchFromGitHub {
owner = "babluboy";
repo = pname;
rev = version;
sha256 = "0w0rlyahpgx0l6inkbj106agbnr2czil0vdcy1zzv70apnjz488j";
rev = "f3df858ce748a6bbc43f03a6e261ff76a6d7d303";
hash = "sha256-mLyJfblF5WnWBV3rX1ZRupccou4t5mBpo3W7+ECNMVI=";
};
nativeBuildInputs = [
bash
gobject-introspection
libxml2
meson
ninja
pkg-config
python3
vala
wrapGAppsHook
];
buildInputs = [
pantheon.granite
glib
libgee
gtk3
html2text
poppler
python2
sqlite
webkitgtk
appstream
desktop-file-utils
glib
gobject-introspection
gtk3
html2text
libgee
libxml2
pantheon.granite
poppler
python3
sqlite
webkitgtk
];
postPatch = ''
@ -57,13 +82,13 @@ stdenv.mkDerivation rec {
patchShebangs $out/share/bookworm/scripts/tasks/*.sh
'';
meta = with lib; {
description = "A simple, focused eBook reader";
longDescription = ''
Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc.
'';
homepage = "https://babluboy.github.io/bookworm/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
meta = with lib; {
description = "A simple, focused eBook reader";
longDescription = ''
Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc.
'';
homepage = "https://babluboy.github.io/bookworm/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

36
pkgs/applications/science/astronomy/gnuastro/default.nix Normal file
View file

@ -0,0 +1,36 @@
{ lib, stdenv, fetchurl, libtool
, cfitsio, curl, ghostscript, gsl, libgit2, libjpeg, libtiff, lzlib, wcslib }:
stdenv.mkDerivation rec {
pname = "gnuastro";
version = "0.17";
src = fetchurl {
url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz";
sha256 = "sha256-xBvtM8wkDOqXg/Q2dNfPR0R0ZgRm4QiPJZoLDKivaPU=";
};
nativeBuildInputs = [ libtool ];
buildInputs = [
cfitsio
curl
ghostscript
gsl
libgit2
libjpeg
libtiff
lzlib
wcslib
];
enableParallelBuilding = true;
meta = with lib; {
description = "GNU astronomy utilities and library";
homepage = "https://www.gnu.org/software/gnuastro/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ sikmir ];
};
}

4
pkgs/applications/science/math/cemu/default.nix
View file

@ -7,7 +7,7 @@
, qtbase
, qmake
, git
, libpng_apng
, libpng
, pkg-config
, wrapQtAppsHook
, stdenv
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
libarchive
libusb-compat-0_1
qtbase
libpng_apng
libpng
];
qmakeFlags = [

6
pkgs/applications/science/misc/simgrid/default.nix
View file

@ -4,6 +4,7 @@
, buildJavaBindings ? false, openjdk
, buildPythonBindings ? true, python3Packages
, modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw
, bmfSupport ? true, eigen
, minimalBindings ? false
, debug ? false
, optimize ? (!debug)
@ -19,14 +20,14 @@ in
stdenv.mkDerivation rec {
pname = "simgrid";
version = "3.30";
version = "3.31";
src = fetchFromGitLab {
domain = "framagit.org";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1dg8ywqif20g0fs8dnd6364n080nvwx7f444zcfwqwz6iax61qv1";
sha256 = "sha256-K6YkkCMxc2lqxHIwyuLiwcp3m49sqbEtOlwZh4L1YJg=";
};
propagatedBuildInputs = [ boost ];
@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
++ optionals buildJavaBindings [ openjdk ]
++ optionals buildPythonBindings [ python3Packages.pybind11 ]
++ optionals buildDocumentation [ fig2dev ghostscript doxygen ]
++ optionals bmfSupport [ eigen ]
++ optionals modelCheckingSupport [ libunwind libevent elfutils ];
outputs = [ "out" ]

78
pkgs/applications/version-management/git-and-tools/cgit/common.nix Normal file
View file

@ -0,0 +1,78 @@
{ pname, version, src, gitSrc, buildInputs ? []
, homepage, repo, description, maintainers
}:
{ lib, stdenv, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xsl, pkg-config
, coreutils, gnused, groff, docutils
, gzip, bzip2, lzip, xz, zstd
, python3Packages
}:
stdenv.mkDerivation {
inherit pname version src gitSrc;
nativeBuildInputs = [
pkg-config asciidoc
] ++ (with python3Packages; [ python wrapPython ]);
buildInputs = buildInputs ++ [
openssl zlib libxml2 libxslt docbook_xsl
];
pythonPath = with python3Packages; [ pygments markdown ];
postPatch = ''
sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
-e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-e 's|"lzip"|"${lzip}/bin/lzip"|' \
-e 's|"xz"|"${xz.bin}/bin/xz"|' \
-e 's|"zstd"|"${zstd}/bin/zstd"|' \
-i ui-snapshot.c
substituteInPlace filters/html-converters/man2html \
--replace 'groff' '${groff}/bin/groff'
substituteInPlace filters/html-converters/rst2html \
--replace 'rst2html.py' '${docutils}/bin/rst2html.py'
'';
# Give cgit a git source tree and pass configuration parameters (as make
# variables).
preBuild = ''
mkdir -p git
tar --strip-components=1 -xf "$gitSrc" -C git
'';
makeFlags = [
"prefix=$(out)"
"CGIT_SCRIPT_PATH=$(out)/cgit/"
"CC=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"
];
# Install manpage.
postInstall = ''
# xmllint fails:
#make install-man
# bypassing xmllint works:
a2x --no-xmllint -f manpage cgitrc.5.txt
mkdir -p "$out/share/man/man5"
cp cgitrc.5 "$out/share/man/man5"
wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do
wrapProgram $script --prefix PATH : '${lib.makeBinPath [ coreutils gnused ]}'
done
'';
stripDebugList = [ "cgit" ];
meta = {
inherit homepage description;
repositories.git = repo;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = maintainers ++ (with lib.maintainers; [ qyliss ]);
};
}

77
pkgs/applications/version-management/git-and-tools/cgit/default.nix
View file

@ -1,11 +1,6 @@
{ lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xsl, pkg-config, luajit
, coreutils, gnused, groff, docutils
, gzip, bzip2, lzip, xz, zstd
, python, wrapPython, pygments, markdown
}:
{ lib, fetchurl, callPackage, luajit }:
stdenv.mkDerivation rec {
callPackage (import ./common.nix rec {
pname = "cgit";
version = "1.2.3";
@ -22,66 +17,10 @@ stdenv.mkDerivation rec {
sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
};
nativeBuildInputs = [ pkg-config asciidoc ] ++ [ python wrapPython ];
buildInputs = [
openssl zlib libxml2 libxslt docbook_xsl luajit
];
pythonPath = [ pygments markdown ];
buildInputs = [ luajit ];
postPatch = ''
sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
-e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-e 's|"lzip"|"${lzip}/bin/lzip"|' \
-e 's|"xz"|"${xz.bin}/bin/xz"|' \
-e 's|"zstd"|"${zstd}/bin/zstd"|' \
-i ui-snapshot.c
substituteInPlace filters/html-converters/man2html \
--replace 'groff' '${groff}/bin/groff'
substituteInPlace filters/html-converters/rst2html \
--replace 'rst2html.py' '${docutils}/bin/rst2html.py'
'';
# Give cgit a git source tree and pass configuration parameters (as make
# variables).
preBuild = ''
mkdir -p git
tar --strip-components=1 -xf "$gitSrc" -C git
'';
makeFlags = [
"prefix=$(out)"
"CGIT_SCRIPT_PATH=$(out)/cgit/"
"CC=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"
];
# Install manpage.
postInstall = ''
# xmllint fails:
#make install-man
# bypassing xmllint works:
a2x --no-xmllint -f manpage cgitrc.5.txt
mkdir -p "$out/share/man/man5"
cp cgitrc.5 "$out/share/man/man5"
wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do
wrapProgram $script --prefix PATH : '${lib.makeBinPath [ coreutils gnused ]}'
done
'';
stripDebugList = [ "cgit" ];
meta = {
homepage = "https://git.zx2c4.com/cgit/about/";
repositories.git = "git://git.zx2c4.com/cgit";
description = "Web frontend for git repositories";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ bjornfor ];
};
}
homepage = "https://git.zx2c4.com/cgit/about/";
repo = "git://git.zx2c4.com/cgit";
description = "Web frontend for git repositories";
maintainers = with lib.maintainers; [ bjornfor ];
}) {}

24
pkgs/applications/version-management/git-and-tools/cgit/pink.nix Normal file
View file

@ -0,0 +1,24 @@
{ lib, fetchurl, callPackage }:
callPackage (import ./common.nix rec {
pname = "cgit-pink";
version = "1.3.0";
src = fetchurl {
url = "https://git.causal.agency/cgit-pink/snapshot/cgit-pink-${version}.tar.gz";
sha256 = "sha256-oL46NWgqi1VqKNEt0QGBWNXbi2l7nOQDZy1aMivcWuM=";
};
# cgit-pink is tightly coupled with git and needs a git source tree to build.
# IMPORTANT: Remember to check which git version cgit-pink needs on every
# version bump (look for "GIT_VER" in the top-level Makefile).
gitSrc = fetchurl {
url = "mirror://kernel/software/scm/git/git-2.35.1.tar.xz";
sha256 = "sha256-12hSjmRD9logMDYmbxylD50Se6iXUeMurTcRftkZEIA=";
};
homepage = "https://git.causal.agency/cgit-pink/about/";
repo = "https://git.causal.agency/cgit-pink";
description = "cgit fork aiming for better maintenance";
maintainers = with lib.maintainers; [ qyliss sternenseemann ];
}) {}

43
pkgs/applications/version-management/git-and-tools/hut/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ lib
, buildGoModule
, fetchFromSourcehut
, scdoc
, unstableGitUpdater
}:
buildGoModule {
pname = "hut";
version = "unstable-2022-03-02";
src = fetchFromSourcehut {
owner = "~emersion";
repo = "hut";
rev = "55ad2fbd9ceeeb9e7dc203c15476fa785f1209e0";
sha256 = "sha256-j2IVwCm7iq3JKccPL8noRBhqw+V+4qfcpAwV65xhZk0=";
};
vendorSha256 = "sha256-zdQvk0M1a+Y90pnhqIpKxLJnlVJqMoSycewTep2Oux4=";
nativeBuildInputs = [
scdoc
];
makeFlags = [ "PREFIX=$(out)" ];
postBuild = ''
make $makeFlags completions doc/hut.1
'';
preInstall = ''
make $makeFlags install
'';
passthru.updateScript = unstableGitUpdater { };
meta = with lib; {
homepage = "https://sr.ht/~emersion/hut/";
description = "A CLI tool for Sourcehut / sr.ht";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fgaz ];
};
}

8
pkgs/applications/version-management/gitkraken/default.nix
View file

@ -11,24 +11,24 @@ with lib;
let
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
pname = "gitkraken";
version = "8.3.0";
version = "8.3.3";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "sha256-iAXw6+KCyfyabyJvBQ5cLNEMNbsELL9sQaZkzZL7+/w=";
sha256 = "185msrpa33w40prc88n5m0g12wh8r6szj56iikk4ps6kwr6wamy7";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
sha256 = "sha256-Spgx5JQ/AENYdvkl7+YnBaNk/VI9DdyN17ABfxanfZ4=";
sha256 = "0iam5ni8imajxhcv12zib6m475i6czllmqy512r1wmzw9zbilf43";
};
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
sha256 = "sha256-PJ4/R1pHbfoSBHhIyiqcGoE13FSWQapxj4Lq+ZdcYCQ=";
sha256 = "12af421r4d8s4l5j54xyd3x8pa72nbilass95v0y3b0wgsi35g0z";
};
};

16
pkgs/applications/video/corrscope/default.nix
View file

@ -2,7 +2,6 @@
, mkDerivationWith
, python3Packages
, fetchFromGitHub
, fetchpatch
, wrapQtAppsHook
, ffmpeg
, qtbase
@ -10,25 +9,16 @@
mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "corrscope";
version = "0.7.1";
version = "0.8.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "corrscope";
repo = "corrscope";
rev = version;
sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m";
sha256 = "1wdla4ryif1ss37aqi61lcvzddvf568wyh5s3xv1lrryh4al9vpd";
};
patches = [
# Remove when bumping past 0.7.1
(fetchpatch {
name = "0001-Use-poetry-core.patch";
url = "https://github.com/corrscope/corrscope/commit/d40d1846dd54b8bccd7b8055d6aece48aacbb943.patch";
sha256 = "0xxsbmxdbh3agfm6ww3rpa7ab0ysppan490w0gaqwmwzrxmmdljv";
})
];
nativeBuildInputs = [
wrapQtAppsHook
] ++ (with python3Packages; [
@ -48,8 +38,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
matplotlib
numpy
packaging
qtpy
pyqt5
ruamel-yaml
colorspacious
];
dontWrapQtApps = true;

50
pkgs/applications/video/gpu-screen-recorder/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ stdenv, lib, fetchgit, makeWrapper, pkg-config, cudatoolkit, glew, libX11
, libXcomposite, glfw, libpulseaudio, ffmpeg }:
stdenv.mkDerivation rec {
pname = "gpu-screen-recorder";
version = "1.0.0";
src = fetchgit {
url = "https://repo.dec05eba.com/gpu-screen-recorder";
rev = "36fd4516db06bcb192e49055319d1778bbed0322";
sha256 = "sha256-hYEHM4FOYcPmQ5Yxh520PKy8HiD+G0xv9hrn8SmA07w=";
};
nativeBuildInputs = [
pkg-config
makeWrapper
];
buildInputs = [
glew
libX11
libXcomposite
glfw
libpulseaudio
ffmpeg
];
postPatch = ''
substituteInPlace ./build.sh \
--replace '/opt/cuda/targets/x86_64-linux/include' '${cudatoolkit}/targets/x86_64-linux/include' \
--replace '/usr/lib64/libcuda.so' '${cudatoolkit}/targets/x86_64-linux/lib/stubs/libcuda.so'
'';
buildPhase = ''
./build.sh
'';
installPhase = ''
install -Dt $out/bin/ gpu-screen-recorder
wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib
'';
meta = with lib; {
description = "A screen recorder that has minimal impact on system performance by recording a window using the GPU only";
homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ babbaj ];
platforms = [ "x86_64-linux" ];
};
}

38
pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch Normal file
View file

@ -0,0 +1,38 @@
diff --git a/build.sh b/build.sh
index 05603db..8c38b31 100755
--- a/build.sh
+++ b/build.sh
@@ -2,5 +2,5 @@
dependencies="gtk+-3.0 x11 xrandr libpulse"
includes="$(pkg-config --cflags $dependencies)"
-libs="$(pkg-config --libs $dependencies)"
+libs="$(pkg-config --libs $dependencies) -ldl"
g++ -o gpu-screen-recorder-gtk -O2 src/main.cpp -s $includes $libs
diff --git a/src/main.cpp b/src/main.cpp
index ae2078f..9dcdce1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,6 +15,7 @@
#include <pwd.h>
#include <libgen.h>
#include <functional>
+#include <dlfcn.h>
typedef struct {
Display *display;
@@ -830,7 +831,13 @@ static void audio_input_change_callback(GtkComboBox *widget, gpointer userdata)
}
static bool is_nv_fbc_installed() {
- return access("/usr/lib/libnvidia-fbc.so.1", F_OK) == 0 || access("/usr/local/lib/libnvidia-fbc.so.1", F_OK) == 0;
+ auto handle = dlopen("libnvidia-fbc.so.1", RTLD_LAZY);
+ if (handle) {
+ dlclose(handle);
+ return true;
+ } else {
+ return false;
+ }
}
static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *app) {

46
pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix Normal file
View file

@ -0,0 +1,46 @@
{ stdenv, lib, fetchgit, pkg-config, makeWrapper, gtk3, libX11, libXrandr
, libpulseaudio, gpu-screen-recorder }:
stdenv.mkDerivation rec {
pname = "gpu-screen-recorder-gtk";
version = "0.1.0";
src = fetchgit {
url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk";
rev = "4c317abd0531f8e155fbbbcd32850bbeebbf2ead";
sha256 = "sha256-5W6qmUMP31ndRDxMHuQ/XnZysPQgaie0vVlMTzfODU4=";
};
patches = [ ./fix-nvfbc-check.patch ];
nativeBuildInputs = [
pkg-config
makeWrapper
];
buildInputs = [
gtk3
libX11
libXrandr
libpulseaudio
];
buildPhase = ''
./build.sh
'';
installPhase = ''
install -Dt $out/bin/ gpu-screen-recorder-gtk
install -Dt $out/share/applications/ gpu-screen-recorder-gtk.desktop
wrapProgram $out/bin/gpu-screen-recorder-gtk --prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]}
'';
meta = with lib; {
description = "GTK frontend for gpu-screen-recorder.";
homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ babbaj ];
platforms = [ "x86_64-linux" ];
};
}

4
pkgs/applications/virtualization/docker-slim/default.nix
View file

@ -6,7 +6,7 @@
buildGoPackage rec {
pname = "docker-slim";
version = "1.37.4";
version = "1.37.5";
goPackagePath = "github.com/docker-slim/docker-slim";
@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "docker-slim";
repo = "docker-slim";
rev = version;
sha256 = "sha256-iz1V+wcrJf0grOe81kwbXPBqnvXpHnh7IMDdugaUOH0=";
sha256 = "sha256-MBs0ybBXsanNFt6R7+ZYvtCh7iHE3FtWXE9uy9tbrE4=";
};
subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];

4
pkgs/data/icons/whitesur-icon-theme/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "Whitesur-icon-theme";
version = "2021-11-08";
version = "2022-03-18";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "LZ0GLJFUUvzsPhU2sBkfy5mPpQHuPzYhbumwFKnogoA=";
sha256 = "iHLxZqcDLUo62J67MwZ72CSvsHHiI9/Jk31KwkgIPr4=";
};
nativeBuildInputs = [ gtk3 ];

11
pkgs/data/themes/graphite-gtk-theme/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, gitUpdater
, gnome-themes-extra
, gtk-engine-murrine
, jdupes
@ -21,18 +22,18 @@ in
lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants
lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dark" "rimless" "normal" ] tweaks
lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens
stdenvNoCC.mkDerivation {
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "unstable-2022-02-04";
version = "2022-03-22";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891";
sha256 = "09xixd6cz2iyyyg6vskyk0wj2mahfsg21dlfcvi862h8w01hg9lr";
sha256 = "maYHA+AICoPiZo62IJ52UFUhOZh+6m2e9z6Kz0zrsSc=";
};
nativeBuildInputs = [
@ -85,6 +86,8 @@ stdenvNoCC.mkDerivation {
runHook postInstall
'';
passthru.updateScript = gitUpdater { inherit pname version; };
meta = with lib; {
description = "Flat Gtk+ theme based on Elegant Design";
homepage = "https://github.com/vinceliuice/Graphite-gtk-theme";

6
pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "kde-rounded-corners";
version = "unstable-2021-11-06";
version = "0.1.1";
src = fetchFromGitHub {
owner = "matinlotfali";
repo = "KDE-Rounded-Corners";
rev = "8ad8f5f5eff9d1625abc57cb24dc484d51f0e1bd";
sha256 = "0xbskf7jd03d2invfz1nnfc82klzvc784snw539n4kn6c6rc381p";
rev = "v${version}";
hash = "sha256-cXpJabeOHnat7OljtRzduUdOaA6Z3z6vV3aBKwiIrR0=";
};
postConfigure = ''

3
pkgs/desktops/plasma-5/default.nix
View file

@ -133,10 +133,10 @@ let
milou = callPackage ./milou.nix {};
oxygen = callPackage ./oxygen.nix {};
plasma-browser-integration = callPackage ./plasma-browser-integration.nix {};
plasma-phone-components = callPackage ./plasma-phone-components {};
plasma-desktop = callPackage ./plasma-desktop {};
plasma-disks = callPackage ./plasma-disks.nix {};
plasma-integration = callPackage ./plasma-integration {};
plasma-mobile = callPackage ./plasma-mobile {};
plasma-nano = callPackage ./plasma-nano {};
plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
@ -168,6 +168,7 @@ let
} // lib.optionalAttrs (config.allowAliases or true) {
ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
plasma-phone-components = throw "'plasma-phone-components' has been renamed to/replaced by 'plasma-mobile'";
};
in
lib.makeScope libsForQt5.newScope packages

2
pkgs/desktops/plasma-5/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.0/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.3/ -A '*.tar.xz' )

6
pkgs/desktops/plasma-5/plasma-phone-components/default.nix → pkgs/desktops/plasma-5/plasma-mobile/default.nix
View file

@ -7,7 +7,7 @@
kdeclarative, kdelibs4support, kpeople, kconfig, krunner, kinit, kwayland, kwin,
plasma-framework, telepathy, libphonenumber, protobuf, libqofono, modemmanager-qt,
plasma-workspace,
networkmanager-qt, plasma-workspace,
maliit-framework, maliit-keyboard,
qtwayland, qttools
@ -16,14 +16,14 @@
let inherit (lib) getBin getLib; in
mkDerivation {
pname = "plasma-phone-components";
pname = "plasma-mobile";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
appstream libdbusmenu pam wayland
kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin
plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt
maliit-framework maliit-keyboard
networkmanager-qt maliit-framework maliit-keyboard
];
postPatch = ''

4
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
View file

@ -71,10 +71,10 @@ index 008fdfcaf..72468f21c 100644
}
void cleanupPlasmaEnvironment(const std::optional<QProcessEnvironment> &oldSystemdEnvironment)
@@ -500,7 +500,7 @@ QProcess *setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash");
@@ -501,7 +501,7 @@ QProcess *setupKSplash()
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
p->setProcessChannelMode(QProcess::ForwardedChannels);
- p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
+ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
}

440
pkgs/desktops/plasma-5/srcs.nix
View file

@ -4,435 +4,427 @@
{
bluedevil = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/bluedevil-5.24.0.tar.xz";
sha256 = "128br83hkxxrb6wca3d1racygdnfgk3r5md1gcjvgwb0gpy6bnzp";
name = "bluedevil-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/bluedevil-5.24.3.tar.xz";
sha256 = "1hlyqhn14yq7960zfjwjygkpkvbmrlsanm1g1wrr7dwbmrp5dlcx";
name = "bluedevil-5.24.3.tar.xz";
};
};
breeze = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/breeze-5.24.0.tar.xz";
sha256 = "08b3hihz98z7kdybb0y1b74q1dn511ga81qqqxzlfirgpp8c9f9q";
name = "breeze-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/breeze-5.24.3.tar.xz";
sha256 = "0h19m6wmhjw8v6ys47kgzcb0h2nb9w2fcjzypnvmkvbjbkjr53sb";
name = "breeze-5.24.3.tar.xz";
};
};
breeze-grub = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/breeze-grub-5.24.0.tar.xz";
sha256 = "0p0pzmsd6scssyxcm9n58mp7fc9vz1lg4n7c1ch4bqragih1gnlr";
name = "breeze-grub-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/breeze-grub-5.24.3.tar.xz";
sha256 = "15cpmqp7klp4dhcil3i78iff4kjasfx273v36ml8y05hm8w0igjq";
name = "breeze-grub-5.24.3.tar.xz";
};
};
breeze-gtk = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/breeze-gtk-5.24.0.tar.xz";
sha256 = "090cczxc1ciic6wghz3p21gpfdwnc8pjcvq6wn7bfkp1i3r5mihp";
name = "breeze-gtk-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/breeze-gtk-5.24.3.tar.xz";
sha256 = "1922s17mh4ifaqbf4b7p6yj8pwd6z3qwpbf21j1fqhmdk4pvn499";
name = "breeze-gtk-5.24.3.tar.xz";
};
};
breeze-plymouth = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/breeze-plymouth-5.24.0.tar.xz";
sha256 = "1qqpwgp1yy3p1s0z21xwds6wx4z8daibkgk1bynj73cx7a2wch9g";
name = "breeze-plymouth-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/breeze-plymouth-5.24.3.tar.xz";
sha256 = "0nkf0ll4hcawmkd7nrh8gcf6hhbl0ajxiz2azf9njab9pv2lcz1j";
name = "breeze-plymouth-5.24.3.tar.xz";
};
};
discover = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/discover-5.24.0.tar.xz";
sha256 = "0dbfvqana31wqharsbyb8rcrw1w6l9x1g6p02aqwiph0inkrz20q";
name = "discover-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/discover-5.24.3.tar.xz";
sha256 = "097m5njz86vi4innap1mvizas60r1qcrdzdgsid1hd6p5a92rwca";
name = "discover-5.24.3.tar.xz";
};
};
drkonqi = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/drkonqi-5.24.0.tar.xz";
sha256 = "1ismgg7rcxijkprn4sci15wn4w2gmdn0fdbgvzxdcrqaf4g6qc3s";
name = "drkonqi-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/drkonqi-5.24.3.tar.xz";
sha256 = "1n6psvr3washk796zrc8ag011fwy677h2mdkw9ijx8dhrk80br0k";
name = "drkonqi-5.24.3.tar.xz";
};
};
kactivitymanagerd = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kactivitymanagerd-5.24.0.tar.xz";
sha256 = "12dvgm3ilyqlxzm8209b7g42nfk0ahfzizs3pbmi18zapjszcsps";
name = "kactivitymanagerd-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kactivitymanagerd-5.24.3.tar.xz";
sha256 = "0qxf3j36dj1yklnl27znsi9qdjmn6nr779cnzms38x76dq9kxblw";
name = "kactivitymanagerd-5.24.3.tar.xz";
};
};
kde-cli-tools = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kde-cli-tools-5.24.0.tar.xz";
sha256 = "0l8a4ysz1cqwdh3c20q51qamwh58vvs8yzb5jdvbp8bahsyyc4mr";
name = "kde-cli-tools-5.24.0.tar.xz";
};
};
kde-gtk-config = {
version = "5.24.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kde-gtk-config-5.24.0.tar.xz";
sha256 = "024pglycz2kbp9npnvbx5qpkz9381wyyp6xkalqynzr9gy58syrx";
name = "kde-gtk-config-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kde-cli-tools-5.24.3.tar.xz";
sha256 = "00z8yxic5ibk05x8c25dsc4ijvk6yv0aw1iyfhnpnzmdwdydlr7y";
name = "kde-cli-tools-5.24.3.tar.xz";
};
};
kdecoration = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kdecoration-5.24.0.tar.xz";
sha256 = "0xl8892w49z11k9mxgh7lp8a4l1x8wldmaij82kd1vnh9sxvb3f3";
name = "kdecoration-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kdecoration-5.24.3.tar.xz";
sha256 = "0dpnaf5myn1h368cnkq9g6xfm1sqmyam6bxyidbd5j3dyy1kvz5v";
name = "kdecoration-5.24.3.tar.xz";
};
};
kde-gtk-config = {
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.3/kde-gtk-config-5.24.3.tar.xz";
sha256 = "0p50kf34csdrgck1y09d3lnz0r9ly0ca4778achrc59yr4qcsjzv";
name = "kde-gtk-config-5.24.3.tar.xz";
};
};
kdeplasma-addons = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kdeplasma-addons-5.24.0.tar.xz";
sha256 = "0q8yf0gz4gjn1kyf545i8fpsn2dpy48qhjpm8ssp3ywv6s2abjxn";
name = "kdeplasma-addons-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kdeplasma-addons-5.24.3.tar.xz";
sha256 = "0g7jcvd6abnlzz9ibnc7phzm58pn6dv3795w4hhy47738jkhizl6";
name = "kdeplasma-addons-5.24.3.tar.xz";
};
};
kgamma5 = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kgamma5-5.24.0.tar.xz";
sha256 = "07w7l25snpi98j5bxg3zri5lsymabnli6h9d5w0qx0c19wzjwayl";
name = "kgamma5-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kgamma5-5.24.3.tar.xz";
sha256 = "0rwqvz14a50s43p74n19v1zzd9y8f2lylfappxmhrdyxmbgkpnk6";
name = "kgamma5-5.24.3.tar.xz";
};
};
khotkeys = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/khotkeys-5.24.0.tar.xz";
sha256 = "0gjdwdzg5vybalima8jnwrprqj0rnxmzds0x8w707nb9ypz4k7k6";
name = "khotkeys-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/khotkeys-5.24.3.tar.xz";
sha256 = "1jxg91rpz09sh13fz270pxfw40qdy6p50j5xw7cpnyqlk2l5zx0p";
name = "khotkeys-5.24.3.tar.xz";
};
};
kinfocenter = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kinfocenter-5.24.0.tar.xz";
sha256 = "09fq69q4300ppi1y9pp8s4h1bbai1p5qsz384bb445pjvwsyn6nf";
name = "kinfocenter-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kinfocenter-5.24.3.tar.xz";
sha256 = "08z2044bl0v4ydlx2chv849y6m4py0yd4lnw76sycd14lnvsrxfj";
name = "kinfocenter-5.24.3.tar.xz";
};
};
kmenuedit = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kmenuedit-5.24.0.tar.xz";
sha256 = "0bjiqdw4wqi5vpkn98wjjz23x6k47lvxac8nyxs8ddd9i8mlklij";
name = "kmenuedit-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kmenuedit-5.24.3.tar.xz";
sha256 = "1yivrdix4jiycfbw9g6pzx8zkmdq4g8g51ndc7sy3r0qxzgx1icb";
name = "kmenuedit-5.24.3.tar.xz";
};
};
kscreen = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kscreen-5.24.0.tar.xz";
sha256 = "19kqvvgj209ri035ldzn1k5l36l54rvagsnfzhw61v8rd9r6r02x";
name = "kscreen-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kscreen-5.24.3.tar.xz";
sha256 = "1wjbd33h8473v8i5qxdccxrsv04v6jyd7scrqdxqaln9n8ylp08f";
name = "kscreen-5.24.3.tar.xz";
};
};
kscreenlocker = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kscreenlocker-5.24.0.tar.xz";
sha256 = "0d827h5br27sdd925brljb1mwnkzj739g5q0k8xkw9f9q9bxk8l8";
name = "kscreenlocker-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kscreenlocker-5.24.3.tar.xz";
sha256 = "1dh3z55hwakj11ffn2fm79vnlw7gcg1nkcxbxvcdcpq84ahpq583";
name = "kscreenlocker-5.24.3.tar.xz";
};
};
ksshaskpass = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/ksshaskpass-5.24.0.tar.xz";
sha256 = "1xiw25imhmkcikp746q9s393djmkdpkh9jb7h1diwwhambnimy6d";
name = "ksshaskpass-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/ksshaskpass-5.24.3.tar.xz";
sha256 = "0ivq9nyyqm1rrm6ck26jlsh8qv9q98dz5qwvcnpgpmxb3mr1dgiv";
name = "ksshaskpass-5.24.3.tar.xz";
};
};
ksystemstats = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/ksystemstats-5.24.0.tar.xz";
sha256 = "1182dfcg1av9329g9p9ll64yiwyxm46kczakxb3vj4d2ajaclzm1";
name = "ksystemstats-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/ksystemstats-5.24.3.tar.xz";
sha256 = "03ikpd3m0qk8cb92g63i7q9c8bks7ggf1pmmig559cmg7gbknc2c";
name = "ksystemstats-5.24.3.tar.xz";
};
};
kwallet-pam = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kwallet-pam-5.24.0.tar.xz";
sha256 = "0jzi2rcwxxjp3lg8cywp96ysnwm51a0m9pdwk8z7n3v1ncr2p38q";
name = "kwallet-pam-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kwallet-pam-5.24.3.tar.xz";
sha256 = "0zxdrpjq8sg3qw2gfkvjs567b41labi940cq4qrix395v7251p9k";
name = "kwallet-pam-5.24.3.tar.xz";
};
};
kwayland-integration = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kwayland-integration-5.24.0.tar.xz";
sha256 = "1yq9cjb8xcvqr747p5hm8xxg4rn6mahchd5c2camv3qrjbqm8ll6";
name = "kwayland-integration-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kwayland-integration-5.24.3.tar.xz";
sha256 = "1kq5vrrplbdxri8610h89apfz07a6xi1gnlvmr8gbsvas5zicvwz";
name = "kwayland-integration-5.24.3.tar.xz";
};
};
kwayland-server = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kwayland-server-5.24.0.tar.xz";
sha256 = "1zbi4c14zvjwkxxqlg80mv749ybnkmcdvn72irmrzbbf4g1z7k32";
name = "kwayland-server-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kwayland-server-5.24.3.tar.xz";
sha256 = "0fq61qk3cp4xg9759ylqqw5ncx9s7kayjf0bilg5m725bfhj02sn";
name = "kwayland-server-5.24.3.tar.xz";
};
};
kwin = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kwin-5.24.0.tar.xz";
sha256 = "19q5pphqnr1xc1c4z0sd3yr60jsiq190llwllfmlj4acjlbcbbn6";
name = "kwin-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kwin-5.24.3.tar.xz";
sha256 = "0szlrcsj4h4fa5yf27nmza7c4dyc0xcwdrihs05pl5qk5bivfkfq";
name = "kwin-5.24.3.tar.xz";
};
};
kwrited = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/kwrited-5.24.0.tar.xz";
sha256 = "018wvkkqzg4qyjd0w1h2d3ms72ghlq8mg79rrsj518l7hhlv6rsg";
name = "kwrited-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/kwrited-5.24.3.tar.xz";
sha256 = "1sgd3iik647pz2zr5cpsbwm2ll8f11xyw2jv2sfxkbiiw53qaxid";
name = "kwrited-5.24.3.tar.xz";
};
};
layer-shell-qt = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/layer-shell-qt-5.24.0.tar.xz";
sha256 = "0y3z2xr9vpxnm84gs1zpa1apma341wza7pjcpwibaqd6aiz9vpqv";
name = "layer-shell-qt-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/layer-shell-qt-5.24.3.tar.xz";
sha256 = "0h3xlvmgyxyzxvazgbbn0a9l14hg5d38cl9hclnwmrnpwbn0bqax";
name = "layer-shell-qt-5.24.3.tar.xz";
};
};
libkscreen = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/libkscreen-5.24.0.tar.xz";
sha256 = "0h6sycib940gbw2rf6ax3v7mg77pzga36xzwzbyz9h49fba3dpjk";
name = "libkscreen-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/libkscreen-5.24.3.tar.xz";
sha256 = "18777lwn5j0isc347dks25731byyfdyls79lj6hnxqb6807lz1x6";
name = "libkscreen-5.24.3.tar.xz";
};
};
libksysguard = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/libksysguard-5.24.0.tar.xz";
sha256 = "1f0hwk2kzmgpjxmsjfd4g25sr91qyazp4hysyfjdhrrs2ajdkm0b";
name = "libksysguard-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/libksysguard-5.24.3.tar.xz";
sha256 = "18piiy24rd5fzvp4cnhgx0d4x4m6fnxx01zm1mx0sh676g7m31hl";
name = "libksysguard-5.24.3.tar.xz";
};
};
milou = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/milou-5.24.0.tar.xz";
sha256 = "0sxsisrzfancxwk8lsxhj2b85sgjdb9gzy4l0nax4fp942ygiirs";
name = "milou-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/milou-5.24.3.tar.xz";
sha256 = "06xx4afym92hfpvbiqrv7mx30bdm3dhdfn8vki5zxq2k0rv0pmri";
name = "milou-5.24.3.tar.xz";
};
};
oxygen = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/oxygen-5.24.0.tar.xz";
sha256 = "0ym74q29c2f32l1xm3kd0s2p7zzbg6a96g7d39fkp5paxicx5fb7";
name = "oxygen-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/oxygen-5.24.3.tar.xz";
sha256 = "02j0drc24mf2pfhdgzri5sdcscq1bbj4lhhmhp6bn1v74wybv381";
name = "oxygen-5.24.3.tar.xz";
};
};
plasma-browser-integration = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-browser-integration-5.24.0.tar.xz";
sha256 = "1gp9m7drwxflb0ms0vbvk7qydm1bghhzalc00lpcjh4nrf0bgh33";
name = "plasma-browser-integration-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-browser-integration-5.24.3.tar.xz";
sha256 = "1msib3c8arybqbv1vfj1ijx74a34a02hn8gvjy4sf95zcl07mc20";
name = "plasma-browser-integration-5.24.3.tar.xz";
};
};
plasma-desktop = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-desktop-5.24.0.tar.xz";
sha256 = "1brnm6yivjy2piy88ncmclv4g2rxkaiyi923c557dmiipah2bx7z";
name = "plasma-desktop-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-desktop-5.24.3.tar.xz";
sha256 = "1lwizprs6nk6nibydwkwmpi9c7c50lvg2k188pb6ddz2sb7pwgjq";
name = "plasma-desktop-5.24.3.tar.xz";
};
};
plasma-disks = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-disks-5.24.0.tar.xz";
sha256 = "1c3pwnyhdmj7grk3gjh4kw5437m5cxhp70qsbhnfsaacps3mdv5d";
name = "plasma-disks-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-disks-5.24.3.tar.xz";
sha256 = "0nklcimxyvci3xa6nc5jxbcxds4a14vkkwihgc6xfpc7xcca0wcy";
name = "plasma-disks-5.24.3.tar.xz";
};
};
plasma-firewall = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-firewall-5.24.0.tar.xz";
sha256 = "1jjw414547qksjxg2x5n666iq6qildbn9k9c8hqipmwnlkprpbb1";
name = "plasma-firewall-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-firewall-5.24.3.tar.xz";
sha256 = "0r7gh3asnc5lbfsp1jb33lmgcxfpjmlrqlyz41g0wv9aj9x6pwxz";
name = "plasma-firewall-5.24.3.tar.xz";
};
};
plasma-integration = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-integration-5.24.0.tar.xz";
sha256 = "17dqf6j1za3q8hzk7jfc5wc7s4kr28slrkq5iqvzqgyqjqy3z7rv";
name = "plasma-integration-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-integration-5.24.3.tar.xz";
sha256 = "031w205icblf50ps7bw7wp5q4azbqpcp4bnig2wh5d1lc8xqzvvs";
name = "plasma-integration-5.24.3.tar.xz";
};
};
plasma-mobile = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-mobile-5.24.0.tar.xz";
sha256 = "0g9mbb8dzqcngc1sq43knwyc3kr81w3vl359wyrgvnr8r1qikv2z";
name = "plasma-mobile-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-mobile-5.24.3.tar.xz";
sha256 = "1bwmy7xvd8wmh0snqqjh9jjgawib8ks2g30w48sqxwhplhf3da58";
name = "plasma-mobile-5.24.3.tar.xz";
};
};
plasma-nano = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-nano-5.24.0.tar.xz";
sha256 = "0i8lsp83g2i3c88djkmxawwbwa6lr0w89lzxj73fr6az6vdcrypj";
name = "plasma-nano-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-nano-5.24.3.tar.xz";
sha256 = "13jxhfi3c3dhg7zdyfqnsii661h1am0w9dsv82dalqvwr1mw28l5";
name = "plasma-nano-5.24.3.tar.xz";
};
};
plasma-nm = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-nm-5.24.0.tar.xz";
sha256 = "17pmyklmr46qg21w4ql9q5nhfdjw1xmmv1qz7lyhlww7qa6mz1ny";
name = "plasma-nm-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-nm-5.24.3.tar.xz";
sha256 = "1z9vzj2mbvqklnjxf2izpx9s6cq097im0kz41fy4c5cjxna4xxic";
name = "plasma-nm-5.24.3.tar.xz";
};
};
plasma-pa = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-pa-5.24.0.tar.xz";
sha256 = "19n2plbk455qwgq0lcpb7rj2ck78ck64fpvlldmh53j9vxyzcasl";
name = "plasma-pa-5.24.0.tar.xz";
};
};
plasma-phone-components = {
version = "5.24.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-phone-components-5.24.0.tar.xz";
sha256 = "0g9mbb8dzqcngc1sq43knwyc3kr81w3vl359wyrgvnr8r1qikv2z";
name = "plasma-phone-components-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-pa-5.24.3.tar.xz";
sha256 = "0n87rb04izd0ix50iy2dgj6yzzr626vhpfk76lnqr57jz6fbx3z1";
name = "plasma-pa-5.24.3.tar.xz";
};
};
plasma-sdk = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-sdk-5.24.0.tar.xz";
sha256 = "16fn98rv4qaci3b5whzjs6csbbxyrnmnr9gngn5dirdpla8cffld";
name = "plasma-sdk-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-sdk-5.24.3.tar.xz";
sha256 = "0g6nypqsbmsp9msixd7p25lk58zismdamkp41f5lx3cbb49x1fpr";
name = "plasma-sdk-5.24.3.tar.xz";
};
};
plasma-systemmonitor = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-systemmonitor-5.24.0.tar.xz";
sha256 = "0zkvbgwm2rpyisbx72a75ywy45d2primjjpnmw76x6924j8sp7pd";
name = "plasma-systemmonitor-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-systemmonitor-5.24.3.tar.xz";
sha256 = "17a3q1az4d3xpk2ifqsj6sz7r4apxy58kk2r2l14p6s6aszhqk4h";
name = "plasma-systemmonitor-5.24.3.tar.xz";
};
};
plasma-tests = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-tests-5.24.0.tar.xz";
sha256 = "1q95mrrb0p9ah4dg3bhkc9yh2ydasdmyd87jclraybcsfl6fi9kf";
name = "plasma-tests-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-tests-5.24.3.tar.xz";
sha256 = "1x5hr465kj3dg6c335lji2lxvp7cbn86181l78qk4l75sj1ss721";
name = "plasma-tests-5.24.3.tar.xz";
};
};
plasma-thunderbolt = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-thunderbolt-5.24.0.tar.xz";
sha256 = "1vsb3wf2sgbfbm2wk8kj18qhv4z9l4yzxaf8g30zpz4d1sva7jdc";
name = "plasma-thunderbolt-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-thunderbolt-5.24.3.tar.xz";
sha256 = "1px5vfk37ak6hj6q3ipljj2dpazdbgdsga6nbkwcfn31708c7gjj";
name = "plasma-thunderbolt-5.24.3.tar.xz";
};
};
plasma-vault = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-vault-5.24.0.tar.xz";
sha256 = "1vk38iarhsr6rdrmhbcyjziw3dn8yjmgyn4dy2xdr0l4yqpq7qzz";
name = "plasma-vault-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-vault-5.24.3.tar.xz";
sha256 = "0f5yhz7qz4bqj7mc7hv7mvh2ji82pp02c901ws5cwwsh23yrhjcd";
name = "plasma-vault-5.24.3.tar.xz";
};
};
plasma-workspace = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-workspace-5.24.0.tar.xz";
sha256 = "0jnksl2i2viw5aaqv38b371z4lxrxah6p1bjp40a1zfa68vr8dz3";
name = "plasma-workspace-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-5.24.3.tar.xz";
sha256 = "1d1a8k75q0rdbbwkx8p1i38hc6xv9kggvfm6973lh3q0pc75qk0h";
name = "plasma-workspace-5.24.3.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plasma-workspace-wallpapers-5.24.0.tar.xz";
sha256 = "0329ks3q32nb9k3dxddlmxccjilgyxx5jplwbpln5b0p4plkn77k";
name = "plasma-workspace-wallpapers-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-wallpapers-5.24.3.tar.xz";
sha256 = "0j1qqjc27grh3k02dgfb657ps11gym28lc9hzcw3qdxkf3djw9fs";
name = "plasma-workspace-wallpapers-5.24.3.tar.xz";
};
};
plymouth-kcm = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/plymouth-kcm-5.24.0.tar.xz";
sha256 = "1pcvfrv8vmk43s14209iv8gngi3al9g4za74yz2l79nxscyppzh5";
name = "plymouth-kcm-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/plymouth-kcm-5.24.3.tar.xz";
sha256 = "196nx8h54bnnrly12zvnwl22ksr9nk2mi6g39k4xmp28agw94jv5";
name = "plymouth-kcm-5.24.3.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.24.0";
version = "1-5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/polkit-kde-agent-1-5.24.0.tar.xz";
sha256 = "1qayxff5hl8qr9p5bsfrq0cz3x1jlwc8f0nx66rkbngphdm7085n";
name = "polkit-kde-agent-1-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/polkit-kde-agent-1-5.24.3.tar.xz";
sha256 = "1mbr8xpjvd8w9b5nd6k8fxcnjykzzygwqk19il4wirqyh4n3k3bq";
name = "polkit-kde-agent-1-5.24.3.tar.xz";
};
};
powerdevil = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/powerdevil-5.24.0.tar.xz";
sha256 = "06mrahlrqibvgfhcxywh72h6jblqq6sjsxqjzbq7zbq61vgc3jg3";
name = "powerdevil-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/powerdevil-5.24.3.tar.xz";
sha256 = "047h4lz8d1kdyakh5x7fr3kpk35r38z39vm7wb974rd9hjz7alj9";
name = "powerdevil-5.24.3.tar.xz";
};
};
qqc2-breeze-style = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/qqc2-breeze-style-5.24.0.tar.xz";
sha256 = "11kwrqsq5i1y1kvhg75hvax7bz122cjdsvb66f6hvni09yfcgyci";
name = "qqc2-breeze-style-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/qqc2-breeze-style-5.24.3.tar.xz";
sha256 = "1y21ldxwlb12kfqzxpyhdw9lkcaf5sfamwhg68r512hy785sg490";
name = "qqc2-breeze-style-5.24.3.tar.xz";
};
};
sddm-kcm = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/sddm-kcm-5.24.0.tar.xz";
sha256 = "011b68vca8nnmj9rxlyl5gl3xrrbysmcrx8szyfhha0wl9rgy2hx";
name = "sddm-kcm-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/sddm-kcm-5.24.3.tar.xz";
sha256 = "15n6drklwk3lmiaklw1af98qcixml4w83hngy23lwwv2lbnirl6h";
name = "sddm-kcm-5.24.3.tar.xz";
};
};
systemsettings = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/systemsettings-5.24.0.tar.xz";
sha256 = "1jx1kllfd5561fq11d90r7m68736rsdlyzb109yq8awdwrl1vkp3";
name = "systemsettings-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/systemsettings-5.24.3.tar.xz";
sha256 = "11fmjdh6v0a4gacqshhrk374i07px989p3x70w8438gr6y0n2032";
name = "systemsettings-5.24.3.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.24.0";
version = "5.24.3";
src = fetchurl {
url = "${mirror}/stable/plasma/5.24.0/xdg-desktop-portal-kde-5.24.0.tar.xz";
sha256 = "0f5wv4557avzcn7gf2hjqpn2p9r0d16k1iqcijzcfdmnvh2cp69d";
name = "xdg-desktop-portal-kde-5.24.0.tar.xz";
url = "${mirror}/stable/plasma/5.24.3/xdg-desktop-portal-kde-5.24.3.tar.xz";
sha256 = "06qdr7j2m9s9l60mk8vspb2173va10zdv6sinhmkhxxp78h857z6";
name = "xdg-desktop-portal-kde-5.24.3.tar.xz";
};
};
}

6
pkgs/development/compilers/ocaml/4.14.nix
View file

@ -1,9 +1,9 @@
import ./generic.nix {
major_version = "4";
minor_version = "14";
patch_version = "0-beta1";
patch_version = "0-rc2";
src = fetchTarball {
url = "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~beta1.tar.xz";
sha256 = "0jiz20hb58jbbk8j38agx11ra4hg0v3prmzc5a9j70lm09mnzfcd";
url = "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~rc2.tar.xz";
sha256 = "sha256:0ch8nyfk2mzwhmlxb434cyamp7n14zxhwsq1h8033g629kw50kb0";
};
}

35
pkgs/development/compilers/souffle/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, perl, ncurses, zlib, sqlite, libffi
, autoreconfHook, mcpp, bison, flex, doxygen, graphviz
{ lib, stdenv, fetchFromGitHub
, bash-completion, perl, ncurses, zlib, sqlite, libffi
, mcpp, cmake, bison, flex, doxygen, graphviz
, makeWrapper
}:
@ -10,42 +10,23 @@ let
in
stdenv.mkDerivation rec {
pname = "souffle";
version = "2.0.2";
version = "2.2";
src = fetchFromGitHub {
owner = "souffle-lang";
repo = "souffle";
rev = version;
sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5";
sha256 = "sha256-whvC+DL9XbQLc4wf2kFxUKXSyJnGkYq0/0uLCLbliJU=";
};
patches = [
# Pull pending unstream inclusion fix for ncurses-6.3:
# https://github.com/souffle-lang/souffle/pull/2134
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch";
sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa";
})
];
nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];
buildInputs = [ ncurses zlib sqlite libffi ];
nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ];
buildInputs = [ bash-completion ncurses zlib sqlite libffi ];
# these propagated inputs are needed for the compiled Souffle mode to work,
# since generated compiler code uses them. TODO: maybe write a g++ wrapper
# that adds these so we can keep the propagated inputs clean?
propagatedBuildInputs = [ ncurses zlib sqlite libffi ];
# see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for
# Wno-error fixes
postPatch = ''
substituteInPlace ./src/Makefile.am \
--replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other'
substituteInPlace configure.ac \
--replace "m4_esyscmd([git describe --tags --always | tr -d '\n'])" "${version}"
'';
cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ];
postInstall = ''
wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}"

6
pkgs/development/interpreters/alda/default.nix
View file

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "alda";
version = "2.0.6";
version = "2.2.0";
src_alda = fetchurl {
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/client/linux-amd64/alda";
sha256 = "1078hywl3gim5wfgxb0xwbk1dn80ls3i7y33n76qsdd4b0x0sn7i";
sha256 = "0z3n81fmv3fxwgr641r6jjn1dmi5d3rw8d6r8jdfjhgpxanyi9a7";
};
src_player = fetchurl {
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player";
sha256 = "1g7k2qnh4vcw63604z7zbvhbpn7l1v3m9mx4j4vywfq6qar1r6ck";
sha256 = "11kji846hbn1f2w1s7rc1ing203jkamy89j1jmysajvirdpp8nha";
};
dontUnpack = true;

4
pkgs/development/interpreters/php/8.0.nix
View file

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.0.16";
sha256 = "sha256-9J+Bge4pRjoNI6DGWWnpLVj+6KxWTfkXz/WOSNZeGEk=";
version = "8.0.17";
sha256 = "52811ee2dde71660ca32737a4ac696c24591eb22e846dd8e09ee77122660283f";
});
in

4
pkgs/development/interpreters/php/8.1.nix
View file

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.1.3";
sha256 = "sha256-NUxOLFBgRuyoEtH8JSaISi9UtePSDvDt6RmmnrIy0L4=";
version = "8.1.4";
sha256 = "b3f688cb69758523838b8e7f509aaef0152133d9b84a84a0b7cf68eeafc1df76";
});
in

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "LAStools";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "LAStools";
repo = "LAStools";
rev = "v${version}";
sha256 = "19y49j5af3z3fsiknq9kg9yjcsr73ywng8dfy837y97q4shc9g00";
sha256 = "sha256-Mxic/zLk/qkB/rSlvkLZPgtNscrTrzSzrxiqXAMeDVU=";
};
patches = [

7
pkgs/development/libraries/boost/generic.nix
View file

@ -126,6 +126,13 @@ stdenv.mkDerivation {
stripLen = 1;
extraPrefix = "libs/context/";
})
# Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions
++ optional (versionAtLeast version "1.65" && versionOlder version "1.67")
(fetchpatch {
url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch";
sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0";
stripLen = 1;
})
++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch
++ optional (version == "1.77.0") (fetchpatch {

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "cglm";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "recp";
repo = "cglm";
rev = "v${version}";
sha256 = "sha256-AJK1M6iyYdL61pZQhbUWzf+YOUE5FEvUyKqxbQqc7H0=";
sha256 = "sha256-PJHDZXc0DD/d+K/4uouv5F8gAf1sE5e3jLkGILPMpnI=";
};
nativeBuildInputs = [ cmake ];

16
pkgs/development/libraries/crcpp/default.nix
View file

@ -1,27 +1,27 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "crcpp";
version = "1.1.0.0";
version = "1.2.0.0";
src = fetchFromGitHub {
owner = "d-bahr";
repo = "CRCpp";
rev = "release-${version}";
sha256 = "sha256-jBvh4dHSFChxNPVgkGVHy3TXSExsfwdVUfsA8XB1cn8=";
sha256 = "sha256-OY8MF8fwr6k+ZSA/p1U+9GnTFoMSnUZxKVez+mda2tA=";
};
dontBuild = true;
nativeBuildInputs = [ cmake ];
installPhase = ''
mkdir -p $out/include
cp inc/CRC.h $out/include
'';
doCheck = true;
meta = with lib; {
homepage = "https://github.com/d-bahr/CRCpp";
changelog = "https://github.com/d-bahr/CRCpp/releases/tag/release-${version}";
description = "Easy to use and fast C++ CRC library";
platforms = platforms.all;
maintainers = [ maintainers.ivar ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libqb";
version = "2.0.4";
version = "2.0.5";
src = fetchFromGitHub {
owner = "ClusterLabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-s6b2/bCVNzr3IBqiSAjiJ/DHCqkRwR1aA+J4uBP5mO4=";
sha256 = "sha256-G49JBEUkO4ySAamvI7xN6ct1SvN4afcOmdrzpDL90FE=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

15
pkgs/development/libraries/libthreadar/default.nix
View file

@ -1,18 +1,20 @@
{ lib, stdenv, fetchurl }:
with lib;
{ lib, stdenv, fetchurl, gcc-unwrapped }:
stdenv.mkDerivation rec {
version = "1.3.5";
version = "1.4.0";
pname = "libthreadar";
src = fetchurl {
url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz";
sha256 = "sha256-T5W83Ry3e1hHrnpmSLkfJDYHrVP6YDpXTqmf0WGCjB8=";
sha256 = "sha256-LkcVF4AnuslzpIg/S8sGNJQye6iGcQRGqCqAhg8aN5E=";
};
outputs = [ "out" "dev" ];
buildInputs = [ gcc-unwrapped ];
CXXFLAGS = [ "-std=c++14" ];
configureFlags = [
"--disable-build-html"
];
@ -22,7 +24,7 @@ stdenv.mkDerivation rec {
rm -r "$out"/share
'';
meta = {
meta = with lib; {
homepage = "http://libthreadar.sourceforge.net/";
description = "A C++ library that provides several classes to manipulate threads";
longDescription = ''
@ -32,6 +34,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ izorkin ];
license = licenses.lgpl3;
platforms = platforms.unix;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libthreadar.x86_64-darwin
};
}

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

@ -53,7 +53,7 @@ in {
};
libtoxcore_0_2 = generic {
version = "0.2.13";
sha256 = "0a1cp00bnxl3q4l74yqp4aa6fg9slz4rg4lfzkl3khvmm6nzckds";
version = "0.2.17";
sha256 = "sha256-SOI6QKOSt/EK9JDrSaV6CrD5sx8aYb5ZL3StYq8u/Dg=";
};
}

16
pkgs/development/libraries/libudev-zero/default.nix
View file

@ -1,25 +1,16 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "libudev-zero";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "illiliti";
repo = "libudev-zero";
rev = version;
sha256 = "0mln7iwyz7lxz8dx7bx7b47j6yws1dvfq35qsdcwg3wwmd4ngsz6";
sha256 = "1dg6zqy8w3gxca8clz6hhv4jyvz8jdwvpmn9y289nrms1zx1jcs5";
};
patches = [
# Fix static.
# https://github.com/illiliti/libudev-zero/pull/48
(fetchpatch {
url = "https://github.com/illiliti/libudev-zero/commit/505c61819b371a1802e054fe2601e64f2dc6d79e.patch";
sha256 = "0y06rgjv73dd7fi3a0dlabcc8ryk3yhbsyrrhnnn3v36y1wz6m0g";
})
];
makeFlags = [ "PREFIX=$(out)" ];
# Just let the installPhase build stuff, because there's no
@ -31,6 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/illiliti/libudev-zero";
description = "Daemonless replacement for libudev";
changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${version}";
maintainers = with maintainers; [ qyliss shamilton ];
license = licenses.isc;
platforms = platforms.linux;

15
pkgs/development/libraries/pipewire/wireplumber.nix
View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, nix-update-script
, # base build deps
meson
@ -27,7 +26,7 @@ let
in
stdenv.mkDerivation rec {
pname = "wireplumber";
version = "0.4.8";
version = "0.4.9";
outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
@ -36,19 +35,9 @@ stdenv.mkDerivation rec {
owner = "pipewire";
repo = "wireplumber";
rev = version;
sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y=";
sha256 = "sha256-U92ozuEUFJA416qKnalVowJuBjLRdORHfhmznGf1IFU=";
};
patches = [
# backport a patch to fix hangs in some applications
# ref: https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/213
# FIXME: drop this in 0.4.9
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/afbc0ce57aac7aee8dc1651de4620f15c73dbace.patch";
sha256 = "sha256-8ycFnrzDq7QHgjwJ/772OTMsSsN3m7gjbdvTmlMJ+mU=";
})
];
nativeBuildInputs = [
meson
pkg-config

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

@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "qscintilla-qt5";
version = "2.13.1";
version = "2.13.2";
src = fetchurl {
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz";
sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo=";
sha256 = "sha256-tsfl8ntR0l8J/mz4Sumn8Idq8NZdjMtVEQnm57JYhfQ=";
};
sourceRoot = "QScintilla_src-${version}/src";

39
pkgs/development/libraries/wxwidgets/wxGTK31.nix
View file

@ -17,20 +17,26 @@
, compat28 ? false
, compat30 ? true
, unicode ? true
, withGtk2 ? true
, withGtk2 ? (!stdenv.isDarwin)
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withWebKit ? false, webkitgtk
, darwin
, withWebKit ? stdenv.isDarwin
, webkitgtk
, setfile
, AGL
, Carbon
, Cocoa
, Kernel
, QTKit
, AVFoundation
, AVKit
, WebKit
}:
assert withMesa -> libGLU != null && libGL != null;
assert withWebKit -> webkitgtk != null;
assert withWebKit -> stdenv.isDarwin;
assert withGtk2 -> (!withWebKit);
let
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
inherit (gnome2) GConf;
inherit (gst_all_1) gst-plugins-base gstreamer;
gtk = if withGtk2 then gtk2 else gtk3;
@ -57,6 +63,8 @@ stdenv.mkDerivation rec {
buildInputs = [
gst-plugins-base
gstreamer
]
++ lib.optionals (!stdenv.isDarwin) [
gtk
libSM
libXinerama
@ -68,19 +76,25 @@ stdenv.mkDerivation rec {
GConf
]
++ lib.optional withMesa libGLU
++ lib.optional withWebKit webkitgtk
++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk
++ lib.optional (withWebKit && stdenv.isDarwin) WebKit
++ lib.optionals stdenv.isDarwin [
setfile
Carbon
Cocoa
Kernel
QTKit
setfile
AVFoundation
AVKit
WebKit
];
propagatedBuildInputs = lib.optional stdenv.isDarwin AGL;
configureFlags = [
"--disable-precomp-headers"
# This is the default option, but be explicit
"--disable-monolithic"
"--enable-mediactrl"
(if compat28 then "--enable-compat28" else "--disable-compat28")
(if compat30 then "--enable-compat30" else "--disable-compat30")
@ -88,10 +102,8 @@ stdenv.mkDerivation rec {
++ lib.optional unicode "--enable-unicode"
++ lib.optional withMesa "--with-opengl"
++ lib.optionals stdenv.isDarwin [
# allow building on 64-bit
"--enable-universal-binaries"
"--with-cocoa"
"--with-macosx-version-min=10.7"
"--with-osx_cocoa"
"--with-libiconv"
]
++ lib.optionals withWebKit [
"--enable-webview"
@ -139,7 +151,6 @@ stdenv.mkDerivation rec {
license = licenses.wxWindows;
maintainers = with maintainers; [ AndersonTorres tfmoraes ];
platforms = platforms.unix;
badPlatforms = platforms.darwin; # ofBorg is failing, don't know if internal
};
passthru = {

12
pkgs/development/node-packages/default.nix
View file

@ -432,6 +432,18 @@ let
'';
};
thelounge-plugin-closepms = super.thelounge-plugin-closepms.override {
nativeBuildInputs = [ self.node-pre-gyp ];
};
thelounge-theme-flat-blue = super.thelounge-theme-flat-blue.override {
nativeBuildInputs = [ self.node-pre-gyp ];
};
thelounge-theme-flat-dark = super.thelounge-theme-flat-dark.override {
nativeBuildInputs = [ self.node-pre-gyp ];
};
tsun = super.tsun.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
postInstall = ''

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioairzone";
version = "0.1.0";
version = "0.1.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "Noltari";
repo = pname;
rev = version;
hash = "sha256-QruXxC/+61P2Mi0UILUIKp4S3wS1+E+WmzBbiUqlVe4=";
hash = "sha256-8OpC/w83us85NWpRXXLsWsLNiPG3v+8BHAToADdLaP4=";
};
propagatedBuildInputs = [

32
pkgs/development/python-modules/arpeggio/default.nix
View file

@ -1,34 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, glibcLocales
, pytest-runner
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "Arpeggio";
version = "1.10.2";
pname = "arpeggio";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1";
pname = "Arpeggio";
inherit version;
sha256 = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0=";
};
# Shall not be needed for next release
LC_ALL = "en_US.UTF-8";
buildInputs = [ glibcLocales ];
nativeBuildInputs = [ pytest-runner ];
postPatch = ''
substituteInPlace setup.cfg \
--replace "pytest-runner" ""
'';
checkInputs = [ pytestCheckHook ];
disabledTests = [ "test_examples" "test_issue_22" ];
pythonImportsCheck = [ "arpeggio" ];
dontUseSetuptoolsCheck = true;
meta = {
description = "Packrat parser interpreter";
license = lib.licenses.mit;
meta = with lib; {
description = "Recursive descent parser with memoization based on PEG grammars (aka Packrat parser)";
homepage = "https://github.com/textX/Arpeggio";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

4
pkgs/development/python-modules/azure-mgmt-cdn/default.nix
View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cdn";
version = "11.0.0";
version = "12.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907";
sha256 = "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0=";
};
propagatedBuildInputs = [

9
pkgs/development/python-modules/brotli/default.nix
View file

@ -1,22 +1,23 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook }:
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "brotli";
version = "1.0.9";
# PyPI doesn't contain tests so let's use GitHub
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o=";
# for some reason, the test data isn't captured in releases, force a git checkout
# .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data
forceFetchGit = true;
};
# only returns information how to really build
dontConfigure = true;
checkInputs = [
@ -31,6 +32,6 @@ buildPythonPackage rec {
homepage = "https://github.com/google/brotli";
description = "Generic-purpose lossless compression algorithm";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

2
pkgs/development/python-modules/brotlicffi/default.nix
View file

@ -34,7 +34,7 @@ buildPythonPackage rec {
export USE_SHARED_BROTLI=1
'';
# Test data is not available, only when using libbortli git checkout
# Test data is not available, only when using libbrotli git checkout
doCheck = false;
pythonImportsCheck = [ "brotlicffi" ];

6
pkgs/development/python-modules/certifi/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, isPy27
, pythonOlder
, fetchFromGitHub
, pytestCheckHook
}:
@ -9,7 +9,7 @@ buildPythonPackage rec {
pname = "certifi";
version = "2021.10.08";
disabled = isPy27;
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = pname;
@ -28,6 +28,6 @@ buildPythonPackage rec {
homepage = "https://github.com/certifi/python-certifi";
description = "Python package for providing Mozilla's CA Bundle";
license = licenses.isc;
maintainers = with maintainers; [ koral ];
maintainers = with maintainers; [ koral SuperSandro2000 ];
};
}

1
pkgs/development/python-modules/click/default.nix
View file

@ -37,5 +37,6 @@ buildPythonPackage rec {
composable way, with as little code as necessary.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

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

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "docplex";
version = "2.22.213";
version = "2.23.222";
# No source available from official repo
src = fetchPypi {
inherit pname version;
sha256 = "8a86bba42b5b65f2e0f88ed350115efeb783b444661e2cfcf3a67d5c59bcb0bd";
sha256 = "sha256-c5XpfEGTkojgzk+ATHCSzzh04zeEVJEEKBp+lPfS+x4=";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/flask/default.nix
View file

@ -38,7 +38,7 @@ buildPythonPackage rec {
];
meta = with lib; {
homepage = "http://flask.pocoo.org/";
homepage = "https://flask.palletsprojects.com/";
description = "The Python micro framework for building web applications";
longDescription = ''
Flask is a lightweight WSGI web application framework. It is

2
pkgs/development/python-modules/h2/default.nix
View file

@ -39,6 +39,6 @@ buildPythonPackage rec {
description = "HTTP/2 State-Machine based protocol implementation";
homepage = "https://github.com/python-hyper/h2";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

4
pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "ibm-cloud-sdk-core";
version = "3.15.0";
version = "3.15.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oHQXgiW80zqgpyt5osbBCtoT3XYCGEk4mgKPIsMmBHY=";
sha256 = "sha256-bGTr8Qf7ywlbsl6/FEJEjFB/bqyyMwfmjVVAsrgmkTg=";
};
propagatedBuildInputs = [

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

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "jdatetime";
version = "4.0.0";
version = "4.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-01uuou0hPk6Hu4QMYWNwAVQL0h6ORFS9EjUrBlkewI4=";
sha256 = "sha256-SmeoLuV+NbX2+ff75qDtpj9Wzh3Yr0CbTComozQEV9s=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/mypy-boto3-builder/default.nix
View file

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "mypy-boto3-builder";
version = "7.3.0";
version = "7.4.1";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "vemel";
repo = "mypy_boto3_builder";
rev = version;
hash = "sha256-X/dPO2p6GmnyJwcVPOmyo9zYda2uYfBAkuKTeX0Bt0Q=";
hash = "sha256-7sl6S1/bQceVP6i/3KMYqsrOxNBvpBZUKdpOrnlhYNk=";
};
nativeBuildInputs = [

6
pkgs/development/python-modules/ocrmypdf/default.nix
View file

@ -80,6 +80,12 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
# https://github.com/ocrmypdf/OCRmyPDF/issues/933
substituteInPlace setup.cfg \
--replace "pdfminer.six!=20200720,>=20191110,<=20211012" "pdfminer.six!=20200720,>=20191110,<=20220319"
'';
pythonImportsCheck = [
"ocrmypdf"
];

28
pkgs/development/python-modules/parver/default.nix
View file

@ -3,7 +3,7 @@
, fetchPypi
, six
, attrs
, pytest
, pytestCheckHook
, hypothesis
, pretend
, arpeggio
@ -18,11 +18,27 @@ buildPythonPackage rec {
sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3";
};
propagatedBuildInputs = [ six attrs arpeggio ];
checkInputs = [ pytest hypothesis pretend ];
postPatch = ''
substituteInPlace setup.py \
--replace "arpeggio ~= 1.7" "arpeggio"
'';
meta = {
description = "parver allows parsing and manipulation of PEP 440 version numbers.";
license = lib.licenses.mit;
propagatedBuildInputs = [
six
attrs
arpeggio
];
checkInputs = [
pytestCheckHook
hypothesis
pretend
];
meta = with lib; {
description = "Allows parsing and manipulation of PEP 440 version numbers";
homepage = "https://github.com/RazerM/parver";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

6
pkgs/development/python-modules/pdfminer_six/default.nix
View file

@ -21,6 +21,12 @@ buildPythonPackage rec {
done
'';
postPatch = ''
# Verion is not stored in repo, gets added by a GitHub action after tag is created
# https://github.com/pdfminer/pdfminer.six/pull/727
substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version}
'';
checkInputs = [ pytestCheckHook ];
meta = with lib; {

3
pkgs/development/python-modules/pdfx/default.nix
View file

@ -13,7 +13,8 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "chardet==4.0.0" "chardet"
--replace "chardet==4.0.0" "chardet" \
--replace "pdfminer.six==20201018" "pdfminer.six"
'';
propagatedBuildInputs = [ pdfminer chardet ];

7
pkgs/development/python-modules/pex/default.nix
View file

@ -2,16 +2,19 @@
, buildPythonPackage
, fetchPypi
, flit-core
, pythonOlder
}:
buildPythonPackage rec {
pname = "pex";
version = "2.1.72";
version = "2.1.73";
format = "flit";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-0hhnBkbgt4bSlqjvYKX2Mhty/T1vBGm91HhKmyvVzmA=";
hash = "sha256-OxIm0vFH0JadaKMGrKNNj8mA7ue1kazjpauSK6XNGiU=";
};
nativeBuildInputs = [

48
pkgs/development/python-modules/pint-pandas/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, setuptools-scm
, pint
, pandas
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pint-pandas";
version = "0.2";
src = fetchPypi {
pname = "Pint-Pandas";
inherit version;
sha256 = "sha256-b2DS6ArBAuD5St25IG4PbMpe5C8Lf4kw2MeYAC5B+oc=";
};
patches = [
# Fixes a failing test, see: https://github.com/hgrecco/pint-pandas/issues/107
(fetchpatch{
url = "https://github.com/hgrecco/pint-pandas/commit/4c31e25609af968665ee60d019b9b5366f328680.patch";
sha256 = "vIT0LI4S73D4MBfGI8vtCZAM+Zb4PZ4E3xfpGKNyA4I=";
})
];
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
pint
pandas
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Pandas support for pint";
license = licenses.bsd3;
homepage = "https://github.com/hgrecco/pint-pandas";
maintainers = with maintainers; [ doronbehar ];
};
}

31
pkgs/development/python-modules/preprocess-cancellation/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, poetry-core
, pytestCheckHook, pytest-cov
, shapely }:
buildPythonPackage rec {
pname = "preprocess-cancellation";
version = "0.2.0";
disabled = pythonOlder "3.6"; # >= 3.6
format = "pyproject";
# No tests in PyPI
src = fetchFromGitHub {
owner = "kageurufu";
repo = "cancelobject-preprocessor";
rev = version;
hash = "sha256-mn3/etXA5dkL+IsyxwD4/XjU/t4/roYFVyqQxlLOoOI=";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ shapely ];
checkInputs = [ pytestCheckHook pytest-cov ];
meta = with lib; {
description = "Klipper GCode Preprocessor for Object Cancellation";
homepage = "https://github.com/kageurufu/cancelobject-preprocessor";
license = licenses.gpl3Only;
maintainers = with maintainers; [ zhaofengli ];
};
}

8
pkgs/development/python-modules/pycurl/default.nix
View file

@ -7,7 +7,6 @@
, openssl
, bottle
, pytestCheckHook
, nose
, flaky
}:
@ -38,7 +37,6 @@ buildPythonPackage rec {
checkInputs = [
bottle
pytestCheckHook
nose
flaky
];
@ -76,9 +74,9 @@ buildPythonPackage rec {
];
meta = with lib; {
homepage = "http://pycurl.sourceforge.net/";
description = "Python wrapper for libcurl";
license = licenses.lgpl2Only;
homepage = "http://pycurl.io/";
description = "Python Interface To The cURL library";
license = with licenses; [ lgpl2Only mit ];
maintainers = with maintainers; [];
};
}

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

@ -18,13 +18,13 @@
}:
buildPythonPackage rec {
version = "1.5.22";
version = "1.5.23";
pname = "pyglet";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-VjDcNuoA/cEa06g5TGdkF+w2WyX92a9XoQfhmtxBGw8=";
sha256 = "sha256-3ukgIDzzBhWcUDurti84eHJocIl39clF0oM3WUt5fEY=";
extension = "zip";
};

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyrogram";
version = "1.4.8";
version = "1.4.9";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "Pyrogram";
inherit version;
hash = "sha256-mUJEV8DLYhXNvYiuiVDCfgMmZRDCNZuydngj9C9FvQU=";
hash = "sha256-iAPzQDHRyFl8m/23zTGOFXA3v5ONU5BGp7KT1ZSywA4=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-core";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.core";
inherit version;
hash = "sha256-gkvr1FgFWI1eurjbuUYhYj0D4eZTIBsDMRXSWrKiCP4=";
hash = "sha256-lH0Mi2nR4jqawvpvVfn79U0AflxE8lU1VLKvqAEXDOo=";
};
# pyroute2 sub-modules have no tests

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ethtool";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ethtool";
inherit version;
hash = "sha256-+/B+YQOluzyGYmnwAZonsjgZeiZPYl8LhJ9OjnvV/64=";
hash = "sha256-6o75plLeSle6ZFgoIZGKLCjx1hg4Z2okOq2RqAT2g8E=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipdb";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipdb";
inherit version;
hash = "sha256-sjlJ1eBoMQaJzEF/4Qk9ZwZB0s/yvR5wUUDP3UWBA50=";
hash = "sha256-sJ9Zzlrh9FWVWL7StyHpPPuXo6TtNLz2/lQBCl53Wrk=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ipset";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ipset";
inherit version;
hash = "sha256-j2vEQyfuuMH0QRtXw6acX9AMureQwgeS+Ap7m2uP9OY=";
hash = "sha256-icEMJno03WKUdIYTZ6BIAo9lm43RwMjxNXcoSkYF81M=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyroute2-ndb";
version = "0.6.8";
version = "0.6.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyroute2.ndb";
inherit version;
hash = "sha256-90DAbXCkoIFUbWZotKYkCSGsQvb7LrEpf6xGCviP40w=";
hash = "sha256-ASk6ycw3dQNMV4xmaxPAHDL1KtrY1JGQ5yJYcJ+OgUE=";
};
propagatedBuildInputs = [

Some files were not shown because too many files have changed in this diff Show more