Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-05-25 18:43:26 +00:00 committed by GitHub
commit 82cf111f8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 320 additions and 99 deletions

View file

@ -9167,6 +9167,12 @@
githubId = 1443459;
name = "Sheena Artrip";
};
sheepforce = {
email = "phillip.seeber@googlemail.com";
github = "sheepforce";
githubId = 16844216;
name = "Phillip Seeber";
};
sheganinans = {
email = "sheganinans@gmail.com";
github = "sheganinans";

View file

@ -12,4 +12,15 @@
</para>
</listitem>
</itemizedlist>
<section xml:id="backward-incompatibilities">
<title>Backward incompatibilities</title>
<itemizedlist spacing="compact">
<listitem>
<para>
The <literal>staticjinja</literal> package has been upgraded
from 1.0.4 to 2.0.0
</para>
</listitem>
</itemizedlist>
</section>
</section>

View file

@ -3,3 +3,7 @@
In addition to numerous new and upgraded packages, this release has the following highlights:
* Support is planned until the end of April 2022, handing over to 22.05.
## Backward incompatibilities
* The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0

View file

@ -115,6 +115,8 @@ in {
config = mkIf cfg.enable {
environment.etc."knot-resolver/kresd.conf".source = configFile; # not required
networking.resolvconf.useLocalResolver = mkDefault true;
users.users.knot-resolver =
{ isSystemUser = true;
group = "knot-resolver";

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
version = "1.46";
version = "1.47";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
sha256 = "sha256-Y6FgIbNCsxnM/B2bEB7oufBjU1BnBYaz7/oysWttIOc=";
sha256 = "sha256-KLHJROOtRPtGHBYEMByY7LG6FY4vES6WndCiz7okan8=";
};
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)

View file

@ -0,0 +1,37 @@
{ lib
, fetchFromGitLab
, rustPlatform
, pkg-config
, clang
, libclang
, glib
, gtk4
, pipewire
}:
rustPlatform.buildRustPackage rec {
pname = "helvum";
version = "0.2.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "ryuukyu";
repo = pname;
rev = version;
sha256 = "sha256-sQ4epL3QNOLHuR/dr/amHgiaxV/1SWeb3eijnjAAR3w=";
};
cargoSha256 = "sha256-uNTSU06Fz/ud04K40e98rb7o/uAht0DsiJOXeHX72vw=";
nativeBuildInputs = [ clang pkg-config ];
buildInputs = [ glib gtk4 pipewire ];
LIBCLANG_PATH = "${libclang.lib}/lib";
meta = with lib; {
description = "A GTK patchbay for pipewire";
homepage = "https://gitlab.freedesktop.org/ryuukyu/helvum";
license = licenses.gpl3Only;
maintainers = with maintainers; [ fufexan ];
};
}

View file

@ -1,6 +1,6 @@
{ lib
, mkDerivation
, fetchFromGitLab
, fetchurl
, cmake
, corrosion
, extra-cmake-modules
@ -12,6 +12,7 @@
, knotifications
, kpurpose
, kwindowsystem
, qtfeedback
, qtquickcontrols2
, qtwebengine
, rustPlatform
@ -19,20 +20,17 @@
mkDerivation rec {
pname = "angelfish";
version = "1.8.0";
version = "21.05";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "plasma-mobile";
repo = "angelfish";
rev = "v${version}";
sha256 = "0pj2kw7lmxh7diwdcmk24qxqslavhvf23r2i6h549gbllbzk219f";
src = fetchurl {
url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz";
sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "0cyrmhlg0kjr14842ckbjdljc2zc28al0y9i8w5l0qzr18krgc0m";
sha256 = "05xvh7yxndqm2bqpm06jsxiv4v02mqxaazll8wllp367qapvr21g";
};
nativeBuildInputs = [
@ -58,6 +56,7 @@ mkDerivation rec {
knotifications
kpurpose
kwindowsystem
qtfeedback
qtquickcontrols2
qtwebengine
];

View file

@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
version = "2.22";
version = "2.23";
pname = "links2";
src = fetchurl {
url = "${meta.homepage}/download/links-${version}.tar.bz2";
sha256 = "sha256-A2SYazp/Ho4xcb6jYrU/ceHdM2CohC1m/cZVgOvCCE0=";
sha256 = "sha256-ZmDSAvUh/Ri/UYTD8XMtH6dCahAzdCd60c245XzmrEU=";
};
buildInputs = with lib;

View file

@ -21,19 +21,19 @@
# Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here.
alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss
alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev
}:
let
pname = "pcloud";
version = "1.9.1";
code = "XZXB3fXZgXyQbnTkTm5XOJH9i6NsKX9lL21V";
version = "1.9.2";
code = "XZCBKnXZdbHEAu1ec7bMDQCb1oCztBc169Py";
name = "${pname}-${version}";
# Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive
src = fetchzip {
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${name}.zip";
hash = "sha256-vUrz4thp9tcU9T8d52DJUAbt6Jnv+E3pbUytzMR8d/E=";
hash = "sha256-9I4xl9cO1MDvdXaTv6ER/NPdqKoo0y7HNWxGl0Fn1O0=";
};
appimageContents = appimageTools.extractType2 {

View file

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
version = "7.6.0";
version = "7.6.1";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "11818d8ph9qqisdpkv46afhr79qq128gaz5d0n7b48dx25ih1jb9";
sha256 = "sha256-wpfTozXxanZkYtYQHY950PLsVO4lXLt5OOP/xDCrFEw=";
};
dontBuild = true;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "freetube";
version = "0.12.0";
version = "0.13.0";
src = fetchurl {
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
sha256 = "151fcm1swsasrwzm93fddx669q4xlfl3d58q1w58nyv7r6kh4fda";
sha256 = "sha256-CutTSpwb0G7FZgeKf/lvWHlhOn+X5AWLvPk0cpFQ1lk=";
};
appimageContents = appimageTools.extractType2 {

View file

@ -6,6 +6,7 @@
, makeSetupHook
, maturin
, rust
, rustc
, stdenv
, target ? rust.toRustTargetSpec stdenv.hostPlatform
}:
@ -85,7 +86,7 @@ in {
maturinBuildHook = callPackage ({ }:
makeSetupHook {
name = "maturin-build-hook.sh";
deps = [ cargo maturin ];
deps = [ cargo maturin rustc ];
substitutions = {
inherit ccForBuild ccForHost cxxForBuild cxxForHost
rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec;

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "marwaita";
version = "9.2.1";
version = "9.2.2";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "08392ybpxnbq3wswa7bvz8nnxryjg9aczvw3arnhfvmbigwq5q0s";
sha256 = "0fbcncsldn2v6x6jla187mp6sjm529ij8rf85wcxpahc45vwb9pg";
};
buildInputs = [

View file

@ -26,6 +26,6 @@ rec {
# Hooks
inherit (callPackage ../../../build-support/rust/hooks {
inherit cargo;
inherit cargo rustc;
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
version = "10.4.1";
version = "10.5.0";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "sha256-5aRR4FXeX4sEhKzVyrLsXbrW3ihze1zHJRDYkuxppYA=";
sha256 = "sha256-6pkMNNxtcNfJW0NU2fOwgZveJX27Z3ljSOkeGWCCy4c=";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, getconf }:
stdenv.mkDerivation rec {
pname = "libfixposix";
@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals stdenv.isDarwin [ getconf ];
meta = with lib; {
homepage = "https://github.com/sionescu/libfixposix";
description = "Thin wrapper over POSIX syscalls and some replacement functionality";
license = licenses.boost;
maintainers = with maintainers; [ orivej raskin ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}

View file

@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
pname = "lief";
version = "0.11.4";
version = "0.11.5";
src = fetchFromGitHub {
owner = "lief-project";
repo = "LIEF";
rev = version;
sha256 = "DgsTrJ2+zdXJK6CdDOan7roakaaxQiwrVeiQnzJnk0A=";
sha256 = "sha256-crYFBeX+YaIvVAv3uvGEeNCg+ZbUryr0NacDG56TUGE=";
};
outputs = [ "out" "py" ];

View file

@ -0,0 +1,48 @@
{ lib
, mkDerivation
, fetchFromGitHub
, perl
, qmake
, qtbase
, qtdeclarative
}:
mkDerivation rec {
pname = "qtfeedback";
version = "unstable-2018-09-03";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "qt";
repo = "qtfeedback";
rev = "a14bd0bb1373cde86e09e3619fb9dc70f34c71f2";
sha256 = "0kiiffvriagql1cark6g1qxy7l9c3q3s13cx3s2plbz19nlnikj7";
};
nativeBuildInputs = [
perl
qmake
];
buildInputs = [
qtdeclarative
];
qmakeFlags = [ "CONFIG+=git_build" ];
doCheck = true;
postFixup = ''
# Drop QMAKE_PRL_BUILD_DIR because it references the build dir
find "$out/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
'';
meta = with lib; {
description = "Qt Tactile Feedback";
homepage = "https://github.com/qt/qtfeedback";
license = with licenses; [ lgpl3Only /* or */ gpl2Plus ];
maintainers = with maintainers; [ dotlambda OPNA2608 ];
};
}

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.13.2";
version = "3.13.3";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
sha256 = "sha256-ke2BDpMOTcYq37Eb8DX+gIztqHKstsTmjZL8Uw5C0/Q=";
sha256 = "sha256-tA3UafaFvUH6Ko0OAXhh8Jz+ht+seTuhPjBsHHaI6rE=";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, frozenlist
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "aiosignal";
version = "1.1.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
rev = "v${version}";
sha256 = "0a9md2dy83qwg2an57nqrzp9nb7krq27y9zz0f7qxcrv0xd42djy";
};
propagatedBuildInputs = [
frozenlist
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
postPatch = ''
substituteInPlace pytest.ini \
--replace "--cov=aiosignal" ""
'';
pythonImportsCheck = [ "aiosignal" ];
meta = with lib; {
description = "Python list of registered asynchronous callbacks";
homepage = "https://github.com/aio-libs/aiosignal";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, cython
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "frozenlist";
version = "1.1.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
rev = "v${version}";
sha256 = "07z33vid7s8fjwvybyn8357yvs0f6nlhizv1l3qj1bczi3jbdkbh";
};
nativeBuildInputs = [
cython
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace pytest.ini \
--replace "--cov=frozenlist" ""
'';
preBuild = ''
cython frozenlist/_frozenlist.pyx
'';
pythonImportsCheck = [ "frozenlist" ];
meta = with lib; {
description = "Python module for list-like structure";
homepage = "https://github.com/aio-libs/frozenlist";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -23,19 +23,7 @@ buildPythonPackage rec {
dontUseCmakeConfigure = true;
# we never actually explicitly call the install command so this is the only way
# to inject these options to it - however, openmp-library doesn't appear to have
# any effect, so we have to inject it into NIX_LDFLAGS manually below
postPatch = lib.optionalString stdenv.cc.isClang ''
cat >> setup.cfg <<EOF
[install]
openmp-include-dir=${llvmPackages.openmp}/include
openmp-library=${llvmPackages.openmp}/lib/libomp.dylib
EOF
'';
buildInputs = lib.optional stdenv.cc.isClang [ llvmPackages.openmp ];
propagatedBuildInputs = [
numpy
scipy
@ -44,14 +32,13 @@ buildPythonPackage rec {
postConfigure = ''
export HOME=$(mktemp -d)
'' + lib.optionalString stdenv.cc.isClang ''
export NIX_LDFLAGS="$NIX_LDFLAGS -L${llvmPackages.openmp}/lib -lomp"
'';
# The pypi package doesn't distribute the tests from the GitHub
# repository. It contains c++ tests which don't seem to wired up to
# `make check`.
doCheck = false;
pythonImportsCheck = [ "lightgbm" ];
meta = with lib; {
description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework";

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pyupgrade";
version = "2.16.0";
version = "2.18.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "asottile";
repo = pname;
rev = "v${version}";
sha256 = "sha256-U1Ak0oGy0FxBMqRM2A3N7VuNDz2aUW4FFW+hKKhjfdk=";
sha256 = "sha256-nkMKy1NAFBG/PuPdj3LAqr0c4UqEM2R2kHKuORql2dw=";
};
checkInputs = [ pytestCheckHook ];

View file

@ -47,6 +47,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# https://github.com/NixOS/nixpkgs/issues/124165
"test_bridge_getdevicestatus"
];
pythonImportsCheck = [ "pywemo" ];
meta = with lib; {

View file

@ -0,0 +1,26 @@
{ buildPythonPackage, lib, fetchPypi, numpy, pydantic, pint,
networkx, pytestrunner, pytestcov, pytest
} :
buildPythonPackage rec {
pname = "qcelemental";
version = "0.20.0";
checkInputs = [ pytestrunner pytestcov pytest ];
propagatedBuildInputs = [ numpy pydantic pint networkx ];
src = fetchPypi {
inherit pname version;
sha256 = "141vw36fmacj897q26kq2bl9l0d23lyqjfry6q46aa9087dcs7ni";
};
doCheck = true;
meta = with lib; {
description = "Periodic table, physical constants, and molecule parsing for quantum chemistry.";
homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ maintainers.sheepforce ];
};
}

View file

@ -13,17 +13,15 @@
buildPythonPackage rec {
pname = "staticjinja";
version = "1.0.4";
version = "2.0.0";
format = "pyproject";
disabled = isPy27; # 0.4.0 drops python2 support
# No tests in pypi
src = fetchFromGitHub {
owner = "staticjinja";
repo = pname;
rev = version;
sha256 = "1saz6f71s693gz9c2k3bq2di2mrkj65mgmfdg86jk0z0zzjk90y1";
sha256 = "0z5y4l4sv4c7zmp6pj1ws3psq7i87xqbcmk648bmsa1d6prr1hil";
};
nativeBuildInputs = [

View file

@ -49,19 +49,19 @@ let
};
in buildPythonPackage rec {
pname = "tokenizers";
version = "0.10.1";
version = "0.10.3";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
hash = "sha256-N/dKjQwHKmJnB76q8ISQ3cjuW0Z4GqGavnFFx/w9JRQ=";
hash = "sha256-X7aUiJJjB2ZDlE8LbK7Pn/15SLTZbP8kb4l9ED7/xvU=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src sourceRoot;
name = "${pname}-${version}";
hash = "sha256-3ICSjtiRfLOj+PXu6mcuDoAtod5uXAcabYWTLxEgI18=";
hash = "sha256-gRqxlL6q87sGC0birDhCmGF+CVbfxwOxW6Tl6+5mGoo=";
};
sourceRoot = "source/bindings/python";
@ -76,15 +76,12 @@ in buildPythonPackage rec {
numpy
];
installCheckInputs = [
checkInputs = [
datasets
pytestCheckHook
requests
];
doCheck = false;
doInstallCheck = true;
postUnpack = ''
# Add data files for tests, otherwise tests attempt network access.
mkdir $sourceRoot/tests/data

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "zwave-js-server-python";
version = "0.24.0";
version = "0.25.0";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "sha256-LHAlGWoASDiFwvy59uXl5GH5pPmMuthoo4ZrFegkCIU=";
sha256 = "sha256-frhmyla3neFVZILDy7HnKloMqNLRjm3gxS88xZdu29w=";
};
propagatedBuildInputs = [

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "git-quick-stats";
version = "2.1.9";
version = "2.2.0";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
sha256 = "sha256-2rrwbEXwBBuussybCZFbAEjNwm/ztbXw1jUlTnxPINA=";
sha256 = "sha256-cE9eo8FUUNlhmBrHalFDTFK2LIQUaWFy7Gj/E2F15t4=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -5,26 +5,27 @@
, rustPlatform
, pkg-config
, dbus
, libiconv
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "maturin";
version = "0.10.4";
version = "0.10.6";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
hash = "sha256-9emrBajFd0eLHcsd9Uf6MLCWqZFqxmZdWPBLGIYc2kU=";
hash = "sha256-qWDrdS1zxe5woQSKLHhDSGJ1KF4SHk1mhaQApJXCCO4=";
};
cargoSha256 = "113i7a5hpz7qch45wwapp53ixvgssnlxm0810yjicxp3k61ak30j";
cargoHash = "sha256-NEXgb7yWQkqbbofd3oYQ5n+CmfaM2cWj8HwufrcRKkc=";
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optional stdenv.isLinux dbus
++ lib.optional stdenv.isDarwin Security;
buildInputs = lib.optionals stdenv.isLinux [ dbus ]
++ lib.optionals stdenv.isDarwin [ Security libiconv ];
# Requires network access, fails in sandbox.
doCheck = false;

View file

@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix args {
version = "1.20.0";
sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl";
version = "1.21.0";
sha256 = "0w87zhm5nfx88x9hj6drrvm5f3m02kzbjp39x1lsglrbmi5jl6gy";
}

View file

@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix args {
version = "1.20.0";
sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl";
version = "1.20.1";
sha256 = "0jccnknx57yvbvx6qwwisa8rb5zm1wb54xnz0nm0phym6cay2qp4";
}

View file

@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "navidrome";
version = "0.42.1";
version = "0.43.0";
src = fetchurl {
url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
sha256 = "1bndqs689rc7pf1l08rlph8h3f86kr1c7i96szs4wkycfy9w8vsv";
sha256 = "0y7a5n8phffxga1bjkaf7x5ijripqg1nfjljkrrj26778550vqb5";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "agi";
version = "1.1.0-dev-20210517";
version = "1.1.0-dev-20210521";
src = fetchzip {
url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
sha256 = "sha256-O3U/aDGEhXQltM70DHhnDCgothF8HHZMJ102EjiaINU=";
sha256 = "sha256-otdthD5p+12JmBltFtXgVaa1fgsItluHv0S4k/GbB9Q=";
};
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "microplane";
version = "0.0.31";
version = "0.0.32";
src = fetchFromGitHub {
owner = "Clever";
repo = "microplane";
rev = "v${version}";
sha256 = "sha256-PcojOFe3SHhnFy09kcxHhb5kd07TG7Uq+coPUNbJjx4=";
sha256 = "sha256-QYii/UmYus5hloTUsbVKsw50bSfI4bArUgGzFSK8Cas=";
};
vendorSha256 = "sha256-5HHdxSXg3ZIUyFQALaYgvf4pQwNxG58cF4vnCnMgAuY=";
vendorSha256 = "sha256-1XtpoGqQ//2ccJdl8E7jnSBQhYoA4/YVBbHeI+OfaR0=";
buildFlagsArray = ''
-ldflags=-s -w -X main.version=${version}

View file

@ -1,37 +1,36 @@
{ lib, stdenv, fetchgit, perl, coreutils }:
{ lib, rustPlatform, fetchgit, coreutils, installShellFiles }:
stdenv.mkDerivation rec {
rustPlatform.buildRustPackage rec {
pname = "safe-rm";
version = "0.12";
version = "1.1.0";
src = fetchgit {
url = "https://git.launchpad.net/safe-rm";
rev = "refs/tags/${pname}-${version}";
sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq";
sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw=";
};
# pod2man
nativeBuildInputs = [ perl ];
cargoSha256 = "sha256-durb4RTzEun7HPeYfvDJpvO+6L7tNFmAxdIwINbwZrg=";
propagatedBuildInputs = [ coreutils perl ];
postFixup = ''
sed -e 's@/bin/rm@${coreutils}/bin/rm@' -i $out/bin/safe-rm
postPatch = ''
substituteInPlace src/main.rs \
--replace "/bin/rm" "${coreutils}/bin/rm"
'';
installPhase = ''
mkdir -p $out/bin
cp safe-rm $out/bin
nativeBuildInputs = [ installShellFiles ];
mkdir -p $out/share/man/man1
pod2man safe-rm > $out/share/man/man1/safe-rm.1
# uses lots of absolute paths outside of the sandbox
doCheck = false;
postInstall = ''
installManPage safe-rm.1
'';
meta = with lib; {
description = "Tool intended to prevent the accidental deletion of important files";
homepage = "https://launchpad.net/safe-rm";
license = licenses.gpl3;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.koral ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -21759,6 +21759,8 @@ in
helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { };
helvum = callPackage ../applications/audio/helvum { };
hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { };
hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { };

View file

@ -333,6 +333,8 @@ in {
aioshelly = callPackage ../development/python-modules/aioshelly { };
aiosignal = callPackage ../development/python-modules/aiosignal { };
aiosmb = callPackage ../development/python-modules/aiosmb { };
aiosmtpd = callPackage ../development/python-modules/aiosmtpd { };
@ -2619,6 +2621,8 @@ in {
frozendict = callPackage ../development/python-modules/frozendict { };
frozenlist = callPackage ../development/python-modules/frozenlist { };
fs = callPackage ../development/python-modules/fs { };
fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
@ -7007,6 +7011,8 @@ in {
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
qcelemental = callPackage ../development/python-modules/qcelemental { };
qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
qdldl = callPackage ../development/python-modules/qdldl { };

View file

@ -172,6 +172,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
withQt5 = true;
};
qtfeedback = callPackage ../development/libraries/qtfeedback { };
qtutilities = callPackage ../development/libraries/qtutilities { };
qtinstaller = callPackage ../development/libraries/qtinstaller { };