Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
3db2dee35f
@ -10562,6 +10562,12 @@
|
||||
githubId = 1141948;
|
||||
name = "Zack Grannan";
|
||||
};
|
||||
zhaofengli = {
|
||||
email = "hello@zhaofeng.li";
|
||||
github = "zhaofengli";
|
||||
githubId = 2189609;
|
||||
name = "Zhaofeng Li";
|
||||
};
|
||||
zimbatm = {
|
||||
email = "zimbatm@zimbatm.com";
|
||||
github = "zimbatm";
|
||||
|
||||
@ -2,24 +2,6 @@
|
||||
|
||||
with lib;
|
||||
let
|
||||
findWinner = candidates: winner:
|
||||
any (x: x == winner) candidates;
|
||||
|
||||
# winners is an ordered list where first item wins over 2nd etc
|
||||
mergeAnswer = winners: locs: defs:
|
||||
let
|
||||
values = map (x: x.value) defs;
|
||||
inter = intersectLists values winners;
|
||||
winner = head winners;
|
||||
in
|
||||
if defs == [] then abort "This case should never happen."
|
||||
else if winner == [] then abort "Give a valid list of winner"
|
||||
else if inter == [] then mergeOneOption locs defs
|
||||
else if findWinner values winner then
|
||||
winner
|
||||
else
|
||||
mergeAnswer (tail winners) locs defs;
|
||||
|
||||
mergeFalseByDefault = locs: defs:
|
||||
if defs == [] then abort "This case should never happen."
|
||||
else if any (x: x == false) (getValues defs) then false
|
||||
@ -28,9 +10,7 @@ let
|
||||
kernelItem = types.submodule {
|
||||
options = {
|
||||
tristate = mkOption {
|
||||
type = types.enum [ "y" "m" "n" null ] // {
|
||||
merge = mergeAnswer [ "y" "m" "n" ];
|
||||
};
|
||||
type = types.enum [ "y" "m" "n" null ];
|
||||
default = null;
|
||||
internal = true;
|
||||
visible = true;
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
, flac, expat, libidn, qtbase, qtwebkit, libvorbis }:
|
||||
assert stdenv.hostPlatform.system == "x86_64-linux";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "beta_1.0.467.4929-r0"; # friendly to nix-env version sorting algo
|
||||
product = "google-musicmanager";
|
||||
name = "${product}-${version}";
|
||||
|
||||
# When looking for newer versions, since google doesn't let you list their repo dirs,
|
||||
# curl http://dl.google.com/linux/musicmanager/deb/dists/stable/Release
|
||||
# fetch an appropriate packages file such as main/binary-amd64/Packages:
|
||||
# curl http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-amd64/Packages
|
||||
# which will contain the links to all available *.debs for the arch.
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_amd64.deb";
|
||||
sha256 = "0yaprpbp44var88kdj1h11fqkhgcklixr69jyia49v9m22529gg2";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
ar vx ${src}
|
||||
tar xvf data.tar.xz
|
||||
tar xvf control.tar.gz
|
||||
'';
|
||||
|
||||
prePatch = ''
|
||||
sed -i "s@\(Exec=\).*@\1$out/bin/google-musicmanager@" opt/google/musicmanager/google-musicmanager.desktop
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib
|
||||
mkdir -p $out/share/applications
|
||||
|
||||
cp -r opt $out
|
||||
find -name "*.so*" -exec cp "{}" $out/lib \;
|
||||
ln -s $out/opt/google/musicmanager/google-musicmanager $out/bin
|
||||
ln -s $out/opt/google/musicmanager/google-musicmanager.desktop $out/share/applications
|
||||
|
||||
for i in 16 32 48 128
|
||||
do
|
||||
iconDirectory=$out/usr/share/icons/hicolor/"$i"x"$i"/apps
|
||||
|
||||
mkdir -p $iconDirectory
|
||||
ln -s $out/opt/google/musicmanager/product_logo_"$i".png $iconDirectory/google-musicmanager.png
|
||||
done
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/minidump_upload):${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \
|
||||
$out/opt/google/musicmanager/minidump_upload
|
||||
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "$(patchelf --print-rpath $out/opt/google/musicmanager/MusicManager):$out/lib:${lib.makeLibraryPath [
|
||||
flac
|
||||
expat
|
||||
libidn
|
||||
qtbase
|
||||
qtwebkit
|
||||
libvorbis
|
||||
stdenv.cc.cc.lib
|
||||
]}" \
|
||||
$out/opt/google/musicmanager/MusicManager
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Uploads music from your computer to Google Play";
|
||||
homepage = "https://support.google.com/googleplay/answer/1229970";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,82 +0,0 @@
|
||||
{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
|
||||
, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
|
||||
, nss, pango, udev, xorg
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.7.1";
|
||||
|
||||
deps = [
|
||||
alsaLib
|
||||
atk
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
fontconfig
|
||||
freetype
|
||||
GConf
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk2
|
||||
gtk3
|
||||
libpulseaudio
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
stdenv.cc.cc
|
||||
udev
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXcursor
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "google-play-music-desktop-player";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
|
||||
sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg -x $src .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r ./usr/share $out
|
||||
cp -r ./usr/bin $out
|
||||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
"$out/share/google-play-music-desktop-player/Google Play Music Desktop Player"
|
||||
|
||||
wrapProgram $out/bin/google-play-music-desktop-player \
|
||||
--prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.googleplaymusicdesktopplayer.com/";
|
||||
description = "A beautiful cross platform Desktop Player for Google Play Music";
|
||||
license = lib.licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = [ lib.maintainers.SuprDewd ];
|
||||
};
|
||||
}
|
||||
@ -12,8 +12,6 @@ let
|
||||
|
||||
mopidy = callPackage ./mopidy.nix { };
|
||||
|
||||
mopidy-gmusic = callPackage ./gmusic.nix { };
|
||||
|
||||
mopidy-iris = callPackage ./iris.nix { };
|
||||
|
||||
mopidy-local = callPackage ./local.nix { };
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
{ lib, python3Packages, mopidy }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mopidy-gmusic";
|
||||
version = "4.0.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "Mopidy-GMusic";
|
||||
sha256 = "14yswmlfs659rs3k595606m77lw9c6pjykb5pikqw21sb97haxl3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mopidy
|
||||
python3Packages.requests
|
||||
python3Packages.gmusicapi
|
||||
python3Packages.cachetools
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.mopidy.com/";
|
||||
description = "Mopidy extension for playing music from Google Play Music";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.jgillich ];
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
||||
@ -42,7 +42,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
homepage = "https://www.mopidy.com/";
|
||||
description = ''
|
||||
An extensible music server that plays music from local disk, Spotify,
|
||||
SoundCloud, Google Play Music, and more
|
||||
SoundCloud, and more
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.fpletz ];
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
{ buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "tuijam";
|
||||
version = "unstable-2020-06-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cfangmeier";
|
||||
repo = pname;
|
||||
rev = "7baec6f6e80ee90da0d0363b430dd7d5695ff03b";
|
||||
sha256 = "1l0s88jvj99jkxnczw5nfj78m8vihh29g815n4mg9jblad23mgx5";
|
||||
};
|
||||
|
||||
buildInputs = [ python3Packages.Babel ];
|
||||
|
||||
# the package has no tests
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
gmusicapi
|
||||
google-api-python-client
|
||||
mpv
|
||||
pydbus
|
||||
pygobject3
|
||||
pyyaml
|
||||
requests
|
||||
rsa
|
||||
urwid
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fancy TUI client for Google Play Music";
|
||||
longDescription = ''
|
||||
TUIJam seeks to make a simple, attractive, terminal-based interface to
|
||||
listening to music for Google Play Music All-Access subscribers.
|
||||
'';
|
||||
homepage = "https://github.com/cfangmeier/tuijam";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kalbasit ];
|
||||
};
|
||||
}
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.1.4";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EN0fQ5Scwrd7Tv31upQVbuqoNCoYudtruwtPR1IKTzE=";
|
||||
sha256 = "sha256-Y+BiXKxlUSZXaLcz75l333ZBkKyII9IyTmKQwjshBkE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
111
pkgs/applications/networking/powerdns-admin/default.nix
Normal file
111
pkgs/applications/networking/powerdns-admin/default.nix
Normal file
@ -0,0 +1,111 @@
|
||||
{ lib, stdenv, fetchFromGitHub, mkYarnPackage, writeText, python3Packages }:
|
||||
|
||||
let
|
||||
version = "0.2.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngoduykhanh";
|
||||
repo = "PowerDNS-Admin";
|
||||
rev = "v${version}";
|
||||
sha256 = "16faz57d77mxkflkvwyi8gb9wvnq2vhw79b84v1fmqvxri1yaphw";
|
||||
};
|
||||
|
||||
pythonDeps = with python3Packages; [
|
||||
flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-sslify
|
||||
mysqlclient sqlalchemy
|
||||
configobj bcrypt requests ldap pyotp qrcode dnspython_1
|
||||
gunicorn python3-saml pyopenssl pytz cssmin jsmin authlib bravado-core
|
||||
lima pytimeparse pyyaml
|
||||
];
|
||||
|
||||
assets = mkYarnPackage {
|
||||
inherit src version;
|
||||
packageJSON = ./package.json;
|
||||
yarnNix = ./yarndeps.nix;
|
||||
|
||||
nativeBuildInputs = pythonDeps;
|
||||
patchPhase = ''
|
||||
sed -i -r -e "s|'cssmin',\s?'cssrewrite'|'cssmin'|g" powerdnsadmin/assets.py
|
||||
'';
|
||||
buildPhase = ''
|
||||
# The build process expects the directory to be writable
|
||||
# with node_modules at a specific path
|
||||
# https://github.com/ngoduykhanh/PowerDNS-Admin/blob/master/.yarnrc
|
||||
|
||||
approot=deps/powerdns-admin-assets
|
||||
|
||||
ln -s $node_modules $approot/powerdnsadmin/static/node_modules
|
||||
FLASK_APP=$approot/powerdnsadmin/__init__.py flask assets build
|
||||
'';
|
||||
installPhase = ''
|
||||
# https://github.com/ngoduykhanh/PowerDNS-Admin/blob/54b257768f600c5548a1c7e50eac49c40df49f92/docker/Dockerfile#L43
|
||||
mkdir $out
|
||||
cp -r $approot/powerdnsadmin/static/{generated,assets,img} $out
|
||||
find $node_modules/icheck/skins/square -name '*.png' -exec cp {} $out/generated \;
|
||||
|
||||
mkdir $out/fonts
|
||||
cp $node_modules/ionicons/dist/fonts/* $out/fonts
|
||||
cp $node_modules/bootstrap/dist/fonts/* $out/fonts
|
||||
cp $node_modules/font-awesome/fonts/* $out/fonts
|
||||
'';
|
||||
distPhase = "true";
|
||||
};
|
||||
|
||||
assetsPy = writeText "assets.py" ''
|
||||
from flask_assets import Environment
|
||||
assets = Environment()
|
||||
assets.register('js_login', 'generated/login.js')
|
||||
assets.register('js_validation', 'generated/validation.js')
|
||||
assets.register('css_login', 'generated/login.css')
|
||||
assets.register('js_main', 'generated/main.js')
|
||||
assets.register('css_main', 'generated/main.css')
|
||||
'';
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "powerdns-admin";
|
||||
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [ python3Packages.wrapPython ];
|
||||
|
||||
pythonPath = pythonDeps;
|
||||
|
||||
gunicornScript = ''
|
||||
#!/bin/sh
|
||||
if [ ! -z $CONFIG ]; then
|
||||
exec python -m gunicorn.app.wsgiapp "powerdnsadmin:create_app(config='$CONFIG')" "$@"
|
||||
fi
|
||||
|
||||
exec python -m gunicorn.app.wsgiapp "powerdnsadmin:create_app()" "$@"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
rm -r powerdnsadmin/static powerdnsadmin/assets.py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
# Nasty hack: call wrapPythonPrograms to set program_PYTHONPATH (see tribler)
|
||||
wrapPythonPrograms
|
||||
|
||||
mkdir -p $out/share $out/bin
|
||||
cp -r powerdnsadmin $out/share/powerdnsadmin
|
||||
|
||||
ln -s ${assets} $out/share/powerdnsadmin/static
|
||||
ln -s ${assetsPy} $out/share/powerdnsadmin/assets.py
|
||||
|
||||
echo "$gunicornScript" > $out/bin/powerdns-admin
|
||||
chmod +x $out/bin/powerdns-admin
|
||||
wrapProgram $out/bin/powerdns-admin \
|
||||
--set PATH ${python3Packages.python}/bin \
|
||||
--set PYTHONPATH $out/share:$program_PYTHONPATH
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A PowerDNS web interface with advanced features";
|
||||
homepage = "https://github.com/ngoduykhanh/PowerDNS-Admin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
||||
16
pkgs/applications/networking/powerdns-admin/package.json
Normal file
16
pkgs/applications/networking/powerdns-admin/package.json
Normal file
@ -0,0 +1,16 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"admin-lte": "2.4.9",
|
||||
"bootstrap": "^3.4.1",
|
||||
"bootstrap-validator": "^0.11.9",
|
||||
"datatables.net-plugins": "^1.10.19",
|
||||
"icheck": "^1.0.2",
|
||||
"jquery-slimscroll": "^1.3.8",
|
||||
"jquery-ui-dist": "^1.12.1",
|
||||
"jquery.quicksearch": "^2.4.0",
|
||||
"jtimeout": "^3.1.0",
|
||||
"multiselect": "^0.9.12"
|
||||
},
|
||||
"name": "powerdns-admin-assets",
|
||||
"version": "0.2.3"
|
||||
}
|
||||
20
pkgs/applications/networking/powerdns-admin/update-asset-deps.sh
Executable file
20
pkgs/applications/networking/powerdns-admin/update-asset-deps.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../.. -i bash -p wget yarn2nix-moretea.yarn2nix jq
|
||||
|
||||
# This script is based upon:
|
||||
# pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [[ $# -ne 1 || $1 == -* ]]; then
|
||||
echo "Regenerates the Yarn dependency lock files for the powerdns-admin package."
|
||||
echo "Usage: $0 <git release version>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
WEB_SRC="https://raw.githubusercontent.com/ngoduykhanh/PowerDNS-Admin/v$1"
|
||||
|
||||
wget "$WEB_SRC/package.json" -O - | jq ".name = \"powerdns-admin-assets\" | .version = \"$1\"" > package.json
|
||||
wget "$WEB_SRC/yarn.lock" -O yarn.lock
|
||||
yarn2nix --lockfile=yarn.lock > yarndeps.nix
|
||||
rm yarn.lock
|
||||
1453
pkgs/applications/networking/powerdns-admin/yarndeps.nix
Normal file
1453
pkgs/applications/networking/powerdns-admin/yarndeps.nix
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,65 @@
|
||||
{ stdenv, lib
|
||||
, makeWrapper, dpkg, fetchurl, autoPatchelfHook
|
||||
, curl, kerberos, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-workspaces";
|
||||
version = "3.1.3.925";
|
||||
|
||||
src = fetchurl {
|
||||
# ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/Packages
|
||||
urls = [
|
||||
"https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb"
|
||||
"https://web.archive.org/web/20210307233836/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb"
|
||||
];
|
||||
sha256 = "5b57edb4f6f8c950164fd8104bf62df4c452ab5b16cb65d48db3636959a0f0ad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
# Crashes at startup when stripping:
|
||||
# "Failed to create CoreCLR, HRESULT: 0x80004005"
|
||||
dontStrip = true;
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc.lib
|
||||
kerberos
|
||||
curl
|
||||
lttng-ust
|
||||
libpulseaudio
|
||||
gtk3
|
||||
openssl_1_1.out
|
||||
icu
|
||||
webkitgtk
|
||||
librsvg
|
||||
gdk-pixbuf
|
||||
libsoup
|
||||
glib-networking
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
${dpkg}/bin/dpkg -x $src $out
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv $out/opt/workspacesclient/* $out/bin
|
||||
|
||||
wrapProgram $out/bin/workspacesclient \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
|
||||
--set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution";
|
||||
homepage = "https://clients.amazonworkspaces.com";
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ]; # TODO Mac support
|
||||
maintainers = [ maintainers.mausch ];
|
||||
};
|
||||
}
|
||||
@ -17,14 +17,14 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.31.24";
|
||||
version = "14.31.32";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "sha256-86nDeKRXSNKrmYeo1rRLfziLVnmEmdIJRfIv6DFIxcs=";
|
||||
sha256 = "sha256-lY4DvtSAC8VDYwzZVZVHNXnyJiSn1vo829DEsLEG/hM=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.0.26";
|
||||
version = "2.0.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q2lh02iZ7FDBPjtoKY5p3c6Vcn9Ey8DCMn/Oe7/74ug=";
|
||||
sha256 = "sha256-LMvhSoKd652XVPzuId8Ortf0f08FUP1zCn06PgtRwkA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -6,5 +6,4 @@
|
||||
inherit name;
|
||||
url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz";
|
||||
meta.homepage = "https://bitbucket.org/${owner}/${repo}/";
|
||||
extraPostFetch = ''rm -f "$out"/.hg_archival.txt''; # impure file; see #12002
|
||||
} // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }
|
||||
|
||||
37
pkgs/data/icons/oranchelo-icon-theme/default.nix
Normal file
37
pkgs/data/icons/oranchelo-icon-theme/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib, stdenv, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oranchelo-icon-theme";
|
||||
version = "0.8.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OrancheloTeam";
|
||||
repo = pname;
|
||||
rev = "096c8c8d550ac9a85f5f34f3f30243e6f198df2d";
|
||||
sha256 = "sha256-TKi42SA33pGKdrPtGTpvxFbOP+5N93Y4BvO4CRTveLM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gtk3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
plasma5Packages.breeze-icons
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/icons
|
||||
cp -r $Oranchelo* $out/share/icons/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Oranchelo icon theme";
|
||||
homepage = "https://github.com/OrancheloTeam/oranchelo-icon-theme";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ _414owen ];
|
||||
};
|
||||
}
|
||||
@ -1,15 +1,15 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf
|
||||
, gflags, libnsl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.35.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
version = "1.36.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
pname = "grpc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd";
|
||||
sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
patches = [
|
||||
@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config re2 openssl protobuf gflags ]
|
||||
++ lib.optionals stdenv.isLinux [ libnsl ];
|
||||
|
||||
cmakeFlags =
|
||||
[ "-DgRPC_ZLIB_PROVIDER=package"
|
||||
"-DgRPC_CARES_PROVIDER=package"
|
||||
"-DgRPC_RE2_PROVIDER=package"
|
||||
"-DgRPC_SSL_PROVIDER=package"
|
||||
"-DgRPC_PROTOBUF_PROVIDER=package"
|
||||
"-DgRPC_GFLAGS_PROVIDER=package"
|
||||
|
||||
1017
pkgs/development/node-packages/node-packages.nix
generated
1017
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a14c642b1f6849e57b5c442e81e809c9e1e3a0bcfebfd54b15a9f9fd273f9611";
|
||||
sha256 = "sha256-F5p3RO9847YQ7tDzb0r3+6dSCEAWoyxtMGBwhywR3/0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.17.20"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
version = "1.17.22"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ihnx6+iNJmr6VRb5k5g+uodCuVf6T9aFTzxzqjAw6TE=";
|
||||
sha256 = "sha256-Thd8ndSsRdnkGGfPt0f0yYXWsF/xRjesWGGmDaqVx8E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.20.20"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
version = "1.20.22"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gMMqgfse6L36B0p5v7iFuyAG6Kl4LyNTwMn2OScE4To=";
|
||||
sha256 = "sha256-MuhvnRhVW9O03GlKJjmhwfyMi0KknaVDuVrJ0ExAdws=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
pname = "elementpath";
|
||||
disabled = isPy27; # uses incompatible class syntax
|
||||
|
||||
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||
owner = "sissaschool";
|
||||
repo = "elementpath";
|
||||
rev = "v${version}";
|
||||
sha256 = "062l1dqbaz1pab3qz6x5zmja8m8gw1bxgfl4kx91gdh0zsiakg8j";
|
||||
sha256 = "00v6npm7d4bk4cnpzacxybn165x6vjqrydssznn0bxzv8aynm1vb";
|
||||
};
|
||||
|
||||
# avoid circular dependency with xmlschema which directly depends on this
|
||||
|
||||
25
pkgs/development/python-modules/flask-seasurf/default.nix
Normal file
25
pkgs/development/python-modules/flask-seasurf/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, flask }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-SeaSurf";
|
||||
version = "0.3.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxcountryman";
|
||||
repo = "flask-seasurf";
|
||||
rev = version;
|
||||
sha256 = "02hsvppsz1d93v641f14fdnd22gbc12ilc9k9kn7wl119n5s3pd8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ flask ];
|
||||
|
||||
pythonImportsCheck = [ "flask_seasurf" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Flask extension for preventing cross-site request forgery";
|
||||
homepage = "https://github.com/maxcountryman/flask-seasurf";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
||||
23
pkgs/development/python-modules/flask-sslify/default.nix
Normal file
23
pkgs/development/python-modules/flask-sslify/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, flask }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-SSLify";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0gjl1m828z5dm3c5dpc2qjgi4llf84cp72mafr0ib5fd14y1sgnk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ flask ];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "flask_sslify" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Flask extension that redirects all incoming requests to HTTPS";
|
||||
homepage = "https://github.com/kennethreitz42/flask-sslify";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, validictory
|
||||
, decorator
|
||||
, mutagen
|
||||
, protobuf
|
||||
, setuptools
|
||||
, requests
|
||||
, dateutil
|
||||
, proboscis
|
||||
, mock
|
||||
, appdirs
|
||||
, oauth2client
|
||||
, pyopenssl
|
||||
, gpsoauth
|
||||
, MechanicalSoup
|
||||
, future
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gmusicapi";
|
||||
version = "13.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "14dqs64nhy84dykyyrdjmsirc7m169zsvwa8abh4v0xcm658lm5k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "gmusicapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An unofficial API for Google Play Music";
|
||||
homepage = "https://pypi.python.org/pypi/gmusicapi/";
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, attrs
|
||||
, audio-metadata
|
||||
, importlib-metadata
|
||||
, marshmallow
|
||||
, pendulum
|
||||
, protobuf
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-music-proto";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "91b78c0de4f59b1e5503fd6d49cb3fec029d9199cca0794c87667e643342e987";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py
|
||||
substituteInPlace setup.py \
|
||||
--replace "'attrs>=18.2,<19.4'" "'attrs'"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
audio-metadata
|
||||
marshmallow
|
||||
pendulum
|
||||
protobuf
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "google_music_proto" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thebigmunch/google-music-proto";
|
||||
description = "Sans-I/O wrapper of Google Music API calls";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jakewaksbaum ];
|
||||
};
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, audio-metadata
|
||||
, multidict
|
||||
, poetry
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-music-utils";
|
||||
version = "2.5.0";
|
||||
|
||||
# Pypi tarball doesn't contain tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "thebigmunch";
|
||||
repo = "google-music-utils";
|
||||
rev = version;
|
||||
sha256 = "0vwbrgakk23fypjspmscz4gllnb3dksv2njy4j4bm8vyr6fwbi5f";
|
||||
};
|
||||
format = "pyproject";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'multidict = "^4.0"' 'multidict = ">4.0"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
|
||||
propagatedBuildInputs = [ audio-metadata multidict ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thebigmunch/google-music-utils";
|
||||
description = "A set of utility functionality for google-music and related projects";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jakewaksbaum ];
|
||||
};
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, appdirs
|
||||
, audio-metadata
|
||||
, google-music-proto
|
||||
, httpx
|
||||
, protobuf
|
||||
, requests_oauthlib
|
||||
, tenacity
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-music";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
audio-metadata
|
||||
google-music-proto
|
||||
httpx
|
||||
protobuf
|
||||
requests_oauthlib
|
||||
tenacity
|
||||
];
|
||||
|
||||
# No tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thebigmunch/google-music";
|
||||
description = "A Google Music API wrapper";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jakewaksbaum ];
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-tools";
|
||||
version = "1.35.0";
|
||||
version = "1.36.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf";
|
||||
sha256 = "80ef584f7b917f575e4b8f2ec59cd4a4d98c2046e801a735f3136b05742a36a6";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
21
pkgs/development/python-modules/lima/default.nix
Normal file
21
pkgs/development/python-modules/lima/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lima";
|
||||
version = "0.5";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0qqj0053r77ppkcyyk2fhpaxjzsl1h98nf9clpny6cs66sdl241v";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight Marshalling of Python 3 Objects.";
|
||||
homepage = "https://github.com/b6d/lima";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
||||
40
pkgs/development/python-modules/pytest-cid/default.nix
Normal file
40
pkgs/development/python-modules/pytest-cid/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, py-cid
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-cid";
|
||||
version = "1.1.1";
|
||||
format = "flit";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ntninja";
|
||||
repo = pname;
|
||||
rev = "1ff9ec43ac9eaf76352ea7e7a060cd081cb8b68a"; # Version has no git tag
|
||||
sha256 = "sha256-H2RtMGYWukowTTfqZSx+hikxzkqw1v5bA4AfZfiVl8U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
py-cid
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pytest_cid" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ntninja/pytest-cid";
|
||||
description = "A simple wrapper around py-cid for easily writing tests involving CIDs in datastructures";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
||||
40
pkgs/development/python-modules/python3-saml/default.nix
Normal file
40
pkgs/development/python-modules/python3-saml/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib, fetchurl, fetchFromGitHub, buildPythonPackage, isPy3k,
|
||||
isodate, lxml, xmlsec, freezegun }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python3-saml";
|
||||
version = "1.10.1";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onelogin";
|
||||
repo = "python3-saml";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yk02xq90bm7p6k091av6gapb5h2ccxzgrbm03sj2x8h0wff9s8k";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove the dependency on defusedxml
|
||||
#
|
||||
# This patch is already merged upstream and does not introduce any
|
||||
# functionality changes.
|
||||
(fetchurl {
|
||||
url = "https://github.com/onelogin/python3-saml/commit/4b6c4b1f2ed3f6eab70ff4391e595b808ace168c.patch";
|
||||
sha256 = "11gqn7ib2hmlx5wp4xhi375v5ajapwmj4lpw0y44bh5ww8cypvqy";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
isodate lxml xmlsec
|
||||
];
|
||||
|
||||
checkInputs = [ freezegun ];
|
||||
pythonImportsCheck = [ "onelogin.saml2" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OneLogin's SAML Python Toolkit for Python 3";
|
||||
homepage = "https://github.com/onelogin/python3-saml";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
||||
47
pkgs/development/python-modules/xmlsec/default.nix
Normal file
47
pkgs/development/python-modules/xmlsec/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pytestCheckHook
|
||||
, libxslt
|
||||
, libxml2
|
||||
, libtool
|
||||
, pkg-config
|
||||
, xmlsec
|
||||
, pkgconfig
|
||||
, setuptools-scm
|
||||
, toml
|
||||
, lxml
|
||||
, hypothesis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xmlsec";
|
||||
version = "1.3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1c4k42zv3plm6v65p7z6l5rxyf50h40d02nhc16vq7cjrfvdf4rx";
|
||||
};
|
||||
|
||||
# https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116
|
||||
patches = [
|
||||
./reset-lxml-in-tests.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm toml ];
|
||||
|
||||
buildInputs = [ xmlsec libxslt libxml2 libtool ];
|
||||
|
||||
propagatedBuildInputs = [ lxml ];
|
||||
|
||||
# Full git clone required for test_doc_examples
|
||||
checkInputs = [ pytestCheckHook hypothesis ];
|
||||
disabledTestPaths = [ "tests/test_doc_examples.py" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for the XML Security Library";
|
||||
homepage = "https://github.com/mehcode/python-xmlsec";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
diff --git a/tests/base.py b/tests/base.py
|
||||
index b05de1d..5ec356f 100644
|
||||
--- a/tests/base.py
|
||||
+++ b/tests/base.py
|
||||
@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase):
|
||||
|
||||
def load_xml(self, name, xpath=None):
|
||||
"""returns xml.etree"""
|
||||
+ etree.set_default_parser(parser=etree.XMLParser())
|
||||
root = etree.parse(self.path(name)).getroot()
|
||||
if xpath is None:
|
||||
return root
|
||||
diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py
|
||||
index 2fc490f..53d2377 100644
|
||||
--- a/tests/test_doc_examples.py
|
||||
+++ b/tests/test_doc_examples.py
|
||||
@@ -42,3 +42,5 @@ def test_doc_example(example):
|
||||
"""
|
||||
with cd(example.parent):
|
||||
runpy.run_path(str(example))
|
||||
+ from lxml import etree
|
||||
+ etree.set_default_parser(parser=etree.XMLParser())
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.19.6";
|
||||
version = "1.19.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YTguBkQcMNjHMVMEN3/P+8fOC5eqmQvlRd1ny9umS/4=";
|
||||
sha256 = "sha256-xhnhc4vhKw5T93076vS+pszIOpj22KzaPyzCvuHMaPE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.12214";
|
||||
version = "0.1.15085";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YV/fqATdGqlAdpKuOMq8KO9UQ+4D1PHwIE5O1zqndHQ=";
|
||||
sha256 = "sha256-KcC9KfAeUM3pMSNThL+w/kzpQYzcMYV6YoNEN4q6duA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6FBMLwoLM2BtnMHQfpY7f7NiQt5evsL4CfYTZvr3gAs=";
|
||||
vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -8,6 +8,6 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "15.10.0";
|
||||
sha256 = "1i7fdlkkyh5ssncbvxmiz894a12mww4cmj7y4qzm9ddbbvqxhj3p";
|
||||
version = "15.11.0";
|
||||
sha256 = "1lfjm0jgzbr0a874c04pddbjnvjcdyx5vyaakdhp0fa222i92w0s";
|
||||
}
|
||||
|
||||
@ -29,20 +29,20 @@ let
|
||||
# Note: when raising the version, ensure that all SNAPSHOT versions in
|
||||
# build.gradle are replaced by a fixed version
|
||||
# (the current one at the time of release) (see postPatch).
|
||||
version = "125.1";
|
||||
version = "126.1";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
Mindustry = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
rev = "v${version}";
|
||||
sha256 = "0p05ndxhl3zgwm4k9cbqclp995kvcjxxhmbkmpjvv7cphiw82hvw";
|
||||
sha256 = "cyg4TofSSFLv8pM3zzvc0FxXMiTm+OIchBJF9PDQrkg=";
|
||||
};
|
||||
Arc = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "Arc";
|
||||
rev = "v${version}";
|
||||
sha256 = "1injdyxwgc9dn49zvr4qggsfrsslkvh5d53z3yv28ayx48qpsgxk";
|
||||
sha256 = "uBIm82mt1etBB/HrNY6XGa7mmBfwd1E3RtqN8Rk5qeY=";
|
||||
};
|
||||
soloud = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
@ -114,7 +114,7 @@ let
|
||||
'';
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "0dk4w8h0kg0mgbn0ifmk29rw8aj917k3nf27qdf1lyr6wl8k7f8k";
|
||||
outputHash = "Mw8LZ1iW6vn4RkBBs8SWHp6mo2Bhj7tMZjLbyuJUqSI=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@ -2950,6 +2950,18 @@ let
|
||||
meta.homepage = "https://github.com/nathunsmitty/nvim-ale-diagnostic/";
|
||||
};
|
||||
|
||||
nvim-autopairs= buildVimPluginFrom2Nix {
|
||||
pname = "nvim-autopairs";
|
||||
version = "2021-02-25";
|
||||
src = fetchFromGitHub {
|
||||
owner = "windwp";
|
||||
repo = "nvim-autopairs";
|
||||
rev = "1596756a90114cbe25d0f383825a1ae2145b459b";
|
||||
sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd";
|
||||
};
|
||||
meta.homepage = "https://github.com/windwp/nvim-autopairs";
|
||||
};
|
||||
|
||||
nvim-cm-racer = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-cm-racer";
|
||||
version = "2017-07-27";
|
||||
|
||||
@ -707,6 +707,7 @@ whonore/Coqtail
|
||||
will133/vim-dirdiff
|
||||
wincent/command-t
|
||||
wincent/ferret
|
||||
windwp/nvim-autopairs
|
||||
wlangstroth/vim-racket
|
||||
wsdjeg/vim-fetch
|
||||
xavierd/clang_complete
|
||||
|
||||
@ -365,8 +365,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "todo-tree";
|
||||
publisher = "Gruntfuggly";
|
||||
version = "0.0.198";
|
||||
sha256 = "0riy2k8dbsnpk8vkv814fr8zh87y425s24nklcx4b7mfrszv7xbn";
|
||||
version = "0.0.201";
|
||||
sha256 = "1hjck1r2byc45rp28gn15wbmcrl1wjng7kn5lyhr6mgjjwqh5pa8";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
||||
@ -20,14 +20,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bolt";
|
||||
version = "0.9";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "bolt";
|
||||
repo = "bolt";
|
||||
rev = version;
|
||||
sha256 = "sha256-lcJE+bMK2S2GObHMy/Fu12WGb3T1HrWjsNyZPz4/f4E=";
|
||||
sha256 = "1phgp8fs0dlj74kbkqlvfniwc32daz47b3pvsxlfxqzyrp77xrfm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -193,16 +193,17 @@ let
|
||||
NET_DROP_MONITOR = yes;
|
||||
|
||||
# needed for ss
|
||||
INET_DIAG = module;
|
||||
INET_TCP_DIAG = module;
|
||||
INET_UDP_DIAG = module;
|
||||
INET_RAW_DIAG = whenAtLeast "4.14" module;
|
||||
INET_DIAG_DESTROY = whenAtLeast "4.9" yes;
|
||||
# Use a lower priority to allow these options to be overridden in hardened/config.nix
|
||||
INET_DIAG = mkDefault module;
|
||||
INET_TCP_DIAG = mkDefault module;
|
||||
INET_UDP_DIAG = mkDefault module;
|
||||
INET_RAW_DIAG = whenAtLeast "4.14" (mkDefault module);
|
||||
INET_DIAG_DESTROY = whenAtLeast "4.9" (mkDefault yes);
|
||||
|
||||
# enable multipath-tcp
|
||||
MPTCP = whenAtLeast "5.6" yes;
|
||||
MPTCP_IPV6 = whenAtLeast "5.6" yes;
|
||||
INET_MPTCP_DIAG = whenAtLeast "5.9" module;
|
||||
INET_MPTCP_DIAG = whenAtLeast "5.9" (mkDefault module);
|
||||
};
|
||||
|
||||
wireless = {
|
||||
|
||||
@ -65,7 +65,7 @@ assert (versionAtLeast version "4.9");
|
||||
PANIC_TIMEOUT = freeform "-1";
|
||||
|
||||
GCC_PLUGINS = yes; # Enable gcc plugin options
|
||||
# Gather additional entropy at boot time for systems that may = no;ot have appropriate entropy sources.
|
||||
# Gather additional entropy at boot time for systems that may not have appropriate entropy sources.
|
||||
GCC_PLUGIN_LATENT_ENTROPY = yes;
|
||||
|
||||
GCC_PLUGIN_STRUCTLEAK = whenAtLeast "4.11" yes; # A port of the PaX structleak plugin
|
||||
@ -79,6 +79,14 @@ assert (versionAtLeast version "4.9");
|
||||
PROC_KCORE = no; # Exposes kernel text image layout
|
||||
INET_DIAG = no; # Has been used for heap based attacks in the past
|
||||
|
||||
# INET_DIAG=n causes the following options to not exist anymore, but since they are defined in common-config.nix,
|
||||
# make them optional
|
||||
INET_DIAG_DESTROY = option no;
|
||||
INET_RAW_DIAG = option no;
|
||||
INET_TCP_DIAG = option no;
|
||||
INET_UDP_DIAG = option no;
|
||||
INET_MPTCP_DIAG = option no;
|
||||
|
||||
# Use -fstack-protector-strong (gcc 4.9+) for best stack canary coverage.
|
||||
CC_STACKPROTECTOR_REGULAR = whenOlder "4.18" no;
|
||||
CC_STACKPROTECTOR_STRONG = whenOlder "4.18" yes;
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
{ stdenv, nixosTests, lib, fetchFromGitHub, python3
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
, nixosTests
|
||||
|
||||
# Look up dependencies of specified components in component-packages.nix
|
||||
, extraComponents ? [ ]
|
||||
@ -84,7 +89,14 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
patches = [];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix I-frame interval in stream test video
|
||||
# https://github.com/home-assistant/core/pull/47638
|
||||
url = "https://github.com/home-assistant/core/commit/d9bf63103fde44ddd38fb6b9a510d82609802b36.patch";
|
||||
sha256 = "1y34cmw9zqb2lxyzm0q7vxlm05wwz76mhysgnh1jn39484fn9f9m";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
@ -331,12 +343,6 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
# generic/test_camera.py: AssertionError: 500 == 200
|
||||
"test_fetching_without_verify_ssl"
|
||||
"test_fetching_url_with_verify_ssl"
|
||||
] ++ lib.optionals (stdenv.isAarch64) [
|
||||
# tests getting stuck on aarch64
|
||||
# components/stream/test_hls.py
|
||||
"test_stream_ended"
|
||||
# components/stream/test_recorder.py
|
||||
"test_record_stream"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "2.4.3";
|
||||
version = "2.4.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
sha256 = "sha256-lCUwzd+ECi2g5jv6ksxrlDdx7cjLgBnaBdYbgzADkcg=";
|
||||
sha256 = "1f2gj9axmdisp4yza5pa60x2s79vdybgsb5ddyfwkl5m89sh0r2z";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kCRXDEuaxFVZuP7PkmZIiXjhMUWjMYbOOtWl4V81DeI=";
|
||||
vendorSha256 = "1w9crp4bk5dk0ph558w9mj8cylm2z6bc81hghmv86ild524a0l9v";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -5,18 +5,20 @@
|
||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2021-03-01";
|
||||
version = "2021-03-08";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "6fbad5bf72fad4ecf30ba4d4ffee62bac582f0ed";
|
||||
rev = "0ab87c26c17171ae6162ff379a0c704fa57dff2e";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "1sd9lhgrig4vpdy0d1ls551gzs7y9q4hq2m0jakslqliyx5d6mpn";
|
||||
sha256 = "1ryf7wj7k7b63sg3ipjdmn3wnyjlh0saf2kz084jmy82hxhqpd8w";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
outdir=$out/share/oh-my-zsh
|
||||
template=templates/zshrc.zsh-template
|
||||
|
||||
@ -64,6 +66,8 @@ stdenv.mkDerivation rec {
|
||||
. ~/.zsh_aliases
|
||||
fi
|
||||
EOF
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -28,11 +28,11 @@ let
|
||||
in
|
||||
with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli";
|
||||
version = "1.19.20"; # N.B: if you change this, change botocore and boto3 to a matching version too
|
||||
version = "1.19.22"; # N.B: if you change this, change botocore and boto3 to a matching version too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Fu+KuGOGDUMXgwUKabZjaCBQHdlLLBwPJXU4rlohKNs=";
|
||||
sha256 = "sha256-yu2IltNbOLB44M+0u5lTjHHllDndBHp4rNfMwFOKMgw=";
|
||||
};
|
||||
|
||||
# https://github.com/aws/aws-cli/issues/4837
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor
|
||||
, enableAcousticbrainz ? true
|
||||
, enableAcoustid ? true
|
||||
, enableAura ? true
|
||||
, enableBadfiles ? true, flac, mp3val
|
||||
, enableBeatport ? true
|
||||
, enableBpsync ? true
|
||||
@ -16,7 +17,6 @@
|
||||
, enableDiscogs ? true
|
||||
, enableEmbyupdate ? true
|
||||
, enableFetchart ? true
|
||||
, enableGmusic ? true
|
||||
, enableKeyfinder ? true, keyfinder-cli
|
||||
, enableKodiupdate ? true
|
||||
, enableLastfm ? true
|
||||
@ -32,7 +32,6 @@
|
||||
|
||||
# External plugins
|
||||
, enableAlternatives ? false
|
||||
, enableCheck ? false, liboggz
|
||||
, enableCopyArtifacts ? false
|
||||
, enableExtraFiles ? false
|
||||
|
||||
@ -45,6 +44,7 @@ let
|
||||
optionalPlugins = {
|
||||
absubmit = enableAbsubmit;
|
||||
acousticbrainz = enableAcousticbrainz;
|
||||
aura = enableAura;
|
||||
badfiles = enableBadfiles;
|
||||
beatport = enableBeatport;
|
||||
bpsync = enableBpsync;
|
||||
@ -54,7 +54,6 @@ let
|
||||
discogs = enableDiscogs;
|
||||
embyupdate = enableEmbyupdate;
|
||||
fetchart = enableFetchart;
|
||||
gmusic = enableGmusic;
|
||||
keyfinder = enableKeyfinder;
|
||||
kodiupdate = enableKodiupdate;
|
||||
lastgenre = enableLastfm;
|
||||
@ -104,13 +103,13 @@ in pythonPackages.buildPythonApplication rec {
|
||||
# unstable does not require bs1770gain[2].
|
||||
# [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
|
||||
# [2]: https://github.com/NixOS/nixpkgs/pull/90504
|
||||
version = "unstable-2021-01-29";
|
||||
version = "unstable-2021-03-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beetbox";
|
||||
repo = "beets";
|
||||
rev = "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2";
|
||||
sha256 = "sha256-BIa3hnOsBxThbA2WCE4q9eaFNtObr3erZBBqobVOSiQ=";
|
||||
rev = "debd382837ef1d30574c2234710d536bb299f979";
|
||||
sha256 = "sha256-I6ejW3f72fdzWoz7g4n8pDYz2NiHGrorLegUQhQOSiI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -128,32 +127,30 @@ in pythonPackages.buildPythonApplication rec {
|
||||
pythonPackages.confuse
|
||||
pythonPackages.mediafile
|
||||
gobject-introspection
|
||||
] ++ lib.optional enableAbsubmit essentia-extractor
|
||||
++ lib.optional enableAcoustid pythonPackages.pyacoustid
|
||||
++ lib.optional enableBeatport pythonPackages.requests_oauthlib
|
||||
] ++ lib.optional enableAbsubmit essentia-extractor
|
||||
++ lib.optional enableAcoustid pythonPackages.pyacoustid
|
||||
++ lib.optional enableBeatport pythonPackages.requests_oauthlib
|
||||
++ lib.optional (enableFetchart
|
||||
|| enableDeezer
|
||||
|| enableEmbyupdate
|
||||
|| enableKodiupdate
|
||||
|| enableLoadext
|
||||
|| enablePlaylist
|
||||
|| enableSubsonicplaylist
|
||||
|| enableSubsonicupdate
|
||||
|| enableAcousticbrainz)
|
||||
pythonPackages.requests
|
||||
++ lib.optional enableCheck beetsExternalPlugins.check
|
||||
++ lib.optional enableConvert ffmpeg
|
||||
++ lib.optional enableDiscogs pythonPackages.discogs_client
|
||||
++ lib.optional enableGmusic pythonPackages.gmusicapi
|
||||
++ lib.optional enableKeyfinder keyfinder-cli
|
||||
++ lib.optional enableLastfm pythonPackages.pylast
|
||||
++ lib.optional enableMpd pythonPackages.mpd2
|
||||
++ lib.optional enableSonosUpdate pythonPackages.soco
|
||||
++ lib.optional enableThumbnails pythonPackages.pyxdg
|
||||
++ lib.optional enableWeb pythonPackages.flask
|
||||
++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
|
||||
++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
|
||||
++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
|
||||
|| enableDeezer
|
||||
|| enableEmbyupdate
|
||||
|| enableKodiupdate
|
||||
|| enableLoadext
|
||||
|| enablePlaylist
|
||||
|| enableSubsonicplaylist
|
||||
|| enableSubsonicupdate
|
||||
|| enableAcousticbrainz) pythonPackages.requests
|
||||
++ lib.optional enableConvert ffmpeg
|
||||
++ lib.optional enableDiscogs pythonPackages.discogs_client
|
||||
++ lib.optional enableKeyfinder keyfinder-cli
|
||||
++ lib.optional enableLastfm pythonPackages.pylast
|
||||
++ lib.optional enableMpd pythonPackages.mpd2
|
||||
++ lib.optional enableSonosUpdate pythonPackages.soco
|
||||
++ lib.optional enableThumbnails pythonPackages.pyxdg
|
||||
++ lib.optional (enableAura
|
||||
|| enableWeb) pythonPackages.flask
|
||||
++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
|
||||
++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
|
||||
++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
|
||||
;
|
||||
|
||||
buildInputs = [
|
||||
@ -209,6 +206,9 @@ in pythonPackages.buildPythonApplication rec {
|
||||
echo echo completion tests passed > test/rsrc/test_completion.sh
|
||||
|
||||
sed -i -e 's/len(mf.images)/0/' test/test_zero.py
|
||||
|
||||
# Google Play Music was discontinued
|
||||
rm -r beetsplug/gmusic.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -2,19 +2,26 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "beets-alternatives";
|
||||
version = "0.9.0";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "beets-alternatives";
|
||||
owner = "geigerzaehler";
|
||||
# This is 0.8.2 with fixes against Beets 1.4.6 and Python 3 compatibility.
|
||||
rev = "v${version}";
|
||||
sha256 = "19160gwg5j6asy8mc21g2kf87mx4zs9x2gbk8q4r6330z4kpl5pm";
|
||||
sha256 = "1dsz94fb29wra1f9580w20bz2f1bgkj4xnsjgwgbv14flbfw4bp0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ beets pythonPackages.nose ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "addopts = --cov --cov-report=term --cov-report=html" ""
|
||||
'';
|
||||
|
||||
checkPhase = "nosetests";
|
||||
nativeBuildInputs = [ beets ];
|
||||
|
||||
checkInputs = with pythonPackages; [
|
||||
pytestCheckHook
|
||||
mock
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Beets plugin to manage external files";
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
diff --git a/test/cli_test.py b/test/cli_test.py
|
||||
index 26df140..2eb913c 100644
|
||||
--- a/test/cli_test.py
|
||||
+++ b/test/cli_test.py
|
||||
@@ -372,12 +372,6 @@ class ToolListTest(TestHelper, TestCase):
|
||||
self.assertIn('flac', stdout.getvalue())
|
||||
self.assertIn('oggz-validate', stdout.getvalue())
|
||||
|
||||
- def test_found_mp3val(self):
|
||||
- shutil.copy('/bin/echo', os.path.join(self.temp_dir, 'mp3val'))
|
||||
- with captureStdout() as stdout:
|
||||
- beets.ui._raw_main(['check', '--list-tools'])
|
||||
- self.assertRegexpMatches(stdout.getvalue(), r'mp3val *found')
|
||||
-
|
||||
def test_oggz_validate_not_found(self):
|
||||
with captureStdout() as stdout:
|
||||
beets.ui._raw_main(['check', '--list-tools'])
|
||||
@ -1,35 +0,0 @@
|
||||
{ lib, fetchFromGitHub, beets, pythonPackages, flac, liboggz, mp3val }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "beets-check";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "beets-check";
|
||||
owner = "geigerzaehler";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b2ijjf0gycs6b40sm33ida3sjygjiv4spb5mba52vysc7iwmnjn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ beets ];
|
||||
checkInputs = [ pythonPackages.nose flac liboggz mp3val ];
|
||||
propagatedBuildInputs = [ flac liboggz mp3val ];
|
||||
|
||||
# patch out broken tests
|
||||
patches = [ ./check-tests.patch ];
|
||||
|
||||
# patch out futures dependency, it is only needed for Python2 which we don't
|
||||
# support.
|
||||
prePatch = ''
|
||||
sed -i "/futures/d" setup.py
|
||||
'';
|
||||
|
||||
checkPhase = "nosetests";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Beets plugin to Verify and store checksums in your library";
|
||||
homepage = "https://github.com/geigerzaehler/beets-check";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault ];
|
||||
};
|
||||
}
|
||||
@ -1,59 +0,0 @@
|
||||
{ lib, python3 }:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
loguru = super.loguru.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.4.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0j47cg3gi8in4z6z4w3by6x02mpkkfl78gr85xjn5rg0nxiz7pfm";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "google-music-scripts";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0apwgj86whrc077dfymvyb4qwj19bawyrx49g4kg364895v0rbbq";
|
||||
};
|
||||
|
||||
# there are already later releases present
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "tomlkit>=0.5,<0.6" "tomlkit" \
|
||||
--replace "attrs>=18.2,<19.4" "attrs"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
audio-metadata
|
||||
google-music
|
||||
google-music-proto
|
||||
google-music-utils
|
||||
loguru
|
||||
pendulum
|
||||
natsort
|
||||
tomlkit
|
||||
];
|
||||
|
||||
# No tests
|
||||
checkPhase = ''
|
||||
$out/bin/gms --help >/dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/thebigmunch/google-music-scripts";
|
||||
description = "A CLI utility for interacting with Google Music";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jakewaksbaum ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mergerfs";
|
||||
version = "2.32.3";
|
||||
version = "2.32.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trapexit";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-loOBMrAtvJAcFdcgwzEEko7TMM07Ocx+1umxjnLB1uY=";
|
||||
sha256 = "sha256-VTnAAJWya1JLZA0gjzpUsdnO5XQP8sJzEP8qHBH+t5k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluent-bit";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluent";
|
||||
repo = "fluent-bit";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xzbsnij0xsgd5j11frkf35w8rkr55hq2yl7myaxrgzh686a8law";
|
||||
sha256 = "sha256-5R26NvhSYesMk/8i9+5H3pZTgbdbnuQ1rLlCa/gWJGc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "0.157.0";
|
||||
version = "0.158.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wUlAllWBGJBZ98lbf2pOfW3a31r74py5Zh7uszkRYqA=";
|
||||
sha256 = "sha256-ewwJHn55zzry2hhMNuRUlGwC995r0ooPJGqKYaCh4WE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8SOUFlbwGwRuOB50V9eXE9KQWGiSexTZct6Rux6Stuw=";
|
||||
vendorSha256 = "sha256-awgkYMidTDcUjQt7hA5cSiwSAsNo5iUqKcG4+2lCXIM=";
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
sha256 = "1lxx9xzkv3y2qjffa5dmwv0ygka71dx3c2995ggcgy5fb19yrghc";
|
||||
sha256 = "1mqxfw21ilcy0gc2jrn5f385y3g9inabp9fjc39m5ydljja4g5b9";
|
||||
};
|
||||
|
||||
cargoSha256 = "0p93dv4nlwl5167dmp160l09wqba5d40gaiwc6vbzb4iqdicgwls";
|
||||
cargoSha256 = "1ja2hcsa2wa0zmblz4ps35jcx1y29j469lf4i9a7sw0kgh3xp1ha";
|
||||
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
|
||||
|
||||
checkFlags = [ "--skip=http_proxy" "--skip=udp_tunnel" ];
|
||||
|
||||
@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A Rust port of shadowsocks";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
broken = stdenv.isAarch64; # crypto2 crate doesn't build on aarch64
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,22 +3,22 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.34.0";
|
||||
version = "4.35.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "v2ray-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x6smffpvnrk76plnsk31qqznkyz06dh4sazncp2l3y9va8k2jb1";
|
||||
sha256 = "07fih1hnnv1a4aj6sb63408vqf10bgk74lhqqv63lvm7gaz73srd";
|
||||
};
|
||||
|
||||
vendorSha256 = "077jnjsmhzr0idrk7pifr5s2r9yjf1v9bvj177n2k2ln8w3wgx3g";
|
||||
vendorSha256 = "sha256-+kI9p0lu4PbLe6jhWqTfRYXHFOOrKmY36LzdcQT9BWw=";
|
||||
|
||||
assets = {
|
||||
# MIT licensed
|
||||
"geoip.dat" = let
|
||||
geoipRev = "202101070033";
|
||||
geoipSha256 = "11naj51pzchdrjmkp1dqzcby1i2fhbq0mncwm4d5q5mh3chyizsf";
|
||||
geoipRev = "202103080146";
|
||||
geoipSha256 = "1qwmz5fxqqxcjw5jm9dvgpmbin2q69j9wdx4xv3pm8fc47wzx8w5";
|
||||
in fetchurl {
|
||||
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
|
||||
sha256 = geoipSha256;
|
||||
@ -26,8 +26,8 @@ let
|
||||
|
||||
# MIT licensed
|
||||
"geosite.dat" = let
|
||||
geositeRev = "20210106164413";
|
||||
geositeSha256 = "0chc7jb3yzgrrjkpd3s1rlim5qgf6j2kp952fvkhpwmnap86aip7";
|
||||
geositeRev = "20210308021214";
|
||||
geositeSha256 = "1fp787wlzdjn2gxx4zmqrqqzqcq4xd10pqx8q919fag0kkzdm23s";
|
||||
in fetchurl {
|
||||
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
|
||||
sha256 = geositeSha256;
|
||||
@ -68,7 +68,7 @@ let
|
||||
};
|
||||
|
||||
in runCommand "v2ray-${version}" {
|
||||
inherit version;
|
||||
inherit src version;
|
||||
inherit (core) meta;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -61,7 +61,7 @@ set +o pipefail
|
||||
vendorSha256=$(
|
||||
nix-build "$nixpkgs" -A v2ray --no-out-link 2>&1 |
|
||||
tee /dev/stderr |
|
||||
sed -nE 's/.*got:\s*sha256:(\w+)$/\1/p'
|
||||
sed -nE 's/.*got:\s*(sha256\S+)$/\1/p'
|
||||
)
|
||||
[[ "$vendorSha256" ]]
|
||||
sed --in-place \
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shfmt";
|
||||
version = "3.2.2";
|
||||
version = "3.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvdan";
|
||||
repo = "sh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZeyHidw8iHboo/LHTR9E3Sqj8euaRvDaYbPQMdecsrk=";
|
||||
sha256 = "sha256-BkvsCIcm3qnfECNhY3DIPnBRih6D7rOHOQu9oc0YDZA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1ma7nvyn6ylbi8bd7x900i94pzs877kfy9xh0nf1bbify1vcpd29";
|
||||
|
||||
@ -260,6 +260,9 @@ mapAliases ({
|
||||
goimports = gotools; # added 2018-09-16
|
||||
gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23
|
||||
google-gflags = gflags; # added 2019-07-25
|
||||
google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # added 2021-03-07
|
||||
google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07
|
||||
google-play-music-desktop-player = throw "google-play-music-desktop-player has been removed because Google Play Music was discontinued"; # added 2021-03-07
|
||||
googleAuthenticator = google-authenticator; # added 2016-10-16
|
||||
grantlee5 = libsForQt5.grantlee; # added 2015-12-19
|
||||
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
|
||||
@ -384,6 +387,7 @@ mapAliases ({
|
||||
mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23
|
||||
mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25
|
||||
mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10
|
||||
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07
|
||||
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
||||
mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
||||
mysql-client = hiPrio mariadb.client;
|
||||
@ -731,6 +735,7 @@ mapAliases ({
|
||||
trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29
|
||||
truecrypt = veracrypt; # added 2018-10-24
|
||||
tshark = wireshark-cli; # added 2018-04-25
|
||||
tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # added 2021-03-07
|
||||
uberwriter = apostrophe; # added 2020-04-23
|
||||
ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21
|
||||
ucsFonts = ucs-fonts; # added 2016-07-15
|
||||
|
||||
@ -662,8 +662,6 @@ in
|
||||
|
||||
arc_unpacker = callPackage ../tools/archivers/arc_unpacker { };
|
||||
|
||||
tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; };
|
||||
|
||||
opnplug = callPackage ../applications/audio/adlplug {
|
||||
adlplugChip = "-DADLplug_CHIP=OPN2";
|
||||
pname = "OPNplug";
|
||||
@ -1044,6 +1042,8 @@ in
|
||||
|
||||
aws-vault = callPackage ../tools/admin/aws-vault { };
|
||||
|
||||
aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { };
|
||||
|
||||
iamy = callPackage ../tools/admin/iamy { };
|
||||
|
||||
azure-cli = callPackage ../tools/admin/azure-cli { };
|
||||
@ -3036,7 +3036,6 @@ in
|
||||
};
|
||||
in lib.recurseIntoAttrs {
|
||||
alternatives = callPackage ../tools/audio/beets/plugins/alternatives.nix pluginArgs;
|
||||
check = callPackage ../tools/audio/beets/plugins/check.nix pluginArgs;
|
||||
copyartifacts = callPackage ../tools/audio/beets/plugins/copyartifacts.nix pluginArgs;
|
||||
extrafiles = callPackage ../tools/audio/beets/plugins/extrafiles.nix pluginArgs;
|
||||
};
|
||||
@ -4882,8 +4881,6 @@ in
|
||||
|
||||
google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { };
|
||||
|
||||
google-music-scripts = callPackage ../tools/audio/google-music-scripts { };
|
||||
|
||||
google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { };
|
||||
|
||||
gdown = with python3Packages; toPythonApplication gdown;
|
||||
@ -20106,6 +20103,8 @@ in
|
||||
|
||||
powerdns = callPackage ../servers/dns/powerdns { };
|
||||
|
||||
powerdns-admin = callPackage ../applications/networking/powerdns-admin { };
|
||||
|
||||
dnsdist = callPackage ../servers/dns/dnsdist { };
|
||||
|
||||
pdns-recursor = callPackage ../servers/dns/pdns-recursor { };
|
||||
@ -20971,6 +20970,8 @@ in
|
||||
|
||||
openzone-cursors = callPackage ../data/themes/openzone { };
|
||||
|
||||
oranchelo-icon-theme = callPackage ../data/icons/oranchelo-icon-theme { };
|
||||
|
||||
orbitron = callPackage ../data/fonts/orbitron { };
|
||||
|
||||
orchis = callPackage ../data/themes/orchis { };
|
||||
@ -22402,17 +22403,6 @@ in
|
||||
|
||||
inherit (ocamlPackages) google-drive-ocamlfuse;
|
||||
|
||||
google-musicmanager = callPackage ../applications/audio/google-musicmanager {
|
||||
inherit (qt514) qtbase qtwebkit;
|
||||
# Downgrade to 1.34 to get libidn.so.11
|
||||
libidn = (libidn.overrideAttrs (oldAttrs: {
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libidn/libidn-1.34.tar.gz";
|
||||
sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
|
||||
};
|
||||
})).out;
|
||||
};
|
||||
|
||||
googler = callPackage ../applications/misc/googler {
|
||||
python = python3;
|
||||
};
|
||||
@ -22865,10 +22855,6 @@ in
|
||||
|
||||
google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; };
|
||||
|
||||
google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player {
|
||||
inherit (gnome2) GConf;
|
||||
};
|
||||
|
||||
gosmore = callPackage ../applications/misc/gosmore { };
|
||||
|
||||
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
|
||||
@ -23934,7 +23920,6 @@ in
|
||||
|
||||
inherit (mopidyPackages)
|
||||
mopidy
|
||||
mopidy-gmusic
|
||||
mopidy-iris
|
||||
mopidy-local
|
||||
mopidy-moped
|
||||
|
||||
@ -2403,6 +2403,8 @@ in {
|
||||
|
||||
flask_script = callPackage ../development/python-modules/flask-script { };
|
||||
|
||||
flask-seasurf = callPackage ../development/python-modules/flask-seasurf { };
|
||||
|
||||
flask-silk = callPackage ../development/python-modules/flask-silk { };
|
||||
|
||||
flask-socketio = callPackage ../development/python-modules/flask-socketio { };
|
||||
@ -2411,6 +2413,8 @@ in {
|
||||
|
||||
flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { };
|
||||
|
||||
flask-sslify = callPackage ../development/python-modules/flask-sslify { };
|
||||
|
||||
flask-swagger = callPackage ../development/python-modules/flask-swagger { };
|
||||
|
||||
flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { };
|
||||
@ -2672,8 +2676,6 @@ in {
|
||||
|
||||
gmpy = callPackage ../development/python-modules/gmpy { };
|
||||
|
||||
gmusicapi = callPackage ../development/python-modules/gmusicapi { };
|
||||
|
||||
gntp = callPackage ../development/python-modules/gntp { };
|
||||
|
||||
gnureadline = callPackage ../development/python-modules/gnureadline { };
|
||||
@ -2797,12 +2799,6 @@ in {
|
||||
|
||||
googlemaps = callPackage ../development/python-modules/googlemaps { };
|
||||
|
||||
google-music = callPackage ../development/python-modules/google-music { };
|
||||
|
||||
google-music-proto = callPackage ../development/python-modules/google-music-proto { };
|
||||
|
||||
google-music-utils = callPackage ../development/python-modules/google-music-utils { };
|
||||
|
||||
google-pasta = callPackage ../development/python-modules/google-pasta { };
|
||||
|
||||
google-resumable-media = callPackage ../development/python-modules/google-resumable-media { };
|
||||
@ -3845,6 +3841,8 @@ in {
|
||||
|
||||
lightparam = callPackage ../development/python-modules/lightparam { };
|
||||
|
||||
lima = callPackage ../development/python-modules/lima { };
|
||||
|
||||
limitlessled = callPackage ../development/python-modules/limitlessled { };
|
||||
|
||||
limits = callPackage ../development/python-modules/limits { };
|
||||
@ -6261,6 +6259,8 @@ in {
|
||||
|
||||
pytest-check = callPackage ../development/python-modules/pytest-check { };
|
||||
|
||||
pytest-cid = callPackage ../development/python-modules/pytest-cid { };
|
||||
|
||||
pytest-click = callPackage ../development/python-modules/pytest-click { };
|
||||
|
||||
pytest-cov = self.pytestcov; # self 2021-01-04
|
||||
@ -6418,6 +6418,8 @@ in {
|
||||
|
||||
python-awair = callPackage ../development/python-modules/python-awair { };
|
||||
|
||||
python3-saml = callPackage ../development/python-modules/python3-saml { };
|
||||
|
||||
python-axolotl = callPackage ../development/python-modules/python-axolotl { };
|
||||
|
||||
python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
|
||||
@ -8663,6 +8665,10 @@ in {
|
||||
|
||||
xmlschema = callPackage ../development/python-modules/xmlschema { };
|
||||
|
||||
xmlsec = callPackage ../development/python-modules/xmlsec {
|
||||
inherit (pkgs) libxslt libxml2 libtool pkg-config xmlsec;
|
||||
};
|
||||
|
||||
xmltodict = callPackage ../development/python-modules/xmltodict { };
|
||||
|
||||
xmodem = callPackage ../development/python-modules/xmodem { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user