BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-05-07 06:01:44 +00:00 committed by GitHub
commit 3d1b7b0dc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 114 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
pkgs/applications/audio/rhythmbox/default.nix
View file

@ -1,17 +1,30 @@
{ lib, stdenv, fetchurl, pkg-config, fetchFromGitLab { stdenv
, lib
, fetchurl
, fetchpatch
, pkg-config
, meson
, ninja
, fetchFromGitLab
, python3 , python3
, perl , vala
, perlPackages , glib
, gtk3 , gtk3
, intltool
, libpeas , libpeas
, libsoup , libsoup
, libxml2
, libsecret , libsecret
, libnotify , libnotify
, libdmapsharing , libdmapsharing
, gnome , gnome
, gobject-introspection , gobject-introspection
, totem-pl-parser , totem-pl-parser
, libgudev
, libgpod
, libmtp
, lirc
, brasero
, grilo
, tdb , tdb
, json-glib , json-glib
, itstool , itstool
@ -19,38 +32,32 @@
, gst_all_1 , gst_all_1
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] , 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. stdenv.mkDerivation rec {
# 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 {
pname = "rhythmbox"; pname = "rhythmbox";
version = "3.4.4"; version = "3.4.5";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 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 = [ nativeBuildInputs = [
pkg-config pkg-config
intltool perl perlPackages.XMLParser meson
ninja
vala
glib
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -58,13 +65,20 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
python3 python3
libsoup libsoup
libxml2
tdb tdb
json-glib json-glib
glib
gtk3 gtk3
libpeas libpeas
totem-pl-parser totem-pl-parser
gnome.adwaita-icon-theme libgudev
libgpod
libmtp
lirc
brasero
grilo
gobject-introspection gobject-introspection
python3.pkgs.pygobject3 python3.pkgs.pygobject3
@ -76,16 +90,14 @@ in stdenv.mkDerivation rec {
gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav gst_all_1.gst-libav
libdmapsharing_3 # necessary for daap support libdmapsharing # for daap support
libsecret libsecret
libnotify libnotify
] ++ gst_plugins; ] ++ gst_plugins;
configureFlags = [ postInstall = ''
"--enable-daap" glib-compile-schemas "$out/share/glib-2.0/schemas"
"--enable-libnotify" '';
"--with-libsecret"
];
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
@ -93,8 +105,6 @@ in stdenv.mkDerivation rec {
) )
''; '';
enableParallelBuilding = true;
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;

16
pkgs/applications/misc/hstr/default.nix
View file

@ -1,27 +1,17 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, readline, ncurses { lib, stdenv, fetchFromGitHub, readline, ncurses
, autoreconfHook, pkg-config, gettext }: , autoreconfHook, pkg-config, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hstr"; pname = "hstr";
version = "2.3"; version = "2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dvorka"; owner = "dvorka";
repo = "hstr"; repo = "hstr";
rev = version; 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 ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ readline ncurses gettext ]; buildInputs = [ readline ncurses gettext ];

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

@ -31,7 +31,7 @@
, pyyaml , pyyaml
, requests , requests
, keyring , keyring
, python_magic , python-magic
# commands that lutris needs # commands that lutris needs
, xrandr , xrandr
@ -104,7 +104,7 @@ buildPythonApplication rec {
libnotify libnotify
pango pango
webkitgtk webkitgtk
python_magic python-magic
] ++ gstDeps; ] ++ gstDeps;
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -117,7 +117,7 @@ buildPythonApplication rec {
pillow pillow
dbus-python dbus-python
keyring keyring
python_magic python-magic
]; ];
postPatch = '' postPatch = ''

2
pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
View file

@ -18,7 +18,7 @@ let
scriptPython = python.withPackages (ps: with ps; [ scriptPython = python.withPackages (ps: with ps; [
aiohttp aiohttp
requests requests
python_magic python-magic
]); ]);
version = "0.3.0"; version = "0.3.0";

2
pkgs/applications/networking/mailreaders/alot/default.nix
View file

@ -40,7 +40,7 @@ with python3.pkgs; buildPythonApplication rec {
file file
gpgme gpgme
notmuch2 notmuch2
python_magic python-magic
service-identity service-identity
twisted twisted
urwid urwid

2
pkgs/applications/office/paperless-ngx/default.nix
View file

@ -106,7 +106,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
python-dotenv python-dotenv
python-gnupg python-gnupg
python-Levenshtein python-Levenshtein
python_magic python-magic
pytz pytz
pyyaml pyyaml
redis redis

13
pkgs/development/coq-modules/QuickChick/default.nix
View file

@ -1,11 +1,12 @@
{ lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: { lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }:
let recent = lib.versions.isGe "8.7" coq.coq-version; in let recent = lib.versions.isGe "8.7" coq.coq-version; in
mkCoqDerivation { (mkCoqDerivation {
pname = "QuickChick"; pname = "QuickChick";
owner = "QuickChick"; owner = "QuickChick";
inherit version; inherit version;
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.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.13" pred.true ]; out = "1.5.0"; }
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; }
{ cases = [ "8.11" pred.true ]; out = "1.3.2"; } { cases = [ "8.11" pred.true ]; out = "1.3.2"; }
@ -16,6 +17,7 @@ mkCoqDerivation {
{ cases = [ "8.6" pred.true ]; out = "20171102"; } { cases = [ "8.6" pred.true ]; out = "20171102"; }
{ cases = [ "8.5" pred.true ]; out = "20170512"; } { cases = [ "8.5" pred.true ]; out = "20170512"; }
] null; ] null;
release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0";
release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw"; release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw";
release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc"; release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc";
release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs"; release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs";
@ -46,4 +48,11 @@ mkCoqDerivation {
description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
maintainers = with maintainers; [ jwiegley ]; 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 ]);
})

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

@ -17,7 +17,7 @@
, nose , nose
, nose-timer , nose-timer
, mock , mock
, python_magic , python-magic
, codecov , codecov
, coverage , coverage
, qt5 , qt5
@ -70,7 +70,7 @@ buildPythonPackage rec {
nose-timer nose-timer
pyperclip pyperclip
pyqt5 pyqt5
python_magic python-magic
]; ];
inherit doCheck; inherit doCheck;

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

@ -12,7 +12,7 @@
, oauth2client , oauth2client
, ply , ply
, pytest , pytest
, python_magic , python-magic
, requests , requests
}: }:
@ -40,7 +40,7 @@ buildPythonPackage rec {
lxml lxml
oauth2client oauth2client
ply ply
python_magic python-magic
requests requests
# pytest really is a runtime dependency # pytest really is a runtime dependency
# https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82 # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82

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

@ -3,7 +3,7 @@
, fetchPypi , fetchPypi
, django , django
, pillow , pillow
, python_magic , python-magic
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {
inherit pname version; inherit pname version;
sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3"; sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3";
}; };
propagatedBuildInputs = [ pillow python_magic ]; propagatedBuildInputs = [ pillow python-magic ];
checkInputs = [ django ]; checkInputs = [ django ];

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

@ -4,7 +4,7 @@
, fetchFromGitHub , fetchFromGitHub
, karton-core , karton-core
, pytestCheckHook , pytestCheckHook
, python_magic , python-magic
, pythonOlder , pythonOlder
}: }:
@ -24,7 +24,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
chardet chardet
karton-core karton-core
python_magic python-magic
]; ];
postPatch = '' postPatch = ''

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

@ -6,7 +6,7 @@
, decorator , decorator
, http-ece , http-ece
, python-dateutil , python-dateutil
, python_magic , python-magic
, pytz , pytz
, requests , requests
, six , six
@ -37,7 +37,7 @@ buildPythonPackage rec {
decorator decorator
http-ece http-ece
python-dateutil python-dateutil
python_magic python-magic
pytz pytz
requests requests
six six

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

@ -5,7 +5,7 @@
, isPy3k , isPy3k
, decorator , decorator
, http-parser , http-parser
, python_magic , python-magic
, urllib3 , urllib3
, pytestCheckHook , pytestCheckHook
, pytest-mock , pytest-mock
@ -30,7 +30,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
decorator decorator
http-parser http-parser
python_magic python-magic
urllib3 urllib3
]; ];

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

@ -3,7 +3,7 @@
, fetchPypi , fetchPypi
, requests , requests
, websocket-client , websocket-client
, python_magic , python-magic
, cryptography , cryptography
, pytestCheckHook , pytestCheckHook
}: }:
@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
}; };
propagatedBuildInputs = [ cryptography requests websocket-client python_magic ]; propagatedBuildInputs = [ cryptography requests websocket-client python-magic ];
preCheck = '' preCheck = ''
export PUSHBULLET_API_KEY="" export PUSHBULLET_API_KEY=""

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

@ -6,7 +6,7 @@
, httpretty , httpretty
, ijson , ijson
, poetry-core , poetry-core
, python_magic , python-magic
, pytz , pytz
, pytestCheckHook , pytestCheckHook
, requests-oauthlib , requests-oauthlib
@ -32,7 +32,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
brotli brotli
ijson ijson
python_magic python-magic
pytz pytz
requests-oauthlib requests-oauthlib
]; ];

2
pkgs/development/python-modules/python-magic/default.nix
View file

@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "A python interface to the libmagic file type identification library"; description = "A python interface to the libmagic file type identification library";
homepage = "https://github.com/ahupp/python-magic"; homepage = "https://github.com/ahupp/python-magic";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ SuperSandro2000 ];
}; };
} }

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

@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python_magic }: { lib, fetchPypi, buildPythonPackage, genshi, lxml, python-magic }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "relatorio"; pname = "relatorio";
@ -12,7 +12,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
genshi genshi
lxml lxml
python_magic python-magic
]; ];
meta = { meta = {

2
pkgs/development/tools/rust/rust-analyzer/default.nix
View file

@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ="; cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-analyzer"; owner = "rust-lang";
repo = "rust-analyzer"; repo = "rust-analyzer";
rev = version; rev = version;
sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA="; sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";

2
pkgs/development/tools/rust/rust-analyzer/update.sh
View file

@ -3,7 +3,7 @@
# shellcheck shell=bash # shellcheck shell=bash
set -euo pipefail set -euo pipefail
cd "$(dirname "$0")" cd "$(dirname "$0")"
owner=rust-analyzer owner=rust-lang
repo=rust-analyzer repo=rust-analyzer
nixpkgs=../../../../.. nixpkgs=../../../../..

12
pkgs/development/tools/taplo-cli/default.nix
View file

@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "taplo-cli"; pname = "taplo-cli";
version = "0.6.1"; version = "0.6.2";
src = fetchCrate { src = fetchCrate {
inherit pname version; 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 buildInputs = lib.optional stdenv.isDarwin Security;
++ lib.optional stdenv.isDarwin Security;
meta = with lib; { meta = with lib; {
description = "A TOML toolkit written in Rust"; description = "A TOML toolkit written in Rust";

4
pkgs/servers/caddy/default.nix
View file

@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }: { lib, buildGoModule, fetchFromGitHub, nixosTests }:
let let
version = "2.5.0"; version = "2.5.1";
dist = fetchFromGitHub { dist = fetchFromGitHub {
owner = "caddyserver"; owner = "caddyserver";
repo = "dist"; repo = "dist";
@ -18,7 +18,7 @@ buildGoModule {
owner = "caddyserver"; owner = "caddyserver";
repo = "caddy"; repo = "caddy";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-V9iIz/93n6EBJZ9v3MDKD6FivtplRFN9a/e0o7YX0/w="; sha256 = "sha256-Y4GAx/8XcW7+6eXCQ6k4e/3WZ/6MkTr5za1AXp6El9o=";
}; };
vendorSha256 = "sha256-xu3klc9yb4Ws8fvXRV286IDhi/zQVN1PKCiFKb8VJBo="; vendorSha256 = "sha256-xu3klc9yb4Ws8fvXRV286IDhi/zQVN1PKCiFKb8VJBo=";

2
pkgs/servers/home-assistant/component-packages.nix
View file

@ -2,7 +2,7 @@
# Do not edit! # Do not edit!
{ {
version = "2022.5.1"; version = "2022.5.2";
components = { components = {
"abode" = ps: with ps; [ "abode" = ps: with ps; [
abodepy abodepy

4
pkgs/servers/home-assistant/default.nix
View file

@ -179,7 +179,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating # Don't forget to run parse-requirements.py after updating
hassVersion = "2022.5.1"; hassVersion = "2022.5.2";
in python.pkgs.buildPythonApplication rec { in python.pkgs.buildPythonApplication rec {
pname = "homeassistant"; pname = "homeassistant";
@ -197,7 +197,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant"; owner = "home-assistant";
repo = "core"; repo = "core";
rev = version; 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 # leave this in, so users don't have to constantly update their downstream patch handling

2
pkgs/servers/mautrix-facebook/default.nix
View file

@ -26,7 +26,7 @@ python3.pkgs.buildPythonPackage rec {
prometheus-client prometheus-client
pycryptodome pycryptodome
python-olm python-olm
python_magic python-magic
ruamel-yaml ruamel-yaml
unpaddedbase64 unpaddedbase64
yarl yarl

2
pkgs/servers/mautrix-signal/default.nix
View file

@ -22,7 +22,7 @@ python3.pkgs.buildPythonPackage rec {
prometheus-client prometheus-client
pycryptodome pycryptodome
python-olm python-olm
python_magic python-magic
qrcode qrcode
ruamel-yaml ruamel-yaml
unpaddedbase64 unpaddedbase64

2
pkgs/servers/mautrix-telegram/default.nix
View file

@ -44,7 +44,7 @@ in python.pkgs.buildPythonPackage rec {
sqlalchemy sqlalchemy
CommonMark CommonMark
ruamel-yaml ruamel-yaml
python_magic python-magic
tulir-telethon tulir-telethon
telethon-session-sqlalchemy telethon-session-sqlalchemy
pillow pillow

2
pkgs/servers/pinnwand/steck.nix
View file

@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
pkgs.git pkgs.git
appdirs appdirs
click click
python_magic python-magic
requests requests
termcolor termcolor
toml toml

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

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "eksctl"; pname = "eksctl";
version = "0.95.0"; version = "0.96.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weaveworks"; owner = "weaveworks";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-WAu2ghQAih+f1PdfflsroUOAV5Cs+hvECOyw34DRugU="; sha256 = "sha256-AmwkWFhoGRBWrEhRlTRLGRu79ayWceszZi2hgx388Eg=";
}; };
vendorSha256 = "sha256-zedhE9WWCktqYig+bI4v9bQhzSW8laClgTI2Gsrz+FM="; vendorSha256 = "sha256-akFclhx6c18u3z2oa6EvLd2NwkVCgJrYWv8Vbp1hZ9g=";
doCheck = false; doCheck = false;

2
pkgs/tools/misc/diffoscope/default.nix
View file

@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec {
] ]
++ (with python3Packages; [ ++ (with python3Packages; [
argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c 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 stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
++ lib.optionals enableBloat ([ ++ lib.optionals enableBloat ([

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

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "brook"; pname = "brook";
version = "20220406"; version = "20220501";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "txthinking"; owner = "txthinking";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-KCDXi86Wi01wEIJXPYYX5HkQMq7nKK2VhsN1x5yOvlk="; sha256 = "sha256-JAlSqwhWsF8PTAyn2W1BCDO50eSBq7ukwl0dzzmK1zU=";
}; };
vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU="; vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU=";

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

@ -1,4 +1,4 @@
{ lib, buildPythonApplication, fetchFromGitHub, python_magic, python-dateutil }: { lib, buildPythonApplication, fetchFromGitHub, python-magic, python-dateutil }:
buildPythonApplication rec { buildPythonApplication rec {
pname = "s3cmd"; pname = "s3cmd";
@ -11,7 +11,7 @@ buildPythonApplication rec {
sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri"; sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri";
}; };
propagatedBuildInputs = [ python_magic python-dateutil ]; propagatedBuildInputs = [ python-magic python-dateutil ];
dontUseSetuptoolsCheck = true; dontUseSetuptoolsCheck = true;

2
pkgs/tools/security/hfinger/default.nix
View file

@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
fnvhash fnvhash
python_magic python-magic
] ++ [ ] ++ [
wireshark-cli wireshark-cli
]; ];

2
pkgs/tools/security/pass/extensions/import.nix
View file

@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
defusedxml defusedxml
pyaml pyaml
pykeepass pykeepass
python_magic # similar API to "file-magic", but already in nixpkgs. python-magic # similar API to "file-magic", but already in nixpkgs.
secretstorage secretstorage
]; ];

1
pkgs/top-level/python-aliases.nix
View file

@ -108,6 +108,7 @@ mapAliases ({
pytestrunner = pytest-runner; # added 2021-01-04 pytestrunner = pytest-runner; # added 2021-01-04
python-igraph = igraph; # added 2021-11-11 python-igraph = igraph; # added 2021-11-11
python-lz4 = lz4; # added 2018-06-01 python-lz4 = lz4; # added 2018-06-01
python-magic = python-magic; # added 2022-05-07
python_mimeparse = python-mimeparse; # added 2021-10-31 python_mimeparse = python-mimeparse; # added 2021-10-31
python-subunit = subunit; # added 2021-09-10 python-subunit = subunit; # added 2021-09-10
pytest_xdist = pytest-xdist; # added 2021-01-04 pytest_xdist = pytest-xdist; # added 2021-01-04

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

@ -8363,7 +8363,7 @@ in {
inherit (pkgs) lzo; 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 { }; python-manilaclient = callPackage ../development/python-modules/python-manilaclient { };