Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
e3eaad4c0b
19 changed files with 231 additions and 83 deletions
|
|
@ -1627,6 +1627,16 @@ Superuser created successfully.
|
|||
</listitem>
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>cawbird</literal> Twitter client now uses its own
|
||||
API keys to count as different application than upstream
|
||||
builds. This is done to evade application-level rate limiting.
|
||||
While existing accounts continue to work, users may want to
|
||||
remove and re-register their account in the client to enjoy a
|
||||
better user experience and benefit from this change.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -466,3 +466,5 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- `virtualisation.libvirtd.qemu*` options (e.g.: `virtualisation.libvirtd.qemuRunAsRoot`) were moved to [`virtualisation.libvirtd.qemu`](options.html#opt-virtualisation.libvirtd.qemu) submodule,
|
||||
- software TPM1/TPM2 support (e.g.: Windows 11 guests) ([`virtualisation.libvirtd.qemu.swtpm`](options.html#opt-virtualisation.libvirtd.qemu.swtpm)),
|
||||
- custom OVMF package (e.g.: `pkgs.OVMFFull` with HTTP, CSM and Secure Boot support) ([`virtualisation.libvirtd.qemu.ovmf.package`](options.html#opt-virtualisation.libvirtd.qemu.ovmf.package)).
|
||||
|
||||
- The `cawbird` Twitter client now uses its own API keys to count as different application than upstream builds. This is done to evade application-level rate limiting. While existing accounts continue to work, users may want to remove and re-register their account in the client to enjoy a better user experience and benefit from this change.
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ in {
|
|||
|
||||
assertions = [
|
||||
{ assertion = db.createLocally -> db.user == user;
|
||||
message = "services.bookstack.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true.";
|
||||
message = "services.bookstack.database.user must be set to ${user} if services.bookstack.database.createLocally is set true.";
|
||||
}
|
||||
{ assertion = db.createLocally -> db.passwordFile == null;
|
||||
message = "services.bookstack.database.passwordFile cannot be specified if services.bookstack.database.createLocally is set to true.";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
version = "5.0.0-beta1";
|
||||
version = "5.0.0-beta2";
|
||||
kde-channel = "unstable";
|
||||
sha256 = "1p5l2vpsgcp4wajgn5rgjcyb8l5ickm1nkmfx8zzr4rnwjnyxdbm";
|
||||
sha256 = "0hwh6k40f4kmwg14dy0vvm0m8cx8n0q67lrrc620da9mign3hjs7";
|
||||
})
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
|
|||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
versionPolicy = "none";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,26 @@
|
|||
{ lib
|
||||
, ansiwrap
|
||||
, asteval
|
||||
, buildPythonApplication
|
||||
, colorama
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, keyring
|
||||
, parsedatetime
|
||||
, poetry
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pytz
|
||||
, pyxdg
|
||||
, pyyaml
|
||||
, tzlocal
|
||||
, fetchpatch
|
||||
, python3
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "jrnl";
|
||||
version = "2.8";
|
||||
version = "2.8.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jrnl-org";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zpsvrjhami9y7204yjbdzi04bkkz6i3apda9fh3hbq83y6wzprz";
|
||||
sha256 = "sha256-+kPr7ndY6u1HMw6m0UZJ5jxVIPNjlTfQt7OYEdZkHBE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
ansiwrap
|
||||
asteval
|
||||
colorama
|
||||
|
|
@ -44,12 +34,32 @@ buildPythonApplication rec {
|
|||
tzlocal
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
pythonImportsCheck = [ "jrnl" ];
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytest-bdd
|
||||
pytestCheckHook
|
||||
toml
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/jrnl-org/jrnl/pull/1359
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/jrnl-org/jrnl/commit/a55a240eff7a167af5974a03e9de6f7b818eafd9.patch";
|
||||
sha256 = "1w3gb4vasvh51nggf89fsqsm4862m0g7hr36qz22n4vg9dds175m";
|
||||
})
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jrnl"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://maebert.github.io/jrnl/";
|
||||
description = "A simple command line journal application that stores your journal in a plain text file";
|
||||
description = "Simple command line journal application that stores your journal in a plain text file";
|
||||
homepage = "https://jrnl.sh/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ zalakain ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,27 +1,31 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby }:
|
||||
{ lib
|
||||
, bash
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, go
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "slides";
|
||||
version = "0.5.0";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maaslalani";
|
||||
repo = "slides";
|
||||
rev = "v${version}";
|
||||
sha256 = "175g823n253d3xg8hxycw3gm1hhqb0vz8zs7xxcbdw5rlpd2hjii";
|
||||
sha256 = "sha256-D2ex9/XN5JMKwn+g1cB77UMquYW9NdTzhCCvVtTOBfU=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
bash
|
||||
go
|
||||
python3
|
||||
ruby
|
||||
];
|
||||
|
||||
vendorSha256 = "13kx47amwvzyzc251iijsbwa52s8bpld4xllb4y85qkwllfnmq2g";
|
||||
vendorSha256 = "sha256-pI5/1LJVP/ZH64Dy2rUoOXM21oqJ8KA0/L8ClGRb5UY=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=main.Version=${version}"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-clocks";
|
||||
version = "40.0";
|
||||
version = "41.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "02d3jg46sn8d9gd4dsaly22gg5vkbz2gpq4pmwpvncb4rsqk7sn2";
|
||||
sha256 = "34yLBKuS+mGPXe5RGFce+fyeilt5XqAKNcbcZ3ywLaw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-applets";
|
||||
version = "3.40.0";
|
||||
version = "3.42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1k6mdkg16ia29fyg8ikf4dfs51gnrmg0f8xwpvd3192lhfsbsh19";
|
||||
sha256 = "/RaXR7kv7/Rs05/mLyPd+WZ8EAaPRigDOF0TjvxIedQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-panel";
|
||||
version = "3.40.0";
|
||||
version = "3.42.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs=";
|
||||
hash = "sha256-rqjA78LtuiDpetRpUXnNCiU45kwpBHAsyMWU6OCJhwM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metacity";
|
||||
version = "3.40.0";
|
||||
version = "3.42.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1d8mj2nshijshfiaica8dirfws1p6i9631frq7q23b3y91jiyk12";
|
||||
sha256 = "2J1nnc/tm17vGPBuLcszp6tUPVOzWPqJzmVZPCMe7rw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vte";
|
||||
version = "0.64.2";
|
||||
version = "0.66.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg=";
|
||||
sha256 = "sha256-0IE6wA+x102IhR52X3VdSWyD4JcJc1jqG6rbOLN7ezM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,26 +1,59 @@
|
|||
{ lib, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder
|
||||
, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }:
|
||||
{ lib
|
||||
, boost
|
||||
, buildPythonPackage
|
||||
, cmake
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, pc-ble-driver
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, scikit-build
|
||||
, setuptools
|
||||
, swig
|
||||
, udev
|
||||
, wrapt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pc-ble-driver-py";
|
||||
version = "0.15.0";
|
||||
disabled = pythonOlder "3.6" || pythonAtLeast "3.9";
|
||||
version = "0.16.1";
|
||||
|
||||
disabled = pythonOlder "3.7" || pythonAtLeast "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NordicSemiconductor";
|
||||
repo = "pc-ble-driver-py";
|
||||
rev = version;
|
||||
sha256 = "1ckbsq9dwca8hpx9frf9xd80b4z4kn9j7jx94hza9bwzrh26x5ji";
|
||||
rev = "v${version}";
|
||||
sha256 = "0q2zag77drcjkjm0cbvy2sf6fq2a4yl5li1zv1xfwmy53ami9b5l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
swig
|
||||
git
|
||||
setuptools
|
||||
scikit-build
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
pc-ble-driver
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
wrapt
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
# doCheck tries to write to the global python directory to install things
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ cmake swig git setuptools scikit-build ];
|
||||
buildInputs = [ boost pc-ble-driver ];
|
||||
propagatedBuildInputs = [ enum34 wrapt future ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
pythonImportsCheck = [
|
||||
"pc_ble_driver_py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bluetooth Low Energy nRF5 SoftDevice serialization";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,14 @@
|
|||
{ buildPythonPackage, isPy27, fetchFromGitHub, lib, ipaddress }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "piccata";
|
||||
version = "2.0.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -12,15 +18,23 @@ buildPythonPackage rec {
|
|||
sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipaddress
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "piccata" ];
|
||||
disabledTests = [
|
||||
# No communication possible in the sandbox
|
||||
"test_client_server_communication"
|
||||
];
|
||||
|
||||
meta = {
|
||||
pythonImportsCheck = [
|
||||
"piccata"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple CoAP (RFC7252) toolkit";
|
||||
homepage = "https://github.com/NordicSemiconductor/piccata";
|
||||
maintainers = with lib.maintainers; [ gebner ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,33 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
|
||||
, future, pyserial, ipaddress
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pyserial
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyspinel";
|
||||
version = "unstable-2020-06-19"; # no versioned release since 2018
|
||||
disabled = isPy27;
|
||||
version = "unstable-2021-08-19";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openthread";
|
||||
repo = pname;
|
||||
rev = "e0bb3f8e6f49b593ab248a75de04a71626ae8101";
|
||||
sha256 = "0nfmdkgbhmkl82dfxjpwiiarxngm6a3fvdrzpaqp60a4b17pipqg";
|
||||
rev = "50d104e29eacd92d229f0b7179ec1067f5851c17";
|
||||
sha256 = "0s2r00zb909cq3dd28i91qbl0nz8cga3g98z84gq5jqkjpiy8269";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
ipaddress
|
||||
pyserial
|
||||
];
|
||||
|
||||
# Tests are out-dated
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "spinel" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"spinel"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interface to the OpenThread Network Co-Processor (NCP)";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, glib
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, systemd
|
||||
, fetchFromGitLab
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-desktop-testing";
|
||||
version = "unstable-2019-12-11";
|
||||
version = "2021.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "gnome-desktop-testing";
|
||||
rev = "57239dc8ef49ba74d442603a07a3e132b0cfdc6a";
|
||||
sha256 = "01c4jhpk23kfcnw3l9kfwjw9v5kgqmfhhqypw4k2d2sdkf4mgfv4";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PWn4eEZskY0YgMpf6O2dgXNSu8b8T311vFHREv2HE/Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -30,6 +32,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "gnome-desktop-testing";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "GNOME test runner for installed tests";
|
||||
homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests";
|
||||
|
|
|
|||
|
|
@ -1,20 +1,62 @@
|
|||
{ lib, python3Packages, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgs
|
||||
, python3
|
||||
, python3Packages
|
||||
}:
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
|
||||
with python3Packages; buildPythonApplication rec {
|
||||
libusb1 = super.libusb1.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.9.3";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0j8p7jb7sibiiib18vyv3w5rrk0f4d2dl99bs18nwkq6pqvwxrk0";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace usb1/libusb1.py --replace \
|
||||
"ctypes.util.find_library(base_name)" \
|
||||
"'${pkgs.libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'"
|
||||
'';
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "nrfutil";
|
||||
version = "6.1";
|
||||
version = "6.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NordicSemiconductor";
|
||||
repo = "pc-nrfutil";
|
||||
rev = "v${version}";
|
||||
sha256 = "0g43lf5jmk0qxb7r4h68wr38fli6pjjk67w8l2cpdm9rd8jz4lpn";
|
||||
sha256 = "1gpxjdcjn4rjvk649vpkh563c7lx3rrfvamazb1qjii1pxrvvqa7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pc-ble-driver-py six pyserial enum34 click ecdsa
|
||||
protobuf tqdm piccata pyspinel intelhex pyyaml crcmod libusb1 ipaddress ];
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
crcmod
|
||||
ecdsa
|
||||
libusb1
|
||||
intelhex
|
||||
pc-ble-driver-py
|
||||
piccata
|
||||
protobuf
|
||||
pyserial
|
||||
pyspinel
|
||||
pyyaml
|
||||
tqdm
|
||||
];
|
||||
|
||||
checkInputs = [ nose behave ];
|
||||
checkInputs = [
|
||||
behave
|
||||
nose
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
mkdir test-reports
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, qtbase
|
||||
, cmake
|
||||
, qttools
|
||||
|
|
@ -19,6 +20,21 @@ mkDerivation rec {
|
|||
sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Support for USE_LAUNCHER_ABSOLUTE_PATH.
|
||||
# Should be removed when the next release comes out.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/flameshot-org/flameshot/commit/1031980ed1e62d24d7f719998b7951d48801e3fa.patch";
|
||||
sha256 = "sha256-o8Zz/bBvitXMDFt5rAfubiUPOx+EQ+ITgrfnFM3dFjE=";
|
||||
})
|
||||
# Fix autostart write path.
|
||||
# Should be removed when the next release comes out.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/flameshot-org/flameshot/commit/7977cbb52c2d785abd0d85d9df5991e8f7cae441.patch";
|
||||
sha256 = "sha256-wWa9Y+4flBiggOMuX7KQyL+q3f2cALGeQBGusX2x6sk=";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
|
|
@ -28,10 +44,13 @@ mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake qttools qtsvg ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
# Use relative path for the .desktop file.
|
||||
cmakeFlags = [ "-DUSE_LAUNCHER_ABSOLUTE_PATH=OFF" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Powerful yet simple to use screenshot software";
|
||||
homepage = "https://github.com/flameshot-org/flameshot";
|
||||
maintainers = with maintainers; [ scode ];
|
||||
maintainers = with maintainers; [ scode oxalica ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6543,7 +6543,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
|
||||
};
|
||||
|
||||
jrnl = python3Packages.callPackage ../applications/misc/jrnl { };
|
||||
jrnl = callPackage ../applications/misc/jrnl { };
|
||||
|
||||
jsawk = callPackage ../tools/text/jsawk { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue