gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2022-05-20 18:02:18 +00:00
committed by GitHub
parent f5558d8fda 25e4e7af03
commit 77bded3c43
50 changed files with 1084 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/finance/odoo/default.nix
+13 -6
View File
@@ -4,6 +4,7 @@
, python3
, nodePackages
, wkhtmltopdf
, nixosTests
}:
let
@@ -72,19 +73,18 @@ let
in python.pkgs.buildPythonApplication rec {
pname = "odoo";
major = "15";
minor = "0";
patch = "20220126";
odoo_version = "15.0";
odoo_release = "20220506";
version = "${major}.${minor}.${patch}";
version = "${odoo_version}.${odoo_release}";
format = "setuptools";
# latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile
src = fetchurl {
url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz";
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz";
name = "${pname}-${version}";
hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg=";
sha256 = "0mwlmfz5nhvg483ldrmlrjhwaf284c0c0pxf0fb0sfx2dnjjj3ib"; # odoo
};
# needs some investigation
@@ -140,6 +140,13 @@ in python.pkgs.buildPythonApplication rec {
cd odoo*
'';
passthru = {
updateScript = ./update.sh;
tests = {
inherit (nixosTests) odoo;
};
};
meta = with lib; {
description = "Open Source ERP and CRM";
homepage = "https://www.odoo.com/";
pkgs/applications/finance/odoo/update.sh
Executable
+27
View File
@@ -0,0 +1,27 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix coreutils
set -euo pipefail
DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/15.0/Dockerfile)
get_var() {
echo "$DOCKER" | grep -E "^[A-Z][A-Z][A-Z] ODOO_$1" | sed -r "s|^[A-Z]{3} ODOO_$1.||g"
}
VERSION=$(get_var VERSION)
RELEASE=$(get_var RELEASE)
latestVersion="$VERSION.$RELEASE"
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "odoo is up-to-date: $currentVersion"
exit 0
fi
cd "$(dirname "${BASH_SOURCE[0]}")"
sed -ri "s| sha256.+ # odoo| sha256 = \"$(nix-prefetch-url --type sha256 "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" default.nix
sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix
sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix
pkgs/applications/graphics/ImageMagick/7.0.nix
+2 -2
View File
@@ -45,13 +45,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-34";
version = "7.1.0-35";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-eASmIOTYupK5di3lggJ/8O5pkG88ZpFuvaYK23AWsq4=";
hash = "sha256-KLS7gKUVeOAA89Kfrk07JzSXEF6TH6AgfheECbWi0lE=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
pkgs/applications/office/buho/default.nix → pkgs/applications/maui/buho.nix
+1 -11
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@@ -17,17 +16,8 @@
, qtquickcontrols2
}:
mkDerivation rec {
mkDerivation {
pname = "buho";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "buho";
rev = "v${version}";
sha256 = "sha256-rHjjvjRY2WsyZfj3fzp46copZ1g2ae6PVv9lBNZDzcI=";
};
nativeBuildInputs = [
cmake
pkgs/applications/video/clip/default.nix → pkgs/applications/maui/clip.nix
+1 -11
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@@ -17,17 +16,8 @@
, ffmpeg
}:
mkDerivation rec {
mkDerivation {
pname = "clip";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "clip";
rev = "v${version}";
sha256 = "sha256-vW3A0PKJSC2QNs+QVZ9w0g4aVmcndhahrpkd4wWoUko=";
};
nativeBuildInputs = [
cmake
pkgs/tools/misc/communicator/default.nix → pkgs/applications/maui/communicator.nix
+1 -11
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@@ -19,17 +18,8 @@
, kcontacts
}:
mkDerivation rec {
mkDerivation {
pname = "communicator";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "communicator";
rev = "v${version}";
sha256 = "sha256-tHuFQgssZ6bohELx8tHrd4vvnrWixTyqCqK8WKJEdRE=";
};
nativeBuildInputs = [
cmake
pkgs/applications/maui/default.nix
+82
View File
@@ -0,0 +1,82 @@
/*
# New packages
READ THIS FIRST
This module is for the MauiKit framework and official Maui applications. All
available packages are listed in `callPackage ./srcs.nix`, although some are not yet
packaged in Nixpkgs.
IF YOUR PACKAGE IS NOT LISTED IN `callPackage ./srcs.nix`, IT DOES NOT GO HERE.
See also `pkgs/applications/kde` as this is what this is based on.
# Updates
1. Update the URL in `callPackage ./fetch.sh`.
2. Run `callPackage ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui`
from the top of the Nixpkgs tree.
3. Use `nixpkgs-review wip` to check that everything builds.
4. Commit the changes and open a pull request.
*/
{ lib
, libsForQt5
, fetchurl
}:
let
minQtVersion = "5.15";
broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
mkDerivation = args:
let
inherit (args) pname;
inherit (srcs.${pname}) src version;
mkDerivation =
libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
in
mkDerivation (args // {
inherit pname version src;
outputs = args.outputs or [ "out" ];
meta =
let meta = args.meta or {}; in
meta // {
homepage = meta.homepage or "https://mauikit.org/";
platforms = meta.platforms or lib.platforms.linux;
broken = meta.broken or broken;
};
});
packages = self: with self;
let
callPackage = self.newScope {
inherit mkDerivation;
};
in {
# libraries
mauikit = callPackage ./mauikit.nix { };
mauikit-accounts = callPackage ./mauikit-accounts.nix { };
mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
# applications
buho = callPackage ./buho.nix { };
clip = callPackage ./clip.nix { };
communicator = callPackage ./communicator.nix { };
index = callPackage ./index.nix { };
nota = callPackage ./nota.nix { };
pix = callPackage ./pix.nix { };
shelf = callPackage ./shelf.nix { };
vvave = callPackage ./vvave.nix { };
};
in lib.makeScope libsForQt5.newScope packages
pkgs/applications/maui/fetch.sh
+1
View File
@@ -0,0 +1 @@
WGET_ARGS=( https://download.kde.org/stable/maui/ -A '*-2.1.2.tar.xz' )
pkgs/applications/misc/index-fm/default.nix → pkgs/applications/maui/index.nix
+1 -11
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, karchive
@@ -14,17 +13,8 @@
, qtquickcontrols2
}:
mkDerivation rec {
mkDerivation {
pname = "index-fm";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "index-fm";
rev = "v${version}";
hash = "sha256-F4qgewkPxkbAbeR+MaeRDiw9KIsd/Xx4C0cYEYDkPOE=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
pkgs/development/libraries/mauikit-accounts/default.nix → pkgs/applications/maui/mauikit-accounts.nix
+2 -12
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@@ -8,17 +7,8 @@
, mauikit
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit-accounts";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-accounts";
rev = "v${version}";
sha256 = "sha256-B0VmgE0L8kBOqR/lrWCHO3psCQ7GZVPIGljGAwpuymE=";
};
nativeBuildInputs = [
cmake
@@ -34,7 +24,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-accounts";
description = "MauiKit utilities to handle User Accounts";
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ onny ];
};
}
pkgs/development/libraries/mauikit-filebrowsing/default.nix → pkgs/applications/maui/mauikit-filebrowsing.nix
+2 -12
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@@ -8,17 +7,8 @@
, mauikit
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit-filebrowsing";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-filebrowsing";
rev = "v${version}";
hash = "sha256-2LzGvjh2t4RVZS9Js7ky3hM51L7bx0SHmDlKKPjl3LM=";
};
nativeBuildInputs = [
cmake
@@ -34,7 +24,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-filebrowsing";
description = "MauiKit File Browsing utilities and controls";
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ dotlambda ];
};
}
pkgs/applications/maui/mauikit-imagetools.nix
+36
View File
@@ -0,0 +1,36 @@
{ lib
, mkDerivation
, cmake
, extra-cmake-modules
, kconfig
, kio
, mauikit
, qtlocation
, exiv2
, kquickimageedit
}:
mkDerivation {
pname = "mauikit-imagetools";
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
kconfig
kio
mauikit
qtlocation
exiv2
kquickimageedit
];
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-imagetools";
description = "MauiKit Image Tools Components";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ onny ];
};
}
pkgs/development/libraries/mauikit-texteditor/default.nix → pkgs/applications/maui/mauikit-texteditor.nix
+2 -12
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@@ -9,17 +8,8 @@
, syntax-highlighting
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit-texteditor";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-texteditor";
rev = "v${version}";
sha256 = "sha256-C0EOc0CE6Ef7vnmOKRqTzeJUamGXsvREpHRPGTcAaIc=";
};
nativeBuildInputs = [
cmake
@@ -36,7 +26,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-texteditor";
description = "MauiKit Text Editor components";
license = licenses.lgpl2Plus;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ onny ];
};
}
pkgs/development/libraries/mauikit/default.nix → pkgs/applications/maui/mauikit.nix
+2 -13
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
@@ -12,17 +11,8 @@
, qtx11extras
}:
mkDerivation rec {
mkDerivation {
pname = "mauikit";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit";
rev = "v${version}";
hash = "sha256-INvh+J484xkAsNGtYdf8NGGpFGp2AG7s9UYESoem3QY=";
};
nativeBuildInputs = [
cmake
@@ -41,8 +31,7 @@ mkDerivation rec {
meta = with lib; {
homepage = "https://mauikit.org/";
description = "Free and modular front-end framework for developing fast and compelling user experiences";
license = licenses.lgpl2Plus;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dotlambda ];
broken = versionOlder qtbase.version "5.15.0";
};
}
pkgs/applications/editors/maui-nota/default.nix → pkgs/applications/maui/nota.nix
+1 -11
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@@ -16,17 +15,8 @@
, qtquickcontrols2
}:
mkDerivation rec {
mkDerivation {
pname = "nota";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "nota";
rev = "v${version}";
sha256 = "sha256-Sgpm5njhQDe9ohAVFcN5iPNC6v9+QZnGRPYxuLvUno8=";
};
nativeBuildInputs = [
cmake
pkgs/applications/maui/pix.nix
+52
View File
@@ -0,0 +1,52 @@
{ lib
, mkDerivation
, cmake
, extra-cmake-modules
, applet-window-buttons
, karchive
, kcoreaddons
, ki18n
, kio
, kirigami2
, mauikit
, mauikit-filebrowsing
, mauikit-imagetools
, qtmultimedia
, qtquickcontrols2
, qtlocation
, exiv2
, kquickimageedit
}:
mkDerivation {
pname = "pix";
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
applet-window-buttons
karchive
kcoreaddons
ki18n
kio
kirigami2
mauikit
mauikit-filebrowsing
mauikit-imagetools
qtmultimedia
qtquickcontrols2
qtlocation
exiv2
kquickimageedit
];
meta = with lib; {
description = "Image gallery application";
homepage = "https://invent.kde.org/maui/pix";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ onny ];
};
}
pkgs/applications/office/shelf/default.nix → pkgs/applications/maui/shelf.nix
+1 -11
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@@ -17,17 +16,8 @@
, poppler
}:
mkDerivation rec {
mkDerivation {
pname = "shelf";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "shelf";
rev = "v${version}";
sha256 = "sha256-0a5UHrYrkLR35cezjin+K9cTk3+aLeUAkvBbmKMK61w=";
};
nativeBuildInputs = [
cmake
pkgs/applications/maui/srcs.nix
+118
View File
@@ -0,0 +1,118 @@
# DO NOT EDIT! This file is generated automatically.
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui
{ fetchurl, mirror }:
{
buho = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/buho/2.1.2/buho-2.1.2.tar.xz";
sha256 = "0xc623w1zp0yh929b8h6mf9r4frnfabd30634ba43x4ac12jk7g8";
name = "buho-2.1.2.tar.xz";
};
};
clip = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/clip/2.1.2/clip-2.1.2.tar.xz";
sha256 = "168lz2qi4y56pwfwyzqnhwz4lgh2763w260l860527aw049crv4z";
name = "clip-2.1.2.tar.xz";
};
};
communicator = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/communicator/2.1.2/communicator-2.1.2.tar.xz";
sha256 = "0m7axdjpl7s9cz6fcaj4kwr9wdxybwdb76k9rz5yigyy35vigcfi";
name = "communicator-2.1.2.tar.xz";
};
};
index-fm = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/index/2.1.2/index-fm-2.1.2.tar.xz";
sha256 = "1yawnzx51h6yrlnivbwz9d7481k382pzg3jnczrajfjnv7ir29dn";
name = "index-fm-2.1.2.tar.xz";
};
};
mauikit = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit/2.1.2/mauikit-2.1.2.tar.xz";
sha256 = "1n5p8107lwa4m5gbwlcqmmdlyw15vjaq0dfaz5zal733s6rq2gm7";
name = "mauikit-2.1.2.tar.xz";
};
};
mauikit-accounts = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-accounts/2.1.2/mauikit-accounts-2.1.2.tar.xz";
sha256 = "00nc54gi34r8z6cwa0h8490gd0w01a245rh2g4d9fvbkrybwg7sk";
name = "mauikit-accounts-2.1.2.tar.xz";
};
};
mauikit-filebrowsing = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.1.2/mauikit-filebrowsing-2.1.2.tar.xz";
sha256 = "09pfjr449mkf27ywmwsvflzq0dgaiprw8b2lcms3m5ad7i6jvvyq";
name = "mauikit-filebrowsing-2.1.2.tar.xz";
};
};
mauikit-imagetools = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-imagetools/2.1.2/mauikit-imagetools-2.1.2.tar.xz";
sha256 = "1830x8xwyjs7bj0qi63pl1dk5h2qi6f84mki1schviddddq5cv6j";
name = "mauikit-imagetools-2.1.2.tar.xz";
};
};
mauikit-texteditor = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-texteditor/2.1.2/mauikit-texteditor-2.1.2.tar.xz";
sha256 = "19z9qry56h2624kdx5xnfjzd3spv5shc87p2m6ix33x9mmrf92p1";
name = "mauikit-texteditor-2.1.2.tar.xz";
};
};
nota = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/nota/2.1.2/nota-2.1.2.tar.xz";
sha256 = "11z1mw6yhwin3wj19gj9495az4p40yjkwrn0nb6i8h9b0nh44pn7";
name = "nota-2.1.2.tar.xz";
};
};
pix = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/pix/2.1.2/pix-2.1.2.tar.xz";
sha256 = "0ycpazi267pl4l178i34lwzc0ssjklp0indz79r7mcfpr1vicz1s";
name = "pix-2.1.2.tar.xz";
};
};
shelf = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/shelf/2.1.2/shelf-2.1.2.tar.xz";
sha256 = "0f3781l8wfbpj0irmri0zkp3ia3qlik4aaq3w6qk97xjv24d98xh";
name = "shelf-2.1.2.tar.xz";
};
};
station = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/station/2.1.2/station-2.1.2.tar.xz";
sha256 = "0lrw7rf8i277nl9bwyx5sc05bswgll00k1jzad1i69rwdfiy9ghg";
name = "station-2.1.2.tar.xz";
};
};
vvave = {
version = "2.1.2";
src = fetchurl {
url = "${mirror}/stable/maui/vvave/2.1.2/vvave-2.1.2.tar.xz";
sha256 = "14b6b034899vyvvhzl2jqifqq715lb26dnw3d5wxzxhdplfd7pdf";
name = "vvave-2.1.2.tar.xz";
};
};
}
pkgs/applications/video/vvave/default.nix → pkgs/applications/maui/vvave.nix
+1 -11
View File
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
@@ -17,17 +16,8 @@
, taglib
}:
mkDerivation rec {
mkDerivation {
pname = "vvave";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "vvave";
rev = "v${version}";
sha256 = "sha256-ykX1kd3106KTDTJQIGk6miSgbj+oROiXQl/nkCjTphE=";
};
nativeBuildInputs = [
cmake
pkgs/applications/misc/crow-translate/default.nix
+19 -17
View File
@@ -1,11 +1,11 @@
{ lib
, stdenv
, nix-update-script
, fetchFromGitHub
, fetchzip
, substituteAll
, cmake
, extra-cmake-modules
, qttools
, kwayland
, leptonica
, tesseract4
, qtmultimedia
@@ -16,14 +16,11 @@
stdenv.mkDerivation rec {
pname = "crow-translate";
version = "2.9.5";
version = "2.9.8";
src = fetchFromGitHub {
owner = "crow-translate";
repo = pname;
rev = version;
sha256 = "sha256-AzwJJ85vxXsc0+W3QM8citN5f0AD6APQVd9628cfLgI=";
fetchSubmodules = true;
src = fetchzip {
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
hash = "sha256-ZqiQVpKwGpglSc05Y1r6uScZyG4qnklPXqTGKxpS3f8=";
};
patches = [
@@ -34,21 +31,26 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ];
nativeBuildInputs = [
cmake
extra-cmake-modules
qttools
wrapQtAppsHook
];
buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ];
buildInputs = [
kwayland
leptonica
tesseract4
qtmultimedia
qtx11extras
];
postInstall = ''
substituteInPlace $out/share/applications/io.crow_translate.CrowTranslate.desktop \
--replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing";
homepage = "https://crow-translate.github.io/";
pkgs/applications/misc/goldendict/default.nix
+5 -4
View File
@@ -10,13 +10,13 @@
mkDerivation rec {
pname = "goldendict";
version = "2021-03-09";
version = "2022-05-10";
src = fetchFromGitHub {
owner = "goldendict";
repo = pname;
rev = "b2e673961d28ca5eb920a909091252d3321f09d6";
sha256 = "sha256-+AAamnICq0/B54ggFpgF/Uupm1a4YiEYgHXrhIK4M0E=";
rev = "f810c6bd724e61977b4e94ca2d8abfa5bd766379";
sha256 = "sha256-gNM+iahoGQy8TlNFLQx5ksITzQznv7MWMX/88QCTnL0";
};
patches = [
@@ -27,7 +27,8 @@ mkDerivation rec {
postPatch = ''
substituteInPlace goldendict.pro \
--replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}"
--replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" \
--replace "opencc.2" "opencc"
'';
nativeBuildInputs = [ pkg-config qmake ];
pkgs/applications/misc/privacyidea/default.nix
+56 -14
View File
@@ -11,6 +11,11 @@ let
inherit version;
hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
};
doCheck = false;
});
# fails with `no tests ran in 1.75s`
alembic = super.alembic.overridePythonAttrs (lib.const {
doCheck = false;
});
flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec {
version = "2.7.0";
@@ -20,33 +25,70 @@ let
sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";
};
});
werkzeug = self.callPackage ../../../development/python2-modules/werkzeug { };
# Taken from by https://github.com/NixOS/nixpkgs/pull/173090/commits/d2c0c7eb4cc91beb0a1adbaf13abc0a526a21708
werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
version = "1.0.1";
src = old.src.override {
inherit version;
sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
};
checkInputs = old.checkInputs ++ (with self; [
requests
]);
disabledTests = old.disabledTests ++ [
# ResourceWarning: unclosed file
"test_basic"
"test_date_to_unix"
"test_easteregg"
"test_file_rfc2231_filename_continuations"
"test_find_terminator"
"test_save_to_pathlib_dst"
];
disabledTestPaths = old.disabledTestPaths ++ [
# ResourceWarning: unclosed file
"tests/test_http.py"
];
});
# Required by flask-1.1
jinja2 = super.jinja2.overridePythonAttrs (old: rec {
version = "2.11.3";
src = old.src.override {
inherit version;
sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y=";
};
});
# Required by jinja2-2.11.3
markupsafe = super.markupsafe.overridePythonAttrs (old: rec {
version = "2.0.1";
src = old.src.override {
inherit version;
sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo=";
};
});
# Required by flask-babel
itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec {
version = "2.0.1";
src = old.src.override {
inherit version;
sha256 = "sha256-nnJNaPwikCoUNTUfhMP7hiPzA//8xWaky5Ut+MVyz/A=";
};
});
flask = self.callPackage ../../../development/python2-modules/flask { };
sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: {
meta = meta // { broken = false; };
});
pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
version = "1.7.1";
src = python3.pkgs.fetchPypi {
pname = "PyJWT";
inherit version;
sha256 = "sha256-jVmpdvt3Pz5qOchWNjV8Tw4kJwc5TK2t2YFPXLqiDpY=";
};
# requires different testing dependencies, and privacyIDEA will test this as well
doCheck = false;
});
};
};
in
python3'.pkgs.buildPythonPackage rec {
pname = "privacyIDEA";
version = "3.6.3";
version = "3.7.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-SsOEmbyEAKU3pdzsyqi5SwDgJMGEAzyCywoio9iFQAA=";
sha256 = "sha256-c5pWbBaOFQd7z3BvtYgrnZBiknLBDCE6So76Q68AptA=";
fetchSubmodules = true;
};
@@ -55,7 +97,7 @@ python3'.pkgs.buildPythonPackage rec {
defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow
python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel
ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2
pydash ecdsa google-auth importlib-metadata
pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt
];
passthru.tests = { inherit (nixosTests) privacyidea; };
pkgs/applications/radio/splat/default.nix
+1 -1
View File
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
homepage = "https://www.qsl.net/kd2bd/splat.html";
maintainers = with maintainers; [ ehmry ];
platforms = platforms.linux;
platforms = platforms.x86_64;
};
}
pkgs/applications/science/physics/crystfel/0002-fix-ftbfs-with-gcc-10.patch
+43
View File
@@ -0,0 +1,43 @@
Description: Fixing argument mismatches in Fortran code, addressing #957430.
Author: Andrius Merkys <merkys@debian.org>
Forwarded: ccp4-dev@dl.ac.uk
--- a/fortran/pack_f.f
+++ b/fortran/pack_f.f
@@ -106,7 +106,7 @@
endif
10 continue
filnarray(len(filn) + 1) = 0
- call pack_wordimage_f(data, x, y, filnarray)
+ call pack_longimage_f(data, x, y, filnarray)
return
end
@@ -138,7 +138,7 @@
endif
10 continue
filnarray(len(filn) + 1) = 0
- call v2pack_wordimage_f(data, x, y, filnarray)
+ call v2pack_longimage_f(data, x, y, filnarray)
return
end
--- a/fortran/lgglib.f
+++ b/fortran/lgglib.f
@@ -1236,7 +1236,7 @@
B3(2) = XYZ(2) * CELL(2)
B3(3) = XYZ(3) * CELL(3)
C
- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1)
+ CALL matmult(3,3,3,1,ORTH,B3,XYZ)
END
c
c
@@ -1274,7 +1274,7 @@
B3(1) = XYZ(1)
B3(2) = XYZ(2)
B3(3) = XYZ(3)
- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1)
+ CALL matmult(3,3,3,1,ORTH,B3,XYZ)
END
character*80 function getnam(filnam)
character*(*) filnam
pkgs/applications/science/physics/crystfel/default.nix
+226
View File
@@ -0,0 +1,226 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, cmake
, lz4
, bzip2
, gfortran
, m4
, hdf5
, gsl
, slurm
, unzip
, makeWrapper
, meson
, git
, ninja
, eigen
, pkg-config
, wrapGAppsHook
, flex
, bison
, doxygen
, opencl-headers
, ncurses
, msgpack
, fftw
, zeromq
, ocl-icd
, gtk3
, gdk-pixbuf
, argp-standalone
, memorymappingHook
, withGui ? true
, withBitshuffle ? true
}:
let
libccp4 = stdenv.mkDerivation rec {
pname = "libccp4";
version = "6.5.1";
src = fetchurl {
# Original mirror, now times out
# url = "ftp://ftp.ccp4.ac.uk/opensource/${pname}-${version}.tar.gz";
url = "https://deb.debian.org/debian/pool/main/libc/${pname}/${pname}_${version}.orig.tar.gz";
sha256 = "1rfvjliny29vy5bdi6rrjaw9hhhhh72pw536xwvqipqcjlylf2r8";
};
nativeBuildInputs = [ gfortran m4 ];
buildInputs = [ hdf5 gsl ];
configureFlags = [ "FFLAGS=-fallow-argument-mismatch" ];
# libccp4 tries to read syminfo.lib by looking at an environment variable, which hinders reproducibility.
# We hard-code this by providing a little patch and then passing the absolute path to syminfo.lib as a
# preprocessor flag.
preBuild = ''
makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"$out/share/syminfo.lib\"')
export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS";
'';
makeFlags = [ "CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"" ];
patches = [
./libccp4-use-hardcoded-syminfo-lib.patch
./0002-fix-ftbfs-with-gcc-10.patch
];
};
# This is the statically-linked, pre-built binary of mosflm. Compiling it ourselves turns out to be very difficult
# since the build process is very hard-coded for a specific machine, architecture, and libraries.
mosflm =
let
version = "7.4.0";
src =
if stdenv.isDarwin then
fetchurl
{
url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-osx-64-noX11.zip";
sha256 = "1da5wimv3kl8bccp49j69vh8gi28cn7axg59lrmb38s68c618h7j";
}
else
fetchurl {
url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-linux-64-noX11.zip";
sha256 = "1rqh3nprxfmnyihllw31nb8i3wfhybmsic6y7z6wn4rafyv3w4fk";
};
mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11";
in
stdenv.mkDerivation rec {
pname = "mosflm";
inherit version src;
dontBuild = true;
nativeBuildInputs = [ unzip makeWrapper ];
sourceRoot = ".";
# mosflm statically links against its own libccp4, which as the syminfo.lib environment variable problem.
# Here, we circumvent it by creating a little wrapper script that calls mosflm after setting the SYMINFO variable.
installPhase = ''
mkdir -p $out/bin
cp ${mosflmBinary} $out/bin/mosflm-raw
makeWrapper $out/bin/mosflm-raw $out/bin/mosflm --set SYMINFO ${libccp4}/share/syminfo.lib --add-flags -n
'';
};
xgandalf = stdenv.mkDerivation rec {
pname = "xgandalf";
version = "c15afa2381d5f87d4aefcc8181a15b4a6fd3a955";
src = fetchurl {
url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
sha256 = "11i1w57a3rpnb4x5y4n8d3iffn5m9w1zydl69syzljdk3aqg2pv8";
};
nativeBuildInputs = [ meson pkg-config ninja ];
buildInputs = [ eigen ];
};
pinkIndexer = stdenv.mkDerivation rec {
pname = "pinkindexer";
version = "8a828788f8272a89d484b00afbd2500c2c1ff974";
src = fetchurl {
url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
sha256 = "1mkgf1xd91ay0z0632kzxm0z3wcxf0cayjvs6a3znds72dkhfsyh";
};
nativeBuildInputs = [ meson pkg-config ninja ];
buildInputs = [ eigen ];
};
fdip = stdenv.mkDerivation rec {
pname = "fdip";
version = "29da626f17f66d5c0780fc59b1eafb7c85b81dd6";
src = fetchurl {
url = "https://gitlab.desy.de/philipp.middendorf/fdip/-/archive/${version}/fdip-${version}.tar.gz";
sha256 = "184l76r4fgznq54rnhgjk7dg41kqdl0d1da02vr5y4cs2fyqppky";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ eigen ];
};
hdf5-external-filter-plugins = stdenv.mkDerivation rec {
pname = "HDF5-External-Filter-Plugins";
version = "0.1.0";
src = fetchFromGitHub {
owner = "nexusformat";
repo = pname;
rev = "d469f175e5273c1d488e71a6134f84088f57d39c";
sha256 = "1jrzzh75i68ad1yrim7s1nx9wy0s49ghkziahs71mm5azprm6gh9";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ hdf5 lz4 bzip2 ];
cmakeFlags = [
"-DENABLE_BITSHUFFLE_PLUGIN=yes"
"-DENABLE_LZ4_PLUGIN=yes"
"-DENABLE_BZIP2_PLUGIN=yes"
];
};
in
stdenv.mkDerivation rec {
pname = "crystfel";
version = "0.10.1";
src = fetchurl {
url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz";
sha256 = "0i9d5ggalic7alj97dxjdys7010kxhm2cb4lwakvigl023j8ms79";
};
nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers ]
++ lib.optionals withGui [ wrapGAppsHook ];
buildInputs = [
hdf5
gsl
ncurses
msgpack
fftw
fdip
zeromq
ocl-icd
libccp4
mosflm
pinkIndexer
xgandalf
] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ]
++ lib.optionals stdenv.isDarwin [
argp-standalone
memorymappingHook
]
# slurm is not available for Darwin; when it is, remove the condition
++ lib.optionals (!stdenv.isDarwin) [ slurm ]
# hdf5-external-filter-plugins doesn't link on Darwin
++ lib.optionals (withBitshuffle && !stdenv.isDarwin) [ hdf5-external-filter-plugins ];
patches = [ ./link-to-argp-standalone-if-needed.patch ];
# CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but
# we'd have to do that for every CrystFEL executable (indexamajig, crystfel, partialator). Better to just
# hard-code mosflm's path once.
postPatch = ''
sed -i -e 's#execlp("mosflm"#execl("${mosflm}/bin/mosflm"#' libcrystfel/src/indexers/mosflm.c;
'';
postInstall = lib.optionalString (withBitshuffle && !stdenv.isDarwin) ''
for file in $out/bin/*; do
wrapProgram $file --set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins
done
'';
meta = with lib; {
description = "Data processing for serial crystallography";
longDescription = ''
CrystFEL is a suite of programs for processing (and simulating) Bragg diffraction data from "serial crystallography" experiments, often (but not always) performed using an X-ray Free-Electron Laser. Compared to rotation data, some of the particular characteristics of such data which call for a specialised software suite are:
- The sliced, rather than integrated, measurement of intensity data. Many, if not all reflections are partially integrated.
- Many patterns (thousands) are required - high throughput is needed.
- The crystal orientations in each pattern are random and uncorrelated.
- Merging into lower symmetry point groups may require the resolution of indexing ambiguities.'';
homepage = "https://www.desy.de/~twhite/crystfel/";
changelog = "https://www.desy.de/~twhite/crystfel/changes.html";
downloadPage = "https://www.desy.de/~twhite/crystfel/download.html";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ pmiddend ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch
+30
View File
@@ -0,0 +1,30 @@
diff --git a/ccp4/csymlib.c b/ccp4/csymlib.c
index 76bc70b..7a0c5dc 100644
--- a/ccp4/csymlib.c
+++ b/ccp4/csymlib.c
@@ -137,24 +137,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg,
}
/* Open the symop file: */
- if (!(symopfile = getenv("SYMINFO"))) {
- if (debug)
- printf("Environment variable SYMINFO not set ... guessing location of symmetry file. \n");
- if (!(ccp4dir = getenv("CLIBD"))) {
- printf("Environment variable CLIBD not set ... big trouble! \n");
- return NULL;
- }
-
- symopfile = ccp4_utils_malloc((strlen(ccp4dir)+22)*sizeof(char));
- strcpy(symopfile,ccp4_utils_joinfilenames(ccp4dir,"syminfo.lib"));
- symopfile[strlen(ccp4dir)+21] = '\0';
- ccp4printf(1," SYMINFO file set to %s \n",symopfile);
- } else {
- if (debug) {
- ccp4printf(1,"\n Spacegroup information obtained from library file: \n");
- ccp4printf(1," Logical Name: SYMINFO Filename: %s\n\n",symopfile);
- }
- }
+ symopfile = NIX_PROVIDED_SYMOP_FILE;
filein = fopen(symopfile,"r");
if (!filein) {
pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/meson.build b/meson.build
index efc9002b..070f37e4 100644
--- a/meson.build
+++ b/meson.build
@@ -34,6 +34,12 @@ if slurmdep.found()
conf_data.set10('HAVE_SLURM', 1)
endif
+if build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}')
+ argpdep = cc.find_library('argp')
+else
+ argpdep = dependency('', required : false)
+endif
+
# Find HDF5 using inbuilt Meson methods. Requires Meson >= 0.50.0
hdf5dep = dependency('hdf5', language: 'c', required: true)
@@ -180,7 +186,7 @@ if zmqdep.found()
endif
executable('indexamajig', indexamajig_sources,
- dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep],
+ dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep, argpdep],
install: true,
install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
pkgs/development/compilers/ocaml/ber-metaocaml.nix
+12
View File
@@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl
, ncurses
, libX11, xorgproto, buildEnv
, fetchpatch
}:
let
@@ -41,6 +42,17 @@ stdenv.mkDerivation rec {
dontStrip = true;
buildInputs = [ ncurses ] ++ optionals useX11 x11deps;
patches = [
# glibc 2.34 changed SIGSTKSZ from a #define'd integer to an
# expression involving a function call. This broke all code that
# used SIGSTKSZ as the size of a statically-allocated array. This
# patch is also applied by the ocaml/4.07.nix expression.
(fetchpatch {
url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch";
sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv";
})
];
postConfigure = ''
tar -xvzf $metaocaml
cd ${pname}-${version}
pkgs/development/compilers/openjdk/darwin/17.nix
+6 -6
View File
@@ -5,16 +5,16 @@ let
dist = {
x86_64-darwin = {
arch = "x64";
zuluVersion = "17.30.15";
jdkVersion = "17.0.1";
sha256 = "sha256-CdZP5XY3O0MUQigRvIQC+7dwAXaCKw4eK/L/imytEOs=";
zuluVersion = "17.34.19";
jdkVersion = "17.0.3";
sha256 = "sha256-qImyxVC2y2QhxuVZwamKPyo46+n+7ytIFXpYI0e6w2c=";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "17.30.15";
jdkVersion = "17.0.1";
sha256 = "sha256-zhBCXOnO/fsj6+q+vAlEz7QVMRFKLVvYnjwZzFz6mRM=";
zuluVersion = "17.34.19";
jdkVersion = "17.0.3";
sha256 = "sha256-eaRX8Qa/Mqr9JhpHSEcf0Q9c4qmqLMgWqRhkEEwAjf8=";
};
}."${stdenv.hostPlatform.system}";
pkgs/development/libraries/libfreeaptx/default.nix
+4 -4
View File
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-eEUhOrKqb2hHWanY+knpY9FBEnjkkFTB+x6BZgMBpbo=";
};
postPatch = lib.optionalString stdenv.isDarwin ''
postPatch = if stdenv.isDarwin then ''
substituteInPlace Makefile \
--replace '-soname' '-install_name' \
--replace 'lib$(NAME).so' 'lib$(NAME).dylib'
'';
'' else null;
makeFlags = [
"PREFIX=${placeholder "out"}"
@@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = lib.optionalString stdenv.isDarwin ''
postInstall = if stdenv.isDarwin then ''
install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxdec
install_name_tool -change libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0 $out/bin/freeaptxenc
install_name_tool -id $out/lib/libfreeaptx.dylib $out/lib/libfreeaptx.dylib
install_name_tool -id $out/lib/libfreeaptx.dylib.0 $out/lib/libfreeaptx.dylib.0
'';
'' else null;
meta = with lib; {
description = "Free Implementation of Audio Processing Technology codec (aptX)";
pkgs/development/python-modules/audible/default.nix
+29
View File
@@ -0,0 +1,29 @@
{ lib, fetchFromGitHub, buildPythonPackage, beautifulsoup4, httpx, pbkdf2, pillow, pyaes, rsa }:
buildPythonPackage rec {
pname = "audible";
version = "0.8.1";
src = fetchFromGitHub {
owner = "mkb79";
repo = "Audible";
rev = "v${version}";
sha256 = "0fsb5av4s7fvpn0iryl8jj3lwffwlxgbwj46l3fidy0l58nq3b1d";
};
propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ];
postPatch = ''
substituteInPlace setup.py \
--replace 'httpx>=0.20.*,<=0.22.*' 'httpx'
'';
pythonImportsCheck = [ "audible"];
meta = with lib; {
description = "A(Sync) Interface for internal Audible API written in pure Python";
license = licenses.agpl3;
homepage = "https://github.com/mkb79/Audible";
maintainers = with maintainers; [ jvanbruegge ];
};
}
pkgs/development/python-modules/gcal-sync/default.nix
+3 -3
View File
@@ -12,15 +12,15 @@
buildPythonPackage rec {
pname = "gcal-sync";
version = "0.8.1";
version = "0.9.0";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "allenporter";
repo = "gcal_sync";
rev = version;
hash = "sha256-JQFfTgnrNvCwKCQ4lD1gE3ZI8WhCjaJ9zDejssZ7FPs=";
rev = "refs/tags/${version}";
hash = "sha256-7XvwN1sShvmg7Co3FyzPYJFCe961Ly4/854A1po22ds=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-firestore/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-firestore";
version = "2.4.0";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-9+esejwSitfYEkD03KsPiTIKxmYhRxTrgfy3QKqIIO4=";
sha256 = "sha256-g/IgGlVWHjkqJKDFvkmp/TVNA0TgN+Xf65M10+x3f+o=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-language/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.4.1";
version = "2.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk=";
sha256 = "sha256-kxJySGikHdichitekEiPjzs48bDqWaXMBhmI6IAwKRM=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-resumable-media/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-resumable-media";
version = "2.3.2";
version = "2.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-BpJOix558VjwIC590VGtdbDqnVm5l8hQ9WvdSlo2FRM=";
sha256 = "sha256-J8UmIL02TRyBFuqsTqKvy/uBrpE5+zGZZS/KwXJL+2w=";
};
propagatedBuildInputs = [ google-auth google-crc32c requests ];
pkgs/development/tools/jira-cli-go/default.nix
+44
View File
@@ -0,0 +1,44 @@
{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testVersion, jira-cli-go }:
buildGoModule rec {
pname = "jira-cli-go";
version = "0.3.0";
src = fetchFromGitHub {
owner = "ankitpokhrel";
repo = "jira-cli";
rev = "v${version}";
sha256 = "sha256-sPoFv3Gzue5H6TJuQZJvqB/Dx/URp9Kt2UuIvKSnAxg=";
};
vendorSha256 = "sha256-UO30/D65vpu3PgEsfSDL3nYgkwo5Cj+1WKiokk7KKKg=";
ldflags = [
"-s" "-w"
"-X github.com/ankitpokhrel/jira-cli/internal/version.GitCommit=${src.rev}"
"-X github.com/ankitpokhrel/jira-cli/internal/version.SourceDateEpoch=0"
"-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}"
];
checkInputs = [ less more ]; # Tests expect a pager in $PATH
passthru.tests.version = testVersion {
package = jira-cli-go;
command = "jira version";
inherit version;
};
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd jira \
--bash <($out/bin/jira completion bash) \
--zsh <($out/bin/jira completion zsh)
'';
meta = with lib; {
description = "Feature-rich interactive Jira command line";
homepage = "https://github.com/ankitpokhrel/jira-cli";
license = licenses.mit;
maintainers = with maintainers; [ bryanasdev000 ];
};
}
pkgs/servers/matrix-synapse/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.58.0";
version = "1.59.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA=";
sha256 = "sha256-EASd+tlPIYQpQP2OOHJSPDzgJZyVoigVfcC2b2c2A2o=";
};
buildInputs = [ openssl ];
pkgs/servers/mautrix-whatsapp/default.nix
+4 -4
View File
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
sha256 = "adsGPVG/EwpzOqhFJvn3anjTXwGY27a7Bc4NNkBeqJk=";
sha256 = "2F0smK2L9Xj3/65j7vwwGT1OLxcTqkImpn16wB5rWDw=";
};
buildInputs = [ olm ];
vendorSha256 = "WT8oDtmUFrqfNK/RnEv8+jpGuQEGt+ppjtmcfUGYZv0=";
vendorSha256 = "Xv+3dJLOHnOjTp5vDbejmkO/NoDQlWxl0KaMx1C3ch0=";
doCheck = false;
@@ -21,6 +21,6 @@ buildGoModule rec {
homepage = "https://github.com/tulir/mautrix-whatsapp";
description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ vskilet ma27 ];
maintainers = with maintainers; [ vskilet ma27 chvp ];
};
}
pkgs/tools/X11/xpra/default.nix
+104 -35
View File
@@ -1,13 +1,40 @@
{ lib
, fetchurl
, substituteAll, python3, pkg-config, runCommand, writeText
, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk, pandoc
, wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which
, ffmpeg, x264, libvpx, libwebp, x265, librsvg
, substituteAll
, pkg-config
, runCommand
, writeText
, wrapGAppsHook
, withNvenc ? false
, atk
, cairo
, cudatoolkit
, ffmpeg
, gdk-pixbuf
, getopt
, glib
, gobject-introspection
, gst_all_1
, gtk3
, libfakeXinerama
, gst_all_1, pulseaudio, gobject-introspection
, withNvenc ? false, cudatoolkit, nv-codec-headers-10, nvidia_x11 ? null
, pam }:
, librsvg
, libvpx
, libwebp
, nv-codec-headers-10
, nvidia_x11 ? null
, pam
, pandoc
, pango
, pulseaudio
, python3
, util-linux
, which
, x264
, x265
, xauth
, xorg
, xorgserver
}:
with lib;
@@ -43,11 +70,11 @@ let
'';
in buildPythonApplication rec {
pname = "xpra";
version = "4.3.2";
version = "4.3.3";
src = fetchurl {
url = "https://xpra.org/src/${pname}-${version}.tar.xz";
hash = "sha256-CIHVpxZ2qC7Ct5Kmc6dxEzxH9s+63/sI07f9SbCh4a4=";
hash = "sha256-J6zzkho0A1faCVzS/0wDlbgLtJmyPrnBkEcR7kDld7A=";
};
patches = [
@@ -56,41 +83,81 @@ in buildPythonApplication rec {
inherit libfakeXinerama;
})
./fix-41106.patch # https://github.com/NixOS/nixpkgs/issues/41106
./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159
];
INCLUDE_DIRS = "${pam}/include";
nativeBuildInputs = [ pkg-config wrapGAppsHook pandoc ]
++ lib.optional withNvenc cudatoolkit;
nativeBuildInputs = [
pkg-config
wrapGAppsHook
pandoc
] ++ lib.optional withNvenc cudatoolkit;
buildInputs = with xorg; [
libX11 xorgproto libXrender libXi libXres
libXtst libXfixes libXcomposite libXdamage
libXrandr libxkbfile
] ++ [
libX11
libXcomposite
libXdamage
libXfixes
libXi
libxkbfile
libXrandr
libXrender
libXres
libXtst
xorgproto
] ++ (with gst_all_1; [
gst-libav
gst-plugins-bad
gst-plugins-base
gst-plugins-good
gstreamer
]) ++ [
atk.out
cairo
cython
librsvg
pango cairo gdk-pixbuf atk.out gtk3 glib
ffmpeg libvpx x264 libwebp x265
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad
gst_all_1.gst-libav
pam
ffmpeg
gdk-pixbuf
glib
gobject-introspection
gtk3
librsvg
libvpx
libwebp
pam
pango
x264
x265
] ++ lib.optional withNvenc nvencHeaders;
propagatedBuildInputs = with python3.pkgs; [
pillow rencode pycrypto cryptography pycups lz4 dbus-python
netifaces numpy pygobject3 pycairo gst-python pam
pyopengl paramiko opencv4 python-uinput pyxdg
ipaddress idna pyinotify
] ++ lib.optionals withNvenc (with python3.pkgs; [pynvml pycuda]);
# error: 'import_cairo' defined but not used
propagatedBuildInputs = with python3.pkgs; ([
cryptography
dbus-python
gst-python
idna
ipaddress
lz4
netifaces
numpy
opencv4
pam
paramiko
pillow
pycairo
pycrypto
pycups
pygobject3
pyinotify
pyopengl
python-uinput
pyxdg
rencode
] ++ lib.optionals withNvenc [
pycuda
pynvml
]);
# error: 'import_cairo' defined but not used
NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
setupPyBuildFlags = [
@@ -104,12 +171,14 @@ in buildPythonApplication rec {
] ++ lib.optional withNvenc "--with-nvenc";
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}"
--set XPRA_INSTALL_PREFIX "$out"
--set XPRA_COMMAND "$out/bin/xpra"
--set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb"
--set XORG_CONFIG_PREFIX ""
--prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
--prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}
'' + lib.optionalString withNvenc ''
pkgs/tools/X11/xpra/fix-122159.patch
+16
View File
@@ -0,0 +1,16 @@
diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
index 6def9e0ad..031f8aba9 100755
--- a/xpra/scripts/main.py
+++ b/xpra/scripts/main.py
@@ -364,11 +364,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults):
"shadow",
) and not display_is_remote:
if use_systemd_run(options.systemd_run):
- #make sure we run via the same interpreter,
- #inject it into the command line if we have to:
argv = list(cmdline)
- if argv[0].find("python")<0:
- argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor))
return systemd_run_wrap(mode, argv, options.systemd_run_args)
configure_env(options.env)
configure_logging(options, mode)
pkgs/tools/misc/audible-cli/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec {
pname = "audible-cli";
version = "0.1.3";
src = fetchFromGitHub {
owner = "mkb79";
repo = pname;
rev = "v${version}";
sha256 = "0i71vwq2bhndndb0mlx21bc5jkv75cr60max5iaxk23agg3xpgwv";
};
propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools ];
postPatch = ''
substituteInPlace setup.py \
--replace "httpx==0.20.*" "httpx" \
--replace "audible==0.7.2" "audible"
'';
meta = with lib; {
description = "A command line interface for audible package. With the cli you can download your Audible books, cover, chapter files";
license = licenses.agpl3;
homepage = "https://github.com/mkb79/audible-cli";
maintainers = with maintainers; [ jvanbruegge ];
};
}
pkgs/tools/misc/ipxe/default.nix
+4
View File
@@ -40,6 +40,10 @@ stdenv.mkDerivation rec {
sha256 = "SrTNEYk13JXAcJuogm9fZ7CrzJIDRc0aziGdjRNv96I=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
substituteInPlace src/util/genfsimg --replace " syslinux " " true "
''; # calling syslinux on a FAT image isn't going to work
# not possible due to assembler code
hardeningDisable = [ "pic" "stackprotector" ];
pkgs/tools/misc/tealdeer/default.nix
+6 -4
View File
@@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
@@ -25,9 +26,10 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles pkg-config ];
postInstall = ''
installShellCompletion --bash --name tealdeer.bash bash_tealdeer
installShellCompletion --fish --name tealdeer.fish fish_tealdeer
installShellCompletion --zsh --name _tealdeer zsh_tealdeer
installShellCompletion --cmd tldr \
--bash bash_tealdeer \
--fish fish_tealdeer \
--zsh zsh_tealdeer
'';
# disable tests for now since one needs network
pkgs/tools/package-management/reuse/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "reuse";
version = "0.14.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "fsfe";
repo = "reuse-tool";
rev = "v${version}";
sha256 = "1pjc8pckacjlrb8xypyca7jq8ii4an7m5b1g7941d7kkhnlbzm7v";
sha256 = "0yplsbd5251s8cabazbdqb00jqv8ibbgal7fhj5pfxv5lsz17vkv";
};
propagatedBuildInputs = with python3Packages; [
pkgs/tools/security/clamav/default.nix
+6 -2
View File
@@ -13,8 +13,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-JwIDpUxFgEnbVPzZNoP/Wy2xkVHzY8SOgs7O/d4rNdQ=";
};
# Flaky test, remove this when https://github.com/Cisco-Talos/clamav/issues/343 is fixed
patches = [ ./remove-freshclam-test.patch ];
patches = [
# Flaky test, remove this when https://github.com/Cisco-Talos/clamav/issues/343 is fixed
./remove-freshclam-test.patch
./sample-cofiguration-file-install-location.patch
];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkg-config rustc rust-bindgen rustfmt cargo python3 ];
@@ -25,6 +28,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd"
"-DAPP_CONFIG_DIRECTORY=/etc/clamav"
];
doCheck = true;
pkgs/tools/security/clamav/sample-cofiguration-file-install-location.patch
+29
View File
@@ -0,0 +1,29 @@
diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 826fff1..3cefc34 100644
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -6,14 +6,14 @@ install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/clamd.conf.sample
DESTINATION
- ${APP_CONFIG_DIRECTORY}
+ ${CMAKE_INSTALL_PREFIX}/${APP_CONFIG_DIRECTORY}
COMPONENT programs)
install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/freshclam.conf.sample
DESTINATION
- ${APP_CONFIG_DIRECTORY}
+ ${CMAKE_INSTALL_PREFIX}/${APP_CONFIG_DIRECTORY}
COMPONENT programs)
if(ENABLE_MILTER)
@@ -21,6 +21,6 @@ if(ENABLE_MILTER)
FILES
${CMAKE_CURRENT_SOURCE_DIR}/clamav-milter.conf.sample
DESTINATION
- ${APP_CONFIG_DIRECTORY}
+ ${CMAKE_INSTALL_PREFIX}/${APP_CONFIG_DIRECTORY}
COMPONENT programs)
endif()
pkgs/top-level/aliases.nix
+7
View File
@@ -129,6 +129,7 @@ mapAliases ({
bro = zeek; # Added 2019-09-29
btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22
bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14
inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
buttersink = throw "buttersink has been removed: abandoned by upstream"; # Added 2022-04-05
# bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30)
@@ -170,6 +171,7 @@ mapAliases ({
cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22
cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11
ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22
inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17
cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
@@ -193,6 +195,7 @@ mapAliases ({
clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05
codimd = hedgedoc; # Added 2020-11-29
inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17
compton = picom; # Added 2019-12-02
compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22
concurrencykit = libck; # Added 2021-03
@@ -578,6 +581,7 @@ mapAliases ({
impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27
i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped";
index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17
infiniband-diags = rdma-core; # Added 2019-08-09
ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project"; # Added 2022-01-12
inotifyTools = inotify-tools;
@@ -807,6 +811,7 @@ mapAliases ({
matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09
mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15
matrique = spectral; # Added 2020-01-27
maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23
mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04
meme = meme-image-generator; # Added 2021-04-21
@@ -1202,6 +1207,7 @@ mapAliases ({
seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21
sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11
shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22
inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17
shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15
sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01
sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01
@@ -1390,6 +1396,7 @@ mapAliases ({
vnc2flv = throw "vnc2flv has been removed: abandoned by upstream"; # Added 2022-03-21
vorbisTools = throw "'vorbisTools' has been renamed to/replaced by 'vorbis-tools'"; # Converted to throw 2022-02-22
vtun = throw "vtune has been removed as it's unmaintained upstream"; # Added 2021-10-29
inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17
### W ###
pkgs/top-level/all-packages.nix
+8 -14
View File
@@ -1085,6 +1085,8 @@ with pkgs;
arch-install-scripts = callPackage ../tools/misc/arch-install-scripts {};
audible-cli = callPackage ../tools/misc/audible-cli { };
auditwheel = callPackage ../tools/package-management/auditwheel { };
amidst = callPackage ../tools/games/minecraft/amidst { };
@@ -1903,6 +1905,10 @@ with pkgs;
checkip = callPackage ../tools/networking/checkip { };
crystfel = callPackage ../applications/science/physics/crystfel { };
crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; };
ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { };
ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { };
@@ -7252,6 +7258,8 @@ with pkgs;
jira-cli = callPackage ../development/tools/jira_cli { };
jira-cli-go = callPackage ../development/tools/jira-cli-go { };
jirafeau = callPackage ../servers/web-apps/jirafeau { };
jitterentropy = callPackage ../development/libraries/jitterentropy { };
@@ -25425,8 +25433,6 @@ with pkgs;
btops = callPackage ../applications/window-managers/btops { };
buho = libsForQt5.callPackage ../applications/office/buho { };
bvi = callPackage ../applications/editors/bvi { };
bviplus = callPackage ../applications/editors/bviplus { };
@@ -25557,8 +25563,6 @@ with pkgs;
clightd = callPackage ../applications/misc/clight/clightd.nix { };
clip = libsForQt5.callPackage ../applications/video/clip { };
clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };
clipcat = callPackage ../applications/misc/clipcat { };
@@ -25593,8 +25597,6 @@ with pkgs;
communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
communicator = libsForQt5.callPackage ../tools/misc/communicator { };
complete-alias = callPackage ../tools/misc/complete-alias { };
confclerk = callPackage ../applications/misc/confclerk { };
@@ -27065,8 +27067,6 @@ with pkgs;
pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { };
shelf = libsForQt5.callPackage ../applications/office/shelf { };
shepherd = nodePackages."@nerdwallet/shepherd";
skate = callPackage ../applications/misc/skate { };
@@ -27333,8 +27333,6 @@ with pkgs;
imgp = python3Packages.callPackage ../applications/graphics/imgp { };
index-fm = libsForQt5.callPackage ../applications/misc/index-fm { };
inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
inkscape = callPackage ../applications/graphics/inkscape {
@@ -28204,8 +28202,6 @@ with pkgs;
ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
maui-nota = libsForQt5.callPackage ../applications/editors/maui-nota { };
pragha = libsForQt5.callPackage ../applications/audio/pragha { };
rofi-mpd = callPackage ../applications/audio/rofi-mpd { };
@@ -30406,8 +30402,6 @@ with pkgs;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
vvave = libsForQt5.callPackage ../applications/video/vvave { };
vwm = callPackage ../applications/window-managers/vwm { };
yeahwm = callPackage ../applications/window-managers/yeahwm { };
pkgs/top-level/python-packages.nix
+2
View File
@@ -767,6 +767,8 @@ in {
aubio = callPackage ../development/python-modules/aubio { };
audible = callPackage ../development/python-modules/audible { };
audio-metadata = callPackage ../development/python-modules/audio-metadata { };
audioread = callPackage ../development/python-modules/audioread { };
pkgs/top-level/qt5-packages.nix
+10 -10
View File
@@ -51,9 +51,17 @@ let
};
in (lib.makeOverridable mkPlamoGear attrs);
in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
mauiPackages = let
mkMaui = import ../applications/maui;
attrs = {
inherit libsForQt5;
inherit (pkgs) lib fetchurl;
};
in (lib.makeOverridable mkMaui attrs);
inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear qt5;
in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // {
inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear mauiPackages qt5;
# Alias for backwards compatibility. Added 2021-05-07.
kdeApplications = kdeGear;
@@ -144,14 +152,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
maplibre-gl-native = callPackage ../development/libraries/maplibre-gl-native { };
mauikit = callPackage ../development/libraries/mauikit { };
mauikit-accounts = callPackage ../development/libraries/mauikit-accounts { };
mauikit-filebrowsing = callPackage ../development/libraries/mauikit-filebrowsing { };
mauikit-texteditor = callPackage ../development/libraries/mauikit-texteditor { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
phonon = callPackage ../development/libraries/phonon { };