alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-01-16 06:01:40 +00:00 committed by GitHub
parent a1f73b7f69 d7b695571b
commit 76839f69b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 760 additions and 1017 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
maintainers/maintainer-list.nix
View file

@ -16295,6 +16295,24 @@
githubId = 5228243;
name = "waelwindows";
};
witchof0x20 = {
name = "Jade";
email = "jade@witchof.space";
github = "witchof0x20";
githubId = 36118348;
keys = [{
fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE";
}];
};
WhiteBlackGoose = {
email = "wbg@angouri.org";
github = "WhiteBlackGoose";
githubId = 31178401;
name = "WhiteBlackGoose";
keys = [{
fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB";
}];
};
wuyoli = {
name = "wuyoli";
email = "wuyoli@tilde.team";

6
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -346,9 +346,11 @@ in
settings = mkOption {
description = lib.mdDoc "Verbatim contents of {file}`sshd_config`.";
description = lib.mdDoc "Configuration for `sshd_config(5)`.";
default = { };
example = literalExpression ''{
UseDns true;
UseDns = true;
PasswordAuthentication = false;
}'';
type = types.submodule ({name, ...}: {
freeformType = settingsFormat.type;

2
nixos/modules/services/networking/znc/default.nix
View file

@ -169,7 +169,7 @@ in
gracefully be applied to this option.
If you intend to update the configuration through this option, be sure
to enable {option}`services.znc.mutable`, otherwise none of the
to disable {option}`services.znc.mutable`, otherwise none of the
changes here will be applied after the initial deploy.
'';
};

4
pkgs/applications/audio/deadbeef/default.nix
View file

@ -40,7 +40,7 @@ assert gtk2Support || gtk3Support;
let
inherit (lib) optionals;
version = "1.9.3";
version = "1.9.4";
in clangStdenv.mkDerivation {
pname = "deadbeef";
inherit version;
@ -50,7 +50,7 @@ in clangStdenv.mkDerivation {
repo = "deadbeef";
fetchSubmodules = true;
rev = version;
sha256 = "sha256-Vt5JHrkNyxerqlShIBVbzZaunG0ZbHm5qf3fq9kMMXc=";
sha256 = "sha256-ow+Aw/lp+oe9GhbOWM7XcX/tJjfAAu7KOUY1us7+f84=";
};
buildInputs = [

4
pkgs/applications/audio/strawberry/default.nix
View file

@ -42,13 +42,13 @@ let
in
stdenv.mkDerivation rec {
pname = "strawberry";
version = "1.0.12";
version = "1.0.13";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
hash = "sha256-XJCU9cGhmwJ6f79y3tAW1qfJKO7YESVpHY/1FmPQ/Mo=";
hash = "sha256-szvCI1olC7GccJUGwR2Cx+FNGvfxeESsiSwWPTXWbc0=";
};
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead

59
pkgs/applications/graphics/litemdview/default.nix Normal file
View file

@ -0,0 +1,59 @@
{ lib
, stdenv
, fetchFromGitea
, gtkmm3
, autoreconfHook
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "litemdview";
# litemdview -v
version = "0.0.32";
src = fetchFromGitea {
domain = "notabug.org";
owner = "g0tsu";
repo = "litemdview";
rev = "litemdview-0.0.32";
hash = "sha256-XGjP+7i3mYCEzPYwVY+75DARdXJFY4vUWHFpPeoNqAE=";
};
buildInputs = [
gtkmm3
];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
meta = with lib; {
homepage = "https://notabug.org/g0tsu/litemdview";
description = "A suckless markdown viewer";
longDescription = ''
LiteMDview is a lightweight, extremely fast markdown viewer with lots of useful features. One of them is ability to use your prefered text editor to edit markdown files, every time you save the file, litemdview reloads those changes (I call it live-reload). It has a convinient navigation through local directories, has support for a basic "git-like" folders hierarchy as well as vimwiki projects.
Features:
- Does not use any of those bloated gecko(servo)-blink engines
- Lightweight and fast
- Live reload
- Convinient key bindings
- Supports text zooming
- Supports images
- Supports links
- Navigation history
- Cool name which associates with 1337, at least for me :)
- Builtin markdown css themes
- Supports emoji™️
- vimwiki support
- Basic html support (very simple offline documents in html)
- Syntax highlighting
'';
license = licenses.gpl2Only;
maintainers = with maintainers; [ WhiteBlackGoose ];
platforms = platforms.linux;
};
}

4
pkgs/applications/graphics/photoflare/default.nix
View file

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "photoflare";
version = "1.6.11";
version = "1.6.12";
src = fetchFromGitHub {
owner = "PhotoFlare";
repo = "photoflare";
rev = "v${version}";
sha256 = "sha256-nXVTkkfRpbLZ+zUgnSzKNlVixI86eKoG5FO8GqgnrDY=";
sha256 = "sha256-UIEHQil7NsdIKQlrNPpf7rxj6O6P1xlz0E7FNYTcdT4=";
};
nativeBuildInputs = [ qmake qttools ];

4
pkgs/applications/graphics/xournal/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, makeDesktopItem
, ghostscript, atk, gtk2, glib, fontconfig, freetype
, libgnomecanvas, libgnomeprint, libgnomeprintui
, libgnomecanvas
, pango, libX11, xorgproto, zlib, poppler
, autoconf, automake, libtool, pkg-config}:
@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
ghostscript atk gtk2 glib fontconfig freetype
libgnomecanvas
pango libX11 xorgproto zlib poppler
] ++ lib.optionals (!stdenv.isDarwin) [
libgnomeprint libgnomeprintui
];
nativeBuildInputs = [ autoconf automake libtool pkg-config ];

126
pkgs/applications/misc/keeweb/default.nix
View file

@ -1,13 +1,34 @@
{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret, libxshmfence }:
{ lib
, stdenv
, fetchurl
, undmg
, dpkg
, autoPatchelfHook
, wrapGAppsHook
, makeWrapper
, alsa-lib
, at-spi2-atk
, gdk-pixbuf
, glibc
, nss
, udev
, xorg
, gnome
, mesa
, gtk3
, libusb1
, libsecret
, libappindicator
, xdotool
}:
let
pname = "keeweb";
version = "1.18.7";
name = "${pname}-${version}";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.AppImage";
hash = "sha256-W3Dfo7YZfLObodAS7ZN3jqnYzLNAnjJIfJC6il5THwY=";
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb";
hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg";
@ -18,11 +39,29 @@ let
hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4=";
};
};
src = srcs.${stdenv.hostPlatform.system};
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
appimageContents = appimageTools.extract {
inherit name src;
};
libraries = [
alsa-lib
at-spi2-atk
gdk-pixbuf
nss
udev
xorg.libX11
xorg.libXcomposite
xorg.libXext
xorg.libXrandr
xorg.libXScrnSaver
xorg.libXtst
xorg.libxshmfence
gnome.gnome-keyring
mesa
gtk3
libusb1
libsecret
libappindicator
xdotool
];
meta = with lib; {
description = "Free cross-platform password manager compatible with KeePass";
@ -33,35 +72,46 @@ let
maintainers = with maintainers; [ sikmir ];
platforms = builtins.attrNames srcs;
};
linux = appimageTools.wrapType2 rec {
inherit name src meta;
extraPkgs = pkgs: with pkgs; [ libsecret libxshmfence ];
extraInstallCommands = ''
mv $out/bin/{${name},${pname}}
install -Dm644 ${appimageContents}/keeweb.desktop -t $out/share/applications
install -Dm644 ${appimageContents}/keeweb.png -t $out/share/icons/hicolor/256x256/apps
install -Dm644 ${appimageContents}/usr/share/mime/keeweb.xml -t $out/share/mime
substituteInPlace $out/share/applications/keeweb.desktop \
--replace "Exec=AppRun" "Exec=$out/bin/${pname}"
'';
};
darwin = stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = ".";
installPhase = ''
mkdir -p $out/Applications
cp -r *.app $out/Applications
'';
};
in
if stdenv.isDarwin
then darwin
else linux
then stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = ".";
installPhase = ''
mkdir -p $out/Applications
cp -r *.app $out/Applications
'';
}
else stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook
makeWrapper
];
buildInputs = libraries;
unpackPhase = ''
${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r usr/share $out/share
makeWrapper $out/share/keeweb-desktop/keeweb $out/bin/keeweb \
--argv0 "keeweb" \
--add-flags "$out/share/keeweb-desktop/resources/app.asar" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}"
runHook postInstall
'';
}

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

@ -2,19 +2,19 @@
python3Packages.buildPythonApplication rec {
pname = "toot";
version = "0.29.0";
version = "0.33.1";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = "refs/tags/${version}";
sha256 = "sha256-SrPjotEkP8Z2uYB/4eAJAk3Zmzmr0xET69PmkxQCwFQ=";
sha256 = "sha256-qZk42zGHWpeN5rZPFw7xAmDIvhPzqTePU3If+p/L98c=";
};
checkInputs = with python3Packages; [ pytest ];
propagatedBuildInputs = with python3Packages;
[ requests beautifulsoup4 future wcwidth urwid ];
[ requests beautifulsoup4 future wcwidth urwid psycopg2 ];
checkPhase = ''
py.test

6
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -1,8 +1,8 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
let
version = "0.38.2";
sha256 = "1fr3jg9j0hrnr55wh40d0lli593pid1vqnbgnw9wxqsv6677dh53";
version = "0.38.3";
sha256 = "15sx743gbmlmww7jmi56r5nlajg33xmzacyd69hmp46jjxqdckmh";
manifestsSha256 = "1dmp7gdnwbg4jjc3dq1wp2jn3z3g6lm296b1nf24ndcfmjja58cz";
manifests = fetchzip {
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-aPkuP6FVIkMAJi+wwNfgvxXi+PE1mMUXfxz44/R31KI=";
vendorSha256 = "sha256-IuOivH9K7e5vNpK44NKegzIEVHS+ihkX89++4DJC+8Q=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

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

@ -29,7 +29,7 @@
stdenv.mkDerivation rec {
pname = "chatty";
version = "0.7.0_rc4";
version = "0.7.0_rc5";
src = fetchFromGitLab {
domain = "source.puri.sm";
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
repo = "chatty";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-/8Y82PYlR9ucnT7/BsUk+STmsftpUvSNJM3cwG+Iv/A=";
hash = "sha256-5V0ApHxsJaQ0MBhMlv1IxnD9Vq+Yw85jFvlvghhFxNI=";
};
postPatch = ''

6
pkgs/applications/networking/instant-messengers/qq/default.nix
View file

@ -17,6 +17,7 @@
, at-spi2-core
, autoPatchelfHook
, wrapGAppsHook
, makeWrapper
}:
let
@ -42,6 +43,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook
makeWrapper
dpkg
];
@ -71,7 +73,9 @@ stdenv.mkDerivation {
substituteInPlace $out/share/applications/qq.desktop \
--replace "/opt/QQ/qq" "$out/bin/qq" \
--replace "/usr/share" "$out/share"
ln -s $out/opt/QQ/qq $out/bin/qq
makeWrapper $out/opt/QQ/qq $out/bin/qq \
--argv0 "qq" \
--prefix GTK_IM_MODULE_FILE : "/run/current-system/sw/etc/gtk-3.0/immodules.cache"
runHook postInstall
'';

2
pkgs/applications/science/medicine/dcmtk/default.nix
View file

@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
# This is only needed until https://github.com/DCMTK/dcmtk/pull/75/files is merged
patches = [ ./0001-Fix-cmake.patch ];
doCheck = true;
meta = {
description =
"Collection of libraries and applications implementing large parts of the DICOM standard";

12
pkgs/applications/science/misc/cwltool/default.nix
View file

@ -7,19 +7,19 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
version = "3.1.20220224085855";
version = "3.1.20221201130942";
format = "setuptools";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = version;
sha256 = "sha256-7+1xOV5Lodqtku0wX1urAEHsCcYKM3Vcd5RDg4DdVow=";
rev = "refs/tags/${version}";
hash = "sha256-PeddmHMJYtj/AAItmUVeyETizF7SKzkJ3bXYkeZU+xs=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "ruamel.yaml >= 0.15, < 0.17.18" "ruamel.yaml" \
--replace "ruamel.yaml >= 0.15, < 0.17.22" "ruamel.yaml" \
--replace "prov == 1.5.1" "prov" \
--replace "setup_requires=PYTEST_RUNNER," ""
'';
@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec {
argcomplete
bagit
coloredlogs
cwl-utils
mypy-extensions
prov
psutil
@ -48,6 +49,7 @@ python3.pkgs.buildPythonApplication rec {
mock
nodejs
pytest-mock
pytest-httpserver
pytest-xdist
pytestCheckHook
];
@ -56,6 +58,7 @@ python3.pkgs.buildPythonApplication rec {
"test_content_types"
"test_env_filtering"
"test_http_path_mapping"
"test_modification_date"
];
disabledTestPaths = [
@ -70,6 +73,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Common Workflow Language reference implementation";
homepage = "https://www.commonwl.org";
changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ veprbl ];
};

4
pkgs/applications/version-management/git-machete/default.nix
View file

@ -12,13 +12,13 @@
buildPythonApplication rec {
pname = "git-machete";
version = "3.14.0";
version = "3.14.2";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
hash = "sha256-UgWPm4IxzydO1qqhjbodUIAmqIhTIITYARMvw+F9T7E=";
hash = "sha256-uIVt7pneJq7l/kMSa7VqhcQgXhHCrpBGEqE7QZaDyQQ=";
};
nativeBuildInputs = [ installShellFiles ];

6
pkgs/applications/version-management/lefthook/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lefthook";
version = "1.2.6";
version = "1.2.7";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
sha256 = "sha256-M15ESB8JCSryD6/+6N2EA6NUzLI4cwgAJUQC9UDNJrM=";
sha256 = "sha256-bsPTOv1s/kU6UUxmmPpYC5Y9/YeR6LnuL09j1x5e3Es=";
};
vendorSha256 = "sha256-KNegRQhVZMNDgcJZOgEei3oviDPM/RFwZbpoh38pxBw=";
vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI=";
nativeBuildInputs = [ installShellFiles ];

21
pkgs/desktops/gnome-2/default.nix
View file

@ -14,20 +14,10 @@ lib.makeScope pkgs.newScope (self: with self; {
libglade = callPackage ./platform/libglade { };
libgnomeprint = callPackage ./platform/libgnomeprint { };
libgnomeprintui = callPackage ./platform/libgnomeprintui { };
libgnomecups = callPackage ./platform/libgnomecups { };
libgtkhtml = callPackage ./platform/libgtkhtml { };
GConf = callPackage ./platform/GConf { };
libgnomecanvas = callPackage ./platform/libgnomecanvas { };
libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };
# for git-head builds
gnome-common = callPackage platform/gnome-common { };
@ -43,10 +33,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libbonoboui = callPackage ./platform/libbonoboui { };
gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; };
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant2; };
gtkglext = callPackage ./platform/gtkglext { };
#### DESKTOP
@ -79,6 +65,13 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_common = gnome-common;
gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14
gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14
gtkhtml = throw "gnome2.gtkhtml has been removed"; # 2023-01-15
gtkhtml4 = throw "gnome2.gtkhtml4 has been removed"; # 2023-01-15
libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15
libgnomecanvasmm = "gnome2.libgnomecanvasmm has been removed"; # 2022-01-15
libgnomecups = throw "gnome2.libgnomecups has been removed"; # 2023-01-15
libgnomeprint = throw "gnome2.libgnomeprint has been removed"; # 2023-01-15
libgnomeprintui = throw "gnome2.libgnomeprintui has been removed"; # 2023-01-15
libgtkhtml = throw "gnome2.libgtkhtml has been removed"; # 2023-01-15
python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14
})

17
pkgs/desktops/gnome-2/platform/gtkhtml/01_remove-disable-deprecated.patch
View file

@ -1,17 +0,0 @@
diff -Naur gtkhtml-3.32.2-orig/configure gtkhtml-3.32.2/configure
--- gtkhtml-3.32.2-orig/configure 2011-02-05 23:12:31.000000000 -0500
+++ gtkhtml-3.32.2/configure 2011-04-22 13:03:18.228874636 -0400
@@ -5761,12 +5761,7 @@
if test "x${enable_deprecated_flags}" = "xyes"; then
- list="-DG_DISABLE_DEPRECATED
- -DPANGO_DISABLE_DEPRECATED
- -DGDK_DISABLE_DEPRECATED
- -DGDK_PIXBUF_DISABLE_DEPRECATED
- -DGTK_DISABLE_DEPRECATED
- -DGNOME_DISABLE_DEPRECATED"
+ list=""
flags_supported=""
flags_unsupported=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler flags" >&5

30
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
View file

@ -1,30 +0,0 @@
{ stdenv, fetchFromGitLab, pkg-config, gtk3, intltool, autoreconfHook, fetchpatch
, GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
version = "4.10.0";
pname = "gtkhtml";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "Archive";
repo = "gtkhtml";
rev = "master";
sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk=";
};
patches = [
# Enables enchant2 support.
# Upstream is dead, no further releases are coming.
(fetchpatch {
name ="enchant-2.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43";
sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI=";
extraPrefix = "";
})
];
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
nativeBuildInputs = [ pkg-config autoreconfHook intltool ];
buildInputs = [ enchant isocodes ];
}

21
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
View file

@ -1,21 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool,
GConf, enchant, isocodes, gnome-icon-theme }:
stdenv.mkDerivation rec {
pname = "gtkhtml";
version = "3.32.2";
src = fetchurl {
url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.bz2";
sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7";
};
#From Debian, fixes build issue described here:
#http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html
patches = [ ./01_remove-disable-deprecated.patch ];
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 GConf enchant isocodes gnome-icon-theme ];
NIX_LDFLAGS = "-lgthread-2.0";
}

14
pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
View file

@ -1,14 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }:
stdenv.mkDerivation rec {
pname = "libgnomecanvasmm";
version = "2.26.0";
src = fetchurl {
url = "mirror://gnome/sources/libgnomecanvasmm/${lib.versions.majorMinor version}/libgnomecanvasmm-${version}.tar.bz2";
sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgnomecanvas gtkmm2 ];
}

285
pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch
View file

@ -1,285 +0,0 @@
From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Tue, 7 Aug 2012 06:53:09 -0400
Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions
CUPS 1.6 makes various structures private and introduces these ippGet
and ippSet functions for all of the fields in these structures.
http://www.cups.org/str.php?L3928
We define our own accessors when building against CUPS < 1.6.
Based on work by Jiri Popelka <jpopelka@redhat.com> at
https://bugzilla.gnome.org/show_bug.cgi?id=679759
---
libgnomecups/gnome-cups-printer.c | 48 +++++++++++++++++++++++++++++-------
libgnomecups/gnome-cups-queue.c | 43 +++++++++++++++++++++++++++------
libgnomecups/gnome-cups-request.c | 44 ++++++++++++++++++++++++++++-----
3 files changed, 110 insertions(+), 25 deletions(-)
diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c
index c924af0..f5e1ef7 100644
--- a/libgnomecups/gnome-cups-printer.c
+++ b/libgnomecups/gnome-cups-printer.c
@@ -37,6 +37,34 @@
#define UPDATE_TIMEOUT 5000
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetCount(attr) attr->num_values
+#define ippGetName(attr) attr->name
+#define ippGetInteger(attr, element) attr->values[element].integer
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t *
+ippFirstAttribute(ipp_t *ipp)
+{
+ if (!ipp)
+ return (NULL);
+ return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t *
+ippNextAttribute(ipp_t *ipp)
+{
+ if (!ipp || !ipp->current)
+ return (NULL);
+ return (ipp->current = ipp->current->next);
+}
+#endif
+
+
struct _GnomeCupsPPDFile {
char name[1];
};
@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer,
printer->details->state_reasons = NULL;
/* cf. RFC2911 4.4.12 */
- for (i = 0; i < attr->num_values; i++) {
+ for (i = 0; i < ippGetCount (attr); i++) {
const char *p;
- const char *keyword = attr->values [i].string.text;
+ const char *keyword = ippGetString (attr, i, NULL);
reason = g_new (GnomeCupsPrinterReason, 1);
@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer)
return printer->details->info;
}
-#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }}
-#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}}
+#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }}
+#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}}
static void
attributes_update_cb (guint id,
@@ -243,14 +271,14 @@ attributes_update_cb (guint id,
changed = FALSE;
if (!error && response) {
- for (attr = response->attrs; attr != NULL; attr = attr->next) {
- if (!attr->name) {
+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
+ if (!ippGetName (attr)) {
continue;
}
- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) {
+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) {
continue;
}
- if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) {
+ if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) {
map_reasons (printer, attr);
}
MAP_INT (printer->details->state, "printer-state");
@@ -570,7 +598,7 @@ get_default (void)
attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
if (attr) {
- name = g_strdup (attr->values[0].string.text);
+ name = g_strdup (ippGetString (attr, 0, NULL));
} else {
name = NULL;
}
@@ -698,7 +726,7 @@ get_printer_names (void)
attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
while (attr) {
ret = g_list_prepend (ret,
- g_strdup (attr->values[0].string.text));
+ g_strdup (ippGetString (attr, 0, NULL)));
attr = ippFindNextAttribute (response,
"printer-name",
diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c
index 9f98ed9..298db42 100644
--- a/libgnomecups/gnome-cups-queue.c
+++ b/libgnomecups/gnome-cups-queue.c
@@ -15,6 +15,33 @@
#define UPDATE_TIMEOUT 3000
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetName(attr) attr->name
+#define ippGetInteger(attr, element) attr->values[element].integer
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t *
+ippFirstAttribute(ipp_t *ipp)
+{
+ if (!ipp)
+ return (NULL);
+ return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t *
+ippNextAttribute(ipp_t *ipp)
+{
+ if (!ipp || !ipp->current)
+ return (NULL);
+ return (ipp->current = ipp->current->next);
+}
+#endif
+
+
struct _GnomeCupsQueueDetails {
char *queue_name;
GList *jobs;
@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job)
job->size = job->size * 1024;
}
-#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}}
-#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } }
+#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}}
+#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } }
static void
get_jobs_cb (guint id,
@@ -231,8 +258,8 @@ get_jobs_cb (guint id,
if (response) {
job = g_new0 (GnomeCupsJob, 1);
- for (attr = response->attrs; attr != NULL; attr = attr->next) {
- if (attr->name == NULL) {
+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
+ if (ippGetName (attr) == NULL) {
if (job->name) {
finish_job (job);
jobs = g_list_prepend (jobs, job);
@@ -244,7 +271,7 @@ get_jobs_cb (guint id,
continue;
}
- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
continue;
}
@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
if (response) {
job = g_new0 (GnomeCupsJob, 1);
- for (attr = response->attrs; attr != NULL; attr = attr->next) {
- if (attr->name == NULL) {
+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
+ if (ippGetName (attr) == NULL) {
if (job->name) {
finish_job (job);
} else {
@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
break;
}
- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
continue;
}
diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c
index c94f623..13f0948 100644
--- a/libgnomecups/gnome-cups-request.c
+++ b/libgnomecups/gnome-cups-request.c
@@ -19,6 +19,36 @@
#define STOP_UNUSED_THREADS_TIMEOUT 60
#define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetCount(attr) attr->num_values
+#define ippGetValueTag(attr) attr->value_tag
+#define ippGetName(attr) attr->name
+#define ippGetBoolean(attr, element) attr->values[element].boolean
+#define ippGetInteger(attr, element) attr->values[element].integer
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t *
+ippFirstAttribute(ipp_t *ipp)
+{
+ if (!ipp)
+ return (NULL);
+ return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t *
+ippNextAttribute(ipp_t *ipp)
+{
+ if (!ipp || !ipp->current)
+ return (NULL);
+ return (ipp->current = ipp->current->next);
+}
+#endif
+
+
typedef struct
{
GMutex *mutex;
@@ -276,14 +306,14 @@ dump_request (ipp_t const *req)
unsigned i;
ipp_attribute_t *attr;
- for (attr = req->attrs; attr != NULL; attr = attr->next) {
- g_print ("%s", attr->name);
- for (i = 0 ; i < attr->num_values ; i++) {
+ for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) {
+ g_print ("%s", ippGetName (attr));
+ for (i = 0 ; i < ippGetCount (attr) ; i++) {
g_print ("\t[%d] = ", i);
- switch (attr->value_tag & ~IPP_TAG_COPY) {
+ switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) {
case IPP_TAG_INTEGER:
case IPP_TAG_ENUM:
- g_print ("%d\n", attr->values[i].integer);
+ g_print ("%d\n", ippGetInteger (attr, i));
break;
case IPP_TAG_STRING:
@@ -294,11 +324,11 @@ dump_request (ipp_t const *req)
case IPP_TAG_CHARSET:
case IPP_TAG_LANGUAGE:
case IPP_TAG_MIMETYPE:
- g_print ("'%s'\n", attr->values[i].string.text);
+ g_print ("'%s'\n", ippGetString (attr, i, NULL));
break;
case IPP_TAG_BOOLEAN:
- g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false");
+ g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false");
break;
default:
--
1.7.8.6

20
pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
View file

@ -1,20 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }:
stdenv.mkDerivation rec {
pname = "libgnomecups";
version = "0.2.3";
src = fetchurl {
url = "mirror://gnome/sources/libgnomecups/${lib.versions.majorMinor version}/libgnomecups-${version}.tar.bz2";
sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71";
};
hardeningDisable = [ "format" ];
patches = [ ./glib.patch ./cups_1.6.patch ];
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 gettext libart_lgpl ];
propagatedBuildInputs = [ libxml2 ];
}

38
pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch
View file

@ -1,38 +0,0 @@
From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sun, 27 Nov 2011 21:36:41 +0100
Subject: [PATCH] Fix: Only glib.h can be included
---
libgnomecups/gnome-cups-i18n.c | 2 +-
libgnomecups/gnome-cups-init.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
index 8987c5c..127756d 100644
--- a/libgnomecups/gnome-cups-i18n.c
+++ b/libgnomecups/gnome-cups-i18n.c
@@ -1,5 +1,5 @@
#include <config.h>
-#include <glib/gmacros.h>
+#include <glib.h>
#include "gnome-cups-i18n.h"
#ifdef ENABLE_NLS
diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h
index 22b682a..c4600fc 100644
--- a/libgnomecups/gnome-cups-init.h
+++ b/libgnomecups/gnome-cups-init.h
@@ -1,8 +1,7 @@
#ifndef GNOME_CUPS_INIT
#define GNOME_CUPS_INIT
-#include <glib/gtypes.h>
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
--
1.7.7

21
pkgs/desktops/gnome-2/platform/libgnomeprint/bug653388.patch
View file

@ -1,21 +0,0 @@
From 9b82b7e75b83395e7c5692085e1934202cf7f65f Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed, 12 Oct 2011 15:08:59 +0000
Subject: Add missing include
https://bugzilla.gnome.org/show_bug.cgi?id=653388
---
diff --git a/libgnomeprint/modules/cups/gnome-print-cups-transport.c b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
index aeb7111..85de91b 100644
--- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c
+++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
@@ -34,6 +34,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <stdio.h>
#include <unistd.h>
#include <locale.h>
--
cgit v0.9.0.2

30
pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
View file

@ -1,30 +0,0 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl
, libgnomecups, bison, flex }:
stdenv.mkDerivation rec {
pname = "libgnomeprint";
version = "2.18.8";
src = fetchurl {
url = "mirror://gnome/sources/libgnomeprint/${lib.versions.majorMinor version}/libgnomeprint-${version}.tar.bz2";
sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691";
};
patches = [
./bug653388.patch
# Fix compatibility with bison 3
(fetchpatch {
url = "https://github.com/pld-linux/libgnomeprint/raw/54c0f9c3675b86c53f6d77a5bc526ce9ef0e38cd/bison3.patch";
sha256 = "1sp04jbv34i1gcwf377hhmwdsmqzig70dd06rjz1isb6zwh4y01l";
})
];
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 gettext libart_lgpl libgnomecups bison flex ];
propagatedBuildInputs = [ libxml2 ];
meta = with lib; {
platforms = platforms.linux;
};
}

14
pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
View file

@ -1,14 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme }:
stdenv.mkDerivation rec {
pname = "libgnomeprintui";
version = "2.18.6";
src = fetchurl {
url = "mirror://gnome/sources/libgnomeprintui/${lib.versions.majorMinor version}/libgnomeprintui-${version}.tar.bz2";
sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm";
};
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 gettext libgnomecanvas libgnomeprint gnome-icon-theme];
}

17
pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
View file

@ -1,17 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }:
stdenv.mkDerivation rec {
pname = "libgtkhtml";
version = "2.11.1";
src = fetchurl {
url = "mirror://gnome/sources/libgtkhtml/${lib.versions.majorMinor version}/libgtkhtml-${version}.tar.bz2";
sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 gettext ];
propagatedBuildInputs = [ libxml2 ];
hardeningDisable = [ "format" ];
}

2
pkgs/desktops/gnome/default.nix
View file

@ -254,7 +254,7 @@ lib.makeScope pkgs.newScope (self: with self; {
nautilus-python = callPackage ./misc/nautilus-python { };
gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; };
gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; };
pomodoro = callPackage ./misc/pomodoro { };

15
pkgs/desktops/gnome/misc/gtkhtml/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, gtk3, intltool
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, gtk3, intltool
, gnome, enchant, isocodes, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
@ -10,11 +10,22 @@ stdenv.mkDerivation rec {
sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
};
patches = [
# Enables enchant2 support.
# Upstream is dead, no further releases are coming.
(fetchpatch {
name ="enchant-2.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43";
sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI=";
extraPrefix = "";
})
];
passthru = {
updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; };
};
nativeBuildInputs = [ pkg-config intltool ];
nativeBuildInputs = [ autoreconfHook pkg-config intltool ];
buildInputs = [ gtk3 gnome.adwaita-icon-theme
gsettings-desktop-schemas ];

3
pkgs/desktops/xfce/default.nix
View file

@ -135,8 +135,6 @@ makeScopeWithSplicing
xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { };
xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { };
xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { };
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { };
@ -176,4 +174,5 @@ makeScopeWithSplicing
thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04
xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15
})

41
pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin/default.nix
View file

@ -1,41 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, autoreconfHook, gnome2, gtkmm2,
libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors, xfce
}:
stdenv.mkDerivation rec {
pname = "xfce4-hardware-monitor-plugin";
version = "1.6.0";
src = fetchurl {
url = "https://git.xfce.org/archive/${pname}/snapshot/${pname}-${version}.tar.gz";
sha256 = "sha256-aLpNY+qUhmobGb8OkbjtJxQMDO9xSlvurVjNLgOpZ4Y=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
intltool
];
buildInputs = [
gtkmm2
gnome2.libgnomecanvas
gnome2.libgnomecanvasmm
libgtop
libxfce4ui
libxfce4util
xfce4-panel
lm_sensors
];
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin";
description = "Hardware monitor plugin for the XFCE4 panel";
license = licenses.gpl3Only;
platforms = platforms.unix;
broken = true; # unmaintained plugin; no longer compatible with xfce 4.16
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
}

4
pkgs/development/compilers/bigloo/default.nix
View file

@ -54,10 +54,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ thoughtpolice ];
# dyld: Library not loaded: /nix/store/w3liqjlrcmzc0sf2kgwjprqgqwqx8z47-libunistring-1.0/lib/libunistring.2.dylib
# Referenced from: /private/tmp/nix-build-bigloo-4.4b.drv-0/bigloo-4.4b/bin/bigloo
# Reason: Incompatible library version: bigloo requires version 5.0.0 or later, but libunistring.2.dylib provides version 4.0.0
broken = (stdenv.isDarwin && stdenv.isx86_64);
longDescription = ''
Bigloo is a Scheme implementation devoted to one goal: enabling

155
pkgs/development/libraries/cxx-rs/Cargo.lock generated
View file

@ -8,12 +8,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bitflags"
version = "1.3.2"
@ -22,9 +16,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "cc"
version = "1.0.73"
version = "1.0.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
dependencies = [
"jobserver",
]
@ -37,31 +31,29 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clang-ast"
version = "0.1.7"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c380e0de48337007dfc91b09eb75f567f5f08209437857fbaabbaf2e77e830"
checksum = "52a6edb6daf3175c637a7c78e46cde7729af8d07d43f36935680a88fd55c0f1c"
dependencies = [
"serde",
]
[[package]]
name = "clap"
version = "3.2.14"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54635806b078b7925d6e36810b1755f2a4b5b4d57560432c1ecf60bcbe10602b"
checksum = "aa91278560fc226a5d9d736cc21e485ff9aad47d26b8ffe1f54cba868b684b9f"
dependencies = [
"bitflags",
"clap_lex",
"indexmap",
"strsim",
"textwrap",
]
[[package]]
name = "clap_lex"
version = "0.2.4"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
dependencies = [
"os_str_bytes",
]
@ -87,7 +79,7 @@ dependencies = [
[[package]]
name = "cxx"
version = "1.0.72"
version = "1.0.86"
dependencies = [
"cc",
"cxx-build",
@ -102,10 +94,11 @@ dependencies = [
[[package]]
name = "cxx-build"
version = "1.0.72"
version = "1.0.86"
dependencies = [
"cc",
"codespan-reporting",
"cxx",
"cxx-gen",
"once_cell",
"pkg-config",
@ -117,7 +110,7 @@ dependencies = [
[[package]]
name = "cxx-gen"
version = "0.7.72"
version = "0.7.86"
dependencies = [
"codespan-reporting",
"proc-macro2",
@ -136,7 +129,7 @@ dependencies = [
[[package]]
name = "cxxbridge-cmd"
version = "1.0.72"
version = "1.0.86"
dependencies = [
"clap",
"codespan-reporting",
@ -147,11 +140,11 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
version = "1.0.72"
version = "1.0.86"
[[package]]
name = "cxxbridge-macro"
version = "1.0.72"
version = "1.0.86"
dependencies = [
"clang-ast",
"cxx",
@ -174,15 +167,15 @@ dependencies = [
[[package]]
name = "dissimilar"
version = "1.0.4"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5"
checksum = "bd5f0c7e4bd266b8ab2550e6238d2e74977c23c15536ac7be45e9c95e2e3fbbb"
[[package]]
name = "flate2"
version = "1.0.24"
version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
dependencies = [
"crc32fast",
"miniz_oxide",
@ -190,52 +183,36 @@ dependencies = [
[[package]]
name = "glob"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "indexmap"
version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
dependencies = [
"autocfg",
"hashbrown",
]
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "itoa"
version = "1.0.2"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
[[package]]
name = "jobserver"
version = "0.1.24"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
dependencies = [
"libc",
]
[[package]]
name = "libc"
version = "0.2.126"
version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
name = "link-cplusplus"
version = "1.0.6"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8"
checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
dependencies = [
"cc",
]
@ -252,81 +229,81 @@ dependencies = [
[[package]]
name = "miniz_oxide"
version = "0.5.3"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
dependencies = [
"adler",
]
[[package]]
name = "once_cell"
version = "1.13.0"
version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]]
name = "os_str_bytes"
version = "6.2.0"
version = "6.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
[[package]]
name = "pkg-config"
version = "0.3.25"
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
[[package]]
name = "proc-macro2"
version = "1.0.40"
version = "1.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.20"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rustversion"
version = "1.0.8"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8"
checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
[[package]]
name = "ryu"
version = "1.0.10"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
[[package]]
name = "scratch"
version = "1.0.1"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96311ef4a16462c757bb6a39152c40f58f31cd2602a40fceb937e2bc34e6cbab"
checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
[[package]]
name = "serde"
version = "1.0.140"
version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.140"
version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [
"proc-macro2",
"quote",
@ -335,9 +312,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.82"
version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
dependencies = [
"itoa",
"ryu",
@ -352,9 +329,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
version = "1.0.98"
version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
dependencies = [
"proc-macro2",
"quote",
@ -370,26 +347,20 @@ dependencies = [
"winapi-util",
]
[[package]]
name = "textwrap"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
[[package]]
name = "toml"
version = "0.5.9"
version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
dependencies = [
"serde",
]
[[package]]
name = "trybuild"
version = "1.0.63"
version = "1.0.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "764b9e244b482a9b81bde596aa37aa6f1347bf8007adab25e59f901b32b4e0a0"
checksum = "f1212c215a87a183687a7cc7065901b1a98da6b37277d51a1b5faedbb4efd4f3"
dependencies = [
"dissimilar",
"glob",
@ -403,15 +374,15 @@ dependencies = [
[[package]]
name = "unicode-ident"
version = "1.0.2"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
[[package]]
name = "unicode-width"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "winapi"

4
pkgs/development/libraries/cxx-rs/default.nix
View file

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cxx-rs";
version = "1.0.72";
version = "1.0.86";
src = fetchFromGitHub {
owner = "dtolnay";
repo = "cxx";
rev = version;
sha256 = "sha256-+OumeLSgz8kLQKhEc3icCk1q+X+S7Xt+XtAlkx8iguU=";
sha256 = "sha256-bysuvCapesU/HaNfTfMUas7g3clf8299HmCChpd7abY=";
};
cargoLock = {

6
pkgs/development/libraries/libraspberrypi/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libraspberrypi";
version = "unstable-2022-03-23";
version = "unstable-2022-06-16";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "userland";
rev = "c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e";
hash = "sha256-sAfpfq7C9HXVS7ym3UFIO6bpEIWFCOfVCSN2n5q1RNg=";
rev = "54fd97ae4066a10b6b02089bc769ceed328737e0";
hash = "sha512-f7tBgIykcIdkwcFjBKk5ooD/5Bsyrd/0OFr7LNCwWFYeE4DH3XA7UR7YjArkwqUVCVBByr82EOaacw0g1blOkw==";
};
patches = [

2
pkgs/development/libraries/qt-6/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.1/submodules/ -A '*.tar.xz' )
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/ -A '*.tar.xz' )

280
pkgs/development/libraries/qt-6/srcs.nix
View file

@ -4,283 +4,283 @@
{
qt3d = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qt3d-everywhere-src-6.4.1.tar.xz";
sha256 = "1654hx04k6vdifjp5kr4sj6jm8qy8m8vna7yalmb3l55pr1k5dg4";
name = "qt3d-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qt3d-everywhere-src-6.4.2.tar.xz";
sha256 = "0hbkld6ys78xvd2npbnbajdqiyjjskzfi7xp43kp60l4sg1j8v25";
name = "qt3d-everywhere-src-6.4.2.tar.xz";
};
};
qt5compat = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qt5compat-everywhere-src-6.4.1.tar.xz";
sha256 = "0cfh5z0kw75k2p3sca9d5gdfxvh93719prh2njg1nd6n8pp379fl";
name = "qt5compat-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qt5compat-everywhere-src-6.4.2.tar.xz";
sha256 = "14mpqj9ci31nn2n68czmxqdiikkg5iw7vqiksyvm2nwqirf507zm";
name = "qt5compat-everywhere-src-6.4.2.tar.xz";
};
};
qtactiveqt = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtactiveqt-everywhere-src-6.4.1.tar.xz";
sha256 = "118ivyzh6xk92ak2qf0294n1fzziy2mxp2xgkblh801d3nbg7kql";
name = "qtactiveqt-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtactiveqt-everywhere-src-6.4.2.tar.xz";
sha256 = "1ky5gp251r4lslc2wnmiy44p231zrqmdgb73m28kl9ii9rn0wg8j";
name = "qtactiveqt-everywhere-src-6.4.2.tar.xz";
};
};
qtbase = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtbase-everywhere-src-6.4.1.tar.xz";
sha256 = "1bjgy9x75y82702xkv3bhxh3q9i37ny4fv3njb5zgj7rq0fdfajk";
name = "qtbase-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz";
sha256 = "0paj0p3j3nvdcp9xnpzrsjxcyy6fr9wslav2kaj7hj5kvg7cd2x8";
name = "qtbase-everywhere-src-6.4.2.tar.xz";
};
};
qtcharts = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtcharts-everywhere-src-6.4.1.tar.xz";
sha256 = "0rwglk5g0k1x0vjb8j5r4fqaa7m31aykh42f18svkjpz3kbbrs6y";
name = "qtcharts-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtcharts-everywhere-src-6.4.2.tar.xz";
sha256 = "1am9s1wahbfz1gvv5db31b8aw6k86wzyp8n3s6bwyw48ikhc19x1";
name = "qtcharts-everywhere-src-6.4.2.tar.xz";
};
};
qtconnectivity = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtconnectivity-everywhere-src-6.4.1.tar.xz";
sha256 = "1qxvixv95wkb7h6ch1q39pxs7cidph6kyddz91qgxr2gznz5s3wv";
name = "qtconnectivity-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtconnectivity-everywhere-src-6.4.2.tar.xz";
sha256 = "1bypqp6szqp6wp5npyqv585qk2760iwl4pyadx6lqaz476r496wc";
name = "qtconnectivity-everywhere-src-6.4.2.tar.xz";
};
};
qtdatavis3d = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdatavis3d-everywhere-src-6.4.1.tar.xz";
sha256 = "00ddsv4inbsqbgc7lc163j8fqx9r156xzsrilh9papidfm7yvrm9";
name = "qtdatavis3d-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtdatavis3d-everywhere-src-6.4.2.tar.xz";
sha256 = "1m145mxgx1hgd8c3kdnjblvq50a8hycihn0a1ibc1y3a3phpp4l3";
name = "qtdatavis3d-everywhere-src-6.4.2.tar.xz";
};
};
qtdeclarative = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdeclarative-everywhere-src-6.4.1.tar.xz";
sha256 = "1zjdd2ndaywl7wgl9q94a1qwin5p45l2838lqhkdm3ckvdgli35g";
name = "qtdeclarative-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtdeclarative-everywhere-src-6.4.2.tar.xz";
sha256 = "1ggm612fv7ahizd0c2ip9rai31srv2ypsxjvz2hbr72fvs1xkgd4";
name = "qtdeclarative-everywhere-src-6.4.2.tar.xz";
};
};
qtdoc = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtdoc-everywhere-src-6.4.1.tar.xz";
sha256 = "198gl45c6m1gxn13aic65xgy94in1b1hy255jq6pi44m36brspbn";
name = "qtdoc-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtdoc-everywhere-src-6.4.2.tar.xz";
sha256 = "178kp7jkam2j5slccv3xkfi21ah9q1kj44kh71kg8sgc7v3fn7sa";
name = "qtdoc-everywhere-src-6.4.2.tar.xz";
};
};
qthttpserver = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qthttpserver-everywhere-src-6.4.1.tar.xz";
sha256 = "1xib6q8ji64kq2r5y6qqig0090irjwi25vzpy8528wv5a3i0yxah";
name = "qthttpserver-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qthttpserver-everywhere-src-6.4.2.tar.xz";
sha256 = "1i8bkcz08ya53mvgilwxifr8sfpa599fxmc21cicqxypcx1a9cql";
name = "qthttpserver-everywhere-src-6.4.2.tar.xz";
};
};
qtimageformats = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtimageformats-everywhere-src-6.4.1.tar.xz";
sha256 = "1rjd8mi8z864gqaa849kc4xppbjjr2yddcgahx16z3psn8zfg1ay";
name = "qtimageformats-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtimageformats-everywhere-src-6.4.2.tar.xz";
sha256 = "01qpw7pbk6q3vqradjvcry0yp1jk67fx8mkra3ang6kpw2d9jpzw";
name = "qtimageformats-everywhere-src-6.4.2.tar.xz";
};
};
qtlanguageserver = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtlanguageserver-everywhere-src-6.4.1.tar.xz";
sha256 = "1j2xd4r9ngdi5nq35bycxx9jc7bngjlrxa0cs8cjgl7zkj3wsmg3";
name = "qtlanguageserver-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtlanguageserver-everywhere-src-6.4.2.tar.xz";
sha256 = "04d83hjbfgapzsfqm6zmqm8jjplih0k2psx35c1vnzqaxz36cgkl";
name = "qtlanguageserver-everywhere-src-6.4.2.tar.xz";
};
};
qtlottie = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtlottie-everywhere-src-6.4.1.tar.xz";
sha256 = "0b59xd5nx4c2mhdl79fzbyz25n8bkdbh8h43l8lp3an15y08bdya";
name = "qtlottie-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtlottie-everywhere-src-6.4.2.tar.xz";
sha256 = "0mhwvv8n3y0j0x471qprg5d18d8js9ic6c1s6xdwx590qxlqik5c";
name = "qtlottie-everywhere-src-6.4.2.tar.xz";
};
};
qtmultimedia = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtmultimedia-everywhere-src-6.4.1.tar.xz";
sha256 = "1bxs1n22yplds2f60h2j25aw9ibhhgprg9np3ybr0q3f08xd91n0";
name = "qtmultimedia-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtmultimedia-everywhere-src-6.4.2.tar.xz";
sha256 = "0xn7fa4z4mm8pzvd2hyms6jrgwjpcql02a0fcs71r4fsxbg70avz";
name = "qtmultimedia-everywhere-src-6.4.2.tar.xz";
};
};
qtnetworkauth = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtnetworkauth-everywhere-src-6.4.1.tar.xz";
sha256 = "08kmkpjm34bkbiz54zm4p9mjr9fjzx2kjf0fkhay0lz3iljp0sl3";
name = "qtnetworkauth-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtnetworkauth-everywhere-src-6.4.2.tar.xz";
sha256 = "1vn28x83079zdf41lrmrdxclg0cif09cfyvmswxlj2kxjnyigayy";
name = "qtnetworkauth-everywhere-src-6.4.2.tar.xz";
};
};
qtpositioning = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtpositioning-everywhere-src-6.4.1.tar.xz";
sha256 = "12yip3awqwcx3fqr8jl64bvp3scvi9pbzyjzk0pm2f6r3kl14qbh";
name = "qtpositioning-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtpositioning-everywhere-src-6.4.2.tar.xz";
sha256 = "10pgkag7bjhh1yxq3fm2szch17q1fmh2xly926rgayl7pbsvl0bz";
name = "qtpositioning-everywhere-src-6.4.2.tar.xz";
};
};
qtquick3d = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquick3d-everywhere-src-6.4.1.tar.xz";
sha256 = "11881pfia0nwjxsgy2789s01qcvi9x4rhfcckxfzl4819pxw1nx6";
name = "qtquick3d-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtquick3d-everywhere-src-6.4.2.tar.xz";
sha256 = "19r655jinshg210ik1mann57ic92bvr52gd3xqy5c06wlrn3ngcm";
name = "qtquick3d-everywhere-src-6.4.2.tar.xz";
};
};
qtquick3dphysics = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquick3dphysics-everywhere-src-6.4.1.tar.xz";
sha256 = "1fxd3d8x0sgwqsvwv61m0kg4pd9gz99gqkgqd3schdhlcwgaim0x";
name = "qtquick3dphysics-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtquick3dphysics-everywhere-src-6.4.2.tar.xz";
sha256 = "14fc4fzcpx4phqf768cavkwxxzhccz7hgif4g5a6xcirdimzhyp8";
name = "qtquick3dphysics-everywhere-src-6.4.2.tar.xz";
};
};
qtquicktimeline = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtquicktimeline-everywhere-src-6.4.1.tar.xz";
sha256 = "0p6yb3qg9i7774kvwcj8i56ab9vkifi5d92y2w8v9s25g31pspzk";
name = "qtquicktimeline-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtquicktimeline-everywhere-src-6.4.2.tar.xz";
sha256 = "0plsy3pz589hrzjz717vmpsy60rl7hf9sl519qsjldkqyjvsp21h";
name = "qtquicktimeline-everywhere-src-6.4.2.tar.xz";
};
};
qtremoteobjects = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtremoteobjects-everywhere-src-6.4.1.tar.xz";
sha256 = "1jvsvfj8bdqxfc0vhihgmvglck0zk5nl487kbbjyhkgia1v37m98";
name = "qtremoteobjects-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtremoteobjects-everywhere-src-6.4.2.tar.xz";
sha256 = "04l88akwawyippzc4j82wd4vn801fl6iibppxrld1m9001j56g2q";
name = "qtremoteobjects-everywhere-src-6.4.2.tar.xz";
};
};
qtscxml = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtscxml-everywhere-src-6.4.1.tar.xz";
sha256 = "13mvih36shrjhpp1z3kqlyzgyh35gkx3a12rzh0yff4gmp5y9w6j";
name = "qtscxml-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtscxml-everywhere-src-6.4.2.tar.xz";
sha256 = "0zsfylzbh3hwjii6l4y1ha524qrby3piyylnh4jfsjrrb4sd9c0k";
name = "qtscxml-everywhere-src-6.4.2.tar.xz";
};
};
qtsensors = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtsensors-everywhere-src-6.4.1.tar.xz";
sha256 = "1qpr6g424dpy2xccfyrkf5v2rszczq5p73lzk79s8g95fl33yzk6";
name = "qtsensors-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtsensors-everywhere-src-6.4.2.tar.xz";
sha256 = "0mp6gq3mlinmagb3gd4kr3zwibygzd91k7lwljmlr7x353zijmj5";
name = "qtsensors-everywhere-src-6.4.2.tar.xz";
};
};
qtserialbus = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtserialbus-everywhere-src-6.4.1.tar.xz";
sha256 = "12y4pd87k1y044rfppnmv0zdfmqx42ng0hixhzblr8fbvvwh494g";
name = "qtserialbus-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz";
sha256 = "06xz91yn2vwybdwn8jgz6ymlbrdmpjsdwj07lnd8j9vkgiji6h30";
name = "qtserialbus-everywhere-src-6.4.2.tar.xz";
};
};
qtserialport = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtserialport-everywhere-src-6.4.1.tar.xz";
sha256 = "1yl25cv0ajfjswg8jgkf4jwwsasr5g7sgsc3fb3zsaz6cd8cw2hx";
name = "qtserialport-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz";
sha256 = "1yj08d810l4drsnhav3mych4p5b2dz5qrpn3nf20301pj28rav9k";
name = "qtserialport-everywhere-src-6.4.2.tar.xz";
};
};
qtshadertools = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtshadertools-everywhere-src-6.4.1.tar.xz";
sha256 = "012525kfnnkprgzgncqkzmif3z9k1qa6hfpscbsqg3084s1p9hbb";
name = "qtshadertools-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtshadertools-everywhere-src-6.4.2.tar.xz";
sha256 = "05x24v12jjh3fyr5wrxy7n33vqp00y10kyznrfs2r72f9pwbyrgs";
name = "qtshadertools-everywhere-src-6.4.2.tar.xz";
};
};
qtspeech = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtspeech-everywhere-src-6.4.1.tar.xz";
sha256 = "0jbv6r953r884wfnxrrcvf44xpvc7d8kzjd3lqv4y234748hsrih";
name = "qtspeech-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtspeech-everywhere-src-6.4.2.tar.xz";
sha256 = "1jwlnh640qk602nn5zslrxmp87ph87fyp6jcysmh1xfn6j6rzjd9";
name = "qtspeech-everywhere-src-6.4.2.tar.xz";
};
};
qtsvg = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtsvg-everywhere-src-6.4.1.tar.xz";
sha256 = "1rcwrsdq9412qq9ilfs54yjz7ih8a6r8mbwx7y4dnrqmjk2lalsy";
name = "qtsvg-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtsvg-everywhere-src-6.4.2.tar.xz";
sha256 = "0503b63zxqrakw33283lq8fm85asmpckibkyxpc22dkrn4yayimp";
name = "qtsvg-everywhere-src-6.4.2.tar.xz";
};
};
qttools = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qttools-everywhere-src-6.4.1.tar.xz";
sha256 = "0cq99c79p90yv3vlb3xbzamgx7qn4s9fb2gdnjyizhh4dcn5c84y";
name = "qttools-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qttools-everywhere-src-6.4.2.tar.xz";
sha256 = "0s3chbap59allfkj825yi07wqcg9x10shgidabpsbr44c68qf4x3";
name = "qttools-everywhere-src-6.4.2.tar.xz";
};
};
qttranslations = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qttranslations-everywhere-src-6.4.1.tar.xz";
sha256 = "04kal5b3bplylf33kjc8f7kc4x801qj5qrpsjs609ljnsbqwdns4";
name = "qttranslations-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qttranslations-everywhere-src-6.4.2.tar.xz";
sha256 = "15n4m6r279wqy9834iwc3n98nbyjbf9y2c7pzrr4nq6208ajkq5v";
name = "qttranslations-everywhere-src-6.4.2.tar.xz";
};
};
qtvirtualkeyboard = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtvirtualkeyboard-everywhere-src-6.4.1.tar.xz";
sha256 = "089v5nxfvrglp9ilaayxls8mhdbrq80z38m2agmw147m8d8dspy2";
name = "qtvirtualkeyboard-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtvirtualkeyboard-everywhere-src-6.4.2.tar.xz";
sha256 = "0a2gd8s7jrc56n4b743ln1qdvvl820cprp2zrbx6x28pdq7q6g4w";
name = "qtvirtualkeyboard-everywhere-src-6.4.2.tar.xz";
};
};
qtwayland = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwayland-everywhere-src-6.4.1.tar.xz";
sha256 = "1mgjd6qbz0m2kq9bcdn6mnypfjycwdfyna6z7dhj1m61s52id5lw";
name = "qtwayland-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwayland-everywhere-src-6.4.2.tar.xz";
sha256 = "0pqkpvc21h3gkr8x7nxylxgksj046xgmqpc1nhvidasiyw51mkr4";
name = "qtwayland-everywhere-src-6.4.2.tar.xz";
};
};
qtwebchannel = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebchannel-everywhere-src-6.4.1.tar.xz";
sha256 = "1abw58yccjhgwjrry56mih0vnxlg69dc10vfyi8grqy543qikgid";
name = "qtwebchannel-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwebchannel-everywhere-src-6.4.2.tar.xz";
sha256 = "11xxpvf53g63dxd6i6bzp4as4wc5pc6xlh3w7drnrwh94lmpnr86";
name = "qtwebchannel-everywhere-src-6.4.2.tar.xz";
};
};
qtwebengine = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebengine-everywhere-src-6.4.1.tar.xz";
sha256 = "10m763yq39jn6k02bqax6mhgbc0bpnmfmxj4wkw5b67ks48w0n9c";
name = "qtwebengine-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwebengine-everywhere-src-6.4.2.tar.xz";
sha256 = "1j8rl5r981xdqh2sqzlw5md4z14h42f8sgjjfgpdkj0wim8lbagz";
name = "qtwebengine-everywhere-src-6.4.2.tar.xz";
};
};
qtwebsockets = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebsockets-everywhere-src-6.4.1.tar.xz";
sha256 = "093ssssws3w1cjacjzp9j80n7b9y7i87yp8ibshshgj0avm8jxsk";
name = "qtwebsockets-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwebsockets-everywhere-src-6.4.2.tar.xz";
sha256 = "09n64yjlkd6kcg4hk0j4f85spi1k3kanfvx50c0w486vh9sqbkvi";
name = "qtwebsockets-everywhere-src-6.4.2.tar.xz";
};
};
qtwebview = {
version = "6.4.1";
version = "6.4.2";
src = fetchurl {
url = "${mirror}/official_releases/qt/6.4/6.4.1/submodules/qtwebview-everywhere-src-6.4.1.tar.xz";
sha256 = "15rqka6pyvi33cmizdjfhc2k5ldd1pykmc4nfx826drar6y32a27";
name = "qtwebview-everywhere-src-6.4.1.tar.xz";
url = "${mirror}/official_releases/qt/6.4/6.4.2/submodules/qtwebview-everywhere-src-6.4.2.tar.xz";
sha256 = "0wpkn9pwbq3bn2yjxhvrmwb32rakknzgxbf8ybxwcly12la9chm6";
name = "qtwebview-everywhere-src-6.4.2.tar.xz";
};
};
}

12
pkgs/development/python-modules/arabic-reshaper/default.nix
View file

@ -2,14 +2,13 @@
, buildPythonPackage
, fetchFromGitHub
, fonttools
, future
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "arabic-reshaper";
version = "2.1.4";
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,14 +16,10 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "mpcabd";
repo = "python-arabic-reshaper";
rev = "v${version}";
hash = "sha256-qQGIC/KequOQZoxwm7AEkdPV0QpS7YoBV9v8ZA7AYQM=";
rev = "refs/tags/v${version}";
hash = "sha256-ucSC5aTvpnlAVQcT0afVecnoN3hIZKtzUhEQ6Qg0jQM=";
};
propagatedBuildInputs = [
future
];
passthru.optional-dependencies = {
with-fonttools = [
fonttools
@ -42,6 +37,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Reconstruct Arabic sentences to be used in applications that don't support Arabic";
homepage = "https://github.com/mpcabd/python-arabic-reshaper";
changelog = "https://github.com/mpcabd/python-arabic-reshaper/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ freezeboy ];
};

53
pkgs/development/python-modules/cwl-upgrader/default.nix Normal file
View file

@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest-xdist
, pytestCheckHook
, pythonOlder
, ruamel-yaml
, schema-salad
}:
buildPythonPackage rec {
pname = "cwl-upgrader";
version = "1.2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-3pKnkU8lks3w+N7w2qST9jr4/CS6YzgnBVLTlgq1gf0=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "ruamel.yaml >= 0.15, < 0.17.22" "ruamel.yaml" \
--replace "setup_requires=PYTEST_RUNNER," ""
sed -i "/ruamel.yaml/d" setup.py
'';
propagatedBuildInputs = [
ruamel-yaml
schema-salad
];
checkInputs = [
pytest-xdist
pytestCheckHook
];
pythonImportsCheck = [
"cwlupgrader"
];
meta = with lib; {
description = "Library to interface with Yolink";
homepage = "https://github.com/common-workflow-language/cwl-utils";
changelog = "https://github.com/common-workflow-language/cwl-utils/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

67
pkgs/development/python-modules/cwl-utils/default.nix Normal file
View file

@ -0,0 +1,67 @@
{ lib
, buildPythonPackage
, cachecontrol
, cwl-upgrader
, cwlformat
, fetchFromGitHub
, packaging
, pytest-mock
, pytest-xdist
, pytestCheckHook
, pythonOlder
, rdflib
, requests
, schema-salad
}:
buildPythonPackage rec {
pname = "cwl-utils";
version = "0.21";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-y1zuYaxoE0XUk8UpCLsg4ty0sn+5Uu4ztRnUoJezO/o=";
};
propagatedBuildInputs = [
cachecontrol
cwl-upgrader
packaging
rdflib
requests
schema-salad
];
checkInputs = [
cwlformat
pytest-mock
pytest-xdist
pytestCheckHook
];
pythonImportsCheck = [
"cwl_utils"
];
disabledTests = [
# Don't run tests which require Node.js
"test_context_multiple_regex"
"test_value_from_two_concatenated_expressions"
"test_graph_split"
"test_caches_js_processes"
"test_load_document_with_remote_uri"
];
meta = with lib; {
description = "Utilities for CWL";
homepage = "https://github.com/common-workflow-language/cwl-utils";
changelog = "https://github.com/common-workflow-language/cwl-utils/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

42
pkgs/development/python-modules/cwlformat/default.nix Normal file
View file

@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, ruamel-yaml
}:
buildPythonPackage rec {
pname = "cwlformat";
version = "2022.02.18";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "rabix";
repo = "cwl-format";
rev = "refs/tags/${version}";
hash = "sha256-FI8hUgb/KglTkubZ+StzptoSsYal71ITyyFNg7j48yk=";
};
propagatedBuildInputs = [
ruamel-yaml
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"cwlformat"
];
meta = with lib; {
description = "Code formatter for CWL";
homepage = "https://github.com/rabix/cwl-format";
changelog = "https://github.com/rabix/cwl-format/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/google-cloud-translate/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.9.0";
version = "3.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-XPfN+IN5gc5KQEXPeaYF5gIlHPxmDoe90RKFqNG6eF8=";
hash = "sha256-SdhAsksalGug0eW9rVlAGpEGIUjreKkFIj3v9x54G6I=";
};
propagatedBuildInputs = [

16
pkgs/development/python-modules/pyatag/default.nix
View file

@ -1,21 +1,22 @@
{ lib
, buildPythonPackage
, isPy27
, fetchFromGitHub
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyatag";
version = "3.5.1";
version = "0.3.6.2";
format = "setuptools";
disabled = isPy27;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "MatsNl";
repo = "pyatag";
rev = version;
sha256 = "17x2m7icbby1y2zfc79jpbir2kvyqlrkix9pvvxanm658arsh8c7";
rev = "refs/tags/${version}";
sha256 = "sha256-yJEPDNjEv2lGrBQ78sl7nseVRemsG7hTdBGH5trciYU=";
};
propagatedBuildInputs = [
@ -33,6 +34,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module to talk to Atag One";
homepage = "https://github.com/MatsNl/pyatag";
changelog = "https://github.com/MatsNl/pyatag/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.17.1";
version = "3.18.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Aluy+jouh73Whz8R20Wnyhkhby+Lau0pFA/KV+MsKY4=";
sha256 = "sha256-RYjJdbi60vHDwlShKmEoK6g3mmtb3euuM9qvdqpn5oE=";
};
propagatedBuildInputs = [ numpy ];

4
pkgs/development/tools/altair-graphql-client/default.nix
View file

@ -2,11 +2,11 @@
let
pname = "altair";
version = "5.0.9";
version = "5.0.10";
src = fetchurl {
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
sha256 = "sha256-7eodAj48MMmdLEZPbYlhsgM01NEm0HxRTiIPPtlxdrA=";
sha256 = "sha256-NrFkLZiqX21BSIuE8qF7lurNWKgmf7PAa/1IpPbcUf0=";
};
appimageContents = appimageTools.extract { inherit pname version src; };

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

@ -6,15 +6,15 @@
buildGoModule rec {
pname = "conftest";
version = "0.37.0";
version = "0.38.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "refs/tags/v${version}";
hash = "sha256-zJvBa7LIm14HI8//J3mfnXb506O3EJ7zrypMYni287Y=";
hash = "sha256-kbWRjOXfDTVI07KuMQHcyxjenc7fW4oWRgyThzO0Pac=";
};
vendorHash = "sha256-A0rEPfNMrb/Z7Y5j1uf9Q5uYqnvyxy0D0p7USyhf2DU=";
vendorHash = "sha256-8ZGZzb7Ikfk9DZQ6zyB+4JJuqyo4nlBDhGWUb8MtSys=";
ldflags = [
"-s"

9
pkgs/development/tools/dapr/cli/default.nix
View file

@ -19,6 +19,13 @@ buildGoModule rec {
export HOME=$(mktemp -d)
'';
ldflags = [
"-X main.version=${version}"
"-X main.apiVersion=1.0"
"-X github.com/dapr/cli/pkg/standalone.gitcommit=${src.rev}"
"-X github.com/dapr/cli/pkg/standalone.gitversion=${version}"
];
postInstall = ''
mv $out/bin/cli $out/bin/dapr
@ -31,7 +38,7 @@ buildGoModule rec {
description = "A CLI for managing Dapr, the distributed application runtime";
homepage = "https://dapr.io";
license = licenses.mit;
maintainers = with maintainers; [ lucperkins ];
maintainers = with maintainers; [ joshvanl lucperkins ];
mainProgram = "dapr";
};
}

22
pkgs/development/tools/golines/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "golines";
version = "0.11.0";
src = fetchFromGitHub {
owner = "segmentio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2K9KAg8iSubiTbujyFGN3yggrL+EDyeUCs9OOta/19A=";
};
vendorSha256 = "sha256-rxYuzn4ezAxaeDhxd8qdOzt+CKYIh03A9zKNdzILq18=";
meta = with lib; {
description = "A golang formatter that fixes long lines";
homepage = "https://github.com/segmentio/golines";
license = licenses.mit;
maintainers = with maintainers; [ meain ];
};
}

8
pkgs/development/tools/rust/cargo-guppy/default.nix
View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-guppy";
version = "unstable-2023-01-08";
version = "unstable-2023-01-14";
src = fetchFromGitHub {
owner = "guppy-rs";
repo = "guppy";
rev = "81753212702ca2b11b65ac8b98db6c9e4f4d278f";
sha256 = "sha256-fCZlnE+/U+Z+X9n6x6qWHxODH5ESV0cM+hwxeyUZs6c=";
rev = "d593660fbcbfe50569de5a8aad5bd1ac19885733";
sha256 = "sha256-5kJTkVAklaSWqGIRjVJX56e8cjxyKAx/2E54OF0mIuw=";
};
cargoSha256 = "sha256-H2voc37Ywmi8oy15UY9J3hW6sbqc3RZuelxWJxrwZKg=";
cargoSha256 = "sha256-H2ta/eH2VzEzHbYs0ugzFseLh0S5lxhB7/wvJEFGj0M=";
nativeBuildInputs = [ pkg-config ];

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

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hakari";
version = "0.9.18";
version = "0.9.21";
src = fetchFromGitHub {
owner = "guppy-rs";
repo = "guppy";
rev = "cargo-hakari-${version}";
sha256 = "sha256-ZjU+0e0GmLCC9cha1RcTV0vEbuRi/SmU9qaNONIB7nI=";
sha256 = "sha256-wra3p3WAcGpsvW0DMMqWKFbAsrDTDnrYWQd6HS3sEls=";
};
cargoHash = "sha256-/KH+h+4xfU2fitWv+IrLkwgiQ8tVjm41DiZtbrerRZ4=";
cargoHash = "sha256-aNsG3ZmTMc5myOVs4h7uI5I5jjnjPd8AC2H7sSGmtHk=";
cargoBuildFlags = [ "-p" "cargo-hakari" ];
cargoTestFlags = [ "-p" "cargo-hakari" ];

6
pkgs/development/tools/rust/cargo-llvm-cov/default.nix
View file

@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-cov";
version = "0.5.7";
version = "0.5.8";
src = fetchzip {
url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz";
sha256 = "sha256-yw3Fv1KmItamja8YLiEQ5kcidjL80hEvxWVIaqA3DP0=";
sha256 = "sha256-APUr3eSEw//ruDeBG3NeJCgN62A7J+125DiYjg2GktA=";
};
cargoSha256 = "sha256-uYeF26MoQudukuzaKgLFQifRCoCairFbQYgznLq5Nm8=";
cargoSha256 = "sha256-0DetcbwAv8FtIZWH7VQWxjAf6r16nbgWxxQe6lkkT5k=";
# skip tests which require llvm-tools-preview
checkFlags = [

6
pkgs/development/tools/rust/cargo-public-api/default.nix
View file

@ -9,14 +9,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-public-api";
version = "0.26.0";
version = "0.27.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-BiGVdWgDi+g+mxdM3+z5RN1pGJz9NIKVm8sTZf2ObCc=";
sha256 = "sha256-NpOufmqaNsJeWv0I0PYRMs60rvWnUA3CrwsJ9U/t8Ps=";
};
cargoSha256 = "sha256-QvZBWo/u+WtIG5zlDVTC2+5bq/mqZftXU5m8oqN25GM=";
cargoSha256 = "sha256-eFCqUV5P4QSvxqCjj4Esb/E0PosU5wJK31O92pRt1XA=";
nativeBuildInputs = [ pkg-config ];

22
pkgs/development/tools/rust/probe-rs-cli/default.nix
View file

@ -1,18 +1,28 @@
{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1, AppKit }:
{ lib
, stdenv
, rustPlatform
, fetchCrate
, pkg-config
, libusb1
, openssl
, DarwinTools
, AppKit
}:
rustPlatform.buildRustPackage rec {
pname = "probe-rs-cli";
version = "0.13.0";
version = "0.14.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-3aKRUABJ1LkRGzwDSwQZeNXKGeRmTlbHKSGewfKn+2Q=";
sha256 = "sha256-y9EHksRDVbw58XiV7/dKzy4p6OWWAkQ3X9LP/WDWD2c=";
};
cargoSha256 = "sha256-bOfdpRVm9zqpFF/YmD06u4OKdyqXwfCSTNlTIZZygeg=";
cargoSha256 = "sha256-vv8XSAsGs1M97Y6cIGYevCdaxmPy3aDmHFF00exumq8=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
meta = with lib; {
description = "CLI tool for on-chip debugging and flashing of ARM chips";

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

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "r2mod_cli";
version = "1.3.2";
version = "1.3.3";
src = fetchFromGitHub {
owner = "Foldex";
repo = "r2mod_cli";
rev = "v${version}";
sha256 = "sha256-WL6zF6EdGjNyOm0j4zYZ1Oe7StEttKFNO28Ne/dA7CQ=";
sha256 = "sha256-VtJtAyojFOkMLBfpQ6N+8fDDkcJtVCflWjwsdq8OD0w=";
};
buildInputs = [ bashInteractive ];

6
pkgs/games/xivlauncher/default.nix
View file

@ -3,7 +3,7 @@
, useSteamRun ? true }:
let
rev = "1.0.2";
rev = "1.0.3";
in
buildDotnetModule rec {
pname = "XIVLauncher";
@ -13,7 +13,7 @@ in
owner = "goatcorp";
repo = "XIVLauncher.Core";
inherit rev;
sha256 = "DlSMxIbgzL5cy+A5nm7ZaA2A0TdINtq2GHW27uxORKI=";
hash = "sha256-aQVfW6Ef8X6L6hBEOCY/Py5tEyorXqtOO3v70mD7efA=";
fetchSubmodules = true;
};
@ -62,7 +62,7 @@ in
description = "Custom launcher for FFXIV";
homepage = "https://github.com/goatcorp/FFXIVQuickLauncher";
license = licenses.gpl3;
maintainers = with maintainers; [ ashkitten sersorrel ];
maintainers = with maintainers; [ sersorrel witchof0x20 ];
platforms = [ "x86_64-linux" ];
mainProgram = "XIVLauncher.Core";
};

10
pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
View file

@ -2,22 +2,22 @@
stdenvNoCC.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "2021-12-06";
version = "2022-07-06";
srcs = [
(fetchFromGitHub {
name = "bluez-firmware";
owner = "RPi-Distro";
repo = "bluez-firmware";
rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d";
hash = "sha256-6xBdXwAGA1N42k1KKYrEgtsxtFAtrwhKdIrYY39Fb7Y=";
rev = "dd840d991939f5046959b8c564596c7228f9d41d";
hash = "sha512-XvF6IHDoKBJkSs0Wyt8O1vcCMpSNS9WSYopn0+EyCr4btABGsHWTkgxb4nQbd+VbE6Ls2dcKr+c+X6aw/y1jhQ==";
})
(fetchFromGitHub {
name = "firmware-nonfree";
owner = "RPi-Distro";
repo = "firmware-nonfree";
rev = "99d5c588e95ec9c9b86d7e88d3cf85b4f729d2bc";
hash = "sha256-xg6fYQvg7t2ikyLI8/XfpiNaNTf7CNFQlAzpTldTz10=";
rev = "541e5a05d152e7e6f0d9be45622e4a3741e51c02";
hash = "sha512-0erVWiFom0V5AMu+XlolJnY9Q5/RCFlZwUovMBMNdEPb+L5rHcCdrA7zehDX1oRNe8DPb4S5gjny0iG/G7G6NQ==";
})
];

6
pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
View file

@ -5,13 +5,13 @@ let
in
stdenv.mkDerivation {
pname = "raspberrypi-armstubs";
version = "2021-11-01";
version = "unstable-2022-07-11";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "tools";
rev = "13474ee775d0c5ec8a7da4fb0a9fa84187abfc87";
sha256 = "s/RPMIpQSznoQfchAP9gpO7I2uuTsOV0Ep4vVz7i2o4=";
rev = "439b6198a9b340de5998dd14a26a0d9d38a6bcac";
hash = "sha512-KMHgj73eXHT++IE8DbCsFeJ87ngc9R3XxMUJy4Z3s4/MtMeB9zblADHkyJqz9oyeugeJTrDtuVETPBRo7M4Y8A==";
};
NIX_CFLAGS_COMPILE = [

4
pkgs/os-specific/linux/firmware/raspberrypi/default.nix
View file

@ -3,13 +3,13 @@
stdenvNoCC.mkDerivation rec {
# NOTE: this should be updated with linux_rpi
pname = "raspberrypi-firmware";
version = "1.20221028";
version = "1.20230106";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "firmware";
rev = version;
hash = "sha256-GgPAWFCrLrrLiUDM+pt3VV6+IvCljMN9nh7L84vTQJs=";
hash = "sha512-iKUR16RipN8BGAmXteTJUzd/P+m5gnbWCJ28LEzYfOTJnGSal63zI7LDQg/HIKXx9wMTARQKObeKn+7ioS4QkA==";
};
installPhase = ''

6
pkgs/os-specific/linux/kernel/linux-rpi.nix
View file

@ -2,8 +2,8 @@
let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "5.15.74";
tag = "1.20221028";
modDirVersion = "5.15.84";
tag = "1.20230106";
in
lib.overrideDerivation (buildLinux (args // {
version = "${modDirVersion}-${tag}";
@ -13,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // {
owner = "raspberrypi";
repo = "linux";
rev = tag;
hash = "sha256-2UdSW9X9prAya9mvEp3i0l3Uim0wtDYEY0WrD2wntaI=";
hash = "sha512-6Dcpo81JBvc8NOv1nvO8JwjUgOOviRgHmXLLcGpE/pI2lEOcSeDRlB/FZtflzXTGilapvmwOSx5NxQfAmysHqQ==";
};
defconfig = {

10
pkgs/servers/hylafaxplus/default.nix
View file

@ -72,6 +72,16 @@ stdenv.mkDerivation {
patches = [
# adjust configure check to work with libtiff > 4.1
./libtiff-4.patch
# fix missing exports in libtiff 4.5+
# https://gitlab.com/libtiff/libtiff/-/issues/504
# can probably be dropped with next hylafaxplus release
(fetchurl {
name = "hylafaxplus-7.0.6-tiff-4.5.0.patch";
url = "https://dev.gentoo.org/~sam/distfiles/net-misc/hylafaxplus/hylafaxplus-7.0.6-tiff-4.5.0.patch.xz";
downloadToTemp = true;
postFetch = ''xz -d < $downloadedFile > $out'';
hash = "sha256-koZvvzlgZHcANVaYdewnuLARz2TTeyDZRjm0EYWzsmk=";
})
];
# Note that `configure` (and maybe `faxsetup`) are looking
# for a couple of standard binaries in the `PATH` and

6
pkgs/shells/zsh/zsh-fzf-tab/default.nix
View file

@ -4,13 +4,13 @@ let
INSTALL_PATH="${placeholder "out"}/share/fzf-tab";
in stdenv.mkDerivation rec {
pname = "zsh-fzf-tab";
version = "unstable-2022-10-15";
version = "unstable-2022-12-08";
src = fetchFromGitHub {
owner = "Aloxaf";
repo = "fzf-tab";
rev = "3aa44739958691c4de06496e5bb18e0a629edd6d";
sha256 = "sha256-VK+qJsyo0rQ2FV6lzUPhGTYNznHCuu4eOCcREqaD8jQ=";
rev = "ffb7b776be492333b94cf0be87456b62a1f26e2f";
sha256 = "bIlnYKjjOC6h5/Gg7xBg+i2TBk+h82wmHgAJPhzMsek=";
};
strictDeps = true;

6
pkgs/shells/zsh/zsh-prezto/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-prezto";
version = "unstable-2022-10-26";
version = "unstable-2023-01-12";
src = fetchFromGitHub {
owner = "sorin-ionescu";
repo = "prezto";
rev = "e3a9583f3370e11a0da1414d3f335eac40c1e922";
sha256 = "P4hgs6b3lKQCDCeyhepCn4HSZu7WuJE+j96PfFOLfl4=";
rev = "e50b93ca882aa58b0119b2e90818c4157e30c794";
sha256 = "25mz5UMTCHAVjtUhQsWTMsAGAweAwwTdGNLHMp2LCBM=";
fetchSubmodules = true;
};

6
pkgs/tools/admin/fioctl/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fioctl";
version = "0.30.1";
version = "0.31";
src = fetchFromGitHub {
owner = "foundriesio";
repo = "fioctl";
rev = "v${version}";
sha256 = "sha256-ocbTYeVhYTDyOJt3NndQhgz18xJWRudJRKel4WKS7vA=";
sha256 = "sha256-A5XRokrYRENaw0poq9e3o2OwCPn0GZaAT2fPjYu3p0M=";
};
vendorSha256 = "sha256-g8sTQXUk162SlA1iLEMGZ6O3FvF+8v/XINtZR8o0m8U=";
vendorHash = "sha256-g8sTQXUk162SlA1iLEMGZ6O3FvF+8v/XINtZR8o0m8U=";
ldflags = [
"-s" "-w"

10
pkgs/tools/graphics/gmic-qt/default.nix
View file

@ -2,6 +2,7 @@
, mkDerivation
, variant ? "standalone"
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, ninja
@ -94,6 +95,15 @@ mkDerivation rec {
"-DENABLE_SYSTEM_GMIC:BOOL=ON"
];
patches = [
# NOTE: this should be removed when a new version is released.
(fetchpatch {
name = "fix_filter_translation_scripts.patch";
url = "https://github.com/c-koi/gmic-qt/commit/ccb9f29eda239d0c80663593cd90a6548c935b39.patch";
sha256 = "sha256-OzuJ6yGuDJweQ+1uin/pmJqZV79bN9E1Zuo+0iciwzg=";
})
];
postPatch = ''
patchShebangs \
translations/filters/csv2ts.sh \

4
pkgs/tools/misc/mongodb-compass/default.nix
View file

@ -33,7 +33,7 @@ xorg,
}:
let
version = "1.34.2";
version = "1.35.0";
rpath = lib.makeLibraryPath [
alsa-lib
@ -82,7 +82,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
sha256 = "sha256-qXteinKphHi2dwHQ4WMIegG+Yb9YGU/WuCbhwcoIV3Y=";
sha256 = "sha256-XSnhv395X0G6n7G3MQxvoSBOrS3chV6fLjmxXRaSJUQ=";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";

6
pkgs/tools/networking/sing-box/default.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "sing-box";
version = "1.1.2";
version = "1.1.4";
src = fetchFromGitHub {
owner = "SagerNet";
repo = pname;
rev = "v${version}";
hash = "sha256-FbW2h/muCk/vAItYHYRA/DFFPQvmTqNq74XUZQkUXaA=";
hash = "sha256-OH4tuSnMdrJSkD7vxEA8dpQxWqh6bUXCOJ/y0fe2pME=";
};
vendorHash = "sha256-kJE+1bekIpv36cG0/Gi25kjnJmTjTp6lt344kFCUSXI=";
vendorHash = "sha256-kCNtbtDnB7JZzsfUd2yMDi+pascHfxIbPVMwUVsP78g=";
tags = [
"with_quic"

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

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "snowflake";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "anti-censorship/pluggable-transports";
repo = "snowflake";
rev = "v${version}";
sha256 = "sha256-DR1H5ncFPHZWQAwOZKkfRrjwfzhirSzwtvKesaRmqcA=";
sha256 = "sha256-FYHQNzKwp5z51F7XXSdktcJDegCSleDBvHjRzWNS3jc=";
};
vendorHash = "sha256-66GqvwHPkMii5oXZV36ayYYkW1oaq5qTjkEA5BeS/5U=";

4
pkgs/tools/security/gotrue/supabase.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gotrue";
version = "2.40.1";
version = "2.40.2";
src = fetchFromGitHub {
owner = "supabase";
repo = pname;
rev = "v${version}";
hash = "sha256-PXWGjuLUHo+adlomL2HqdY7cPqFIS0ttg7hYHNbAWP4=";
hash = "sha256-y2YQDgILH9JRsSjVaGDtwKXdWhTF/Idq6TPytnxsPyE=";
};
vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU=";

12
pkgs/tools/system/netdata/default.nix
View file

@ -4,7 +4,7 @@
, curl, jemalloc, libuv, zlib
, libcap, libuuid, lm_sensors, protobuf
, withCups ? false, cups
, withDBengine ? true, judy, lz4
, withDBengine ? true, lz4
, withIpmi ? (!stdenv.isDarwin), freeipmi
, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct
, withCloud ? (!stdenv.isDarwin), json_c
@ -33,18 +33,18 @@ in stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ];
buildInputs = [ curl.dev jemalloc libuv zlib.dev ]
buildInputs = [ curl jemalloc libuv zlib ]
++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ]
++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ]
++ optionals (!stdenv.isDarwin) [ libcap libuuid ]
++ optionals withCups [ cups ]
++ optionals withDBengine [ judy lz4.dev ]
++ optionals withDBengine [ lz4 ]
++ optionals withIpmi [ freeipmi ]
++ optionals withNetfilter [ libmnl libnetfilter_acct ]
++ optionals withCloud [ json_c ]
++ optionals withConnPubSub [ google-cloud-cpp grpc ]
++ optionals withConnPrometheus [ snappy ]
++ optionals (withCloud || withConnPrometheus) [ protobuf ]
++ optionals withSsl [ openssl.dev ];
++ optionals withSsl [ openssl ];
patches = [
# required to prevent plugins from relying on /etc
@ -117,7 +117,7 @@ in stdenv.mkDerivation rec {
};
meta = {
broken = stdenv.isDarwin;
broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform;
description = "Real-time performance monitoring tool";
homepage = "https://www.netdata.cloud/";
license = licenses.gpl3Plus;

9
pkgs/tools/text/pomsky/default.nix
View file

@ -2,16 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "pomsky";
version = "0.8";
version = "0.9";
src = fetchFromGitHub {
owner = "rulex-rs";
repo = pname;
rev = "v${version}";
sha256 = "1bb28f80wxjpy23mp9zamkprl8xbnx99rmmn8nxcaapq360zv9yi";
sha256 = "sha256-SR+cXCPcEejX3AauN3mS6zWU46m4nomMs1UVk+si1NY=";
};
cargoSha256 = "sha256-Io8Ar7eNgULBIzI0rlitMI+9hLLWzI8pFwmH38hVVYU=";
cargoSha256 = "sha256-5ASB2zPL+0DAPWoB/Ez+DUbEjhDvVk00yyN75w6jzYk=";
# thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: invalid option '--test-threads''
doCheck = false;
meta = with lib; {
description = "A portable, modern regular expression language";

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

@ -515,6 +515,7 @@ with pkgs;
probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli {
inherit (darwin.apple_sdk.frameworks) AppKit;
inherit (darwin) DarwinTools;
};
probe-run = callPackage ../development/tools/rust/probe-run {
@ -14465,55 +14466,6 @@ with pkgs;
gnat = gnat12;
gnat6 = wrapCC (gcc6.cc.override {
name = "gnat";
langC = true;
langCC = false;
langAda = true;
profiledCompiler = false;
# As per upstream instructions building a cross compiler
# should be done with a (native) compiler of the same version.
# If we are cross-compiling GNAT, we may as well go the same
# route (especially as gnatboot can't cross-compile).
gnatboot =
if stdenv.hostPlatform == stdenv.targetPlatform
&& stdenv.buildPlatform == stdenv.hostPlatform
then buildPackages.gnatboot
else buildPackages.gnat6;
});
gnat9 = wrapCC (gcc9.cc.override {
name = "gnat";
langC = true;
langCC = false;
langAda = true;
profiledCompiler = false;
# As per upstream instructions building a cross compiler
# should be done with a (native) compiler of the same version.
# If we are cross-compiling GNAT, we may as well do the same.
gnatboot =
if stdenv.hostPlatform == stdenv.targetPlatform
&& stdenv.buildPlatform == stdenv.hostPlatform
then buildPackages.gnatboot
else buildPackages.gnat9;
});
gnat10 = wrapCC (gcc10.cc.override {
name = "gnat";
langC = true;
langCC = false;
langAda = true;
profiledCompiler = false;
# As per upstream instructions building a cross compiler
# should be done with a (native) compiler of the same version.
# If we are cross-compiling GNAT, we may as well do the same.
gnatboot =
if stdenv.hostPlatform == stdenv.targetPlatform
&& stdenv.buildPlatform == stdenv.hostPlatform
then buildPackages.gnatboot
else buildPackages.gnat10;
});
gnat11 = wrapCC (gcc11.cc.override {
name = "gnat";
langC = true;
@ -26029,6 +25981,8 @@ with pkgs;
go-task = callPackage ../development/tools/go-task { };
golines = callPackage ../development/tools/golines { };
golint = callPackage ../development/tools/golint { };
golangci-lint = callPackage ../development/tools/golangci-lint { };
@ -32501,6 +32455,8 @@ with pkgs;
synology-cloud-sync-decryption-tool = callPackage ../applications/networking/synology-cloud-sync-decryption-tool { };
litemdview = callPackage ../applications/graphics/litemdview { };
maestral = with python3Packages; toPythonApplication maestral;
maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { };
@ -33751,11 +33707,11 @@ with pkgs;
};
xiphos = callPackage ../applications/misc/xiphos {
gtkhtml = gnome2.gtkhtml4;
gtkhtml = gnome.gtkhtml;
};
xournal = callPackage ../applications/graphics/xournal {
inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas;
inherit (gnome2) libgnomecanvas;
};
xournalpp = callPackage ../applications/graphics/xournalpp {

6
pkgs/top-level/python-packages.nix
View file

@ -2124,6 +2124,12 @@ self: super: with self; {
cwcwidth = callPackage ../development/python-modules/cwcwidth { };
cwl-upgrader = callPackage ../development/python-modules/cwl-upgrader { };
cwl-utils = callPackage ../development/python-modules/cwl-utils { };
cwlformat = callPackage ../development/python-modules/cwlformat { };
cx_Freeze = callPackage ../development/python-modules/cx_freeze { };
cx_oracle = callPackage ../development/python-modules/cx_oracle { };