Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
3d1b7b0dc5
@ -1,17 +1,30 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, fetchFromGitLab
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, fetchFromGitLab
|
||||
, python3
|
||||
, perl
|
||||
, perlPackages
|
||||
, vala
|
||||
, glib
|
||||
, gtk3
|
||||
, intltool
|
||||
, libpeas
|
||||
, libsoup
|
||||
, libxml2
|
||||
, libsecret
|
||||
, libnotify
|
||||
, libdmapsharing
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, totem-pl-parser
|
||||
, libgudev
|
||||
, libgpod
|
||||
, libmtp
|
||||
, lirc
|
||||
, brasero
|
||||
, grilo
|
||||
, tdb
|
||||
, json-glib
|
||||
, itstool
|
||||
@ -19,38 +32,32 @@
|
||||
, gst_all_1
|
||||
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
|
||||
}:
|
||||
let
|
||||
|
||||
# The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0.
|
||||
|
||||
# This PR would solve the issue:
|
||||
# https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/12
|
||||
# Unfortunately applying this patch produces a rhythmbox which
|
||||
# cannot fetch data from DAAP shares.
|
||||
|
||||
libdmapsharing_3 = libdmapsharing.overrideAttrs (old: rec {
|
||||
version = "2.9.41";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = old.pname;
|
||||
rev = "${lib.toUpper old.pname}_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "05kvrzf0cp3mskdy6iv7zqq24qdczl800q2dn1h4bk3d9wchgm4p";
|
||||
};
|
||||
});
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rhythmbox";
|
||||
version = "3.4.4";
|
||||
version = "3.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf";
|
||||
sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix stuff linking against rhythmdb not finding libxml headers
|
||||
# included by rhythmdb.h header.
|
||||
# https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch";
|
||||
sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
intltool perl perlPackages.XMLParser
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
glib
|
||||
itstool
|
||||
wrapGAppsHook
|
||||
];
|
||||
@ -58,13 +65,20 @@ in stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
python3
|
||||
libsoup
|
||||
libxml2
|
||||
tdb
|
||||
json-glib
|
||||
|
||||
glib
|
||||
gtk3
|
||||
libpeas
|
||||
totem-pl-parser
|
||||
gnome.adwaita-icon-theme
|
||||
libgudev
|
||||
libgpod
|
||||
libmtp
|
||||
lirc
|
||||
brasero
|
||||
grilo
|
||||
|
||||
gobject-introspection
|
||||
python3.pkgs.pygobject3
|
||||
@ -76,16 +90,14 @@ in stdenv.mkDerivation rec {
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gst-libav
|
||||
|
||||
libdmapsharing_3 # necessary for daap support
|
||||
libdmapsharing # for daap support
|
||||
libsecret
|
||||
libnotify
|
||||
] ++ gst_plugins;
|
||||
|
||||
configureFlags = [
|
||||
"--enable-daap"
|
||||
"--enable-libnotify"
|
||||
"--with-libsecret"
|
||||
];
|
||||
postInstall = ''
|
||||
glib-compile-schemas "$out/share/glib-2.0/schemas"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
@ -93,8 +105,6 @@ in stdenv.mkDerivation rec {
|
||||
)
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
||||
@ -1,27 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, readline, ncurses
|
||||
{ lib, stdenv, fetchFromGitHub, readline, ncurses
|
||||
, autoreconfHook, pkg-config, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hstr";
|
||||
version = "2.3";
|
||||
version = "2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dvorka";
|
||||
repo = "hstr";
|
||||
rev = version;
|
||||
sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y";
|
||||
sha256 = "sha256-qIMnU+gRR3HPAOrrrduN68R5E8ZJKROfZ0sEHL0E4XU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# pull pending upstream inclusion fix for ncurses-6.3:
|
||||
# https://github.com/dvorka/hstr/pull/435
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/dvorka/hstr/commit/7fbd852c464ae3cfcd2f4fed9c62a21fb84c5439.patch";
|
||||
sha256 = "15f0ja4bsh4jnchcg0ray8ijpdraag7k07ss87a6ymfs1rg6i0jr";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ readline ncurses gettext ];
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
, pyyaml
|
||||
, requests
|
||||
, keyring
|
||||
, python_magic
|
||||
, python-magic
|
||||
|
||||
# commands that lutris needs
|
||||
, xrandr
|
||||
@ -104,7 +104,7 @@ buildPythonApplication rec {
|
||||
libnotify
|
||||
pango
|
||||
webkitgtk
|
||||
python_magic
|
||||
python-magic
|
||||
] ++ gstDeps;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -117,7 +117,7 @@ buildPythonApplication rec {
|
||||
pillow
|
||||
dbus-python
|
||||
keyring
|
||||
python_magic
|
||||
python-magic
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -18,7 +18,7 @@ let
|
||||
scriptPython = python.withPackages (ps: with ps; [
|
||||
aiohttp
|
||||
requests
|
||||
python_magic
|
||||
python-magic
|
||||
]);
|
||||
|
||||
version = "0.3.0";
|
||||
|
||||
@ -40,7 +40,7 @@ with python3.pkgs; buildPythonApplication rec {
|
||||
file
|
||||
gpgme
|
||||
notmuch2
|
||||
python_magic
|
||||
python-magic
|
||||
service-identity
|
||||
twisted
|
||||
urwid
|
||||
|
||||
@ -106,7 +106,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
python-dotenv
|
||||
python-gnupg
|
||||
python-Levenshtein
|
||||
python_magic
|
||||
python-magic
|
||||
pytz
|
||||
pyyaml
|
||||
redis
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }:
|
||||
|
||||
let recent = lib.versions.isGe "8.7" coq.coq-version; in
|
||||
mkCoqDerivation {
|
||||
(mkCoqDerivation {
|
||||
pname = "QuickChick";
|
||||
owner = "QuickChick";
|
||||
inherit version;
|
||||
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
|
||||
{ cases = [ (isGe "8.13") pred.true ]; out = "1.6.2"; }
|
||||
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
|
||||
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
|
||||
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; }
|
||||
@ -16,6 +17,7 @@ mkCoqDerivation {
|
||||
{ cases = [ "8.6" pred.true ]; out = "20171102"; }
|
||||
{ cases = [ "8.5" pred.true ]; out = "20170512"; }
|
||||
] null;
|
||||
release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0";
|
||||
release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw";
|
||||
release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
|
||||
release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
|
||||
@ -46,4 +48,11 @@ mkCoqDerivation {
|
||||
description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
|
||||
maintainers = with maintainers; [ jwiegley ];
|
||||
};
|
||||
}
|
||||
}).overrideAttrs (o:
|
||||
let after_1_6 = lib.versions.isGe "1.6" o.version || o.version == "dev";
|
||||
in {
|
||||
nativeBuildInputs = o.nativeBuildInputs
|
||||
++ lib.optional after_1_6 coq.ocamlPackages.cppo;
|
||||
propagatedBuildInputs = o.propagatedBuildInputs
|
||||
++ lib.optionals after_1_6 (with coq.ocamlPackages; [ findlib zarith ]);
|
||||
})
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
, nose
|
||||
, nose-timer
|
||||
, mock
|
||||
, python_magic
|
||||
, python-magic
|
||||
, codecov
|
||||
, coverage
|
||||
, qt5
|
||||
@ -70,7 +70,7 @@ buildPythonPackage rec {
|
||||
nose-timer
|
||||
pyperclip
|
||||
pyqt5
|
||||
python_magic
|
||||
python-magic
|
||||
];
|
||||
inherit doCheck;
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, oauth2client
|
||||
, ply
|
||||
, pytest
|
||||
, python_magic
|
||||
, python-magic
|
||||
, requests
|
||||
}:
|
||||
|
||||
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
lxml
|
||||
oauth2client
|
||||
ply
|
||||
python_magic
|
||||
python-magic
|
||||
requests
|
||||
# pytest really is a runtime dependency
|
||||
# https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchPypi
|
||||
, django
|
||||
, pillow
|
||||
, python_magic
|
||||
, python-magic
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
inherit pname version;
|
||||
sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3";
|
||||
};
|
||||
propagatedBuildInputs = [ pillow python_magic ];
|
||||
propagatedBuildInputs = [ pillow python-magic ];
|
||||
|
||||
checkInputs = [ django ];
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, fetchFromGitHub
|
||||
, karton-core
|
||||
, pytestCheckHook
|
||||
, python_magic
|
||||
, python-magic
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
chardet
|
||||
karton-core
|
||||
python_magic
|
||||
python-magic
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, decorator
|
||||
, http-ece
|
||||
, python-dateutil
|
||||
, python_magic
|
||||
, python-magic
|
||||
, pytz
|
||||
, requests
|
||||
, six
|
||||
@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
decorator
|
||||
http-ece
|
||||
python-dateutil
|
||||
python_magic
|
||||
python-magic
|
||||
pytz
|
||||
requests
|
||||
six
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, isPy3k
|
||||
, decorator
|
||||
, http-parser
|
||||
, python_magic
|
||||
, python-magic
|
||||
, urllib3
|
||||
, pytestCheckHook
|
||||
, pytest-mock
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
decorator
|
||||
http-parser
|
||||
python_magic
|
||||
python-magic
|
||||
urllib3
|
||||
];
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchPypi
|
||||
, requests
|
||||
, websocket-client
|
||||
, python_magic
|
||||
, python-magic
|
||||
, cryptography
|
||||
, pytestCheckHook
|
||||
}:
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cryptography requests websocket-client python_magic ];
|
||||
propagatedBuildInputs = [ cryptography requests websocket-client python-magic ];
|
||||
|
||||
preCheck = ''
|
||||
export PUSHBULLET_API_KEY=""
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, httpretty
|
||||
, ijson
|
||||
, poetry-core
|
||||
, python_magic
|
||||
, python-magic
|
||||
, pytz
|
||||
, pytestCheckHook
|
||||
, requests-oauthlib
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
brotli
|
||||
ijson
|
||||
python_magic
|
||||
python-magic
|
||||
pytz
|
||||
requests-oauthlib
|
||||
];
|
||||
|
||||
@ -36,6 +36,6 @@ buildPythonPackage rec {
|
||||
description = "A python interface to the libmagic file type identification library";
|
||||
homepage = "https://github.com/ahupp/python-magic";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python_magic }:
|
||||
{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python-magic }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "relatorio";
|
||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
genshi
|
||||
lxml
|
||||
python_magic
|
||||
python-magic
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-analyzer";
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# shellcheck shell=bash
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
owner=rust-analyzer
|
||||
owner=rust-lang
|
||||
repo=rust-analyzer
|
||||
nixpkgs=../../../../..
|
||||
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taplo-cli";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-0U7qoRnId3gKTQYPwbvrt/vzGfiSX6kcGwgRNc1uZ/I=";
|
||||
sha256 = "sha256-vz3ClC2PI0ti+cItuVdJgP8KLmR2C+uGUzl3DfVuTrY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-FIcq8wwJrZRxATDr+jo4KOX4l6auriNg+rSpMNsG+Tk=";
|
||||
cargoSha256 = "sha256-m6wsca/muGPs58myQH7ZLPPM+eGP+GL2sC5suu+vWU0=";
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
|
||||
OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
|
||||
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
|
||||
|
||||
buildInputs = lib.optional stdenv.isLinux openssl
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TOML toolkit written in Rust";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||
let
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
dist = fetchFromGitHub {
|
||||
owner = "caddyserver";
|
||||
repo = "dist";
|
||||
@ -18,7 +18,7 @@ buildGoModule {
|
||||
owner = "caddyserver";
|
||||
repo = "caddy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-V9iIz/93n6EBJZ9v3MDKD6FivtplRFN9a/e0o7YX0/w=";
|
||||
sha256 = "sha256-Y4GAx/8XcW7+6eXCQ6k4e/3WZ/6MkTr5za1AXp6El9o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xu3klc9yb4Ws8fvXRV286IDhi/zQVN1PKCiFKb8VJBo=";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.5.1";
|
||||
version = "2022.5.2";
|
||||
components = {
|
||||
"abode" = ps: with ps; [
|
||||
abodepy
|
||||
|
||||
@ -179,7 +179,7 @@ let
|
||||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.5.1";
|
||||
hassVersion = "2022.5.2";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -197,7 +197,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-TsLKcrT31PFik9ZKvl3peMMciR6rma70c2p+dNDn+zk=";
|
||||
hash = "sha256-n8lM1Z5fkZRW0E9J7nPRYntoaUuug9XPoRAKl+5XC6Y=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@ -26,7 +26,7 @@ python3.pkgs.buildPythonPackage rec {
|
||||
prometheus-client
|
||||
pycryptodome
|
||||
python-olm
|
||||
python_magic
|
||||
python-magic
|
||||
ruamel-yaml
|
||||
unpaddedbase64
|
||||
yarl
|
||||
|
||||
@ -22,7 +22,7 @@ python3.pkgs.buildPythonPackage rec {
|
||||
prometheus-client
|
||||
pycryptodome
|
||||
python-olm
|
||||
python_magic
|
||||
python-magic
|
||||
qrcode
|
||||
ruamel-yaml
|
||||
unpaddedbase64
|
||||
|
||||
@ -44,7 +44,7 @@ in python.pkgs.buildPythonPackage rec {
|
||||
sqlalchemy
|
||||
CommonMark
|
||||
ruamel-yaml
|
||||
python_magic
|
||||
python-magic
|
||||
tulir-telethon
|
||||
telethon-session-sqlalchemy
|
||||
pillow
|
||||
|
||||
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pkgs.git
|
||||
appdirs
|
||||
click
|
||||
python_magic
|
||||
python-magic
|
||||
requests
|
||||
termcolor
|
||||
toml
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.95.0";
|
||||
version = "0.96.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WAu2ghQAih+f1PdfflsroUOAV5Cs+hvECOyw34DRugU=";
|
||||
sha256 = "sha256-AmwkWFhoGRBWrEhRlTRLGRu79ayWceszZi2hgx388Eg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zedhE9WWCktqYig+bI4v9bQhzSW8laClgTI2Gsrz+FM=";
|
||||
vendorSha256 = "sha256-akFclhx6c18u3z2oa6EvLd2NwkVCgJrYWv8Vbp1hZ9g=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec {
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c
|
||||
python_magic progressbar33 pypdf2 rpm tlsh
|
||||
python-magic progressbar33 pypdf2 rpm tlsh
|
||||
])
|
||||
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
|
||||
++ lib.optionals enableBloat ([
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "brook";
|
||||
version = "20220406";
|
||||
version = "20220501";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "txthinking";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KCDXi86Wi01wEIJXPYYX5HkQMq7nKK2VhsN1x5yOvlk=";
|
||||
sha256 = "sha256-JAlSqwhWsF8PTAyn2W1BCDO50eSBq7ukwl0dzzmK1zU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU=";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, python_magic, python-dateutil }:
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, python-magic, python-dateutil }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "s3cmd";
|
||||
@ -11,7 +11,7 @@ buildPythonApplication rec {
|
||||
sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python_magic python-dateutil ];
|
||||
propagatedBuildInputs = [ python-magic python-dateutil ];
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
fnvhash
|
||||
python_magic
|
||||
python-magic
|
||||
] ++ [
|
||||
wireshark-cli
|
||||
];
|
||||
|
||||
@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
|
||||
defusedxml
|
||||
pyaml
|
||||
pykeepass
|
||||
python_magic # similar API to "file-magic", but already in nixpkgs.
|
||||
python-magic # similar API to "file-magic", but already in nixpkgs.
|
||||
secretstorage
|
||||
];
|
||||
|
||||
|
||||
@ -108,6 +108,7 @@ mapAliases ({
|
||||
pytestrunner = pytest-runner; # added 2021-01-04
|
||||
python-igraph = igraph; # added 2021-11-11
|
||||
python-lz4 = lz4; # added 2018-06-01
|
||||
python-magic = python-magic; # added 2022-05-07
|
||||
python_mimeparse = python-mimeparse; # added 2021-10-31
|
||||
python-subunit = subunit; # added 2021-09-10
|
||||
pytest_xdist = pytest-xdist; # added 2021-01-04
|
||||
|
||||
@ -8363,7 +8363,7 @@ in {
|
||||
inherit (pkgs) lzo;
|
||||
};
|
||||
|
||||
python_magic = callPackage ../development/python-modules/python-magic { };
|
||||
python-magic = callPackage ../development/python-modules/python-magic { };
|
||||
|
||||
python-manilaclient = callPackage ../development/python-modules/python-manilaclient { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user