Conflicts: pkgs/development/python-modules/awesomeversion/default.nix pkgs/development/python-modules/md2gemini/default.nix pkgs/development/python-modules/mill-local/default.nix pkgs/development/python-modules/pyatv/default.nix pkgs/development/python-modules/pyezviz/default.nix pkgs/development/python-modules/pyinsteon/default.nix pkgs/development/python-modules/pylitterbot/default.nix pkgs/development/python-modules/pynuki/default.nix pkgs/development/python-modules/pypck/default.nix pkgs/development/python-modules/types-requests/default.nix pkgs/top-level/aliases.nixmain
Jonathan Ringer
2 years ago
commit
9a16965c75
@ -1,13 +0,0 @@ |
||||
# pantheon files daemon. |
||||
|
||||
{ config, pkgs, lib, ... }: |
||||
|
||||
with lib; |
||||
|
||||
{ |
||||
|
||||
imports = [ |
||||
(mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`") |
||||
]; |
||||
|
||||
} |
||||
@ -1,52 +0,0 @@ |
||||
{ lib |
||||
, stdenv |
||||
, mkDerivation |
||||
, fetchFromGitHub |
||||
, alsa-lib |
||||
, cmake |
||||
, glib |
||||
, pkg-config |
||||
, qtbase |
||||
, withJack ? stdenv.hostPlatform.isUnix, jack |
||||
}: |
||||
|
||||
mkDerivation rec { |
||||
pname = "munt"; |
||||
version = "2.5.3"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = pname; |
||||
repo = pname; |
||||
rev = "libmt32emu_${lib.replaceChars [ "." ] [ "_" ] version}"; |
||||
hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4="; |
||||
}; |
||||
|
||||
dontFixCmake = true; |
||||
|
||||
nativeBuildInputs = [ |
||||
cmake |
||||
pkg-config |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
glib |
||||
qtbase |
||||
] |
||||
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib |
||||
++ lib.optional withJack jack; |
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' |
||||
mkdir $out/Applications |
||||
mv $out/bin/${meta.mainProgram}.app $out/Applications/ |
||||
ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram} |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
homepage = "http://munt.sourceforge.net/"; |
||||
description = "An emulator of Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; |
||||
license = with licenses; [ lgpl21 gpl3 ]; |
||||
maintainers = with maintainers; [ OPNA2608 ]; |
||||
platforms = platforms.all; |
||||
mainProgram = "mt32emu-qt"; |
||||
}; |
||||
} |
||||
@ -0,0 +1,38 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, cmake |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "libmt32emu"; |
||||
version = "2.5.3"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "munt"; |
||||
repo = "munt"; |
||||
rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}"; |
||||
hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4="; |
||||
}; |
||||
|
||||
outputs = [ "out" "dev" ]; |
||||
|
||||
nativeBuildInputs = [ |
||||
cmake |
||||
]; |
||||
|
||||
dontFixCmake = true; |
||||
|
||||
cmakeFlags = [ |
||||
"-Dmunt_WITH_MT32EMU_SMF2WAV=OFF" |
||||
"-Dmunt_WITH_MT32EMU_QT=OFF" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "http://munt.sourceforge.net/"; |
||||
description = "A library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; |
||||
license = with licenses; [ lgpl21Plus ]; |
||||
maintainers = with maintainers; [ OPNA2608 ]; |
||||
platforms = platforms.unix; # Not tested on ReactOS yet :) |
||||
}; |
||||
} |
||||
@ -0,0 +1,75 @@ |
||||
{ lib |
||||
, stdenv |
||||
, mkDerivation |
||||
, fetchFromGitHub |
||||
, alsa-lib |
||||
, cmake |
||||
, libpulseaudio |
||||
, libmt32emu |
||||
, pkg-config |
||||
, portaudio |
||||
, qtbase |
||||
, qtmultimedia |
||||
, withJack ? stdenv.hostPlatform.isUnix, libjack2 |
||||
}: |
||||
|
||||
mkDerivation rec { |
||||
pname = "mt32emu-qt"; |
||||
version = "1.9.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "munt"; |
||||
repo = "munt"; |
||||
rev = "mt32emu_qt_${lib.replaceChars [ "." ] [ "_" ] version}"; |
||||
hash = "sha256-9vapBKpl1NC3mIDetuCb452IHV6c7c7NCzSyiBry5oo="; |
||||
}; |
||||
|
||||
postPatch = '' |
||||
sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt |
||||
''; |
||||
|
||||
nativeBuildInputs = [ |
||||
cmake |
||||
pkg-config |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
libmt32emu |
||||
portaudio |
||||
qtbase |
||||
qtmultimedia |
||||
] |
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ |
||||
alsa-lib |
||||
libpulseaudio |
||||
] |
||||
++ lib.optional withJack libjack2; |
||||
|
||||
dontFixCmake = true; |
||||
|
||||
cmakeFlags = [ |
||||
"-Dmt32emu-qt_USE_PULSEAUDIO_DYNAMIC_LOADING=OFF" |
||||
"-Dmunt_WITH_MT32EMU_QT=ON" |
||||
"-Dmunt_WITH_MT32EMU_SMF2WAV=OFF" |
||||
]; |
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' |
||||
mkdir $out/Applications |
||||
mv $out/bin/${meta.mainProgram}.app $out/Applications/ |
||||
ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram} |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
homepage = "http://munt.sourceforge.net/"; |
||||
description = "A synthesizer application built on Qt and libmt32emu"; |
||||
longDescription = '' |
||||
mt32emu-qt is a synthesiser application that facilitates both realtime |
||||
synthesis and conversion of pre-recorded SMF files to WAVE making use of |
||||
the mt32emu library and the Qt framework. |
||||
''; |
||||
license = with licenses; [ gpl3Plus ]; |
||||
maintainers = with maintainers; [ OPNA2608 ]; |
||||
platforms = platforms.all; |
||||
mainProgram = "mt32emu-qt"; |
||||
}; |
||||
} |
||||
@ -0,0 +1,50 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, cmake |
||||
, glib |
||||
, libmt32emu |
||||
, pkg-config |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "mt32emu-smf2wav"; |
||||
version = "1.7.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "munt"; |
||||
repo = "munt"; |
||||
rev = "mt32emu_smf2wav_${lib.replaceChars [ "." ] [ "_" ] version}"; |
||||
hash = "sha256-FnKlKJxe7P4Yqpv0oVGgV4253dMgSmgtb7EAa2FI+aI="; |
||||
}; |
||||
|
||||
postPatch = '' |
||||
sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt |
||||
''; |
||||
|
||||
dontFixCmake = true; |
||||
|
||||
nativeBuildInputs = [ |
||||
cmake |
||||
pkg-config |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
libmt32emu |
||||
glib |
||||
]; |
||||
|
||||
cmakeFlags = [ |
||||
"-Dmunt_WITH_MT32EMU_QT=OFF" |
||||
"-Dmunt_WITH_MT32EMU_SMF2WAV=ON" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "http://munt.sourceforge.net/"; |
||||
description = "Produces a WAVE file from a Standard MIDI file (SMF)"; |
||||
license = with licenses; [ gpl3Plus ]; |
||||
maintainers = with maintainers; [ OPNA2608 ]; |
||||
platforms = platforms.all; |
||||
mainProgram = "mt32emu-smf2wav"; |
||||
}; |
||||
} |
||||
@ -1,6 +1,6 @@ |
||||
{ |
||||
"version": "1.9.9", |
||||
"desktopSrcHash": "IMqco5HeAgsh1LMBXFH1/HnlIEFEQU0xqnHbTKwHGL4=", |
||||
"desktopYarnHash": "0zzr14fcyc5q2562x50nvxxda10yr5ihbr12nykzg4j534rgb55y", |
||||
"webHash": "1i3zka9cfn14rv5wzz969w6dz5dbkw87clrgajs8p1s2l62ac1jf" |
||||
"version": "1.10.1", |
||||
"desktopSrcHash": "cA+yXVkfizVRbbykFRhNIbdaGLuEk2IuKFO8YJt78Q4=", |
||||
"desktopYarnHash": "0kz6vkfxxk4sbr9zpaig1lhsbwj4f57v4f4pr373xxsnk1wagkfn", |
||||
"webHash": "1g5hw39fr7adazmafpxivfxv28nzcv99r8sihga1j91avf6lxkim" |
||||
} |
||||
|
||||
@ -0,0 +1,24 @@ |
||||
{ lib, fetchFromGitHub, ocamlPackages }: |
||||
|
||||
ocamlPackages.buildDunePackage rec { |
||||
pname = "anders"; |
||||
version = "1.1.1"; |
||||
|
||||
useDune2 = true; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "groupoid"; |
||||
repo = "anders"; |
||||
rev = "${version}"; |
||||
sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4="; |
||||
}; |
||||
|
||||
buildInputs = with ocamlPackages; [ zarith menhir ]; |
||||
|
||||
meta = with lib; { |
||||
description = "Modal Homotopy Type System"; |
||||
homepage = "https://homotopy.dev/"; |
||||
license = licenses.isc; |
||||
maintainers = [ maintainers.suhr ]; |
||||
}; |
||||
} |
||||
@ -1,39 +0,0 @@ |
||||
diff --git a/src/doc/en/prep/Advanced-2DPlotting.rst b/src/doc/en/prep/Advanced-2DPlotting.rst
|
||||
index 337457afef..f7c76f4b56 100644
|
||||
--- a/src/doc/en/prep/Advanced-2DPlotting.rst
|
||||
+++ b/src/doc/en/prep/Advanced-2DPlotting.rst
|
||||
@@ -695,6 +695,8 @@ by the cells.
|
||||
|
||||
sage: pdf_savename = name+'.pdf'
|
||||
sage: p.save(pdf_savename)
|
||||
+ ...
|
||||
+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code.
|
||||
|
||||
Notably, we can export in formats ready for inclusion in web pages.
|
||||
|
||||
diff --git a/src/sage/plot/disk.py b/src/sage/plot/disk.py
|
||||
index 8680a1c9b1..e83763b678 100644
|
||||
--- a/src/sage/plot/disk.py
|
||||
+++ b/src/sage/plot/disk.py
|
||||
@@ -156,6 +156,8 @@ class Disk(GraphicPrimitive):
|
||||
sage: f = tmp_filename(ext='.pdf')
|
||||
sage: p = disk((0,0), 5, (0, pi/4), alpha=0.5)
|
||||
sage: p.save(f)
|
||||
+ ...
|
||||
+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code.
|
||||
|
||||
"""
|
||||
import matplotlib.patches as patches
|
||||
diff --git a/src/sage/plot/text.py b/src/sage/plot/text.py
|
||||
index 04cbdedf76..a970f97b79 100644
|
||||
--- a/src/sage/plot/text.py
|
||||
+++ b/src/sage/plot/text.py
|
||||
@@ -325,6 +325,8 @@ def text(string, xy, **options):
|
||||
You can save text as part of PDF output::
|
||||
|
||||
sage: text("sage", (0,0), rgbcolor=(0,0,0)).save(os.path.join(SAGE_TMP, 'a.pdf'))
|
||||
+ ...
|
||||
+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code.
|
||||
|
||||
Some examples of bounding box::
|
||||
|
||||
@ -1,104 +0,0 @@ |
||||
{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages |
||||
, which, readline, zlib, icu, cargo, rustc, llvmPackages }: |
||||
|
||||
with lib; |
||||
|
||||
let |
||||
python3Env = buildPackages.python3.withPackages (p: [p.six]); |
||||
in stdenv.mkDerivation rec { |
||||
pname = "spidermonkey"; |
||||
version = "68.12.0"; |
||||
|
||||
src = fetchurl { |
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; |
||||
sha256 = "1k17pi4zh9hrvkzbw4rzzw879a15hpvwriylp75wl22rl7r2nsdf"; |
||||
}; |
||||
|
||||
patches = [ |
||||
# Backport a change from Firefox 75 that fixes finding the |
||||
# location of clang and libclang. |
||||
(fetchpatch { |
||||
url = "https://hg.mozilla.org/mozilla-central/raw-rev/ccd1356fc8f1d0bfa9d896e88d3cc924425623da"; |
||||
sha256 = "005g3mfmal9nw32khrgyiv3221z7pazfhhm2qvgc8d48i2yzj3j0"; |
||||
}) |
||||
]; |
||||
|
||||
outputs = [ "out" "dev" ]; |
||||
setOutputFlags = false; # Configure script only understands --includedir |
||||
|
||||
nativeBuildInputs = [ |
||||
autoconf213 |
||||
pkg-config |
||||
perl |
||||
which |
||||
python2 |
||||
zip |
||||
cargo |
||||
rustc |
||||
llvmPackages.llvm |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
readline |
||||
zlib |
||||
icu |
||||
]; |
||||
|
||||
preConfigure = '' |
||||
export CXXFLAGS="-fpermissive" |
||||
export LIBXUL_DIST=$out |
||||
export PYTHON3="${python3Env.interpreter}" |
||||
|
||||
# We can't build in js/src/, so create a build dir |
||||
mkdir obj |
||||
cd obj/ |
||||
configureScript=../js/src/configure |
||||
''; |
||||
|
||||
configureFlags = [ |
||||
# Reccommended by gjs upstream |
||||
"--disable-jemalloc" |
||||
"--enable-unaligned-private-values" |
||||
"--with-intl-api" |
||||
"--enable-posix-nspr-emulation" |
||||
"--with-system-zlib" |
||||
"--with-system-icu" |
||||
|
||||
"--enable-shared-js" |
||||
"--enable-readline" |
||||
# Fedora and Arch disable optimize, but it doesn't seme to be necessary |
||||
# It turns on -O3 which some gcc version had a problem with: |
||||
# https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e |
||||
"--enable-optimize" |
||||
"--enable-release" |
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ |
||||
# Spidermonkey seems to use different host/build terminology for cross |
||||
# compilation here. |
||||
"--host=${stdenv.buildPlatform.config}" |
||||
"--target=${stdenv.hostPlatform.config}" |
||||
]; |
||||
|
||||
# mkDerivation by default appends --build/--host to configureFlags when cross compiling |
||||
# These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list |
||||
configurePlatforms = []; |
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ]; |
||||
|
||||
# Remove unnecessary static lib |
||||
preFixup = '' |
||||
moveToOutput bin/js60-config "$dev" |
||||
rm $out/lib/libjs_static.ajs |
||||
ln -s $out/bin/js60 $out/bin/js |
||||
''; |
||||
|
||||
enableParallelBuilding = true; |
||||
|
||||
meta = with lib; { |
||||
description = "Mozilla's JavaScript engine written in C/C++"; |
||||
homepage = "https://developer.mozilla.org/en/SpiderMonkey"; |
||||
license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. |
||||
maintainers = [ maintainers.abbradar ]; |
||||
badPlatforms = [ "riscv32-linux" "riscv64-linux" ]; |
||||
platforms = platforms.linux; |
||||
}; |
||||
} |
||||
@ -1,37 +1,31 @@ |
||||
{ lib, stdenv, fetchFromGitHub }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "jitterentropy"; |
||||
version = "2.2.0"; |
||||
version = "3.3.1"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "smuellerDD"; |
||||
repo = "jitterentropy-library"; |
||||
rev = "v${version}"; |
||||
sha256 = "0n2l1fxr7bynnarpwdjifb2fvlsq8w5wmfh31yk5nrc756cjlgyw"; |
||||
hash = "sha256-go7eGwBoZ58LkgKL7t8oZSc1cFlE6fPOT/ML3Aa8+CM="; |
||||
}; |
||||
patches = [ |
||||
# Can be removed when upgrading beyond 2.2.0 |
||||
./reproducible-manpages.patch |
||||
]; |
||||
|
||||
enableParallelBuilding = true; |
||||
outputs = [ "out" "dev" ]; |
||||
|
||||
preInstall = '' |
||||
mkdir -p $out/include |
||||
substituteInPlace Makefile \ |
||||
--replace "install -m 0755 -s" \ |
||||
'install -m 0755 -s --strip-program $(STRIP)' |
||||
''; |
||||
enableParallelBuilding = true; |
||||
hardeningDisable = [ "fortify" ]; # avoid warnings |
||||
|
||||
installFlags = [ |
||||
"PREFIX=$(out)" |
||||
"PREFIX=${placeholder "out"}" |
||||
]; |
||||
|
||||
meta = { |
||||
meta = with lib; { |
||||
description = "Provides a noise source using the CPU execution timing jitter"; |
||||
homepage = "https://github.com/smuellerDD/jitterentropy-library"; |
||||
license = with lib.licenses; [ gpl2 bsd3 ]; |
||||
platforms = lib.platforms.linux; |
||||
maintainers = with lib.maintainers; [ johnazoidberg ]; |
||||
changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; |
||||
license = with licenses; [ bsd3 /* OR */ gpl2Only ]; |
||||
platforms = platforms.linux; |
||||
maintainers = with maintainers; [ johnazoidberg c0bw3b ]; |
||||
}; |
||||
} |
||||
|
||||
@ -1,13 +0,0 @@ |
||||
diff --git a/Makefile b/Makefile
|
||||
index 4ff069b..3b8714a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -58,7 +58,7 @@ cppcheck:
|
||||
install:
|
||||
install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
|
||||
install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
|
||||
- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
|
||||
+ gzip -n -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
|
||||
install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
|
||||
install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
|
||||
install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)
|
||||
@ -1,49 +0,0 @@ |
||||
{ lib, stdenv, fetchurl, libxml2, pkg-config, perl |
||||
, compressionSupport ? true, zlib ? null |
||||
, sslSupport ? true, openssl ? null |
||||
, static ? false |
||||
, shared ? true |
||||
}: |
||||
|
||||
assert compressionSupport -> zlib != null; |
||||
assert sslSupport -> openssl != null; |
||||
assert static || shared; |
||||
|
||||
let |
||||
inherit (lib) optionals; |
||||
in |
||||
|
||||
stdenv.mkDerivation rec { |
||||
version = "0.29.6"; |
||||
pname = "neon"; |
||||
|
||||
src = fetchurl { |
||||
url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; |
||||
sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; |
||||
}; |
||||
|
||||
patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; |
||||
|
||||
nativeBuildInputs = [ pkg-config ]; |
||||
buildInputs = [libxml2 openssl] |
||||
++ lib.optional compressionSupport zlib; |
||||
|
||||
configureFlags = [ |
||||
(lib.enableFeature shared "shared") |
||||
(lib.enableFeature static "static") |
||||
(lib.withFeature compressionSupport "zlib") |
||||
(lib.withFeature sslSupport "ssl") |
||||
]; |
||||
|
||||
passthru = {inherit compressionSupport sslSupport;}; |
||||
|
||||
checkInputs = [ perl ]; |
||||
doCheck = false; # fails, needs the net |
||||
|
||||
meta = with lib; { |
||||
description = "An HTTP and WebDAV client library"; |
||||
homepage = "http://www.webdav.org/neon/"; |
||||
platforms = platforms.unix; |
||||
license = licenses.lgpl2; |
||||
}; |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue