Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
9e062723b2
|
|
@ -153,7 +153,7 @@ The dot product of [1 2] and [3 4] is: 11
|
||||||
But if we maintain the script ourselves, and if there are more dependencies, it
|
But if we maintain the script ourselves, and if there are more dependencies, it
|
||||||
may be nice to encode those dependencies in source to make the script re-usable
|
may be nice to encode those dependencies in source to make the script re-usable
|
||||||
without that bit of knowledge. That can be done by using `nix-shell` as a
|
without that bit of knowledge. That can be done by using `nix-shell` as a
|
||||||
[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix), like so:
|
[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)), like so:
|
||||||
|
|
||||||
```python
|
```python
|
||||||
#!/usr/bin/env nix-shell
|
#!/usr/bin/env nix-shell
|
||||||
|
|
|
||||||
|
|
@ -4143,6 +4143,12 @@
|
||||||
githubId = 60272884;
|
githubId = 60272884;
|
||||||
name = "Jonathan Jeppener-Haltenhoff";
|
name = "Jonathan Jeppener-Haltenhoff";
|
||||||
};
|
};
|
||||||
|
joelancaster = {
|
||||||
|
email = "joe.a.lancas@gmail.com";
|
||||||
|
github = "joelancaster";
|
||||||
|
githubId = 16760945;
|
||||||
|
name = "Joe Lancaster";
|
||||||
|
};
|
||||||
joelburget = {
|
joelburget = {
|
||||||
email = "joelburget@gmail.com";
|
email = "joelburget@gmail.com";
|
||||||
github = "joelburget";
|
github = "joelburget";
|
||||||
|
|
|
||||||
|
|
@ -232,6 +232,16 @@ in
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf}";
|
ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf}";
|
||||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||||
|
|
||||||
|
ProtectSystem = "strict";
|
||||||
|
ProtectHome = true;
|
||||||
|
PrivateDevices = true;
|
||||||
|
PrivateTmp = true;
|
||||||
|
ReadWritePaths = "${cfg.dataDir}";
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectKernelTunables = true;
|
||||||
|
NoNewPrivileges = true;
|
||||||
};
|
};
|
||||||
preStart = ''
|
preStart = ''
|
||||||
rm -f ${cfg.dataDir}/passwd
|
rm -f ${cfg.dataDir}/passwd
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,12 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "jamulus";
|
pname = "jamulus";
|
||||||
version = "3.6.0";
|
version = "3.6.1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "corrados";
|
owner = "corrados";
|
||||||
repo = "jamulus";
|
repo = "jamulus";
|
||||||
rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
|
rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||||
sha256 = "06x9b2kjsgk8kddhif0x59nwzhnwjmq40x3w5nrphqaimqlrhlcf";
|
sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config qmake ];
|
nativeBuildInputs = [ pkg-config qmake ];
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ let
|
||||||
It allows you to quickly migrate and refactor relational databases,
|
It allows you to quickly migrate and refactor relational databases,
|
||||||
construct efficient, statically checked SQL queries and much more.
|
construct efficient, statically checked SQL queries and much more.
|
||||||
'';
|
'';
|
||||||
maintainers = with maintainers; [ loskutov ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
@ -268,12 +268,12 @@ in
|
||||||
|
|
||||||
clion = buildClion rec {
|
clion = buildClion rec {
|
||||||
name = "clion-${version}";
|
name = "clion-${version}";
|
||||||
version = "2020.2.4"; /* updated by script */
|
version = "2020.2.5"; /* updated by script */
|
||||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||||
sha256 = "0xkra8l3ga8qsmzbvfisn99lxm5wxa8c4d4jzljjwn8855bs20a3"; /* updated by script */
|
sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-clion";
|
wmClass = "jetbrains-clion";
|
||||||
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||||
|
|
@ -281,12 +281,12 @@ in
|
||||||
|
|
||||||
datagrip = buildDataGrip rec {
|
datagrip = buildDataGrip rec {
|
||||||
name = "datagrip-${version}";
|
name = "datagrip-${version}";
|
||||||
version = "2020.2.3"; /* updated by script */
|
version = "2020.3"; /* updated by script */
|
||||||
description = "Your Swiss Army Knife for Databases and SQL";
|
description = "Your Swiss Army Knife for Databases and SQL";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
|
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
|
||||||
sha256 = "0iv1zmdpbqk8f4cjd6dhgj9mrvxli4dg83jzkhv566sy8wrrx7kb"; /* updated by script */
|
sha256 = "1j0mlsiqh80mspi2x9mi0h5hxhg5gw6395hyl9w33q8dxm95mx2d"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-datagrip";
|
wmClass = "jetbrains-datagrip";
|
||||||
update-channel = "DataGrip RELEASE";
|
update-channel = "DataGrip RELEASE";
|
||||||
|
|
@ -307,12 +307,12 @@ in
|
||||||
|
|
||||||
idea-community = buildIdea rec {
|
idea-community = buildIdea rec {
|
||||||
name = "idea-community-${version}";
|
name = "idea-community-${version}";
|
||||||
version = "2020.2.3"; /* updated by script */
|
version = "2020.2.4"; /* updated by script */
|
||||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||||
license = stdenv.lib.licenses.asl20;
|
license = stdenv.lib.licenses.asl20;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||||
sha256 = "092swkz7l1p3asrna6fxj6j324sh7pdbgzrlapdwka8kq9y40ajz"; /* updated by script */
|
sha256 = "1rlw01aq6ci46xv4d4877k30309jjws29kwhriy98xf804msyzyb"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-idea-ce";
|
wmClass = "jetbrains-idea-ce";
|
||||||
update-channel = "IntelliJ IDEA RELEASE";
|
update-channel = "IntelliJ IDEA RELEASE";
|
||||||
|
|
@ -320,12 +320,12 @@ in
|
||||||
|
|
||||||
idea-ultimate = buildIdea rec {
|
idea-ultimate = buildIdea rec {
|
||||||
name = "idea-ultimate-${version}";
|
name = "idea-ultimate-${version}";
|
||||||
version = "2020.2.3"; /* updated by script */
|
version = "2020.2.4"; /* updated by script */
|
||||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
|
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
|
||||||
sha256 = "1416ikna169d2hx77yd0bb8hpxkpnf27jgyq5yrgla1w6h1fp1p0"; /* updated by script */
|
sha256 = "05qr8jiasqxmkgi9v52g7hgpdf7pkkjcp42bbkh1f4zgvq81p5py"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-idea";
|
wmClass = "jetbrains-idea";
|
||||||
update-channel = "IntelliJ IDEA RELEASE";
|
update-channel = "IntelliJ IDEA RELEASE";
|
||||||
|
|
@ -346,12 +346,12 @@ in
|
||||||
|
|
||||||
phpstorm = buildPhpStorm rec {
|
phpstorm = buildPhpStorm rec {
|
||||||
name = "phpstorm-${version}";
|
name = "phpstorm-${version}";
|
||||||
version = "2020.2.3"; /* updated by script */
|
version = "2020.2.4"; /* updated by script */
|
||||||
description = "Professional IDE for Web and PHP developers";
|
description = "Professional IDE for Web and PHP developers";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||||
sha256 = "0bdxmxml6337cdpb2amhdqlvxicng50cgzlnmiw0wqnmwj5ihpih"; /* updated by script */
|
sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-phpstorm";
|
wmClass = "jetbrains-phpstorm";
|
||||||
update-channel = "PhpStorm RELEASE";
|
update-channel = "PhpStorm RELEASE";
|
||||||
|
|
@ -359,12 +359,12 @@ in
|
||||||
|
|
||||||
pycharm-community = buildPycharm rec {
|
pycharm-community = buildPycharm rec {
|
||||||
name = "pycharm-community-${version}";
|
name = "pycharm-community-${version}";
|
||||||
version = "2020.2.3"; /* updated by script */
|
version = "2020.2.4"; /* updated by script */
|
||||||
description = "PyCharm Community Edition";
|
description = "PyCharm Community Edition";
|
||||||
license = stdenv.lib.licenses.asl20;
|
license = stdenv.lib.licenses.asl20;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||||
sha256 = "0wqhcag32fxqxg6aml2a3d0rpds0d48rgbcl7cp0ah8xj6x72047"; /* updated by script */
|
sha256 = "196hhb4n52a50w50awx01ksyl5dkrbdmnz8sb9di5ihni7043p97"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-pycharm-ce";
|
wmClass = "jetbrains-pycharm-ce";
|
||||||
update-channel = "PyCharm RELEASE";
|
update-channel = "PyCharm RELEASE";
|
||||||
|
|
@ -372,12 +372,12 @@ in
|
||||||
|
|
||||||
pycharm-professional = buildPycharm rec {
|
pycharm-professional = buildPycharm rec {
|
||||||
name = "pycharm-professional-${version}";
|
name = "pycharm-professional-${version}";
|
||||||
version = "2020.2.3"; /* updated by script */
|
version = "2020.2.4"; /* updated by script */
|
||||||
description = "PyCharm Professional Edition";
|
description = "PyCharm Professional Edition";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||||
sha256 = "0g7bki4bzi3a1w3rlwik2w0ma10xb4g450qxm4fr4fp8dy2xaysc"; /* updated by script */
|
sha256 = "0dwd9gvi8n3igza95pil3mf7azxn131830rvfzdvnvrzj9yb2q8l"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-pycharm";
|
wmClass = "jetbrains-pycharm";
|
||||||
update-channel = "PyCharm RELEASE";
|
update-channel = "PyCharm RELEASE";
|
||||||
|
|
@ -398,12 +398,12 @@ in
|
||||||
|
|
||||||
ruby-mine = buildRubyMine rec {
|
ruby-mine = buildRubyMine rec {
|
||||||
name = "ruby-mine-${version}";
|
name = "ruby-mine-${version}";
|
||||||
version = "2020.2.3"; /* updated by script */
|
version = "2020.2.4"; /* updated by script */
|
||||||
description = "The Most Intelligent Ruby and Rails IDE";
|
description = "The Most Intelligent Ruby and Rails IDE";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
|
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
|
||||||
sha256 = "03f1z7xhz90j9l8xp3il115yvb15kda0i6ba5ndhby7nf52vnphk"; /* updated by script */
|
sha256 = "0bpkl8phc16yjm7qjfbg42rm7sbfwbrjva7w0qiwiw9ibwvs90id"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-rubymine";
|
wmClass = "jetbrains-rubymine";
|
||||||
update-channel = "RubyMine RELEASE";
|
update-channel = "RubyMine RELEASE";
|
||||||
|
|
@ -411,12 +411,12 @@ in
|
||||||
|
|
||||||
webstorm = buildWebStorm rec {
|
webstorm = buildWebStorm rec {
|
||||||
name = "webstorm-${version}";
|
name = "webstorm-${version}";
|
||||||
version = "2020.2.3"; /* updated by script */
|
version = "2020.2.4"; /* updated by script */
|
||||||
description = "Professional IDE for Web and JavaScript development";
|
description = "Professional IDE for Web and JavaScript development";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||||
sha256 = "1c60k38ai63s4779fs55vaiswfc6bi7ki6p96hrmmkrnpzgsipg5"; /* updated by script */
|
sha256 = "0l97nk9psb8g0sxm148fcz0x2v9mwqblffigrz2rmac3gd275s7f"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-webstorm";
|
wmClass = "jetbrains-webstorm";
|
||||||
update-channel = "WebStorm RELEASE";
|
update-channel = "WebStorm RELEASE";
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,26 @@
|
||||||
diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
|
diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
|
||||||
--- a/build_files/cmake/platform/platform_apple.cmake
|
--- a/build_files/cmake/platform/platform_apple.cmake
|
||||||
+++ b/build_files/cmake/platform/platform_apple.cmake
|
+++ b/build_files/cmake/platform/platform_apple.cmake
|
||||||
@@ -35,7 +35,6 @@ else()
|
@@ -80,7 +80,6 @@ else()
|
||||||
message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
|
message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
|
||||||
endif()
|
endif()
|
||||||
if(NOT EXISTS "${LIBDIR}/")
|
if(NOT EXISTS "${LIBDIR}/")
|
||||||
- message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
|
- message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_OPENAL)
|
# -------------------------------------------------------------------------
|
||||||
@@ -86,7 +85,7 @@ endif()
|
@@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE)
|
||||||
if(WITH_CODEC_SNDFILE)
|
find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
|
||||||
set(LIBSNDFILE ${LIBDIR}/sndfile)
|
find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
|
||||||
set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
|
list(APPEND LIBSNDFILE_LIBRARIES
|
||||||
- set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
|
- ${_sndfile_FLAC_LIBRARY}
|
||||||
+ set(LIBSNDFILE_LIBRARIES sndfile)
|
- ${_sndfile_OGG_LIBRARY}
|
||||||
set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate
|
- ${_sndfile_VORBIS_LIBRARY}
|
||||||
endif()
|
- ${_sndfile_VORBISENC_LIBRARY}
|
||||||
|
)
|
||||||
|
|
||||||
@@ -97,7 +96,7 @@ if(WITH_PYTHON)
|
print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
|
||||||
|
@@ -132,7 +127,7 @@ if(WITH_PYTHON)
|
||||||
# normally cached but not since we include them with blender
|
# normally cached but not since we include them with blender
|
||||||
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
|
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
|
||||||
set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
|
set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
|
||||||
|
|
@ -27,40 +29,18 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
|
||||||
set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
|
set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
|
||||||
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
|
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
|
||||||
else()
|
else()
|
||||||
@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG)
|
@@ -173,9 +168,7 @@ endif()
|
||||||
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
|
if(WITH_CODEC_FFMPEG)
|
||||||
set(FFMPEG_LIBRARIES
|
set(FFMPEG_FIND_COMPONENTS
|
||||||
avcodec avdevice avformat avutil
|
avcodec avdevice avformat avutil
|
||||||
- mp3lame swscale x264 xvidcore
|
- mp3lame ogg opus swresample swscale
|
||||||
- theora theoradec theoraenc
|
- theora theoradec theoraenc vorbis vorbisenc
|
||||||
- vorbis vorbisenc vorbisfile ogg opus
|
- vorbisfile vpx x264 xvidcore)
|
||||||
- vpx swresample)
|
+ swresample swscale)
|
||||||
+ swscale swresample)
|
find_package(FFmpeg)
|
||||||
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA)
|
@@ -266,7 +259,6 @@ if(WITH_BOOST)
|
||||||
set(OPENCOLLADA ${LIBDIR}/opencollada)
|
|
||||||
|
|
||||||
set(OPENCOLLADA_INCLUDE_DIRS
|
|
||||||
- ${LIBDIR}/opencollada/include/COLLADAStreamWriter
|
|
||||||
- ${LIBDIR}/opencollada/include/COLLADABaseUtils
|
|
||||||
- ${LIBDIR}/opencollada/include/COLLADAFramework
|
|
||||||
- ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
|
|
||||||
- ${LIBDIR}/opencollada/include/GeneratedSaxParser
|
|
||||||
+ ${LIBDIR}/opencollada/include/opencollada/COLLADAStreamWriter
|
|
||||||
+ ${LIBDIR}/opencollada/include/opencollada/COLLADABaseUtils
|
|
||||||
+ ${LIBDIR}/opencollada/include/opencollada/COLLADAFramework
|
|
||||||
+ ${LIBDIR}/opencollada/include/opencollada/COLLADASaxFrameworkLoader
|
|
||||||
+ ${LIBDIR}/opencollada/include/opencollada/GeneratedSaxParser
|
|
||||||
)
|
|
||||||
|
|
||||||
- set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
|
|
||||||
+ set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
|
|
||||||
set(OPENCOLLADA_LIBRARIES
|
|
||||||
OpenCOLLADASaxFrameworkLoader
|
|
||||||
-lOpenCOLLADAFramework
|
|
||||||
@@ -277,14 +273,13 @@ if(WITH_BOOST)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
|
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
|
||||||
|
|
@ -68,25 +48,8 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_OPENIMAGEIO)
|
if(WITH_OPENIMAGEIO)
|
||||||
set(OPENIMAGEIO ${LIBDIR}/openimageio)
|
@@ -439,7 +431,7 @@ else()
|
||||||
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
|
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
|
||||||
set(OPENIMAGEIO_LIBRARIES
|
|
||||||
- ${OPENIMAGEIO}/lib/libOpenImageIO.a
|
|
||||||
+ ${OPENIMAGEIO}/lib/libOpenImageIO.dylib
|
|
||||||
${PNG_LIBRARIES}
|
|
||||||
${JPEG_LIBRARIES}
|
|
||||||
${TIFF_LIBRARY}
|
|
||||||
@@ -307,7 +302,7 @@ endif()
|
|
||||||
if(WITH_OPENCOLORIO)
|
|
||||||
set(OPENCOLORIO ${LIBDIR}/opencolorio)
|
|
||||||
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
|
|
||||||
- set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
|
|
||||||
+ set(OPENCOLORIO_LIBRARIES OpenColorIO)
|
|
||||||
set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
@@ -443,7 +438,7 @@ else()
|
|
||||||
set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
-if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
|
-if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew
|
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
|
||||||
, ilmbase, libXi, libX11, libXext, libXrender
|
, ilmbase, libXi, libX11, libXext, libXrender
|
||||||
, libjpeg, libpng, libsamplerate, libsndfile
|
, libjpeg, libpng, libsamplerate, libsndfile
|
||||||
, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages
|
, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
, cudaSupport ? config.cudaSupport or false, cudatoolkit
|
, cudaSupport ? config.cudaSupport or false, cudatoolkit
|
||||||
, colladaSupport ? true, opencollada
|
, colladaSupport ? true, opencollada
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
|
, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
|
||||||
, embree, gmp
|
, embree, gmp
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
|
nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ boost ffmpeg_3 gettext glew ilmbase
|
[ boost ffmpeg gettext glew ilmbase
|
||||||
freetype libjpeg libpng libsamplerate libsndfile libtiff
|
freetype libjpeg libpng libsamplerate libsndfile libtiff
|
||||||
opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
|
opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
|
||||||
alembic
|
alembic
|
||||||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||||
openvdb
|
openvdb
|
||||||
]
|
]
|
||||||
else [
|
else [
|
||||||
pugixml SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
|
pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
|
||||||
])
|
])
|
||||||
++ optional jackaudioSupport libjack2
|
++ optional jackaudioSupport libjack2
|
||||||
++ optional cudaSupport cudatoolkit
|
++ optional cudaSupport cudatoolkit
|
||||||
|
|
@ -61,7 +61,9 @@ stdenv.mkDerivation rec {
|
||||||
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
: > build_files/cmake/platform/platform_apple_xcode.cmake
|
||||||
substituteInPlace source/creator/CMakeLists.txt \
|
substituteInPlace source/creator/CMakeLists.txt \
|
||||||
--replace '${"$"}{LIBDIR}/python' \
|
--replace '${"$"}{LIBDIR}/python' \
|
||||||
'${python}'
|
'${python}' \
|
||||||
|
--replace '${"$"}{LIBDIR}/openmp' \
|
||||||
|
'${llvmPackages.openmp}'
|
||||||
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
|
substituteInPlace build_files/cmake/platform/platform_apple.cmake \
|
||||||
--replace 'set(PYTHON_VERSION 3.7)' \
|
--replace 'set(PYTHON_VERSION 3.7)' \
|
||||||
'set(PYTHON_VERSION ${python.pythonVersion})' \
|
'set(PYTHON_VERSION ${python.pythonVersion})' \
|
||||||
|
|
@ -72,15 +74,7 @@ stdenv.mkDerivation rec {
|
||||||
--replace '${"$"}{LIBDIR}/opencollada' \
|
--replace '${"$"}{LIBDIR}/opencollada' \
|
||||||
'${opencollada}' \
|
'${opencollada}' \
|
||||||
--replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \
|
--replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \
|
||||||
'${python3Packages.numpy}/${python.sitePackages}/numpy' \
|
'${python3Packages.numpy}/${python.sitePackages}/numpy'
|
||||||
--replace 'set(OPENJPEG_INCLUDE_DIRS ' \
|
|
||||||
'set(OPENJPEG_INCLUDE_DIRS "'$(echo ${openjpeg.dev}/include/openjpeg-*)'") #' \
|
|
||||||
--replace 'set(OPENJPEG_LIBRARIES ' \
|
|
||||||
'set(OPENJPEG_LIBRARIES "${openjpeg}/lib/libopenjp2.dylib") #' \
|
|
||||||
--replace 'set(OPENIMAGEIO ' \
|
|
||||||
'set(OPENIMAGEIO "${openimageio2.out}") #' \
|
|
||||||
--replace 'set(OPENEXR_INCLUDE_DIRS ' \
|
|
||||||
'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #'
|
|
||||||
'' else ''
|
'' else ''
|
||||||
substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
|
substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
|
||||||
'');
|
'');
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ fetchFromGitHub, fetchpatch, stdenv
|
{ fetchFromGitHub, fetchpatch, stdenv
|
||||||
, autoreconfHook, intltool, pkgconfig
|
, autoreconfHook, intltool, pkgconfig
|
||||||
, gtk3, xdotool, which, wrapGAppsHook }:
|
, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "clipit";
|
pname = "clipit";
|
||||||
|
|
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ];
|
nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ];
|
||||||
configureFlags = [ "--with-gtk3" ];
|
configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ];
|
||||||
buildInputs = [ gtk3 ];
|
buildInputs = [ gtk3 libayatana-appindicator ];
|
||||||
|
|
||||||
gappsWrapperArgs = [
|
gappsWrapperArgs = [
|
||||||
"--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}"
|
"--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, fetchurl, openssl }:
|
{ stdenv, fetchurl, openssl }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "6.4.13";
|
version = "6.4.14";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "fetchmail";
|
pname = "fetchmail";
|
||||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
||||||
sha256 = "1qablzgwx3a516vdhckx3pv716x9r7nyfyr6fbncif861c3cya3x";
|
sha256 = "1jxxb3qyrh7118fwqa3bhirjh97j2w8r71s8vcb6vp3w1wwhfis2";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl ];
|
buildInputs = [ openssl ];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which
|
{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
|
||||||
, gitSupport ? false, git ? null
|
, gitSupport ? false, git ? null
|
||||||
, docutilsSupport ? false, python ? null, docutils ? null
|
, docutilsSupport ? false, python ? null, docutils ? null
|
||||||
, monotoneSupport ? false, monotone ? null
|
, monotoneSupport ? false, monotone ? null
|
||||||
|
|
@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null);
|
||||||
|
|
||||||
let
|
let
|
||||||
name = "ikiwiki";
|
name = "ikiwiki";
|
||||||
version = "3.20190228";
|
version = "3.20200202.3";
|
||||||
|
|
||||||
lib = stdenv.lib;
|
lib = stdenv.lib;
|
||||||
in
|
in
|
||||||
|
|
@ -28,10 +28,10 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
|
url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
|
||||||
sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh";
|
sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ which ]
|
buildInputs = [ which highlight ]
|
||||||
++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
|
||||||
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
|
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
|
||||||
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
|
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
|
||||||
|
|
@ -62,13 +62,14 @@ stdenv.mkDerivation {
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
for a in "$out/bin/"*; do
|
for a in "$out/bin/"*; do
|
||||||
wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \
|
wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \
|
||||||
${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''}
|
${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \
|
||||||
${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''}
|
${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \
|
||||||
${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''}
|
${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \
|
||||||
${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''}
|
${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \
|
||||||
${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''}
|
${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \
|
||||||
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''}
|
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \
|
||||||
${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''}
|
${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \
|
||||||
|
${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \
|
||||||
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
|
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,28 @@
|
||||||
diff --git a/t/mdwn.t b/t/mdwn.t
|
diff --git a/t/mdwn.t b/t/mdwn.t
|
||||||
index ca3180139..d64750403 100755
|
index 966aad2..2756173 100755
|
||||||
--- a/t/mdwn.t
|
--- a/t/mdwn.t
|
||||||
+++ b/t/mdwn.t
|
+++ b/t/mdwn.t
|
||||||
@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn",
|
@@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) {
|
||||||
"C. S. Lewis wrote books\n"),
|
"<p>C. S. Lewis wrote books</p>\n",
|
||||||
"<p>C. S. Lewis wrote books</p>\n", "alphalist off by default");
|
"alphalist off by default for multimarkdown = $multimarkdown");
|
||||||
|
|
||||||
|
- like(IkiWiki::htmlize("foo", "foo", "mdwn",
|
||||||
|
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
|
||||||
|
- qr{<p>This works.*fnref:1.*},
|
||||||
|
- "footnotes on by default for multimarkdown = $multimarkdown");
|
||||||
|
-
|
||||||
|
$config{mdwn_footnotes} = 0;
|
||||||
|
unlike(IkiWiki::htmlize("foo", "foo", "mdwn",
|
||||||
|
"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
|
||||||
|
qr{<p>An unusual link label: .*fnref:1.*},
|
||||||
|
"footnotes can be disabled for multimarkdown = $multimarkdown");
|
||||||
|
-
|
||||||
|
- $config{mdwn_footnotes} = 1;
|
||||||
|
- like(IkiWiki::htmlize("foo", "foo", "mdwn",
|
||||||
|
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
|
||||||
|
- qr{<p>This works.*fnref:1.*},
|
||||||
|
- "footnotes can be enabled for multimarkdown = $multimarkdown");
|
||||||
|
}
|
||||||
|
|
||||||
-$config{mdwn_alpha_lists} = 1;
|
-$config{mdwn_alpha_lists} = 1;
|
||||||
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
|
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
|
||||||
|
|
@ -15,23 +33,3 @@ index ca3180139..d64750403 100755
|
||||||
$config{mdwn_alpha_lists} = 0;
|
$config{mdwn_alpha_lists} = 0;
|
||||||
like(IkiWiki::htmlize("foo", "foo", "mdwn",
|
like(IkiWiki::htmlize("foo", "foo", "mdwn",
|
||||||
"A. One\n".
|
"A. One\n".
|
||||||
"B. Two\n"),
|
|
||||||
qr{<p>A. One\sB. Two</p>\n}, "alphalist can be disabled");
|
|
||||||
|
|
||||||
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
|
|
||||||
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
|
|
||||||
- qr{<p>This works<sup\W}, "footnotes on by default");
|
|
||||||
-
|
|
||||||
$config{mdwn_footnotes} = 0;
|
|
||||||
like(IkiWiki::htmlize("foo", "foo", "mdwn",
|
|
||||||
"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
|
|
||||||
qr{<a href="http://example\.com/">\^1</a>}, "footnotes can be disabled");
|
|
||||||
|
|
||||||
-$config{mdwn_footnotes} = 1;
|
|
||||||
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
|
|
||||||
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
|
|
||||||
- qr{<p>This works<sup\W}, "footnotes can be enabled");
|
|
||||||
-
|
|
||||||
SKIP: {
|
|
||||||
skip 'set $IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT if you have Discount 2.2.0+', 4
|
|
||||||
unless $ENV{IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT};
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "joplin-desktop";
|
pname = "joplin-desktop";
|
||||||
version = "1.3.18";
|
version = "1.4.15";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
inherit (stdenv.hostPlatform) system;
|
inherit (stdenv.hostPlatform) system;
|
||||||
|
|
@ -16,8 +16,8 @@ let
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
||||||
sha256 = {
|
sha256 = {
|
||||||
x86_64-linux = "1dldy137ia8qxhf7d5xzq5slm12bhnmw4kx7fm37n1ajjdcn5sf7";
|
x86_64-linux = "12wh7f1a9sn250lqnb8c9b5gqr8r76kxrhl0kgsm2lg93jgpvvbb";
|
||||||
x86_64-darwin = "0zm9vhxlfs1ldd8za4yha54psqwl0al4hzdfxjfp7ir98i9a4cj7";
|
x86_64-darwin = "1jzfqwyz3vkmmkdzx3iw36fbjq7fns46v8crmg5n09w9kvf22qil";
|
||||||
}.${system} or throwSystem;
|
}.${system} or throwSystem;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -52,9 +52,9 @@ let
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mv $out/bin/{${name},${pname}}
|
mv $out/bin/{${name},${pname}}
|
||||||
install -Dm444 ${appimageContents}/joplin.desktop -t $out/share/applications
|
install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications
|
||||||
install -Dm444 ${appimageContents}/joplin.png -t $out/share/pixmaps
|
install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps
|
||||||
substituteInPlace $out/share/applications/joplin.desktop \
|
substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \
|
||||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -6,11 +6,11 @@ let
|
||||||
cerberus_1_1 = callPackage ./cerberus.nix { };
|
cerberus_1_1 = callPackage ./cerberus.nix { };
|
||||||
in buildPythonApplication rec {
|
in buildPythonApplication rec {
|
||||||
pname = "pyditz";
|
pname = "pyditz";
|
||||||
version = "0.10.3";
|
version = "0.11";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf";
|
sha256 = "da0365ae9064e30c4a27526fb0d7a802fda5c8651cda6990d17be7ede89a2551";
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [ setuptools_scm ];
|
nativeBuildInputs = [ setuptools_scm ];
|
||||||
propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ];
|
propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ];
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
{ stdenv, rustPlatform, fetchFromGitHub, perl }:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "tickrs";
|
||||||
|
version = "0.7.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "tarkah";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "159smcjrf5193yijfpvy1g9b1gin72xwbjghfyrrphwscwhb215z";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "1s95b3x7vs1z8xs7j6j80y6mfpy5bdgnzmzn3qa9zr6cghabbf6n";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ perl ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Realtime ticker data in your terminal";
|
||||||
|
homepage = "https://github.com/tarkah/tickrs";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ mredaelli ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -139,6 +139,7 @@ buildEnv {
|
||||||
paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ];
|
paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
broken = true; # libtoggl is broken
|
||||||
description = "Client for Toggl time tracking service";
|
description = "Client for Toggl time tracking service";
|
||||||
homepage = "https://github.com/toggl/toggldesktop";
|
homepage = "https://github.com/toggl/toggldesktop";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xmrig";
|
pname = "xmrig";
|
||||||
version = "6.5.3";
|
version = "6.6.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xmrig";
|
owner = "xmrig";
|
||||||
repo = "xmrig";
|
repo = "xmrig";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0hywdb6zzkmiik93bnsw6pzir7189mnm46brg4v8fyn56vxskfmi";
|
sha256 = "03phq1c6fylvkg5x7l0bskspr9jdfx61jy67yx2lxhymqgpbf64z";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
||||||
|
|
@ -20,13 +20,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ephemeral";
|
pname = "ephemeral";
|
||||||
version = "6.4.1";
|
version = "7.0.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cassidyjames";
|
owner = "cassidyjames";
|
||||||
repo = "ephemeral";
|
repo = "ephemeral";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1lzcwaczh601kwbx7fzg32nrzlg67asby7p86qy10qz86xf4g608";
|
sha256 = "18chvfdmka21zvjgqfpinm3nrj0ba09szxhhm39anpvpbj92ra8j";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -150,10 +150,10 @@ in stdenv.mkDerivation {
|
||||||
description = "A freeware web browser developed by Google";
|
description = "A freeware web browser developed by Google";
|
||||||
homepage = "https://www.google.com/chrome/browser/";
|
homepage = "https://www.google.com/chrome/browser/";
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
maintainers = with maintainers; [ primeos msteen ];
|
maintainers = with maintainers; [ primeos ];
|
||||||
# Note from primeos: By updating Chromium I also update Google Chrome and
|
# Note from primeos: By updating Chromium I also update Google Chrome and
|
||||||
# will try to merge PRs and respond to issues but I'm not actually using
|
# will try to merge PRs and respond to issues but I'm not actually using
|
||||||
# Google Chrome. msteen is the actual user/maintainer.
|
# Google Chrome.
|
||||||
platforms = [ "x86_64-linux" ];
|
platforms = [ "x86_64-linux" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,13 @@ buildGoModule rec {
|
||||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||||
running in development environment and try to serve assets from the
|
running in development environment and try to serve assets from the
|
||||||
source tree, which is not there once build completes. */
|
source tree, which is not there once build completes. */
|
||||||
version = "0.17.11";
|
version = "0.17.12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tilt-dev";
|
owner = "tilt-dev";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0ggr8l93xpfm4ljjxw0g6kbm0q64hviaamcb5r2vrx9nabz95n95";
|
sha256 = "0l70nmxvk30h56bs46cgakddzdf3laj1y88d0jchij0yy7ixa61f";
|
||||||
};
|
};
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,11 +11,11 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "datovka";
|
pname = "datovka";
|
||||||
version = "4.15.5";
|
version = "4.15.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";
|
url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1mnw1m3wjkw8rfh6fwwrhfmkna6j19pza9cs7kyp8qj1fzzqi8my";
|
sha256 = "1qs1yd9qqsf56jm9w6sffkqb2l8s3i9qgi2q8vd59ss19ym6yky2";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];
|
buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];
|
||||||
|
|
|
||||||
|
|
@ -17,20 +17,20 @@ in {
|
||||||
pname = "discord-ptb";
|
pname = "discord-ptb";
|
||||||
binaryName = "DiscordPTB";
|
binaryName = "DiscordPTB";
|
||||||
desktopName = "Discord PTB";
|
desktopName = "Discord PTB";
|
||||||
version = "0.0.22";
|
version = "0.0.23";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||||
sha256 = "06qyh8i9d7il6q7q7iaymbbcmdcgrj6rc4z4xik1ay3fr7qy299j";
|
sha256 = "0vxz68vldrbmmw1alpwl7blfcy6byd6zg9m0851dm0p0ldyhsp5j";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
canary = callPackage ./base.nix rec {
|
canary = callPackage ./base.nix rec {
|
||||||
pname = "discord-canary";
|
pname = "discord-canary";
|
||||||
binaryName = "DiscordCanary";
|
binaryName = "DiscordCanary";
|
||||||
desktopName = "Discord Canary";
|
desktopName = "Discord Canary";
|
||||||
version = "0.0.115";
|
version = "0.0.116";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||||
sha256 = "0w9i3plbiiy2kp4yahsdvz0f4wpszsgqdnlgzbnx7wj0xk4qrkcx";
|
sha256 = "14kg85gz91f9mvvnl5p1lwz40rm47bca3a8dwv4618zv6vncgmkp";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}.${branch}
|
}.${branch}
|
||||||
|
|
|
||||||
|
|
@ -92,6 +92,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
description = "Matrix group messaging app";
|
description = "Matrix group messaging app";
|
||||||
homepage = "https://gitlab.gnome.org/GNOME/fractal";
|
homepage = "https://gitlab.gnome.org/GNOME/fractal";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
|
broken = stdenv.isDarwin;
|
||||||
maintainers = with maintainers; [ dtzWill worldofpeace ];
|
maintainers = with maintainers; [ dtzWill worldofpeace ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "20201120";
|
version = "20201127";
|
||||||
pname = "neomutt";
|
pname = "neomutt";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neomutt";
|
owner = "neomutt";
|
||||||
repo = "neomutt";
|
repo = "neomutt";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0z6xavgd0zv9pqvfsdyvhhi1q3y7zxhgg24isbnn9r6mldafqwna";
|
sha256 = "sha256-BkDGKZmpwahDw1vD67CyWfxD93H83kcpv5JBGVL5F/o=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,7 @@ mkDerivation rec {
|
||||||
GenericName[it]=Generatore ed Analizzatore di pacchetti di rete
|
GenericName[it]=Generatore ed Analizzatore di pacchetti di rete
|
||||||
Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole
|
Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole
|
||||||
'';
|
'';
|
||||||
|
fileValidation = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,12 @@
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "6.8.7";
|
version = "6.8.8";
|
||||||
pname = "frostwire";
|
pname = "frostwire";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
|
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
|
||||||
sha256 = "1m9v4abm8jbyz46hin63vi6irs32n1xzg85bdyb48vpdxh6iwv04";
|
sha256 = "0zxk0nv7m1k4n8n82h1rkh239a58s7j643lgqbw3qx45bdy4sf4k";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
broken = true;
|
||||||
description = "A cross-platform SSH client with cloud data sync and more";
|
description = "A cross-platform SSH client with cloud data sync and more";
|
||||||
homepage = "https://termius.com/";
|
homepage = "https://termius.com/";
|
||||||
downloadPage = "https://termius.com/linux/";
|
downloadPage = "https://termius.com/linux/";
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "igv";
|
pname = "igv";
|
||||||
version = "2.8.12";
|
version = "2.8.13";
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip";
|
url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip";
|
||||||
sha256 = "0zxmk417j9s5nms0np1fsip7r0jhwkj1d1x424ljr9krcb2zwcyq";
|
sha256 = "0sab478jq96iw3fv0560hrrj8qbh40r8m4ncypdb7991j9haxl09";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "A high-performance theorem prover and SMT solver";
|
description = "A high-performance theorem prover and SMT solver";
|
||||||
homepage = "https://github.com/Z3Prover/z3";
|
homepage = "https://github.com/Z3Prover/z3";
|
||||||
license = stdenv.lib.licenses.mit;
|
license = stdenv.lib.licenses.mit;
|
||||||
platforms = stdenv.lib.platforms.x86_64;
|
platforms = stdenv.lib.platforms.unix;
|
||||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ];
|
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
broken = true;
|
||||||
description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab";
|
description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = teams.sage.members;
|
maintainers = teams.sage.members;
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bcompare";
|
pname = "bcompare";
|
||||||
version = "4.3.5.24893";
|
version = "4.3.7.25118";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
|
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
|
||||||
sha256 = "1gm8d6hgdg8f3hd83wqac28gkvz5nyn62wj7x44vmr60dh4i2jfn";
|
sha256 = "165d6d81vy29pr62y4rcvl4abqqhfwdzcsx77p0dqlzgqswj88v8";
|
||||||
};
|
};
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gitstatus";
|
pname = "gitstatus";
|
||||||
version = "1.3.1";
|
version = "1.4.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "romkatv";
|
owner = "romkatv";
|
||||||
repo = "gitstatus";
|
repo = "gitstatus";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf";
|
sha256 = "0skpi22plzb9r9cgqfnjzpaz856q9f4n0gd5i97nv8bfny8hl30z";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
|
buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
diff -Naur xen-4.10.4-orig/xen/arch/x86/Makefile xen-4.10.4-patched/xen/arch/x86/Makefile
|
||||||
|
--- xen-4.10.4-orig/xen/arch/x86/Makefile 2019-07-04 01:28:50.000000000 +1000
|
||||||
|
+++ xen-4.10.4-patched/xen/arch/x86/Makefile 2020-03-03 13:32:34.607951507 +1100
|
||||||
|
@@ -166,7 +166,7 @@
|
||||||
|
# Check if the compiler supports the MS ABI.
|
||||||
|
export XEN_BUILD_EFI := $(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c efi/check.c -o efi/check.o 2>/dev/null && echo y)
|
||||||
|
# Check if the linker supports PE.
|
||||||
|
-XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y))
|
||||||
|
+XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y))
|
||||||
|
CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
|
||||||
|
|
||||||
|
$(TARGET).efi: VIRT_BASE = 0x$(shell $(NM) efi/relocs-dummy.o | sed -n 's, A VIRT_START$$,,p')
|
||||||
|
@@ -188,20 +188,20 @@
|
||||||
|
|
||||||
|
$(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc
|
||||||
|
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
||||||
|
- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
|
||||||
|
+ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
|
||||||
|
$(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) :
|
||||||
|
$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S
|
||||||
|
$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \
|
||||||
|
| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S
|
||||||
|
$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o
|
||||||
|
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
||||||
|
- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
|
||||||
|
+ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
|
||||||
|
$(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) :
|
||||||
|
$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S
|
||||||
|
$(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \
|
||||||
|
| $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S
|
||||||
|
$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o
|
||||||
|
- $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
|
||||||
|
+ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
|
||||||
|
$(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@
|
||||||
|
if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \
|
||||||
|
else $(NM) -pa --format=sysv $(@D)/$(@F) \
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
EFI_MOUNTPOINT is conventionally /boot/efi or /boot/EFI or something
|
||||||
|
like that, and (on my machine) has directories within that called
|
||||||
|
{Boot, nixos, gummiboot}.
|
||||||
|
|
||||||
|
This patch does two things:
|
||||||
|
|
||||||
|
1) Xen apparently wants to put files in
|
||||||
|
$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR) - we remove the duplicate 'efi' name
|
||||||
|
because I can't see why we have it
|
||||||
|
|
||||||
|
2) Ensures the said directory exists
|
||||||
|
|
||||||
|
|
||||||
|
--- a/xen/Makefile 2016-01-08 01:50:58.028045657 +0000
|
||||||
|
+++ b/xen/Makefile 2016-01-08 01:51:33.560268718 +0000
|
||||||
|
@@ -49,7 +49,9 @@
|
||||||
|
ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \
|
||||||
|
ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \
|
||||||
|
if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
|
||||||
|
- $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
|
||||||
|
+ [ -d $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ] || \
|
||||||
|
+ $(INSTALL_DIR) $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ;\
|
||||||
|
+ $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
|
||||||
|
elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \
|
||||||
|
echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
|
||||||
|
fi; \
|
||||||
|
@@ -69,7 +69,7 @@
|
||||||
|
rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi
|
||||||
|
rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi
|
||||||
|
rm -f $(D)$(EFI_DIR)/$(T).efi
|
||||||
|
- rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi
|
||||||
|
+ rm -f $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi
|
||||||
|
|
||||||
|
.PHONY: _debug
|
||||||
|
_debug:
|
||||||
|
|
@ -1,198 +0,0 @@
|
||||||
{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit
|
|
||||||
, ocaml-ng
|
|
||||||
, withInternalQemu ? true
|
|
||||||
, withInternalTraditionalQemu ? true
|
|
||||||
, withInternalSeabios ? true
|
|
||||||
, withSeabios ? !withInternalSeabios, seabios ? null
|
|
||||||
, withInternalOVMF ? false # FIXME: tricky to build
|
|
||||||
, withOVMF ? false, OVMF
|
|
||||||
, withLibHVM ? true
|
|
||||||
|
|
||||||
# qemu
|
|
||||||
, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir
|
|
||||||
, alsaLib
|
|
||||||
, ... } @ args:
|
|
||||||
|
|
||||||
assert withInternalSeabios -> !withSeabios;
|
|
||||||
assert withInternalOVMF -> !withOVMF;
|
|
||||||
|
|
||||||
with stdenv.lib;
|
|
||||||
|
|
||||||
# Patching XEN? Check the XSAs at
|
|
||||||
# https://xenbits.xen.org/xsa/
|
|
||||||
# and try applying all the ones we don't have yet.
|
|
||||||
|
|
||||||
let
|
|
||||||
xsa = import ./xsa-patches.nix { inherit fetchpatch; };
|
|
||||||
|
|
||||||
xenlockprofpatch = (fetchpatch {
|
|
||||||
name = "xenlockprof-gcc7.patch";
|
|
||||||
url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222";
|
|
||||||
sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70";
|
|
||||||
});
|
|
||||||
|
|
||||||
xenpmdpatch = (fetchpatch {
|
|
||||||
name = "xenpmd-gcc7.patch";
|
|
||||||
url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3";
|
|
||||||
sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq";
|
|
||||||
});
|
|
||||||
|
|
||||||
qemuMemfdBuildFix = fetchpatch {
|
|
||||||
name = "xen-4.8-memfd-build-fix.patch";
|
|
||||||
url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch";
|
|
||||||
sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Ported from
|
|
||||||
#"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=e014dbe74e0484188164c61ff6843f8a04a8cb9d";
|
|
||||||
#"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=0e3b891fefacc0e49f3c8ffa3a753b69eb7214d2";
|
|
||||||
qemuGlusterfs6Fix = ./qemu-gluster-6-compat.diff;
|
|
||||||
|
|
||||||
qemuDeps = [
|
|
||||||
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
|
|
||||||
alsaLib
|
|
||||||
];
|
|
||||||
in
|
|
||||||
|
|
||||||
callPackage (import ./generic.nix (rec {
|
|
||||||
version = "4.8.5";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz";
|
|
||||||
sha256 = "04xcf01jad1lpqnmjblzhnjzp0bss9fjd9awgcycjx679arbaxqz";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Sources needed to build tools and firmwares.
|
|
||||||
xenfiles = optionalAttrs withInternalQemu {
|
|
||||||
qemu-xen = {
|
|
||||||
src = fetchgit {
|
|
||||||
url = "https://xenbits.xen.org/git-http/qemu-xen.git";
|
|
||||||
rev = "refs/tags/qemu-xen-${version}";
|
|
||||||
sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4";
|
|
||||||
};
|
|
||||||
patches = [
|
|
||||||
qemuMemfdBuildFix
|
|
||||||
qemuGlusterfs6Fix
|
|
||||||
];
|
|
||||||
buildInputs = qemuDeps;
|
|
||||||
meta.description = "Xen's fork of upstream Qemu";
|
|
||||||
};
|
|
||||||
} // optionalAttrs withInternalTraditionalQemu {
|
|
||||||
qemu-xen-traditional = {
|
|
||||||
src = fetchgit {
|
|
||||||
url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git";
|
|
||||||
rev = "refs/tags/xen-${version}";
|
|
||||||
sha256 = "0mryap5y53r09m7qc0b821f717ghwm654r8c3ik1w7adzxr0l5qk";
|
|
||||||
};
|
|
||||||
buildInputs = qemuDeps;
|
|
||||||
patches = [
|
|
||||||
];
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace xen-hooks.mak \
|
|
||||||
--replace /usr/include/pci ${pciutils}/include/pci
|
|
||||||
'';
|
|
||||||
meta.description = "Xen's fork of upstream Qemu that uses old device model";
|
|
||||||
};
|
|
||||||
} // optionalAttrs withInternalSeabios {
|
|
||||||
"firmware/seabios-dir-remote" = {
|
|
||||||
src = fetchgit {
|
|
||||||
url = "https://xenbits.xen.org/git-http/seabios.git";
|
|
||||||
rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df";
|
|
||||||
sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm";
|
|
||||||
};
|
|
||||||
patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
|
|
||||||
meta.description = "Xen's fork of Seabios";
|
|
||||||
};
|
|
||||||
} // optionalAttrs withInternalOVMF {
|
|
||||||
"firmware/ovmf-dir-remote" = {
|
|
||||||
src = fetchgit {
|
|
||||||
url = "https://xenbits.xen.org/git-http/ovmf.git";
|
|
||||||
rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8";
|
|
||||||
sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr";
|
|
||||||
};
|
|
||||||
meta.description = "Xen's fork of OVMF";
|
|
||||||
};
|
|
||||||
} // {
|
|
||||||
# TODO: patch Xen to make this optional?
|
|
||||||
"firmware/etherboot/ipxe.git" = {
|
|
||||||
src = fetchgit {
|
|
||||||
url = "https://git.ipxe.org/ipxe.git";
|
|
||||||
rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d";
|
|
||||||
sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09";
|
|
||||||
};
|
|
||||||
meta.description = "Xen's fork of iPXE";
|
|
||||||
};
|
|
||||||
} // optionalAttrs withLibHVM {
|
|
||||||
xen-libhvm-dir-remote = {
|
|
||||||
src = fetchgit {
|
|
||||||
name = "xen-libhvm";
|
|
||||||
url = "https://github.com/michalpalka/xen-libhvm";
|
|
||||||
rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c";
|
|
||||||
sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd";
|
|
||||||
};
|
|
||||||
buildPhase = ''
|
|
||||||
make
|
|
||||||
cd biospt
|
|
||||||
cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm
|
|
||||||
'';
|
|
||||||
installPhase = ''
|
|
||||||
make install
|
|
||||||
cp biospt/biospt $out/bin/
|
|
||||||
'';
|
|
||||||
meta = {
|
|
||||||
description = ''
|
|
||||||
Helper library for reading ACPI and SMBIOS firmware values
|
|
||||||
from the host system for use with the HVM guest firmware
|
|
||||||
pass-through feature in Xen'';
|
|
||||||
license = licenses.bsd2;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
configureFlags = []
|
|
||||||
++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH
|
|
||||||
++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional"
|
|
||||||
++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional"
|
|
||||||
|
|
||||||
++ optional (withSeabios) "--with-system-seabios=${seabios}"
|
|
||||||
++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios"
|
|
||||||
|
|
||||||
++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
|
|
||||||
++ optional (withInternalOVMF) "--enable-ovmf";
|
|
||||||
|
|
||||||
patches = with xsa; flatten [
|
|
||||||
# 253: 4.8 not affected
|
|
||||||
# 254: no patch supplied by xen project (Meltdown/Spectre)
|
|
||||||
xenlockprofpatch
|
|
||||||
xenpmdpatch
|
|
||||||
];
|
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = toString [
|
|
||||||
# Fix build on Glibc 2.24
|
|
||||||
"-Wno-error=deprecated-declarations"
|
|
||||||
# Fix build with GCC8
|
|
||||||
"-Wno-error=maybe-uninitialized"
|
|
||||||
"-Wno-error=stringop-truncation"
|
|
||||||
"-Wno-error=format-truncation"
|
|
||||||
"-Wno-error=array-bounds"
|
|
||||||
# Fix build with GCC9
|
|
||||||
"-Wno-error=address-of-packed-member"
|
|
||||||
"-Wno-error=format-overflow"
|
|
||||||
"-Wno-error=absolute-value"
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
# Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
|
|
||||||
sed 1i'#include <sys/sysmacros.h>' \
|
|
||||||
-i tools/blktap2/control/tap-ctl-allocate.c \
|
|
||||||
-i tools/libxl/libxl_device.c \
|
|
||||||
${optionalString withInternalQemu "-i tools/qemu-xen/hw/9pfs/9p.c"}
|
|
||||||
|
|
||||||
sed -i -e '/sys\/sysctl\.h/d' tools/blktap2/drivers/block-remus.c
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.qemu-system-i386 = if withInternalQemu
|
|
||||||
then "lib/xen/bin/qemu-system-i386"
|
|
||||||
else throw "this xen has no qemu builtin";
|
|
||||||
|
|
||||||
})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_05; } // args)
|
|
||||||
|
|
@ -20,6 +20,8 @@ config:
|
||||||
# python2Packages.markdown
|
# python2Packages.markdown
|
||||||
, transfig, ghostscript, texinfo, pandoc
|
, transfig, ghostscript, texinfo, pandoc
|
||||||
|
|
||||||
|
, binutils-unwrapped
|
||||||
|
|
||||||
, ...} @ args:
|
, ...} @ args:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
@ -42,6 +44,17 @@ let
|
||||||
}
|
}
|
||||||
( __do )
|
( __do )
|
||||||
'');
|
'');
|
||||||
|
|
||||||
|
# We don't want to use the wrapped version, because this version of ld is
|
||||||
|
# only used for linking the Xen EFI binary, and the build process really
|
||||||
|
# needs control over the LDFLAGS used
|
||||||
|
efiBinutils = binutils-unwrapped.overrideAttrs (oldAttrs: {
|
||||||
|
name = "efi-binutils";
|
||||||
|
configureFlags = oldAttrs.configureFlags ++ [
|
||||||
|
"--enable-targets=x86_64-pep"
|
||||||
|
];
|
||||||
|
doInstallCheck = false; # We get a spurious failure otherwise, due to host/target mis-match
|
||||||
|
});
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation (rec {
|
||||||
|
|
@ -119,10 +132,12 @@ stdenv.mkDerivation (rec {
|
||||||
'')}
|
'')}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
patches = [ ./0000-fix-ipxe-src.patch
|
patches = [
|
||||||
./0000-fix-install-python.patch
|
./0000-fix-ipxe-src.patch
|
||||||
] ++ optional (versionOlder version "4.8.5") ./acpica-utils-20180427.patch
|
./0000-fix-install-python.patch
|
||||||
++ (config.patches or []);
|
./0004-makefile-use-efi-ld.patch
|
||||||
|
./0005-makefile-fix-efi-mountdir-use.patch
|
||||||
|
] ++ (config.patches or []);
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
### Hacks
|
### Hacks
|
||||||
|
|
@ -186,6 +201,9 @@ stdenv.mkDerivation (rec {
|
||||||
--replace /bin/ls ls
|
--replace /bin/ls ls
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
EFI_LD = "${efiBinutils}/bin/ld";
|
||||||
|
EFI_VENDOR = "nixos";
|
||||||
|
|
||||||
# TODO: Flask needs more testing before enabling it by default.
|
# TODO: Flask needs more testing before enabling it by default.
|
||||||
#makeFlags = [ "XSM_ENABLE=y" "FLASK_ENABLE=y" "PREFIX=$(out)" "CONFIG_DIR=/etc" "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" ];
|
#makeFlags = [ "XSM_ENABLE=y" "FLASK_ENABLE=y" "PREFIX=$(out)" "CONFIG_DIR=/etc" "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" ];
|
||||||
makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ]
|
makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ]
|
||||||
|
|
|
||||||
|
|
@ -1,57 +1,11 @@
|
||||||
{ callPackage
|
{ callPackage
|
||||||
, stdenv, overrideCC
|
, stdenv
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim
|
# TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim
|
||||||
# light] for each ./<version>.nix.
|
# light] for each ./<version>.nix.
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
xen_4_8-vanilla = callPackage ./4.8.nix {
|
|
||||||
meta = {
|
|
||||||
description = "vanilla";
|
|
||||||
longDescription = ''
|
|
||||||
Vanilla version of Xen. Uses forks of Qemu and Seabios bundled
|
|
||||||
with Xen. This gives vanilla experince, but wastes space and
|
|
||||||
build time: typical NixOS setup that runs lots of VMs will
|
|
||||||
build three different versions of Qemu when using this (two
|
|
||||||
forks and upstream).
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
xen_4_8-slim = xen_4_8-vanilla.override {
|
|
||||||
withInternalQemu = false;
|
|
||||||
withInternalTraditionalQemu = true;
|
|
||||||
withInternalSeabios = false;
|
|
||||||
withSeabios = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "slim";
|
|
||||||
longDescription = ''
|
|
||||||
Slimmed-down version of Xen that reuses nixpkgs packages as
|
|
||||||
much as possible. Different parts may get out of sync, but
|
|
||||||
this builds faster and uses less space than vanilla. Use with
|
|
||||||
`qemu_xen` from nixpkgs.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
xen_4_8-light = xen_4_8-vanilla.override {
|
|
||||||
withInternalQemu = false;
|
|
||||||
withInternalTraditionalQemu = false;
|
|
||||||
withInternalSeabios = false;
|
|
||||||
withSeabios = true;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "light";
|
|
||||||
longDescription = ''
|
|
||||||
Slimmed-down version of Xen without `qemu-traditional` (you
|
|
||||||
don't need it if you don't know what it is). Use with
|
|
||||||
`qemu_xen-light` from nixpkgs.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
xen_4_10-vanilla = callPackage ./4.10.nix {
|
xen_4_10-vanilla = callPackage ./4.10.nix {
|
||||||
meta = {
|
meta = {
|
||||||
description = "vanilla";
|
description = "vanilla";
|
||||||
|
|
@ -98,8 +52,8 @@ rec {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
xen-vanilla = xen_4_8-vanilla;
|
xen-vanilla = xen_4_10-vanilla;
|
||||||
xen-slim = xen_4_8-slim;
|
xen-slim = xen_4_10-slim;
|
||||||
xen-light = xen_4_8-light;
|
xen-light = xen_4_10-light;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "agave";
|
pname = "agave";
|
||||||
version = "30";
|
version = "35";
|
||||||
in fetchurl {
|
in fetchurl {
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
|
url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf";
|
||||||
|
|
@ -13,7 +13,7 @@ in fetchurl {
|
||||||
install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
|
install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf
|
||||||
'';
|
'';
|
||||||
|
|
||||||
sha256 = "1f2f1fycwi8xbf8x03yfq78nv11b2msl4ll9flw8rkg023h9vwg7";
|
sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "truetype monospaced typeface designed for X environments";
|
description = "truetype monospaced typeface designed for X environments";
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, fetchzip }:
|
{ lib, fetchzip }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "3.11";
|
version = "3.15";
|
||||||
in fetchzip {
|
in fetchzip {
|
||||||
name = "inter-${version}";
|
name = "inter-${version}";
|
||||||
|
|
||||||
|
|
@ -12,7 +12,7 @@ in fetchzip {
|
||||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||||
'';
|
'';
|
||||||
|
|
||||||
sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1";
|
sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://rsms.me/inter/";
|
homepage = "https://rsms.me/inter/";
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "evisum";
|
pname = "evisum";
|
||||||
version = "0.5.7";
|
version = "0.5.8";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
|
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd";
|
sha256 = "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -43,11 +43,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "evolution";
|
pname = "evolution";
|
||||||
version = "3.38.1";
|
version = "3.38.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1z68vhbqnm34axx4zcrds45nz2ppwzr4z1lczxrdiq0zf0cmxyfh";
|
sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -29,11 +29,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnome-maps";
|
pname = "gnome-maps";
|
||||||
version = "3.38.1.1";
|
version = "3.38.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "1y59afvfrylkikqd0ax0nj41zs6b54219l7k5bp5gzh9lxq06xgk";
|
sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1";
|
||||||
};
|
};
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
|
||||||
|
|
@ -38,11 +38,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnome-initial-setup";
|
pname = "gnome-initial-setup";
|
||||||
version = "3.38.1";
|
version = "3.38.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
hash = "sha256-5V1PQHOZjg+3s9/MRw4qTH2VCpa+2rFQEbkITryBNnY=";
|
hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gnome-tetravex";
|
pname = "gnome-tetravex";
|
||||||
version = "3.38.1";
|
version = "3.38.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0s70swm2acgydz77nxyzn9xv8p03la7sl3cq87s7b8g7lyw943mv";
|
sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z";
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
{ stdenv, lib, fetchFromGitHub, makeWrapper }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "muon";
|
||||||
|
version = "2019-11-27";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "nickmqb";
|
||||||
|
repo = pname;
|
||||||
|
rev = "6d3a5054ae75b0e5a0ae633cf8cbc3e2a054f8b3";
|
||||||
|
sha256 = "1sb1i08421jxlx791g8nh4l239syaj730hagkzc159g0z65614zz";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
mkdir -p $out/bin $out/share/mu
|
||||||
|
cp -r lib $out/share/mu
|
||||||
|
gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
makeWrapper $out/bin/mu-unwrapped $out/bin/mu \
|
||||||
|
--add-flags $out/share/mu/lib/core.mu
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Modern low-level programming language";
|
||||||
|
homepage = "https://github.com/nickmqb/muon";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ Br1ght0ne ];
|
||||||
|
platforms = [ "x86_64-linux" ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -4,18 +4,18 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "unison-code-manager";
|
pname = "unison-code-manager";
|
||||||
milestone_id = "M1l";
|
milestone_id = "M1m";
|
||||||
version = "1.0.${milestone_id}-alpha";
|
version = "1.0.${milestone_id}-alpha";
|
||||||
|
|
||||||
src = if (stdenv.isDarwin) then
|
src = if (stdenv.isDarwin) then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
|
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
|
||||||
sha256 = "0qbxakrp3p3k3k8a1m2g24ivs3c8j5rj7ij84i7k548505rva9qr";
|
sha256 = "06pxvp753j8pr0pn02l7cswmmas5pk1vlkw83yd04h3f2rx1s61v";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
|
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
|
||||||
sha256 = "152yzv7j4nyp228ngzbhki9fid1xdqrjvl1rwxc05wq30jwwqx0x";
|
sha256 = "1qspvfq805d34kz031pf9sqw8kzz7h637kc8lnbjlgvwixxkxc7c";
|
||||||
};
|
};
|
||||||
|
|
||||||
# The tarball is just the prebuilt binary, in the archive root.
|
# The tarball is just the prebuilt binary, in the archive root.
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ self: super: {
|
||||||
name = "git-annex-${super.git-annex.version}-src";
|
name = "git-annex-${super.git-annex.version}-src";
|
||||||
url = "git://git-annex.branchable.com/";
|
url = "git://git-annex.branchable.com/";
|
||||||
rev = "refs/tags/" + super.git-annex.version;
|
rev = "refs/tags/" + super.git-annex.version;
|
||||||
sha256 = "13s6czv4p6n6s16kr5r255vldrn9038qjd5yl5xrh91xk6z410cd";
|
sha256 = "1l2syrslba4mrxjzj0iblflz72siw3ibqri6p5hf59fk7rmm30a8";
|
||||||
};
|
};
|
||||||
}).override {
|
}).override {
|
||||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||||
|
|
@ -85,11 +85,6 @@ self: super: {
|
||||||
url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
|
url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
|
||||||
sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql";
|
sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql";
|
||||||
});
|
});
|
||||||
optparse-applicative_0_16_0_0 = appendPatch super.optparse-applicative_0_16_0_0 (pkgs.fetchpatch {
|
|
||||||
name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff";
|
|
||||||
url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
|
|
||||||
sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql";
|
|
||||||
});
|
|
||||||
|
|
||||||
# Fix test trying to access /home directory
|
# Fix test trying to access /home directory
|
||||||
shell-conduit = overrideCabal super.shell-conduit (drv: {
|
shell-conduit = overrideCabal super.shell-conduit (drv: {
|
||||||
|
|
@ -300,6 +295,9 @@ self: super: {
|
||||||
github-rest = dontCheck super.github-rest; # test suite needs the network
|
github-rest = dontCheck super.github-rest; # test suite needs the network
|
||||||
gitlib-cmdline = dontCheck super.gitlib-cmdline;
|
gitlib-cmdline = dontCheck super.gitlib-cmdline;
|
||||||
GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50
|
GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50
|
||||||
|
#next release supports random 1.1; jailbroken because i didn't know about vty when glguy was updating the bounds
|
||||||
|
#should be fixed soon. maybe even before this is merged. currently glirc is 2.37
|
||||||
|
glirc = doJailbreak (super.glirc.override { random = self.random_1_2_0; });
|
||||||
hackport = dontCheck super.hackport;
|
hackport = dontCheck super.hackport;
|
||||||
hadoop-formats = dontCheck super.hadoop-formats;
|
hadoop-formats = dontCheck super.hadoop-formats;
|
||||||
haeredes = dontCheck super.haeredes;
|
haeredes = dontCheck super.haeredes;
|
||||||
|
|
@ -340,7 +338,8 @@ self: super: {
|
||||||
then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63
|
then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63
|
||||||
else super.math-functions;
|
else super.math-functions;
|
||||||
matplotlib = dontCheck super.matplotlib;
|
matplotlib = dontCheck super.matplotlib;
|
||||||
|
# https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
|
||||||
|
matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :')
|
||||||
memcache = dontCheck super.memcache;
|
memcache = dontCheck super.memcache;
|
||||||
metrics = dontCheck super.metrics;
|
metrics = dontCheck super.metrics;
|
||||||
milena = dontCheck super.milena;
|
milena = dontCheck super.milena;
|
||||||
|
|
@ -371,6 +370,9 @@ self: super: {
|
||||||
punycode = dontCheck super.punycode;
|
punycode = dontCheck super.punycode;
|
||||||
pwstore-cli = dontCheck super.pwstore-cli;
|
pwstore-cli = dontCheck super.pwstore-cli;
|
||||||
quantities = dontCheck super.quantities;
|
quantities = dontCheck super.quantities;
|
||||||
|
QuickCheck_2_14_2 = super.QuickCheck_2_14_2.override( {
|
||||||
|
splitmix = self.splitmix_0_1_0_3;
|
||||||
|
});
|
||||||
redis-io = dontCheck super.redis-io;
|
redis-io = dontCheck super.redis-io;
|
||||||
rethinkdb = dontCheck super.rethinkdb;
|
rethinkdb = dontCheck super.rethinkdb;
|
||||||
Rlang-QQ = dontCheck super.Rlang-QQ;
|
Rlang-QQ = dontCheck super.Rlang-QQ;
|
||||||
|
|
@ -394,9 +396,7 @@ self: super: {
|
||||||
tickle = dontCheck super.tickle;
|
tickle = dontCheck super.tickle;
|
||||||
tpdb = dontCheck super.tpdb;
|
tpdb = dontCheck super.tpdb;
|
||||||
translatable-intset = dontCheck super.translatable-intset;
|
translatable-intset = dontCheck super.translatable-intset;
|
||||||
# Aarch64 affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461
|
trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461
|
||||||
# Darwin https://hydra.nixos.org/build/129070963/nixlog/1
|
|
||||||
trifecta = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.isDarwin) then dontCheck super.trifecta else super.trifecta;
|
|
||||||
ua-parser = dontCheck super.ua-parser;
|
ua-parser = dontCheck super.ua-parser;
|
||||||
unagi-chan = dontCheck super.unagi-chan;
|
unagi-chan = dontCheck super.unagi-chan;
|
||||||
wai-logger = dontCheck super.wai-logger;
|
wai-logger = dontCheck super.wai-logger;
|
||||||
|
|
@ -406,6 +406,7 @@ self: super: {
|
||||||
xsd = dontCheck super.xsd;
|
xsd = dontCheck super.xsd;
|
||||||
zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57
|
zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57
|
||||||
|
|
||||||
|
random_1_2_0 = super.random_1_2_0.override ({ splitmix = self.splitmix_0_1_0_3; });
|
||||||
# These test suites run for ages, even on a fast machine. This is nuts.
|
# These test suites run for ages, even on a fast machine. This is nuts.
|
||||||
Random123 = dontCheck super.Random123;
|
Random123 = dontCheck super.Random123;
|
||||||
systemd = dontCheck super.systemd;
|
systemd = dontCheck super.systemd;
|
||||||
|
|
@ -1380,7 +1381,7 @@ self: super: {
|
||||||
in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal
|
in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal
|
||||||
(addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: {
|
(addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: {
|
||||||
optparse-generic = self.optparse-generic_1_4_4;
|
optparse-generic = self.optparse-generic_1_4_4;
|
||||||
optparse-applicative = self.optparse-applicative_0_16_0_0;
|
optparse-applicative = self.optparse-applicative_0_16_1_0;
|
||||||
})) deps) (drv: {
|
})) deps) (drv: {
|
||||||
buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ];
|
buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ];
|
||||||
postInstall = drv.postInstall or "" + ''
|
postInstall = drv.postInstall or "" + ''
|
||||||
|
|
@ -1390,10 +1391,6 @@ self: super: {
|
||||||
'';
|
'';
|
||||||
}));
|
}));
|
||||||
|
|
||||||
optparse-generic_1_4_4 = super.optparse-generic_1_4_4.override {
|
|
||||||
optparse-applicative = self.optparse-applicative_0_16_0_0;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Our quickcheck-instances is too old for the newer binary-instances, but
|
# Our quickcheck-instances is too old for the newer binary-instances, but
|
||||||
# quickcheck-instances is only used in the tests of binary-instances.
|
# quickcheck-instances is only used in the tests of binary-instances.
|
||||||
binary-instances = dontCheck super.binary-instances;
|
binary-instances = dontCheck super.binary-instances;
|
||||||
|
|
@ -1483,10 +1480,6 @@ self: super: {
|
||||||
# Due to tests restricting base in 0.8.0.0 release
|
# Due to tests restricting base in 0.8.0.0 release
|
||||||
http-media = doJailbreak super.http-media;
|
http-media = doJailbreak super.http-media;
|
||||||
|
|
||||||
# 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10
|
|
||||||
# Issue has been fixed in 0.1.3.7, we can enable tests again, once stackage bumps the version
|
|
||||||
pcg-random = assert super.pcg-random.version == "0.1.3.6"; dontCheck super.pcg-random;
|
|
||||||
|
|
||||||
# Use an already merged upstream patch fixing the build with primitive >= 0.7.2
|
# Use an already merged upstream patch fixing the build with primitive >= 0.7.2
|
||||||
# The version bounds were correctly specified before, so we need to jailbreak as well
|
# The version bounds were correctly specified before, so we need to jailbreak as well
|
||||||
streamly = appendPatch (doJailbreak super.streamly) (pkgs.fetchpatch {
|
streamly = appendPatch (doJailbreak super.streamly) (pkgs.fetchpatch {
|
||||||
|
|
@ -1517,4 +1510,21 @@ self: super: {
|
||||||
excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
|
excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
# 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
|
||||||
|
pipes-text = doJailbreak super.pipes-text;
|
||||||
|
|
||||||
|
# 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8
|
||||||
|
blas-hs = dontCheck super.blas-hs;
|
||||||
|
|
||||||
|
# 2020-11-23: https://github.com/cdornan/fmt/issues/30
|
||||||
|
fmt = dontCheck super.fmt;
|
||||||
|
|
||||||
|
|
||||||
|
# 2020-11-27: Tests broken
|
||||||
|
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
|
||||||
|
servant-swagger = dontCheck super.servant-swagger;
|
||||||
|
|
||||||
|
# 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
|
||||||
|
hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
|
||||||
|
|
||||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||||
|
|
|
||||||
|
|
@ -92,5 +92,4 @@ self: super: {
|
||||||
|
|
||||||
# Break out of "Cabal < 3.2" constraint.
|
# Break out of "Cabal < 3.2" constraint.
|
||||||
stylish-haskell = doJailbreak super.stylish-haskell;
|
stylish-haskell = doJailbreak super.stylish-haskell;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ default-package-overrides:
|
||||||
# haskell-language-server 0.5.0.0 doesn't accept newer versions
|
# haskell-language-server 0.5.0.0 doesn't accept newer versions
|
||||||
- fourmolu ==0.2.*
|
- fourmolu ==0.2.*
|
||||||
- refinery ==0.2.*
|
- refinery ==0.2.*
|
||||||
# Stackage Nightly 2020-11-11
|
# Stackage Nightly 2020-11-23
|
||||||
- abstract-deque ==0.3
|
- abstract-deque ==0.3
|
||||||
- abstract-par ==0.3.3
|
- abstract-par ==0.3.3
|
||||||
- AC-Angle ==1.0
|
- AC-Angle ==1.0
|
||||||
|
|
@ -91,6 +91,7 @@ default-package-overrides:
|
||||||
- aeson-better-errors ==0.9.1.0
|
- aeson-better-errors ==0.9.1.0
|
||||||
- aeson-casing ==0.2.0.0
|
- aeson-casing ==0.2.0.0
|
||||||
- aeson-combinators ==0.0.4.0
|
- aeson-combinators ==0.0.4.0
|
||||||
|
- aeson-commit ==1.3
|
||||||
- aeson-compat ==0.3.9
|
- aeson-compat ==0.3.9
|
||||||
- aeson-default ==0.9.1.0
|
- aeson-default ==0.9.1.0
|
||||||
- aeson-diff ==1.1.0.9
|
- aeson-diff ==1.1.0.9
|
||||||
|
|
@ -273,7 +274,7 @@ default-package-overrides:
|
||||||
- avro ==0.5.2.0
|
- avro ==0.5.2.0
|
||||||
- aws-cloudfront-signed-cookies ==0.2.0.6
|
- aws-cloudfront-signed-cookies ==0.2.0.6
|
||||||
- backtracking ==0.1.0
|
- backtracking ==0.1.0
|
||||||
- bank-holidays-england ==0.2.0.5
|
- bank-holidays-england ==0.2.0.6
|
||||||
- barbies ==2.0.2.0
|
- barbies ==2.0.2.0
|
||||||
- base-compat ==0.11.2
|
- base-compat ==0.11.2
|
||||||
- base-compat-batteries ==0.11.2
|
- base-compat-batteries ==0.11.2
|
||||||
|
|
@ -359,7 +360,7 @@ default-package-overrides:
|
||||||
- boundingboxes ==0.2.3
|
- boundingboxes ==0.2.3
|
||||||
- bower-json ==1.0.0.1
|
- bower-json ==1.0.0.1
|
||||||
- boxes ==0.1.5
|
- boxes ==0.1.5
|
||||||
- brick ==0.57
|
- brick ==0.57.1
|
||||||
- broadcast-chan ==0.2.1.1
|
- broadcast-chan ==0.2.1.1
|
||||||
- bsb-http-chunked ==0.0.0.4
|
- bsb-http-chunked ==0.0.0.4
|
||||||
- bson ==0.4.0.1
|
- bson ==0.4.0.1
|
||||||
|
|
@ -368,10 +369,11 @@ default-package-overrides:
|
||||||
- buffer-pipe ==0.0
|
- buffer-pipe ==0.0
|
||||||
- bugsnag-hs ==0.2.0.3
|
- bugsnag-hs ==0.2.0.3
|
||||||
- bugzilla-redhat ==0.3.0
|
- bugzilla-redhat ==0.3.0
|
||||||
- burrito ==1.1.0.2
|
- burrito ==1.2.0.0
|
||||||
- butcher ==1.3.3.2
|
- butcher ==1.3.3.2
|
||||||
- bv ==0.5
|
- bv ==0.5
|
||||||
- bv-little ==1.1.1
|
- bv-little ==1.1.1
|
||||||
|
- byte-count-reader ==0.10.1.2
|
||||||
- byte-order ==0.1.2.0
|
- byte-order ==0.1.2.0
|
||||||
- byteable ==0.1.1
|
- byteable ==0.1.1
|
||||||
- bytedump ==1.0
|
- bytedump ==1.0
|
||||||
|
|
@ -393,7 +395,7 @@ default-package-overrides:
|
||||||
- ca-province-codes ==1.0.0.0
|
- ca-province-codes ==1.0.0.0
|
||||||
- cabal-debian ==5.1
|
- cabal-debian ==5.1
|
||||||
- cabal-doctest ==1.0.8
|
- cabal-doctest ==1.0.8
|
||||||
- cabal-file ==0.1.0
|
- cabal-file ==0.1.1
|
||||||
- cabal-flatpak ==0.1.0.2
|
- cabal-flatpak ==0.1.0.2
|
||||||
- cabal-plan ==0.7.2.0
|
- cabal-plan ==0.7.2.0
|
||||||
- cabal-rpm ==2.0.7
|
- cabal-rpm ==2.0.7
|
||||||
|
|
@ -549,7 +551,7 @@ default-package-overrides:
|
||||||
- crackNum ==2.4
|
- crackNum ==2.4
|
||||||
- crc32c ==0.0.0
|
- crc32c ==0.0.0
|
||||||
- credential-store ==0.1.2
|
- credential-store ==0.1.2
|
||||||
- criterion ==1.5.7.0
|
- criterion ==1.5.9.0
|
||||||
- criterion-measurement ==0.1.2.0
|
- criterion-measurement ==0.1.2.0
|
||||||
- cron ==0.7.0
|
- cron ==0.7.0
|
||||||
- crypto-api ==0.13.3
|
- crypto-api ==0.13.3
|
||||||
|
|
@ -725,7 +727,7 @@ default-package-overrides:
|
||||||
- elm-bridge ==0.6.1
|
- elm-bridge ==0.6.1
|
||||||
- elm-core-sources ==1.0.0
|
- elm-core-sources ==1.0.0
|
||||||
- elm-export ==0.6.0.1
|
- elm-export ==0.6.0.1
|
||||||
- elm2nix ==0.2
|
- elm2nix ==0.2.1
|
||||||
- elynx ==0.5.0
|
- elynx ==0.5.0
|
||||||
- elynx-markov ==0.5.0
|
- elynx-markov ==0.5.0
|
||||||
- elynx-nexus ==0.5.0
|
- elynx-nexus ==0.5.0
|
||||||
|
|
@ -787,6 +789,8 @@ default-package-overrides:
|
||||||
- failable ==1.2.4.0
|
- failable ==1.2.4.0
|
||||||
- fakedata ==0.8.0
|
- fakedata ==0.8.0
|
||||||
- fakedata-parser ==0.1.0.0
|
- fakedata-parser ==0.1.0.0
|
||||||
|
- fakefs ==0.3.0.2
|
||||||
|
- fakepull ==0.3.0.2
|
||||||
- fast-digits ==0.3.0.0
|
- fast-digits ==0.3.0.0
|
||||||
- fast-logger ==3.0.2
|
- fast-logger ==3.0.2
|
||||||
- fast-math ==1.0.2
|
- fast-math ==1.0.2
|
||||||
|
|
@ -873,6 +877,7 @@ default-package-overrides:
|
||||||
- gd ==3000.7.3
|
- gd ==3000.7.3
|
||||||
- gdp ==0.0.3.0
|
- gdp ==0.0.3.0
|
||||||
- general-games ==1.1.1
|
- general-games ==1.1.1
|
||||||
|
- generic-aeson ==0.2.0.11
|
||||||
- generic-arbitrary ==0.1.0
|
- generic-arbitrary ==0.1.0
|
||||||
- generic-constraints ==1.1.1.1
|
- generic-constraints ==1.1.1.1
|
||||||
- generic-data ==0.9.2.0
|
- generic-data ==0.9.2.0
|
||||||
|
|
@ -913,10 +918,10 @@ default-package-overrides:
|
||||||
- geojson ==4.0.2
|
- geojson ==4.0.2
|
||||||
- getopt-generics ==0.13.0.4
|
- getopt-generics ==0.13.0.4
|
||||||
- ghc-byteorder ==4.11.0.0.10
|
- ghc-byteorder ==4.11.0.0.10
|
||||||
- ghc-check ==0.5.0.2
|
- ghc-check ==0.5.0.3
|
||||||
- ghc-core ==0.5.6
|
- ghc-core ==0.5.6
|
||||||
- ghc-events ==0.13.0
|
- ghc-events ==0.14.0
|
||||||
- ghc-exactprint ==0.6.3.2
|
- ghc-exactprint ==0.6.3.3
|
||||||
- ghc-lib ==8.10.2.20200916
|
- ghc-lib ==8.10.2.20200916
|
||||||
- ghc-lib-parser ==8.10.2.20200916
|
- ghc-lib-parser ==8.10.2.20200916
|
||||||
- ghc-lib-parser-ex ==8.10.0.16
|
- ghc-lib-parser-ex ==8.10.0.16
|
||||||
|
|
@ -956,7 +961,8 @@ default-package-overrides:
|
||||||
- ginger ==0.10.1.0
|
- ginger ==0.10.1.0
|
||||||
- gingersnap ==0.3.1.0
|
- gingersnap ==0.3.1.0
|
||||||
- githash ==0.1.5.0
|
- githash ==0.1.5.0
|
||||||
- github-release ==1.3.3
|
- github ==0.26
|
||||||
|
- github-release ==1.3.5
|
||||||
- github-rest ==1.0.3
|
- github-rest ==1.0.3
|
||||||
- github-types ==0.2.1
|
- github-types ==0.2.1
|
||||||
- github-webhooks ==0.15.0
|
- github-webhooks ==0.15.0
|
||||||
|
|
@ -992,6 +998,7 @@ default-package-overrides:
|
||||||
- hackage-security ==0.6.0.1
|
- hackage-security ==0.6.0.1
|
||||||
- haddock-library ==1.9.0
|
- haddock-library ==1.9.0
|
||||||
- hadoop-streaming ==0.2.0.3
|
- hadoop-streaming ==0.2.0.3
|
||||||
|
- hakyll-convert ==0.3.0.3
|
||||||
- half ==0.3
|
- half ==0.3
|
||||||
- hall-symbols ==0.1.0.6
|
- hall-symbols ==0.1.0.6
|
||||||
- hamtsolo ==1.0.3
|
- hamtsolo ==1.0.3
|
||||||
|
|
@ -1044,6 +1051,7 @@ default-package-overrides:
|
||||||
- hedgehog-fn ==1.0
|
- hedgehog-fn ==1.0
|
||||||
- hedgehog-quickcheck ==0.1.1
|
- hedgehog-quickcheck ==0.1.1
|
||||||
- hedis ==0.12.15
|
- hedis ==0.12.15
|
||||||
|
- hedn ==0.3.0.2
|
||||||
- here ==1.2.13
|
- here ==1.2.13
|
||||||
- heredoc ==0.2.0.0
|
- heredoc ==0.2.0.0
|
||||||
- heterocephalus ==1.0.5.4
|
- heterocephalus ==1.0.5.4
|
||||||
|
|
@ -1070,7 +1078,7 @@ default-package-overrides:
|
||||||
- hlibcpuid ==0.2.0
|
- hlibcpuid ==0.2.0
|
||||||
- hlibgit2 ==0.18.0.16
|
- hlibgit2 ==0.18.0.16
|
||||||
- hlibsass ==0.1.10.1
|
- hlibsass ==0.1.10.1
|
||||||
- hmatrix ==0.20.0.0
|
- hmatrix ==0.20.1
|
||||||
- hmatrix-gsl ==0.19.0.1
|
- hmatrix-gsl ==0.19.0.1
|
||||||
- hmatrix-gsl-stats ==0.4.1.8
|
- hmatrix-gsl-stats ==0.4.1.8
|
||||||
- hmatrix-morpheus ==0.1.1.2
|
- hmatrix-morpheus ==0.1.1.2
|
||||||
|
|
@ -1215,7 +1223,7 @@ default-package-overrides:
|
||||||
- hxt-tagsoup ==9.1.4
|
- hxt-tagsoup ==9.1.4
|
||||||
- hxt-unicode ==9.0.2.4
|
- hxt-unicode ==9.0.2.4
|
||||||
- hybrid-vectors ==0.2.2
|
- hybrid-vectors ==0.2.2
|
||||||
- hyper ==0.1.0.3
|
- hyper ==0.2.1.0
|
||||||
- hyperloglog ==0.4.3
|
- hyperloglog ==0.4.3
|
||||||
- hyphenation ==0.8
|
- hyphenation ==0.8
|
||||||
- iconv ==0.4.1.3
|
- iconv ==0.4.1.3
|
||||||
|
|
@ -1272,7 +1280,7 @@ default-package-overrides:
|
||||||
- io-streams ==1.5.2.0
|
- io-streams ==1.5.2.0
|
||||||
- io-streams-haproxy ==1.0.1.0
|
- io-streams-haproxy ==1.0.1.0
|
||||||
- ip6addr ==1.0.1
|
- ip6addr ==1.0.1
|
||||||
- iproute ==1.7.9
|
- iproute ==1.7.10
|
||||||
- IPv6Addr ==1.1.5
|
- IPv6Addr ==1.1.5
|
||||||
- ipynb ==0.1.0.1
|
- ipynb ==0.1.0.1
|
||||||
- ipython-kernel ==0.10.2.1
|
- ipython-kernel ==0.10.2.1
|
||||||
|
|
@ -1280,7 +1288,7 @@ default-package-overrides:
|
||||||
- irc-client ==1.1.2.0
|
- irc-client ==1.1.2.0
|
||||||
- irc-conduit ==0.3.0.4
|
- irc-conduit ==0.3.0.4
|
||||||
- irc-ctcp ==0.1.3.0
|
- irc-ctcp ==0.1.3.0
|
||||||
- isbn ==1.1.0.1
|
- isbn ==1.1.0.2
|
||||||
- islink ==0.1.0.0
|
- islink ==0.1.0.0
|
||||||
- iso3166-country-codes ==0.20140203.8
|
- iso3166-country-codes ==0.20140203.8
|
||||||
- iso639 ==0.1.0.3
|
- iso639 ==0.1.0.3
|
||||||
|
|
@ -1293,9 +1301,11 @@ default-package-overrides:
|
||||||
- ixset-typed-conversions ==0.1.2.0
|
- ixset-typed-conversions ==0.1.2.0
|
||||||
- ixset-typed-hashable-instance ==0.1.0.2
|
- ixset-typed-hashable-instance ==0.1.0.2
|
||||||
- jack ==0.7.1.4
|
- jack ==0.7.1.4
|
||||||
|
- jalaali ==1.0.0.0
|
||||||
- jira-wiki-markup ==1.3.2
|
- jira-wiki-markup ==1.3.2
|
||||||
- jose ==0.8.4
|
- jose ==0.8.4
|
||||||
- jose-jwt ==0.8.0
|
- jose-jwt ==0.8.0
|
||||||
|
- js-chart ==2.9.4.1
|
||||||
- js-dgtable ==0.5.2
|
- js-dgtable ==0.5.2
|
||||||
- js-flot ==0.8.3
|
- js-flot ==0.8.3
|
||||||
- js-jquery ==3.3.1
|
- js-jquery ==3.3.1
|
||||||
|
|
@ -1433,9 +1443,9 @@ default-package-overrides:
|
||||||
- markdown ==0.1.17.4
|
- markdown ==0.1.17.4
|
||||||
- markdown-unlit ==0.5.0
|
- markdown-unlit ==0.5.0
|
||||||
- markov-chain ==0.0.3.4
|
- markov-chain ==0.0.3.4
|
||||||
- massiv ==0.5.5.0
|
- massiv ==0.5.6.0
|
||||||
- massiv-io ==0.4.0.0
|
- massiv-io ==0.4.0.0
|
||||||
- massiv-test ==0.1.4
|
- massiv-test ==0.1.5
|
||||||
- math-extras ==0.1.1.0
|
- math-extras ==0.1.1.0
|
||||||
- math-functions ==0.3.4.1
|
- math-functions ==0.3.4.1
|
||||||
- mathexpr ==0.3.0.0
|
- mathexpr ==0.3.0.0
|
||||||
|
|
@ -1472,7 +1482,7 @@ default-package-overrides:
|
||||||
- microlens-mtl ==0.2.0.1
|
- microlens-mtl ==0.2.0.1
|
||||||
- microlens-platform ==0.4.1
|
- microlens-platform ==0.4.1
|
||||||
- microlens-process ==0.2.0.2
|
- microlens-process ==0.2.0.2
|
||||||
- microlens-th ==0.4.3.6
|
- microlens-th ==0.4.3.8
|
||||||
- microspec ==0.2.1.3
|
- microspec ==0.2.1.3
|
||||||
- microstache ==1.0.1.1
|
- microstache ==1.0.1.1
|
||||||
- midair ==0.2.0.1
|
- midair ==0.2.0.1
|
||||||
|
|
@ -1519,6 +1529,7 @@ default-package-overrides:
|
||||||
- monad-par-extras ==0.3.3
|
- monad-par-extras ==0.3.3
|
||||||
- monad-parallel ==0.7.2.3
|
- monad-parallel ==0.7.2.3
|
||||||
- monad-peel ==0.2.1.2
|
- monad-peel ==0.2.1.2
|
||||||
|
- monad-primitive ==0.1
|
||||||
- monad-products ==4.0.1
|
- monad-products ==4.0.1
|
||||||
- monad-resumption ==0.1.4.0
|
- monad-resumption ==0.1.4.0
|
||||||
- monad-skeleton ==0.1.5
|
- monad-skeleton ==0.1.5
|
||||||
|
|
@ -1542,6 +1553,7 @@ default-package-overrides:
|
||||||
- morpheus-graphql-client ==0.16.0
|
- morpheus-graphql-client ==0.16.0
|
||||||
- morpheus-graphql-core ==0.16.0
|
- morpheus-graphql-core ==0.16.0
|
||||||
- morpheus-graphql-subscriptions ==0.16.0
|
- morpheus-graphql-subscriptions ==0.16.0
|
||||||
|
- moss ==0.2.0.0
|
||||||
- mountpoints ==1.0.2
|
- mountpoints ==1.0.2
|
||||||
- mpi-hs ==0.7.2.0
|
- mpi-hs ==0.7.2.0
|
||||||
- mpi-hs-binary ==0.1.1.0
|
- mpi-hs-binary ==0.1.1.0
|
||||||
|
|
@ -1561,6 +1573,7 @@ default-package-overrides:
|
||||||
- mutable-containers ==0.3.4
|
- mutable-containers ==0.3.4
|
||||||
- mwc-probability ==2.3.1
|
- mwc-probability ==2.3.1
|
||||||
- mwc-random ==0.14.0.0
|
- mwc-random ==0.14.0.0
|
||||||
|
- mwc-random-monad ==0.7.3.1
|
||||||
- mx-state-codes ==1.0.0.0
|
- mx-state-codes ==1.0.0.0
|
||||||
- mysql ==0.1.7.2
|
- mysql ==0.1.7.2
|
||||||
- mysql-simple ==0.4.5
|
- mysql-simple ==0.4.5
|
||||||
|
|
@ -1609,7 +1622,7 @@ default-package-overrides:
|
||||||
- nonce ==1.0.7
|
- nonce ==1.0.7
|
||||||
- nondeterminism ==1.4
|
- nondeterminism ==1.4
|
||||||
- nonempty-containers ==0.3.4.1
|
- nonempty-containers ==0.3.4.1
|
||||||
- nonempty-vector ==0.2.0.2
|
- nonempty-vector ==0.2.1.0
|
||||||
- nonemptymap ==0.0.6.0
|
- nonemptymap ==0.0.6.0
|
||||||
- not-gloss ==0.7.7.0
|
- not-gloss ==0.7.7.0
|
||||||
- nowdoc ==0.1.1.0
|
- nowdoc ==0.1.1.0
|
||||||
|
|
@ -1669,7 +1682,7 @@ default-package-overrides:
|
||||||
- optparse-simple ==0.1.1.3
|
- optparse-simple ==0.1.1.3
|
||||||
- optparse-text ==0.1.1.0
|
- optparse-text ==0.1.1.0
|
||||||
- ordered-containers ==0.2.2
|
- ordered-containers ==0.2.2
|
||||||
- ormolu ==0.1.3.1
|
- ormolu ==0.1.4.1
|
||||||
- overhang ==1.0.0
|
- overhang ==1.0.0
|
||||||
- packcheck ==0.5.1
|
- packcheck ==0.5.1
|
||||||
- packdeps ==0.6.0.0
|
- packdeps ==0.6.0.0
|
||||||
|
|
@ -1677,9 +1690,10 @@ default-package-overrides:
|
||||||
- pagination ==0.2.1
|
- pagination ==0.2.1
|
||||||
- pagure-cli ==0.2
|
- pagure-cli ==0.2
|
||||||
- pandoc-types ==1.22
|
- pandoc-types ==1.22
|
||||||
- pantry ==0.5.1.3
|
- pantry ==0.5.1.4
|
||||||
- parallel ==3.2.2.0
|
- parallel ==3.2.2.0
|
||||||
- parallel-io ==0.3.3
|
- parallel-io ==0.3.3
|
||||||
|
- parameterized ==0.5.0.0
|
||||||
- paripari ==0.7.0.0
|
- paripari ==0.7.0.0
|
||||||
- parseargs ==0.2.0.9
|
- parseargs ==0.2.0.9
|
||||||
- parsec-class ==1.0.0.0
|
- parsec-class ==1.0.0.0
|
||||||
|
|
@ -1706,7 +1720,7 @@ default-package-overrides:
|
||||||
- pathwalk ==0.3.1.2
|
- pathwalk ==0.3.1.2
|
||||||
- pattern-arrows ==0.0.2
|
- pattern-arrows ==0.0.2
|
||||||
- pava ==0.1.0.0
|
- pava ==0.1.0.0
|
||||||
- pcg-random ==0.1.3.6
|
- pcg-random ==0.1.3.7
|
||||||
- pcre-heavy ==1.0.0.2
|
- pcre-heavy ==1.0.0.2
|
||||||
- pcre-light ==0.4.1.0
|
- pcre-light ==0.4.1.0
|
||||||
- pcre-utils ==0.1.8.1.1
|
- pcre-utils ==0.1.8.1.1
|
||||||
|
|
@ -1774,7 +1788,7 @@ default-package-overrides:
|
||||||
- postgresql-libpq ==0.9.4.3
|
- postgresql-libpq ==0.9.4.3
|
||||||
- postgresql-libpq-notify ==0.2.0.0
|
- postgresql-libpq-notify ==0.2.0.0
|
||||||
- postgresql-orm ==0.5.1
|
- postgresql-orm ==0.5.1
|
||||||
- postgresql-simple ==0.6.2
|
- postgresql-simple ==0.6.3
|
||||||
- postgresql-typed ==0.6.1.2
|
- postgresql-typed ==0.6.1.2
|
||||||
- postgrest ==7.0.1
|
- postgrest ==7.0.1
|
||||||
- pptable ==0.3.0.0
|
- pptable ==0.3.0.0
|
||||||
|
|
@ -1801,7 +1815,9 @@ default-package-overrides:
|
||||||
- primes ==0.2.1.0
|
- primes ==0.2.1.0
|
||||||
- primitive ==0.7.1.0
|
- primitive ==0.7.1.0
|
||||||
- primitive-addr ==0.1.0.2
|
- primitive-addr ==0.1.0.2
|
||||||
|
- primitive-extras ==0.8
|
||||||
- primitive-unaligned ==0.1.1.1
|
- primitive-unaligned ==0.1.1.1
|
||||||
|
- primitive-unlifted ==0.1.3.0
|
||||||
- print-console-colors ==0.1.0.0
|
- print-console-colors ==0.1.0.0
|
||||||
- probability ==0.2.7
|
- probability ==0.2.7
|
||||||
- process-extras ==0.7.4
|
- process-extras ==0.7.4
|
||||||
|
|
@ -1879,7 +1895,7 @@ default-package-overrides:
|
||||||
- range-set-list ==0.1.3.1
|
- range-set-list ==0.1.3.1
|
||||||
- Ranged-sets ==0.4.0
|
- Ranged-sets ==0.4.0
|
||||||
- rank1dynamic ==0.4.1
|
- rank1dynamic ==0.4.1
|
||||||
- rank2classes ==1.4.0.1
|
- rank2classes ==1.4.1
|
||||||
- Rasterific ==0.7.5.3
|
- Rasterific ==0.7.5.3
|
||||||
- rasterific-svg ==0.3.3.2
|
- rasterific-svg ==0.3.3.2
|
||||||
- rate-limit ==1.4.2
|
- rate-limit ==1.4.2
|
||||||
|
|
@ -2028,20 +2044,22 @@ default-package-overrides:
|
||||||
- sequenceTools ==1.4.0.5
|
- sequenceTools ==1.4.0.5
|
||||||
- serf ==0.1.1.0
|
- serf ==0.1.1.0
|
||||||
- serialise ==0.2.3.0
|
- serialise ==0.2.3.0
|
||||||
- servant ==0.18.1
|
- servant ==0.18.2
|
||||||
- servant-blaze ==0.9.1
|
- servant-blaze ==0.9.1
|
||||||
- servant-client ==0.18.1
|
- servant-client ==0.18.2
|
||||||
- servant-client-core ==0.18.1
|
- servant-client-core ==0.18.2
|
||||||
- servant-conduit ==0.15.1
|
- servant-conduit ==0.15.1
|
||||||
- servant-docs ==0.11.7
|
- servant-docs ==0.11.8
|
||||||
- servant-foreign ==0.15.2
|
- servant-errors ==0.1.6.0
|
||||||
- servant-http-streams ==0.18.1
|
- servant-foreign ==0.15.3
|
||||||
|
- servant-github-webhook ==0.4.2.0
|
||||||
|
- servant-http-streams ==0.18.2
|
||||||
- servant-machines ==0.15.1
|
- servant-machines ==0.15.1
|
||||||
- servant-multipart ==0.12
|
- servant-multipart ==0.12
|
||||||
- servant-openapi3 ==2.0.1.0
|
- servant-openapi3 ==2.0.1.0
|
||||||
- servant-pipes ==0.15.2
|
- servant-pipes ==0.15.2
|
||||||
- servant-rawm ==1.0.0.0
|
- servant-rawm ==1.0.0.0
|
||||||
- servant-server ==0.18.1
|
- servant-server ==0.18.2
|
||||||
- servant-swagger ==1.1.10
|
- servant-swagger ==1.1.10
|
||||||
- servant-swagger-ui ==0.3.4.3.36.1
|
- servant-swagger-ui ==0.3.4.3.36.1
|
||||||
- servant-swagger-ui-core ==0.3.3
|
- servant-swagger-ui-core ==0.3.3
|
||||||
|
|
@ -2151,8 +2169,11 @@ default-package-overrides:
|
||||||
- step-function ==0.2
|
- step-function ==0.2
|
||||||
- stm-chans ==3.0.0.4
|
- stm-chans ==3.0.0.4
|
||||||
- stm-conduit ==4.0.1
|
- stm-conduit ==4.0.1
|
||||||
|
- stm-containers ==1.2
|
||||||
- stm-delay ==0.1.1.1
|
- stm-delay ==0.1.1.1
|
||||||
- stm-extras ==0.1.0.3
|
- stm-extras ==0.1.0.3
|
||||||
|
- stm-hamt ==1.2.0.4
|
||||||
|
- stm-lifted ==2.5.0.0
|
||||||
- stm-split ==0.0.2.1
|
- stm-split ==0.0.2.1
|
||||||
- STMonadTrans ==0.4.4
|
- STMonadTrans ==0.4.4
|
||||||
- stopwatch ==0.1.0.6
|
- stopwatch ==0.1.0.6
|
||||||
|
|
@ -2173,7 +2194,7 @@ default-package-overrides:
|
||||||
- strict ==0.4
|
- strict ==0.4
|
||||||
- strict-concurrency ==0.2.4.3
|
- strict-concurrency ==0.2.4.3
|
||||||
- strict-list ==0.1.5
|
- strict-list ==0.1.5
|
||||||
- strict-tuple ==0.1.3
|
- strict-tuple ==0.1.4
|
||||||
- strict-tuple-lens ==0.1.0.1
|
- strict-tuple-lens ==0.1.0.1
|
||||||
- string-class ==0.1.7.0
|
- string-class ==0.1.7.0
|
||||||
- string-combinators ==0.6.0.5
|
- string-combinators ==0.6.0.5
|
||||||
|
|
@ -2233,7 +2254,7 @@ default-package-overrides:
|
||||||
- tasty-expected-failure ==0.11.1.2
|
- tasty-expected-failure ==0.11.1.2
|
||||||
- tasty-golden ==2.3.3.2
|
- tasty-golden ==2.3.3.2
|
||||||
- tasty-hedgehog ==1.0.0.2
|
- tasty-hedgehog ==1.0.0.2
|
||||||
- tasty-hspec ==1.1.5.1
|
- tasty-hspec ==1.1.6
|
||||||
- tasty-hunit ==0.10.0.2
|
- tasty-hunit ==0.10.0.2
|
||||||
- tasty-kat ==0.0.3
|
- tasty-kat ==0.0.3
|
||||||
- tasty-leancheck ==0.0.1
|
- tasty-leancheck ==0.0.1
|
||||||
|
|
@ -2282,7 +2303,7 @@ default-package-overrides:
|
||||||
- text-regex-replace ==0.1.1.3
|
- text-regex-replace ==0.1.1.3
|
||||||
- text-region ==0.3.1.0
|
- text-region ==0.3.1.0
|
||||||
- text-short ==0.1.3
|
- text-short ==0.1.3
|
||||||
- text-show ==3.8.5
|
- text-show ==3.9
|
||||||
- text-show-instances ==3.8.4
|
- text-show-instances ==3.8.4
|
||||||
- text-zipper ==0.10.1
|
- text-zipper ==0.10.1
|
||||||
- textlocal ==0.1.0.5
|
- textlocal ==0.1.0.5
|
||||||
|
|
@ -2298,7 +2319,7 @@ default-package-overrides:
|
||||||
- th-expand-syns ==0.4.6.0
|
- th-expand-syns ==0.4.6.0
|
||||||
- th-extras ==0.0.0.4
|
- th-extras ==0.0.0.4
|
||||||
- th-lift ==0.8.2
|
- th-lift ==0.8.2
|
||||||
- th-lift-instances ==0.1.17
|
- th-lift-instances ==0.1.18
|
||||||
- th-nowq ==0.1.0.5
|
- th-nowq ==0.1.0.5
|
||||||
- th-orphans ==0.13.11
|
- th-orphans ==0.13.11
|
||||||
- th-printf ==0.7
|
- th-printf ==0.7
|
||||||
|
|
@ -2332,7 +2353,7 @@ default-package-overrides:
|
||||||
- timeit ==2.0
|
- timeit ==2.0
|
||||||
- timelens ==0.2.0.2
|
- timelens ==0.2.0.2
|
||||||
- timer-wheel ==0.3.0
|
- timer-wheel ==0.3.0
|
||||||
- timerep ==2.0.0.2
|
- timerep ==2.0.1.0
|
||||||
- timezone-olson ==0.2.0
|
- timezone-olson ==0.2.0
|
||||||
- timezone-series ==0.1.9
|
- timezone-series ==0.1.9
|
||||||
- tinylog ==0.15.0
|
- tinylog ==0.15.0
|
||||||
|
|
@ -2350,7 +2371,8 @@ default-package-overrides:
|
||||||
- topograph ==1.0.0.1
|
- topograph ==1.0.0.1
|
||||||
- torsor ==0.1
|
- torsor ==0.1
|
||||||
- tostring ==0.2.1.1
|
- tostring ==0.2.1.1
|
||||||
- tracing ==0.0.5.1
|
- tracing ==0.0.5.2
|
||||||
|
- tracing-control ==0.0.6
|
||||||
- transaction ==0.1.1.3
|
- transaction ==0.1.1.3
|
||||||
- transformers-base ==0.4.5.2
|
- transformers-base ==0.4.5.2
|
||||||
- transformers-bifunctors ==0.1
|
- transformers-bifunctors ==0.1
|
||||||
|
|
@ -2381,6 +2403,7 @@ default-package-overrides:
|
||||||
- type-map ==0.1.6.0
|
- type-map ==0.1.6.0
|
||||||
- type-natural ==0.9.0.0
|
- type-natural ==0.9.0.0
|
||||||
- type-of-html ==1.6.1.2
|
- type-of-html ==1.6.1.2
|
||||||
|
- type-of-html-static ==0.1.0.2
|
||||||
- type-operators ==0.2.0.0
|
- type-operators ==0.2.0.0
|
||||||
- type-spec ==0.4.0.0
|
- type-spec ==0.4.0.0
|
||||||
- TypeCompose ==0.9.14
|
- TypeCompose ==0.9.14
|
||||||
|
|
@ -2496,6 +2519,8 @@ default-package-overrides:
|
||||||
- wai-middleware-caching ==0.1.0.2
|
- wai-middleware-caching ==0.1.0.2
|
||||||
- wai-middleware-clacks ==0.1.0.1
|
- wai-middleware-clacks ==0.1.0.1
|
||||||
- wai-middleware-static ==0.9.0
|
- wai-middleware-static ==0.9.0
|
||||||
|
- wai-rate-limit ==0.1.0.0
|
||||||
|
- wai-rate-limit-redis ==0.1.0.0
|
||||||
- wai-saml2 ==0.2.1.2
|
- wai-saml2 ==0.2.1.2
|
||||||
- wai-session ==0.3.3
|
- wai-session ==0.3.3
|
||||||
- wai-slack-middleware ==0.2.0
|
- wai-slack-middleware ==0.2.0
|
||||||
|
|
@ -2521,6 +2546,7 @@ default-package-overrides:
|
||||||
- Win32 ==2.6.1.0
|
- Win32 ==2.6.1.0
|
||||||
- Win32-notify ==0.3.0.3
|
- Win32-notify ==0.3.0.3
|
||||||
- windns ==0.1.0.1
|
- windns ==0.1.0.1
|
||||||
|
- witch ==0.0.0.3
|
||||||
- with-location ==0.1.0
|
- with-location ==0.1.0
|
||||||
- with-utf8 ==1.0.2.1
|
- with-utf8 ==1.0.2.1
|
||||||
- witherable-class ==0
|
- witherable-class ==0
|
||||||
|
|
@ -2581,7 +2607,7 @@ default-package-overrides:
|
||||||
- yesod-auth ==1.6.10.1
|
- yesod-auth ==1.6.10.1
|
||||||
- yesod-auth-hashdb ==1.7.1.5
|
- yesod-auth-hashdb ==1.7.1.5
|
||||||
- yesod-bin ==1.6.0.6
|
- yesod-bin ==1.6.0.6
|
||||||
- yesod-core ==1.6.18.6
|
- yesod-core ==1.6.18.7
|
||||||
- yesod-fb ==0.6.1
|
- yesod-fb ==0.6.1
|
||||||
- yesod-form ==1.6.7
|
- yesod-form ==1.6.7
|
||||||
- yesod-gitrev ==0.2.1
|
- yesod-gitrev ==0.2.1
|
||||||
|
|
@ -2602,7 +2628,7 @@ default-package-overrides:
|
||||||
- zeromq4-haskell ==0.8.0
|
- zeromq4-haskell ==0.8.0
|
||||||
- zeromq4-patterns ==0.3.1.0
|
- zeromq4-patterns ==0.3.1.0
|
||||||
- zim-parser ==0.2.1.0
|
- zim-parser ==0.2.1.0
|
||||||
- zio ==0.1.0.0
|
- zio ==0.1.0.2
|
||||||
- zip ==1.6.0
|
- zip ==1.6.0
|
||||||
- zip-archive ==0.4.1
|
- zip-archive ==0.4.1
|
||||||
- zip-stream ==0.2.0.1
|
- zip-stream ==0.2.0.1
|
||||||
|
|
@ -2614,6 +2640,7 @@ default-package-overrides:
|
||||||
- zot ==0.0.3
|
- zot ==0.0.3
|
||||||
- zstd ==0.1.2.0
|
- zstd ==0.1.2.0
|
||||||
- ztail ==1.2.0.2
|
- ztail ==1.2.0.2
|
||||||
|
- zydiskell ==0.2.0.0
|
||||||
|
|
||||||
extra-packages:
|
extra-packages:
|
||||||
- Cabal == 2.2.* # required for jailbreak-cabal etc.
|
- Cabal == 2.2.* # required for jailbreak-cabal etc.
|
||||||
|
|
@ -2667,6 +2694,13 @@ package-maintainers:
|
||||||
# - pipes-mongodb
|
# - pipes-mongodb
|
||||||
- streaming-wai
|
- streaming-wai
|
||||||
kiwi:
|
kiwi:
|
||||||
|
- config-schema
|
||||||
|
- config-value
|
||||||
|
- glirc
|
||||||
|
- irc-core
|
||||||
|
- matterhorn
|
||||||
|
- mattermost-api
|
||||||
|
- mattermost-api-qc
|
||||||
- Unique
|
- Unique
|
||||||
psibi:
|
psibi:
|
||||||
- path-pieces
|
- path-pieces
|
||||||
|
|
@ -2678,6 +2712,9 @@ package-maintainers:
|
||||||
- Agda
|
- Agda
|
||||||
roberth:
|
roberth:
|
||||||
- arion-compose
|
- arion-compose
|
||||||
|
- hercules-ci-agent
|
||||||
|
- hercules-ci-api-agent
|
||||||
|
- hercules-ci-api-core
|
||||||
cdepillabout:
|
cdepillabout:
|
||||||
- pretty-simple
|
- pretty-simple
|
||||||
- spago
|
- spago
|
||||||
|
|
@ -3140,6 +3177,7 @@ broken-packages:
|
||||||
- arbor-monad-metric-datadog
|
- arbor-monad-metric-datadog
|
||||||
- arbtt
|
- arbtt
|
||||||
- arch-hs
|
- arch-hs
|
||||||
|
- archive-libarchive
|
||||||
- archiver
|
- archiver
|
||||||
- archlinux
|
- archlinux
|
||||||
- archlinux-web
|
- archlinux-web
|
||||||
|
|
@ -3422,6 +3460,7 @@ broken-packages:
|
||||||
- bindings-apr-util
|
- bindings-apr-util
|
||||||
- bindings-bfd
|
- bindings-bfd
|
||||||
- bindings-cctools
|
- bindings-cctools
|
||||||
|
- bindings-common
|
||||||
- bindings-dc1394
|
- bindings-dc1394
|
||||||
- bindings-eskit
|
- bindings-eskit
|
||||||
- bindings-EsounD
|
- bindings-EsounD
|
||||||
|
|
@ -3518,7 +3557,6 @@ broken-packages:
|
||||||
- blakesum
|
- blakesum
|
||||||
- blakesum-demo
|
- blakesum-demo
|
||||||
- blas
|
- blas
|
||||||
- blas-hs
|
|
||||||
- BlastHTTP
|
- BlastHTTP
|
||||||
- blastxml
|
- blastxml
|
||||||
- blatex
|
- blatex
|
||||||
|
|
@ -3744,6 +3782,7 @@ broken-packages:
|
||||||
- call-haskell-from-anything
|
- call-haskell-from-anything
|
||||||
- camfort
|
- camfort
|
||||||
- campfire
|
- campfire
|
||||||
|
- candid
|
||||||
- canon
|
- canon
|
||||||
- canonical-filepath
|
- canonical-filepath
|
||||||
- canonical-json
|
- canonical-json
|
||||||
|
|
@ -3900,6 +3939,9 @@ broken-packages:
|
||||||
- citeproc-hs-pandoc-filter
|
- citeproc-hs-pandoc-filter
|
||||||
- cj-token
|
- cj-token
|
||||||
- cjk
|
- cjk
|
||||||
|
- cl3
|
||||||
|
- cl3-hmatrix-interface
|
||||||
|
- cl3-linear-interface
|
||||||
- clac
|
- clac
|
||||||
- clafer
|
- clafer
|
||||||
- claferIG
|
- claferIG
|
||||||
|
|
@ -4113,9 +4155,7 @@ broken-packages:
|
||||||
- conffmt
|
- conffmt
|
||||||
- confide
|
- confide
|
||||||
- config-parser
|
- config-parser
|
||||||
- config-schema
|
|
||||||
- config-select
|
- config-select
|
||||||
- config-value
|
|
||||||
- config-value-getopt
|
- config-value-getopt
|
||||||
- ConfigFileTH
|
- ConfigFileTH
|
||||||
- Configger
|
- Configger
|
||||||
|
|
@ -4192,6 +4232,7 @@ broken-packages:
|
||||||
- CoreDump
|
- CoreDump
|
||||||
- CoreErlang
|
- CoreErlang
|
||||||
- CoreFoundation
|
- CoreFoundation
|
||||||
|
- corenlp-parser
|
||||||
- Coroutine
|
- Coroutine
|
||||||
- coroutine-enumerator
|
- coroutine-enumerator
|
||||||
- coroutine-iteratee
|
- coroutine-iteratee
|
||||||
|
|
@ -4209,6 +4250,7 @@ broken-packages:
|
||||||
- cparsing
|
- cparsing
|
||||||
- CPBrainfuck
|
- CPBrainfuck
|
||||||
- cpio-conduit
|
- cpio-conduit
|
||||||
|
- cpkg
|
||||||
- CPL
|
- CPL
|
||||||
- cplusplus-th
|
- cplusplus-th
|
||||||
- cprng-aes-effect
|
- cprng-aes-effect
|
||||||
|
|
@ -4298,6 +4340,7 @@ broken-packages:
|
||||||
- curry-frontend
|
- curry-frontend
|
||||||
- CurryDB
|
- CurryDB
|
||||||
- cursedcsv
|
- cursedcsv
|
||||||
|
- cursor-fuzzy-time-gen
|
||||||
- curves
|
- curves
|
||||||
- custom-prelude
|
- custom-prelude
|
||||||
- CV
|
- CV
|
||||||
|
|
@ -4988,6 +5031,7 @@ broken-packages:
|
||||||
- fastirc
|
- fastirc
|
||||||
- fastly
|
- fastly
|
||||||
- FastPush
|
- FastPush
|
||||||
|
- fastsum
|
||||||
- FastxPipe
|
- FastxPipe
|
||||||
- fathead-util
|
- fathead-util
|
||||||
- fault-tree
|
- fault-tree
|
||||||
|
|
@ -5144,7 +5188,6 @@ broken-packages:
|
||||||
- FM-SBLEX
|
- FM-SBLEX
|
||||||
- fmark
|
- fmark
|
||||||
- FModExRaw
|
- FModExRaw
|
||||||
- fmt
|
|
||||||
- fmt-for-rio
|
- fmt-for-rio
|
||||||
- fmt-terminal-colors
|
- fmt-terminal-colors
|
||||||
- fn-extra
|
- fn-extra
|
||||||
|
|
@ -5173,6 +5216,7 @@ broken-packages:
|
||||||
- FormalGrammars
|
- FormalGrammars
|
||||||
- format
|
- format
|
||||||
- format-status
|
- format-status
|
||||||
|
- formatn
|
||||||
- formattable
|
- formattable
|
||||||
- forml
|
- forml
|
||||||
- formlets
|
- formlets
|
||||||
|
|
@ -5290,6 +5334,7 @@ broken-packages:
|
||||||
- fusion
|
- fusion
|
||||||
- futun
|
- futun
|
||||||
- future
|
- future
|
||||||
|
- fuzzy-time-gen
|
||||||
- fuzzy-timings
|
- fuzzy-timings
|
||||||
- fwgl
|
- fwgl
|
||||||
- fwgl-glfw
|
- fwgl-glfw
|
||||||
|
|
@ -5505,7 +5550,6 @@ broken-packages:
|
||||||
- gli
|
- gli
|
||||||
- glicko
|
- glicko
|
||||||
- glider-nlp
|
- glider-nlp
|
||||||
- glirc
|
|
||||||
- GLMatrix
|
- GLMatrix
|
||||||
- glob-posix
|
- glob-posix
|
||||||
- global
|
- global
|
||||||
|
|
@ -6050,6 +6094,7 @@ broken-packages:
|
||||||
- hasql-postgres-options
|
- hasql-postgres-options
|
||||||
- hasql-queue
|
- hasql-queue
|
||||||
- hasql-simple
|
- hasql-simple
|
||||||
|
- hasql-th
|
||||||
- hastache
|
- hastache
|
||||||
- hastache-aeson
|
- hastache-aeson
|
||||||
- haste
|
- haste
|
||||||
|
|
@ -6131,6 +6176,7 @@ broken-packages:
|
||||||
- hdr-histogram
|
- hdr-histogram
|
||||||
- HDRUtils
|
- HDRUtils
|
||||||
- headergen
|
- headergen
|
||||||
|
- heap-console
|
||||||
- heapsort
|
- heapsort
|
||||||
- heart-app
|
- heart-app
|
||||||
- heart-core
|
- heart-core
|
||||||
|
|
@ -6149,6 +6195,7 @@ broken-packages:
|
||||||
- hedgehog-gen-json
|
- hedgehog-gen-json
|
||||||
- hedgehog-generic
|
- hedgehog-generic
|
||||||
- hedgehog-golden
|
- hedgehog-golden
|
||||||
|
- hedgehog-servant
|
||||||
- Hedi
|
- Hedi
|
||||||
- hedis-config
|
- hedis-config
|
||||||
- hedis-pile
|
- hedis-pile
|
||||||
|
|
@ -6179,9 +6226,6 @@ broken-packages:
|
||||||
- HERA
|
- HERA
|
||||||
- herbalizer
|
- herbalizer
|
||||||
- HerbiePlugin
|
- HerbiePlugin
|
||||||
- hercules-ci-agent
|
|
||||||
- hercules-ci-api-agent
|
|
||||||
- hercules-ci-api-core
|
|
||||||
- heredocs
|
- heredocs
|
||||||
- Hermes
|
- Hermes
|
||||||
- hermit
|
- hermit
|
||||||
|
|
@ -6750,6 +6794,7 @@ broken-packages:
|
||||||
- hw-json-simd
|
- hw-json-simd
|
||||||
- hw-json-simple-cursor
|
- hw-json-simple-cursor
|
||||||
- hw-json-standard-cursor
|
- hw-json-standard-cursor
|
||||||
|
- hw-prim-bits
|
||||||
- hw-simd
|
- hw-simd
|
||||||
- hw-uri
|
- hw-uri
|
||||||
- hwall-auth-iitk
|
- hwall-auth-iitk
|
||||||
|
|
@ -6969,7 +7014,6 @@ broken-packages:
|
||||||
- iptadmin
|
- iptadmin
|
||||||
- IPv6DB
|
- IPv6DB
|
||||||
- Irc
|
- Irc
|
||||||
- irc-core
|
|
||||||
- irc-dcc
|
- irc-dcc
|
||||||
- irc-fun-bot
|
- irc-fun-bot
|
||||||
- irc-fun-client
|
- irc-fun-client
|
||||||
|
|
@ -7390,6 +7434,7 @@ broken-packages:
|
||||||
- lhe
|
- lhe
|
||||||
- lhs2TeX-hl
|
- lhs2TeX-hl
|
||||||
- lhslatex
|
- lhslatex
|
||||||
|
- libarchive
|
||||||
- LibClang
|
- LibClang
|
||||||
- libconfig
|
- libconfig
|
||||||
- libcspm
|
- libcspm
|
||||||
|
|
@ -7712,9 +7757,6 @@ broken-packages:
|
||||||
- matrix-market
|
- matrix-market
|
||||||
- matrix-sized
|
- matrix-sized
|
||||||
- matsuri
|
- matsuri
|
||||||
- matterhorn
|
|
||||||
- mattermost-api
|
|
||||||
- mattermost-api-qc
|
|
||||||
- maude
|
- maude
|
||||||
- maxent
|
- maxent
|
||||||
- maxent-learner-hw
|
- maxent-learner-hw
|
||||||
|
|
@ -7810,6 +7852,10 @@ broken-packages:
|
||||||
- midimory
|
- midimory
|
||||||
- midisurface
|
- midisurface
|
||||||
- mighttpd
|
- mighttpd
|
||||||
|
- migrant-core
|
||||||
|
- migrant-hdbc
|
||||||
|
- migrant-postgresql-simple
|
||||||
|
- migrant-sqlite-simple
|
||||||
- mikmod
|
- mikmod
|
||||||
- mikrokosmos
|
- mikrokosmos
|
||||||
- miku
|
- miku
|
||||||
|
|
@ -7883,6 +7929,7 @@ broken-packages:
|
||||||
- monad-log
|
- monad-log
|
||||||
- monad-lrs
|
- monad-lrs
|
||||||
- monad-mersenne-random
|
- monad-mersenne-random
|
||||||
|
- monad-metrics-extensible
|
||||||
- monad-mock
|
- monad-mock
|
||||||
- monad-open
|
- monad-open
|
||||||
- monad-parallel-progressbar
|
- monad-parallel-progressbar
|
||||||
|
|
@ -8005,6 +8052,7 @@ broken-packages:
|
||||||
- mu-protobuf
|
- mu-protobuf
|
||||||
- mu-rpc
|
- mu-rpc
|
||||||
- mu-schema
|
- mu-schema
|
||||||
|
- mu-servant-server
|
||||||
- mu-tracing
|
- mu-tracing
|
||||||
- MuCheck
|
- MuCheck
|
||||||
- MuCheck-Hspec
|
- MuCheck-Hspec
|
||||||
|
|
@ -8088,6 +8136,9 @@ broken-packages:
|
||||||
- nagios-plugin-ekg
|
- nagios-plugin-ekg
|
||||||
- nakadi-client
|
- nakadi-client
|
||||||
- named-lock
|
- named-lock
|
||||||
|
- named-servant
|
||||||
|
- named-servant-client
|
||||||
|
- named-servant-server
|
||||||
- named-sop
|
- named-sop
|
||||||
- namelist
|
- namelist
|
||||||
- namespace
|
- namespace
|
||||||
|
|
@ -8164,6 +8215,7 @@ broken-packages:
|
||||||
- network-hans
|
- network-hans
|
||||||
- network-house
|
- network-house
|
||||||
- network-interfacerequest
|
- network-interfacerequest
|
||||||
|
- network-messagepack-rpc-websocket
|
||||||
- network-minihttp
|
- network-minihttp
|
||||||
- network-msgpack-rpc
|
- network-msgpack-rpc
|
||||||
- network-netpacket
|
- network-netpacket
|
||||||
|
|
@ -8675,7 +8727,6 @@ broken-packages:
|
||||||
- pipes-s3
|
- pipes-s3
|
||||||
- pipes-shell
|
- pipes-shell
|
||||||
- pipes-sqlite-simple
|
- pipes-sqlite-simple
|
||||||
- pipes-text
|
|
||||||
- pipes-transduce
|
- pipes-transduce
|
||||||
- pipes-vector
|
- pipes-vector
|
||||||
- pipes-zeromq4
|
- pipes-zeromq4
|
||||||
|
|
@ -8790,6 +8841,7 @@ broken-packages:
|
||||||
- postgresql-simple-queue
|
- postgresql-simple-queue
|
||||||
- postgresql-simple-sop
|
- postgresql-simple-sop
|
||||||
- postgresql-simple-typed
|
- postgresql-simple-typed
|
||||||
|
- postgresql-syntax
|
||||||
- postgresql-tx-query
|
- postgresql-tx-query
|
||||||
- postgresql-tx-squeal
|
- postgresql-tx-squeal
|
||||||
- postgresql-typed-lifted
|
- postgresql-typed-lifted
|
||||||
|
|
@ -9123,6 +9175,7 @@ broken-packages:
|
||||||
- rclient
|
- rclient
|
||||||
- rdioh
|
- rdioh
|
||||||
- react-flux
|
- react-flux
|
||||||
|
- react-flux-servant
|
||||||
- react-haskell
|
- react-haskell
|
||||||
- react-tutorial-haskell-server
|
- react-tutorial-haskell-server
|
||||||
- reaction-logic
|
- reaction-logic
|
||||||
|
|
@ -9194,6 +9247,8 @@ broken-packages:
|
||||||
- reflex-gloss
|
- reflex-gloss
|
||||||
- reflex-gloss-scene
|
- reflex-gloss-scene
|
||||||
- reflex-libtelnet
|
- reflex-libtelnet
|
||||||
|
- reflex-localize
|
||||||
|
- reflex-localize-dom
|
||||||
- reflex-orphans
|
- reflex-orphans
|
||||||
- reflex-process
|
- reflex-process
|
||||||
- reflex-sdl2
|
- reflex-sdl2
|
||||||
|
|
@ -9332,6 +9387,7 @@ broken-packages:
|
||||||
- rfc-prelude
|
- rfc-prelude
|
||||||
- rfc-psql
|
- rfc-psql
|
||||||
- rfc-redis
|
- rfc-redis
|
||||||
|
- rfc-servant
|
||||||
- rg
|
- rg
|
||||||
- rhythm-game-tutorial
|
- rhythm-game-tutorial
|
||||||
- rib
|
- rib
|
||||||
|
|
@ -9373,6 +9429,7 @@ broken-packages:
|
||||||
- roc-cluster
|
- roc-cluster
|
||||||
- roc-cluster-demo
|
- roc-cluster-demo
|
||||||
- rock
|
- rock
|
||||||
|
- rocksdb-haskell
|
||||||
- roku-api
|
- roku-api
|
||||||
- rollbar
|
- rollbar
|
||||||
- rollbar-hs
|
- rollbar-hs
|
||||||
|
|
@ -9544,6 +9601,7 @@ broken-packages:
|
||||||
- sdl2-cairo-image
|
- sdl2-cairo-image
|
||||||
- sdl2-compositor
|
- sdl2-compositor
|
||||||
- sdl2-fps
|
- sdl2-fps
|
||||||
|
- sdr
|
||||||
- seakale
|
- seakale
|
||||||
- seakale-postgresql
|
- seakale-postgresql
|
||||||
- seakale-tests
|
- seakale-tests
|
||||||
|
|
@ -9596,6 +9654,78 @@ broken-packages:
|
||||||
- serpentine
|
- serpentine
|
||||||
- serv
|
- serv
|
||||||
- serv-wai
|
- serv-wai
|
||||||
|
- servant-aeson-specs
|
||||||
|
- servant-auth-cookie
|
||||||
|
- servant-auth-hmac
|
||||||
|
- servant-auth-token
|
||||||
|
- servant-auth-token-acid
|
||||||
|
- servant-auth-token-api
|
||||||
|
- servant-auth-token-leveldb
|
||||||
|
- servant-auth-token-persistent
|
||||||
|
- servant-auth-token-rocksdb
|
||||||
|
- servant-auth-wordpress
|
||||||
|
- servant-avro
|
||||||
|
- servant-cassava
|
||||||
|
- servant-cli
|
||||||
|
- servant-client-js
|
||||||
|
- servant-client-namedargs
|
||||||
|
- servant-csharp
|
||||||
|
- servant-db
|
||||||
|
- servant-db-postgresql
|
||||||
|
- servant-dhall
|
||||||
|
- servant-docs-simple
|
||||||
|
- servant-ede
|
||||||
|
- servant-ekg
|
||||||
|
- servant-elm
|
||||||
|
- servant-examples
|
||||||
|
- servant-fiat-content
|
||||||
|
- servant-generate
|
||||||
|
- servant-generic
|
||||||
|
- servant-github
|
||||||
|
- servant-haxl-client
|
||||||
|
- servant-hmac-auth
|
||||||
|
- servant-http2-client
|
||||||
|
- servant-iCalendar
|
||||||
|
- servant-jquery
|
||||||
|
- servant-js
|
||||||
|
- servant-JuicyPixels
|
||||||
|
- servant-kotlin
|
||||||
|
- servant-matrix-param
|
||||||
|
- servant-mock
|
||||||
|
- servant-namedargs
|
||||||
|
- servant-nix
|
||||||
|
- servant-openapi3
|
||||||
|
- servant-pagination
|
||||||
|
- servant-pandoc
|
||||||
|
- servant-pool
|
||||||
|
- servant-postgresql
|
||||||
|
- servant-proto-lens
|
||||||
|
- servant-purescript
|
||||||
|
- servant-pushbullet-client
|
||||||
|
- servant-py
|
||||||
|
- servant-quickcheck
|
||||||
|
- servant-rawm-client
|
||||||
|
- servant-reason
|
||||||
|
- servant-reflex
|
||||||
|
- servant-router
|
||||||
|
- servant-scotty
|
||||||
|
- servant-seo
|
||||||
|
- servant-serf
|
||||||
|
- servant-server-namedargs
|
||||||
|
- servant-smsc-ru
|
||||||
|
- servant-snap
|
||||||
|
- servant-streaming
|
||||||
|
- servant-streaming-client
|
||||||
|
- servant-streaming-docs
|
||||||
|
- servant-streaming-server
|
||||||
|
- servant-swagger-tags
|
||||||
|
- servant-to-elm
|
||||||
|
- servant-waargonaut
|
||||||
|
- servant-yaml
|
||||||
|
- servant-zeppelin
|
||||||
|
- servant-zeppelin-client
|
||||||
|
- servant-zeppelin-server
|
||||||
|
- servant-zeppelin-swagger
|
||||||
- server-generic
|
- server-generic
|
||||||
- serversession-backend-acid-state
|
- serversession-backend-acid-state
|
||||||
- serversession-backend-persistent
|
- serversession-backend-persistent
|
||||||
|
|
@ -9751,6 +9881,7 @@ broken-packages:
|
||||||
- skeletons
|
- skeletons
|
||||||
- skell
|
- skell
|
||||||
- skemmtun
|
- skemmtun
|
||||||
|
- skews
|
||||||
- skulk
|
- skulk
|
||||||
- skylark-client
|
- skylark-client
|
||||||
- skylighting-lucid
|
- skylighting-lucid
|
||||||
|
|
@ -10259,7 +10390,6 @@ broken-packages:
|
||||||
- Tape
|
- Tape
|
||||||
- tapioca
|
- tapioca
|
||||||
- target
|
- target
|
||||||
- tart
|
|
||||||
- task
|
- task
|
||||||
- task-distribution
|
- task-distribution
|
||||||
- taskell
|
- taskell
|
||||||
|
|
@ -10495,6 +10625,7 @@ broken-packages:
|
||||||
- tomato-rubato-openal
|
- tomato-rubato-openal
|
||||||
- toml
|
- toml
|
||||||
- tonatona-google-server-api
|
- tonatona-google-server-api
|
||||||
|
- tonatona-servant
|
||||||
- too-many-cells
|
- too-many-cells
|
||||||
- toodles
|
- toodles
|
||||||
- top
|
- top
|
||||||
|
|
@ -10677,6 +10808,9 @@ broken-packages:
|
||||||
- typesafe-precure
|
- typesafe-precure
|
||||||
- typescript-docs
|
- typescript-docs
|
||||||
- typograffiti
|
- typograffiti
|
||||||
|
- typson-beam
|
||||||
|
- typson-esqueleto
|
||||||
|
- typson-selda
|
||||||
- tyro
|
- tyro
|
||||||
- u2f
|
- u2f
|
||||||
- uber
|
- uber
|
||||||
|
|
@ -10866,6 +11000,7 @@ broken-packages:
|
||||||
- verilog
|
- verilog
|
||||||
- verismith
|
- verismith
|
||||||
- versioning
|
- versioning
|
||||||
|
- versioning-servant
|
||||||
- vflow-types
|
- vflow-types
|
||||||
- vfr-waypoints
|
- vfr-waypoints
|
||||||
- vgrep
|
- vgrep
|
||||||
|
|
@ -11091,6 +11226,7 @@ broken-packages:
|
||||||
- wsedit
|
- wsedit
|
||||||
- wshterm
|
- wshterm
|
||||||
- wsjtx-udp
|
- wsjtx-udp
|
||||||
|
- wss-client
|
||||||
- wstunnel
|
- wstunnel
|
||||||
- wtk
|
- wtk
|
||||||
- wtk-gtk
|
- wtk-gtk
|
||||||
|
|
@ -11361,6 +11497,7 @@ broken-packages:
|
||||||
- zeromq3-haskell
|
- zeromq3-haskell
|
||||||
- zeromq4-clone-pattern
|
- zeromq4-clone-pattern
|
||||||
- zeromq4-conduit
|
- zeromq4-conduit
|
||||||
|
- zeromq4-patterns
|
||||||
- zeroth
|
- zeroth
|
||||||
- zettelkast
|
- zettelkast
|
||||||
- ZFS
|
- ZFS
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -12,6 +12,10 @@ let
|
||||||
aarch64 = "arm64";
|
aarch64 = "arm64";
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
"1.24.3-x86_64-darwin" = fetchurl {
|
||||||
|
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||||
|
sha256 = "1n4cq4jrms4j0yl54b3w14agcgy8dbipv5788jziwk8q06a8c69l";
|
||||||
|
};
|
||||||
"1.24.3-x86_64-linux" = fetchurl {
|
"1.24.3-x86_64-linux" = fetchurl {
|
||||||
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||||
sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3";
|
sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3";
|
||||||
|
|
@ -24,6 +28,10 @@ let
|
||||||
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||||
sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh";
|
sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh";
|
||||||
};
|
};
|
||||||
|
"2.7.2-x86_64-darwin" = fetchurl {
|
||||||
|
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||||
|
sha256 = "111zl075qdk2zd4d4mmfkn30jmzsri9nq3nspnmc2l245gdq34jj";
|
||||||
|
};
|
||||||
"2.7.2-x86_64-linux" = fetchurl {
|
"2.7.2-x86_64-linux" = fetchurl {
|
||||||
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||||
sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v";
|
sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v";
|
||||||
|
|
@ -36,10 +44,18 @@ let
|
||||||
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||||
sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p";
|
sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p";
|
||||||
};
|
};
|
||||||
|
"2.10.0-x86_64-darwin" = fetchurl {
|
||||||
|
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||||
|
sha256 = "1n4qgsax5wi7krgvvs0dy7fz39nlykiw8gr0gdacc85hgyhqg09j";
|
||||||
|
};
|
||||||
"2.10.0-x86_64-linux" = fetchurl {
|
"2.10.0-x86_64-linux" = fetchurl {
|
||||||
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||||
sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb";
|
sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb";
|
||||||
};
|
};
|
||||||
|
"2.9.0-4.0.dev-x86_64-darwin" = fetchurl {
|
||||||
|
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||||
|
sha256 = "0gj91pbvqrxsvxaj742cllqha2z65867gggzq9hq5139vkkpfj9s";
|
||||||
|
};
|
||||||
"2.9.0-4.0.dev-x86_64-linux" = fetchurl {
|
"2.9.0-4.0.dev-x86_64-linux" = fetchurl {
|
||||||
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||||
sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r";
|
sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r";
|
||||||
|
|
@ -52,6 +68,10 @@ let
|
||||||
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
|
||||||
sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc";
|
sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc";
|
||||||
};
|
};
|
||||||
|
"2.11.0-161.0.dev-x86_64-darwin" = fetchurl {
|
||||||
|
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||||
|
sha256 = "0mlwxp7jkkjafxkc4vqlgwl62y0hk1arhfrvc9hpm9dv98g3bdjj";
|
||||||
|
};
|
||||||
"2.11.0-161.0.dev-x86_64-linux" = fetchurl {
|
"2.11.0-161.0.dev-x86_64-linux" = fetchurl {
|
||||||
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
|
||||||
sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i";
|
sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i";
|
||||||
|
|
@ -93,7 +113,7 @@ stdenv.mkDerivation {
|
||||||
with C-style syntax. It offers compilation to JavaScript, interfaces,
|
with C-style syntax. It offers compilation to JavaScript, interfaces,
|
||||||
mixins, abstract classes, reified generics, and optional typing.
|
mixins, abstract classes, reified generics, and optional typing.
|
||||||
'';
|
'';
|
||||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||||
}
|
}
|
||||||
)) {
|
)) {
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
sha256 = "18pz6gjzqy6a62xkcmjanhr7kgxpvpmc0blrk4igz8ldcybz44if";
|
sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m";
|
||||||
};
|
};
|
||||||
|
|
||||||
FONTCONFIG_FILE = fontsConf;
|
FONTCONFIG_FILE = fontsConf;
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
|
||||||
name = "racket-minimal-${oldAttrs.version}";
|
name = "racket-minimal-${oldAttrs.version}";
|
||||||
src = oldAttrs.src.override {
|
src = oldAttrs.src.override {
|
||||||
inherit name;
|
inherit name;
|
||||||
sha256 = "0xvnd7afx058sg7j51bmbikqgn4sl0246nkhr8zlqcrbr3nqi6p4";
|
sha256 = "0yc5zkpq1bavj64h67pllw6mfjhmdp65fgdpyqcaan3syy6b5cia";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = oldAttrs.meta // {
|
meta = oldAttrs.meta // {
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cimg";
|
pname = "cimg";
|
||||||
version = "2.9.3";
|
version = "2.9.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dtschump";
|
owner = "dtschump";
|
||||||
repo = "CImg";
|
repo = "CImg";
|
||||||
rev = "v.${version}";
|
rev = "v.${version}";
|
||||||
sha256 = "1pkjbwpi0047lbc55cva99rj6p70gbw09l14vrym0igwipnxxx0z";
|
sha256 = "1sb0z5ryh34y80ghlr2agsl64gayjmxpl96l9fjaylf5k2m3fg2b";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cppzmq";
|
pname = "cppzmq";
|
||||||
version = "4.6.0";
|
version = "4.7.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zeromq";
|
owner = "zeromq";
|
||||||
repo = "cppzmq";
|
repo = "cppzmq";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h";
|
sha256 = "00lb3pv923nbpaf7ric2cv6lbpspknj0pxj6yj5jyah7r3zw692m";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gtk-layer-shell";
|
pname = "gtk-layer-shell";
|
||||||
version = "0.2.0";
|
version = "0.3.0";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "wmww";
|
owner = "wmww";
|
||||||
repo = "gtk-layer-shell";
|
repo = "gtk-layer-shell";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg";
|
sha256 = "1f7hfwik7a9kzw0q1k3xc1yisrgg8lbp5pjr337phc9hm38lhq3c";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
From f974fe07de9e6820bb1de50b31e480296d1d97b7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christian Kampka <christian@kampka.net>
|
||||||
|
Date: Wed, 25 Nov 2020 20:09:50 +0100
|
||||||
|
Subject: [PATCH] Remove unsupported clang flags
|
||||||
|
|
||||||
|
---
|
||||||
|
src/Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/Makefile b/src/Makefile
|
||||||
|
index f13a6bb..b305150 100644
|
||||||
|
--- a/src/Makefile
|
||||||
|
+++ b/src/Makefile
|
||||||
|
@@ -69,7 +69,7 @@ PREFIX ?= /usr/local
|
||||||
|
LIBDIRNAME ?= /lib/faketime
|
||||||
|
PLATFORM ?=$(shell uname)
|
||||||
|
|
||||||
|
-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
|
||||||
|
+CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
|
||||||
|
ifeq ($(PLATFORM),SunOS)
|
||||||
|
CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
|
||||||
|
endif
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./no-date-in-gzip-man-page.patch
|
./no-date-in-gzip-man-page.patch
|
||||||
];
|
] ++ (stdenv.lib.optionals stdenv.cc.isClang [
|
||||||
|
# https://github.com/wolfcw/libfaketime/issues/277
|
||||||
|
./0001-Remove-unsupported-clang-flags.patch
|
||||||
|
]);
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs test src
|
patchShebangs test src
|
||||||
|
|
@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||||
PREFIX = placeholder "out";
|
PREFIX = placeholder "out";
|
||||||
LIBDIRNAME = "/lib";
|
LIBDIRNAME = "/lib";
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type -Wno-error=format-truncation";
|
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation";
|
||||||
|
|
||||||
checkInputs = [ perl ];
|
checkInputs = [ perl ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fastjet-contrib";
|
pname = "fastjet-contrib";
|
||||||
version = "1.042";
|
version = "1.045";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz";
|
url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz";
|
||||||
sha256 = "0cc8dn6g7adj2pgs8hvczg68i3xhlk6978m4gxamgibilf9jw1av";
|
sha256 = "1y45jx7i30ik2pjv33y16fi5i5jpmi0zp1jh32pwywd3diaiazv6";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ fastjet ];
|
buildInputs = [ fastjet ];
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||||
"-DPRECICE_PETScMapping=OFF"
|
"-DPRECICE_PETScMapping=OFF"
|
||||||
"-DBUILD_SHARED_LIBS=ON"
|
"-DBUILD_SHARED_LIBS=ON"
|
||||||
"-DPYTHON_LIBRARIES=${python3.libPrefix}"
|
"-DPYTHON_LIBRARIES=${python3.libPrefix}"
|
||||||
"-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m"
|
"-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ];
|
NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ];
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,4 @@ in
|
||||||
import ./node-packages.nix {
|
import ./node-packages.nix {
|
||||||
inherit (pkgs) fetchurl fetchgit;
|
inherit (pkgs) fetchurl fetchgit;
|
||||||
inherit nodeEnv;
|
inherit nodeEnv;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@
|
||||||
, "coc-jest"
|
, "coc-jest"
|
||||||
, "coc-json"
|
, "coc-json"
|
||||||
, "coc-lists"
|
, "coc-lists"
|
||||||
|
, "coc-markdownlint"
|
||||||
, "coc-metals"
|
, "coc-metals"
|
||||||
, "coc-pairs"
|
, "coc-pairs"
|
||||||
, "coc-prettier"
|
, "coc-prettier"
|
||||||
|
|
@ -49,6 +50,7 @@
|
||||||
, "coc-tslint-plugin"
|
, "coc-tslint-plugin"
|
||||||
, "coc-tsserver"
|
, "coc-tsserver"
|
||||||
, "coc-vetur"
|
, "coc-vetur"
|
||||||
|
, "coc-vimlsp"
|
||||||
, "coc-vimtex"
|
, "coc-vimtex"
|
||||||
, "coc-wxml"
|
, "coc-wxml"
|
||||||
, "coc-yaml"
|
, "coc-yaml"
|
||||||
|
|
@ -187,6 +189,7 @@
|
||||||
, "ssb-server"
|
, "ssb-server"
|
||||||
, "stackdriver-statsd-backend"
|
, "stackdriver-statsd-backend"
|
||||||
, "stf"
|
, "stf"
|
||||||
|
, "stylelint"
|
||||||
, "svgo"
|
, "svgo"
|
||||||
, "swagger"
|
, "swagger"
|
||||||
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
|
, {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,13 +1,16 @@
|
||||||
{ lib, buildDunePackage, rpclib, ppxlib, ppx_deriving }:
|
{ lib, buildDunePackage, rpclib, alcotest, ppxlib, ppx_deriving, yojson }:
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "ppx_deriving_rpc";
|
pname = "ppx_deriving_rpc";
|
||||||
|
|
||||||
inherit (rpclib) version src;
|
inherit (rpclib) version useDune2 src;
|
||||||
|
|
||||||
buildInputs = [ ppxlib ];
|
minimumOCamlVersion = "4.08";
|
||||||
|
|
||||||
propagatedBuildInputs = [ rpclib ppx_deriving ];
|
propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ];
|
||||||
|
|
||||||
|
checkInputs = [ alcotest yojson ];
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/mirage/ocaml-rpc";
|
homepage = "https://github.com/mirage/ocaml-rpc";
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,22 @@
|
||||||
{ lib, fetchFromGitHub, buildDunePackage, alcotest, cmdliner, rresult, result, xmlm, yojson }:
|
{ lib, fetchurl, buildDunePackage
|
||||||
|
, alcotest
|
||||||
|
, base64, cmdliner, rresult, xmlm, yojson
|
||||||
|
}:
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "rpclib";
|
pname = "rpclib";
|
||||||
version = "7.0.0";
|
version = "8.0.0";
|
||||||
|
|
||||||
minimumOCamlVersion = "4.04";
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchurl {
|
||||||
owner = "mirage";
|
url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz";
|
||||||
repo = "ocaml-rpc";
|
sha256 = "1kqbixk4d9y15ns566fiyzid5jszkamm1kv7iks71invv33v7krz";
|
||||||
rev = "v${version}";
|
|
||||||
sha256 = "0d8nb272mjxkq5ddn65cy9gjpa8yvd0v3jv3wp5xfh9gj29wd2jj";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ alcotest cmdliner yojson ];
|
buildInputs = [ cmdliner yojson ];
|
||||||
propagatedBuildInputs = [ rresult result xmlm ];
|
propagatedBuildInputs = [ base64 rresult xmlm ];
|
||||||
|
checkInputs = [ alcotest ];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
{ lib, buildDunePackage, rpclib
|
||||||
|
, lwt
|
||||||
|
, alcotest-lwt, ppx_deriving_rpc, yojson
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildDunePackage {
|
||||||
|
pname = "rpclib-lwt";
|
||||||
|
inherit (rpclib) version useDune2 src;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ lwt rpclib ];
|
||||||
|
|
||||||
|
checkInputs = [ alcotest-lwt ppx_deriving_rpc yojson ];
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = rpclib.meta // {
|
||||||
|
description = "A library to deal with RPCs in OCaml - Lwt interface";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -1,23 +1,19 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, isPy3k
|
, isPy27
|
||||||
, isPy38
|
|
||||||
# python dependencies
|
# python dependencies
|
||||||
, click
|
, click
|
||||||
, configparser ? null
|
|
||||||
, dateutil
|
, dateutil
|
||||||
, etelemetry
|
, etelemetry
|
||||||
, filelock
|
, filelock
|
||||||
, funcsigs
|
, funcsigs
|
||||||
, future
|
, future
|
||||||
, futures
|
|
||||||
, mock
|
, mock
|
||||||
, networkx
|
, networkx
|
||||||
, nibabel
|
, nibabel
|
||||||
, numpy
|
, numpy
|
||||||
, packaging
|
, packaging
|
||||||
, pathlib2
|
|
||||||
, prov
|
, prov
|
||||||
, psutil
|
, psutil
|
||||||
, pybids
|
, pybids
|
||||||
|
|
@ -25,6 +21,7 @@
|
||||||
, pytest
|
, pytest
|
||||||
, pytest_xdist
|
, pytest_xdist
|
||||||
, pytest-forked
|
, pytest-forked
|
||||||
|
, rdflib
|
||||||
, scipy
|
, scipy
|
||||||
, simplejson
|
, simplejson
|
||||||
, traits
|
, traits
|
||||||
|
|
@ -37,10 +34,12 @@
|
||||||
, bash
|
, bash
|
||||||
, glibcLocales
|
, glibcLocales
|
||||||
, callPackage
|
, callPackage
|
||||||
|
# causes Python packaging conflict with any package requiring rdflib,
|
||||||
|
# so use the unpatched rdflib by default (disables Nipype provenance tracking);
|
||||||
|
# see https://github.com/nipy/nipype/issues/2888:
|
||||||
|
, useNeurdflib ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert !isPy3k -> configparser != null;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
# This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo.
|
# This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo.
|
||||||
|
|
@ -51,6 +50,7 @@ in
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "nipype";
|
pname = "nipype";
|
||||||
version = "1.5.1";
|
version = "1.5.1";
|
||||||
|
disabled = isPy27;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
|
@ -74,7 +74,6 @@ buildPythonPackage rec {
|
||||||
funcsigs
|
funcsigs
|
||||||
future
|
future
|
||||||
networkx
|
networkx
|
||||||
neurdflib
|
|
||||||
nibabel
|
nibabel
|
||||||
numpy
|
numpy
|
||||||
packaging
|
packaging
|
||||||
|
|
@ -85,11 +84,7 @@ buildPythonPackage rec {
|
||||||
simplejson
|
simplejson
|
||||||
traits
|
traits
|
||||||
xvfbwrapper
|
xvfbwrapper
|
||||||
] ++ stdenv.lib.optionals (!isPy3k) [
|
] ++ [ (if useNeurdflib then neurdflib else rdflib) ];
|
||||||
configparser
|
|
||||||
futures
|
|
||||||
pathlib2 # darwin doesn't receive this transitively, but it is in install_requires
|
|
||||||
];
|
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
pybids
|
pybids
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
{ lib, buildPythonPackage, fetchPypi, isPy27, cffi, pytest }:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "pycmarkgfm";
|
||||||
|
version = "1.0.1";
|
||||||
|
disabled = isPy27;
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "0wkbbma214f927ikn3cijxsrzkmm5cqz1x4fimrwx9s2wfphj250";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ cffi ];
|
||||||
|
|
||||||
|
# I would gladly use pytestCheckHook, but pycmarkgfm relies on a native
|
||||||
|
# extension (cmark.so, built through setup.py), and pytestCheckHook runs
|
||||||
|
# pytest in an environment that does not contain this extension, which fails.
|
||||||
|
# cmarkgfm has virtually the same build setup as this package, and uses the
|
||||||
|
# same trick: pkgs/development/python-modules/cmarkgfm/default.nix
|
||||||
|
checkInputs = [ pytest ];
|
||||||
|
checkPhase = ''
|
||||||
|
pytest
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/zopieux/pycmarkgfm";
|
||||||
|
description = "Bindings to GitHub's Flavored Markdown (cmark-gfm), with enhanced support for task lists";
|
||||||
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
maintainers = with maintainers; [ zopieux ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, isPy27
|
||||||
|
, fetchFromGitHub
|
||||||
|
, matplotlib
|
||||||
|
, networkx
|
||||||
|
, nose
|
||||||
|
, numpy
|
||||||
|
, scipy
|
||||||
|
, pytestCheckHook
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "scikit-fuzzy";
|
||||||
|
version = "unstable-2020-10-03";
|
||||||
|
disabled = isPy27;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = pname;
|
||||||
|
repo = pname;
|
||||||
|
rev = "eecf303b701e3efacdc9b9066207ef605d4facaa";
|
||||||
|
sha256 = "18dl0017iqwc7446hqgabhibgjwdakhmycpis6zpvvkkv4ip5062";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ networkx numpy scipy ];
|
||||||
|
checkInputs = [ matplotlib nose pytestCheckHook ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy";
|
||||||
|
description = "Fuzzy logic toolkit for scientific Python";
|
||||||
|
license = licenses.bsd3;
|
||||||
|
maintainers = [ maintainers.bcdarwin ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -57,7 +57,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.py \
|
substituteInPlace setup.py \
|
||||||
--replace "'boto3>=1.4.4,<1.15'," "'boto3~=1.15'," \
|
--replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \
|
||||||
--replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \
|
--replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \
|
||||||
--replace "'idna<2.10'," "'idna'," \
|
--replace "'idna<2.10'," "'idna'," \
|
||||||
--replace "'requests<2.24.0'," "'requests',"
|
--replace "'requests<2.24.0'," "'requests',"
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,8 @@ buildPythonPackage rec {
|
||||||
snowflake-connector-python
|
snowflake-connector-python
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Pypi does not include tests
|
||||||
|
doCheck = false;
|
||||||
pythonImportsCheck = [ "snowflake.sqlalchemy" ];
|
pythonImportsCheck = [ "snowflake.sqlalchemy" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ let
|
||||||
common = { scalaVersion, sha256 }:
|
common = { scalaVersion, sha256 }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ammonite";
|
pname = "ammonite";
|
||||||
version = "2.2.0";
|
version = "2.3.8";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url =
|
url =
|
||||||
|
|
@ -23,7 +23,7 @@ let
|
||||||
install -Dm755 $src $out/bin/amm
|
install -Dm755 $src $out/bin/amm
|
||||||
sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
|
sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
|
||||||
'' + optionalString (disableRemoteLogging) ''
|
'' + optionalString (disableRemoteLogging) ''
|
||||||
sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
|
sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm
|
||||||
sed -i '1i #!/bin/sh' $out/bin/amm
|
sed -i '1i #!/bin/sh' $out/bin/amm
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
@ -75,10 +75,10 @@ let
|
||||||
in {
|
in {
|
||||||
ammonite_2_12 = common {
|
ammonite_2_12 = common {
|
||||||
scalaVersion = "2.12";
|
scalaVersion = "2.12";
|
||||||
sha256 = "9xe4GT5YpVCtDPaZvi9PZwFW/wcNhg+QCdbJ4Tl2lFk=";
|
sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs";
|
||||||
};
|
};
|
||||||
ammonite_2_13 = common {
|
ammonite_2_13 = common {
|
||||||
scalaVersion = "2.13";
|
scalaVersion = "2.13";
|
||||||
sha256 = "KRwh2YOcHpXLA9BlBKzkc9oswdOQbcm3WVqgYaGyi4A=";
|
sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
{ fetchFromGitHub
|
{ fetchFromGitHub
|
||||||
, lib
|
, lib
|
||||||
, python
|
, python3
|
||||||
, enableTelemetry ? false
|
, enableTelemetry ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
py = python.override {
|
py = python3.override {
|
||||||
packageOverrides = self: super: {
|
packageOverrides = self: super: {
|
||||||
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
|
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
|
||||||
version = "1.0.2";
|
version = "1.0.2";
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ python.pkgs.buildPythonApplication rec {
|
||||||
${python.interpreter} setup.py compile_catalog
|
${python.interpreter} setup.py compile_catalog
|
||||||
'';
|
'';
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
patchShebangs gradlew-fdroid
|
||||||
install -m 0755 gradlew-fdroid $out/bin
|
install -m 0755 gradlew-fdroid $out/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "go-migrate";
|
pname = "go-migrate";
|
||||||
version = "4.12.2";
|
version = "4.13.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "golang-migrate";
|
owner = "golang-migrate";
|
||||||
repo = "migrate";
|
repo = "migrate";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0vrc9y90aamj618sfipq2sgzllhdr4hmicj4yvl147klwb1rxlz6";
|
sha256 = "0rzx974cxsipbnggl3n4q6zsvm313svrg718gscydygk41m9nql9";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "0jpz5xvwsw4l7nmi7s1grvbfy4xjp50hrjycwicgv2ll719gz5v0";
|
vendorSha256 = "1107syipynlfibzljyfgz81v1avi8axvsjpmrpj990pm83r9svc6";
|
||||||
|
|
||||||
subPackages = [ "cmd/migrate" ];
|
subPackages = [ "cmd/migrate" ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "metals";
|
pname = "metals";
|
||||||
version = "0.9.6";
|
version = "0.9.7";
|
||||||
|
|
||||||
deps = stdenv.mkDerivation {
|
deps = stdenv.mkDerivation {
|
||||||
name = "${pname}-deps-${version}";
|
name = "${pname}-deps-${version}";
|
||||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHashAlgo = "sha256";
|
outputHashAlgo = "sha256";
|
||||||
outputHash = "0cjivkrykvp2m8bj3x9fsk7nsr5vxf87jfh4rjn24kfliljwfh2w";
|
outputHash = "0aky4vbbm5hi6jnd2n1aimqznbbaya05c7vdgaqhy3630ks3w4k9";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dfu-util";
|
pname = "dfu-util";
|
||||||
version = "0.9";
|
version = "0.10";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ libusb1 ];
|
buildInputs = [ libusb1 ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
|
url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
|
||||||
sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin";
|
sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,24 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
kramdown (1.17.0)
|
chef-utils (16.7.61)
|
||||||
mdl (0.5.0)
|
kramdown (2.3.0)
|
||||||
kramdown (~> 1.12, >= 1.12.0)
|
rexml
|
||||||
mixlib-cli (~> 1.7, >= 1.7.0)
|
kramdown-parser-gfm (1.1.0)
|
||||||
mixlib-config (~> 2.2, >= 2.2.1)
|
kramdown (~> 2.0)
|
||||||
mixlib-cli (1.7.0)
|
mdl (0.11.0)
|
||||||
mixlib-config (2.2.18)
|
kramdown (~> 2.3)
|
||||||
|
kramdown-parser-gfm (~> 1.1)
|
||||||
|
mixlib-cli (~> 2.1, >= 2.1.1)
|
||||||
|
mixlib-config (>= 2.2.1, < 4)
|
||||||
|
mixlib-shellout
|
||||||
|
mixlib-cli (2.1.8)
|
||||||
|
mixlib-config (3.0.9)
|
||||||
tomlrb
|
tomlrb
|
||||||
tomlrb (1.2.8)
|
mixlib-shellout (3.2.2)
|
||||||
|
chef-utils
|
||||||
|
rexml (3.2.4)
|
||||||
|
tomlrb (2.0.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
|
||||||
|
|
@ -1,34 +1,56 @@
|
||||||
{
|
{
|
||||||
kramdown = {
|
chef-utils = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
|
sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.17.0";
|
version = "16.7.61";
|
||||||
|
};
|
||||||
|
kramdown = {
|
||||||
|
dependencies = ["rexml"];
|
||||||
|
groups = ["default"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "2.3.0";
|
||||||
|
};
|
||||||
|
kramdown-parser-gfm = {
|
||||||
|
dependencies = ["kramdown"];
|
||||||
|
groups = ["default"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "1.1.0";
|
||||||
};
|
};
|
||||||
mdl = {
|
mdl = {
|
||||||
dependencies = ["kramdown" "mixlib-cli" "mixlib-config"];
|
dependencies = ["kramdown" "kramdown-parser-gfm" "mixlib-cli" "mixlib-config" "mixlib-shellout"];
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i";
|
sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "0.5.0";
|
version = "0.11.0";
|
||||||
};
|
};
|
||||||
mixlib-cli = {
|
mixlib-cli = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
|
sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.7.0";
|
version = "2.1.8";
|
||||||
};
|
};
|
||||||
mixlib-config = {
|
mixlib-config = {
|
||||||
dependencies = ["tomlrb"];
|
dependencies = ["tomlrb"];
|
||||||
|
|
@ -36,19 +58,40 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb";
|
sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.2.18";
|
version = "3.0.9";
|
||||||
|
};
|
||||||
|
mixlib-shellout = {
|
||||||
|
dependencies = ["chef-utils"];
|
||||||
|
groups = ["default"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "3.2.2";
|
||||||
|
};
|
||||||
|
rexml = {
|
||||||
|
groups = ["default"];
|
||||||
|
platforms = [];
|
||||||
|
source = {
|
||||||
|
remotes = ["https://rubygems.org"];
|
||||||
|
sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
|
||||||
|
type = "gem";
|
||||||
|
};
|
||||||
|
version = "3.2.4";
|
||||||
};
|
};
|
||||||
tomlrb = {
|
tomlrb = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv";
|
sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.2.8";
|
version = "2.0.0";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -34,6 +34,7 @@ in buildEnv {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
broken = true;
|
||||||
homepage = "https://frogatto.com";
|
homepage = "https://frogatto.com";
|
||||||
description = description;
|
description = description;
|
||||||
license = with licenses; [ cc-by-30 unfree ];
|
license = with licenses; [ cc-by-30 unfree ];
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ let
|
||||||
comment = "Official launcher for Minecraft, a sandbox-building game";
|
comment = "Official launcher for Minecraft, a sandbox-building game";
|
||||||
desktopName = "Minecraft Launcher";
|
desktopName = "Minecraft Launcher";
|
||||||
categories = "Game;";
|
categories = "Game;";
|
||||||
|
fileValidation = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
envLibPath = stdenv.lib.makeLibraryPath [
|
envLibPath = stdenv.lib.makeLibraryPath [
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ in mkDerivation rec {
|
||||||
install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop
|
install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop
|
||||||
|
|
||||||
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
|
||||||
wrapProgram $out/bin/multimc --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/
|
wrapProgram $out/bin/multimc --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
{ stdenv, fetchurl, bash, jre }:
|
{ stdenv, fetchurl, bash, jre }:
|
||||||
let
|
let
|
||||||
mcVersion = "1.16.2";
|
mcVersion = "1.16.4";
|
||||||
buildNum = "141";
|
buildNum = "296";
|
||||||
jar = fetchurl {
|
jar = fetchurl {
|
||||||
url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download";
|
url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download";
|
||||||
sha256 = "1qhhnaysw9r73fpvj9qcmjah722a6a4s6g4cblna56n1hpz4lw1s";
|
sha256 = "0885417w7qahk2fwlzvggbwrhvwgpd7xas8lzzb7ar469vyvd9dz";
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
pname = "papermc";
|
pname = "papermc";
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ let
|
||||||
type = "Application";
|
type = "Application";
|
||||||
categories = "Game;";
|
categories = "Game;";
|
||||||
genericName = pname;
|
genericName = pname;
|
||||||
|
fileValidation = false;
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ let
|
||||||
type = "Application";
|
type = "Application";
|
||||||
categories = "Game;RolePlaying;";
|
categories = "Game;RolePlaying;";
|
||||||
genericName = pname;
|
genericName = pname;
|
||||||
|
fileValidation = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
|
|
|
||||||
|
|
@ -447,18 +447,6 @@ let
|
||||||
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
|
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
|
||||||
};
|
};
|
||||||
|
|
||||||
coc-markdownlint = buildVimPluginFrom2Nix {
|
|
||||||
pname = "coc-markdownlint";
|
|
||||||
version = "2020-11-12";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "fannheyward";
|
|
||||||
repo = "coc-markdownlint";
|
|
||||||
rev = "a9304f7b096871e15c2992d0d09e7c7f3a3675d4";
|
|
||||||
sha256 = "0r7mr4qmw04hhxihfn4pndpv0dakwjcj6jf1jccgydxc35qv14vj";
|
|
||||||
};
|
|
||||||
meta.homepage = "https://github.com/fannheyward/coc-markdownlint/";
|
|
||||||
};
|
|
||||||
|
|
||||||
coc-neco = buildVimPluginFrom2Nix {
|
coc-neco = buildVimPluginFrom2Nix {
|
||||||
pname = "coc-neco";
|
pname = "coc-neco";
|
||||||
version = "2020-04-07";
|
version = "2020-04-07";
|
||||||
|
|
@ -483,18 +471,6 @@ let
|
||||||
meta.homepage = "https://github.com/iamcco/coc-spell-checker/";
|
meta.homepage = "https://github.com/iamcco/coc-spell-checker/";
|
||||||
};
|
};
|
||||||
|
|
||||||
coc-vimlsp = buildVimPluginFrom2Nix {
|
|
||||||
pname = "coc-vimlsp";
|
|
||||||
version = "2020-08-01";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "iamcco";
|
|
||||||
repo = "coc-vimlsp";
|
|
||||||
rev = "efb672fe82d8619d83d3978714393e13aee8e296";
|
|
||||||
sha256 = "16whzvyzbx8zh7z33w7pir264dmbapkanb15mkazfhkh0wm3sfvf";
|
|
||||||
};
|
|
||||||
meta.homepage = "https://github.com/iamcco/coc-vimlsp/";
|
|
||||||
};
|
|
||||||
|
|
||||||
coc-nvim = buildVimPluginFrom2Nix {
|
coc-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "coc-nvim";
|
pname = "coc-nvim";
|
||||||
version = "2020-11-17";
|
version = "2020-11-17";
|
||||||
|
|
@ -1737,6 +1713,18 @@ let
|
||||||
meta.homepage = "https://github.com/parsonsmatt/intero-neovim/";
|
meta.homepage = "https://github.com/parsonsmatt/intero-neovim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
investigate-vim = buildVimPluginFrom2Nix {
|
||||||
|
pname = "investigate-vim";
|
||||||
|
version = "2020-02-29";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "keith";
|
||||||
|
repo = "investigate.vim";
|
||||||
|
rev = "aef9332ba3cfc070fb59fd7a4ac82bae2b42cd7b";
|
||||||
|
sha256 = "1jiipch8jr66h1cywwj0zdlx45p70d359s8ljdwcndjwicrqslmk";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/keith/investigate.vim/";
|
||||||
|
};
|
||||||
|
|
||||||
iosvkem = buildVimPluginFrom2Nix {
|
iosvkem = buildVimPluginFrom2Nix {
|
||||||
pname = "iosvkem";
|
pname = "iosvkem";
|
||||||
version = "2020-06-18";
|
version = "2020-06-18";
|
||||||
|
|
|
||||||
|
|
@ -648,12 +648,12 @@ self: super: {
|
||||||
} // (
|
} // (
|
||||||
let
|
let
|
||||||
nodePackageNames = [
|
nodePackageNames = [
|
||||||
"coc-go"
|
|
||||||
"coc-css"
|
"coc-css"
|
||||||
"coc-diagnostic"
|
"coc-diagnostic"
|
||||||
"coc-emmet"
|
"coc-emmet"
|
||||||
"coc-eslint"
|
"coc-eslint"
|
||||||
"coc-git"
|
"coc-git"
|
||||||
|
"coc-go"
|
||||||
"coc-highlight"
|
"coc-highlight"
|
||||||
"coc-html"
|
"coc-html"
|
||||||
"coc-imselect"
|
"coc-imselect"
|
||||||
|
|
@ -661,6 +661,7 @@ self: super: {
|
||||||
"coc-jest"
|
"coc-jest"
|
||||||
"coc-json"
|
"coc-json"
|
||||||
"coc-lists"
|
"coc-lists"
|
||||||
|
"coc-markdownlint"
|
||||||
"coc-metals"
|
"coc-metals"
|
||||||
"coc-pairs"
|
"coc-pairs"
|
||||||
"coc-prettier"
|
"coc-prettier"
|
||||||
|
|
@ -677,6 +678,7 @@ self: super: {
|
||||||
"coc-tslint-plugin"
|
"coc-tslint-plugin"
|
||||||
"coc-tsserver"
|
"coc-tsserver"
|
||||||
"coc-vetur"
|
"coc-vetur"
|
||||||
|
"coc-vimlsp"
|
||||||
"coc-vimtex"
|
"coc-vimtex"
|
||||||
"coc-wxml"
|
"coc-wxml"
|
||||||
"coc-yaml"
|
"coc-yaml"
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,6 @@ ervandew/supertab
|
||||||
esneider/YUNOcommit.vim
|
esneider/YUNOcommit.vim
|
||||||
euclidianAce/BetterLua.vim
|
euclidianAce/BetterLua.vim
|
||||||
euclio/vim-markdown-composer
|
euclio/vim-markdown-composer
|
||||||
fannheyward/coc-markdownlint
|
|
||||||
farmergreg/vim-lastplace
|
farmergreg/vim-lastplace
|
||||||
fatih/vim-go
|
fatih/vim-go
|
||||||
fcpg/vim-osc52
|
fcpg/vim-osc52
|
||||||
|
|
@ -162,7 +161,6 @@ hsanson/vim-android
|
||||||
hsitz/VimOrganizer
|
hsitz/VimOrganizer
|
||||||
hugolgst/vimsence
|
hugolgst/vimsence
|
||||||
iamcco/coc-spell-checker
|
iamcco/coc-spell-checker
|
||||||
iamcco/coc-vimlsp
|
|
||||||
ianks/vim-tsx
|
ianks/vim-tsx
|
||||||
idanarye/vim-merginal
|
idanarye/vim-merginal
|
||||||
idris-hackers/idris-vim
|
idris-hackers/idris-vim
|
||||||
|
|
@ -239,6 +237,7 @@ kbenzie/vim-spirv
|
||||||
kchmck/vim-coffee-script
|
kchmck/vim-coffee-script
|
||||||
KeitaNakamura/neodark.vim
|
KeitaNakamura/neodark.vim
|
||||||
keith/swift.vim
|
keith/swift.vim
|
||||||
|
keith/investigate.vim
|
||||||
kien/rainbow_parentheses.vim
|
kien/rainbow_parentheses.vim
|
||||||
knubie/vim-kitty-navigator
|
knubie/vim-kitty-navigator
|
||||||
konfekt/fastfold
|
konfekt/fastfold
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
|
{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
|
||||||
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
|
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "5.1.6";
|
version = "5.1.6";
|
||||||
|
|
@ -28,13 +28,16 @@ in stdenv.mkDerivation {
|
||||||
unset STRIP # Makefile.rules defines a usable STRIP only without the env var.
|
unset STRIP # Makefile.rules defines a usable STRIP only without the env var.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# configure script is not finding the right path
|
||||||
|
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
make install SUBDIRS="lib daemon modules man" # all but samples
|
make install SUBDIRS="lib daemon modules man" # all but samples
|
||||||
#make install SUBDIRS="samples" # impure!
|
#make install SUBDIRS="samples" # impure!
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd
|
buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd
|
||||||
openssl cyrus_sasl ];
|
openssl cyrus_sasl rpcsvc-proto ];
|
||||||
|
|
||||||
nativeBuildInputs = [ flex bison ];
|
nativeBuildInputs = [ flex bison ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hdparm";
|
pname = "hdparm";
|
||||||
version = "9.58";
|
version = "9.60";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz";
|
url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz";
|
||||||
sha256 = "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws";
|
sha256 = "1k1mcv7naiacw1y6bdd1adnjfiq1kkx2ivsadjwmlkg4fff775w3";
|
||||||
};
|
};
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ipset";
|
pname = "ipset";
|
||||||
version = "7.7";
|
version = "7.9";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
|
url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
|
||||||
sha256 = "0ckc678l1431mb0q5ilfgy0ajjwi8n135c72h606imm43dc0v9a5";
|
sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
|
||||||
|
|
@ -775,6 +775,8 @@ let
|
||||||
X86_CHECK_BIOS_CORRUPTION = yes;
|
X86_CHECK_BIOS_CORRUPTION = yes;
|
||||||
X86_MCE = yes;
|
X86_MCE = yes;
|
||||||
|
|
||||||
|
RAS = yes; # Needed for EDAC support
|
||||||
|
|
||||||
# Our initrd init uses shebang scripts, so can't be modular.
|
# Our initrd init uses shebang scripts, so can't be modular.
|
||||||
BINFMT_SCRIPT = yes;
|
BINFMT_SCRIPT = yes;
|
||||||
# For systemd-binfmt
|
# For systemd-binfmt
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "etcd";
|
pname = "etcd";
|
||||||
version = "3.4.13";
|
version = "3.4.14";
|
||||||
|
|
||||||
deleteVendor = true;
|
deleteVendor = true;
|
||||||
vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc";
|
vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc";
|
||||||
|
|
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||||
owner = "etcd-io";
|
owner = "etcd-io";
|
||||||
repo = "etcd";
|
repo = "etcd";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0bvky593241i60qf6793sxzsxwfl3f56cgscnva9f2jfhk157wmy";
|
sha256 = "0s6xwc8yczjdf6xysb6m0pp31hxjqdqjw24bliq08094jprhj31f";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ callPackage, ... }@args:
|
{ callPackage, ... }@args:
|
||||||
|
|
||||||
callPackage ./generic.nix args {
|
callPackage ./generic.nix args {
|
||||||
version = "1.19.4";
|
version = "1.19.5";
|
||||||
sha256 = "03h0hhrbfy3asla9gki2cp97zjn7idxbp5lk9xi0snlh4xlm9pv1";
|
sha256 = "173rv8gacd9bakb0r9jmkr4pqgjw9mzpdh3f7x2d8ln4ssplc2jw";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,8 @@
|
||||||
*/
|
*/
|
||||||
function __get_custom_data_full_path()
|
function __get_custom_data_full_path()
|
||||||
{
|
{
|
||||||
return '${dataPath}'; // custom data folder path
|
$v = getenv('RAINLOOP_DATA_DIR', TRUE);
|
||||||
|
return $v === FALSE ? '${dataPath}' : $v;
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
@ -33,6 +34,8 @@
|
||||||
cp -r rainloop/* $out
|
cp -r rainloop/* $out
|
||||||
rm -rf $out/data
|
rm -rf $out/data
|
||||||
cp ${includeScript} $out/include.php
|
cp ${includeScript} $out/include.php
|
||||||
|
mkdir $out/data
|
||||||
|
chmod 700 $out/data
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
@ -44,13 +47,13 @@
|
||||||
maintainers = with maintainers; [ das_j ];
|
maintainers = with maintainers; [ das_j ];
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
in {
|
in {
|
||||||
rainloop-community = common {
|
rainloop-community = common {
|
||||||
edition = "community";
|
edition = "community";
|
||||||
sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y";
|
sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y";
|
||||||
};
|
};
|
||||||
rainloop-standard = common {
|
rainloop-standard = common {
|
||||||
edition = "";
|
edition = "";
|
||||||
sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch";
|
sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,5 +31,6 @@ stdenv.mkDerivation {
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = with maintainers; [ msm ];
|
maintainers = with maintainers; [ msm ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
broken = stdenv.isDarwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:
|
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.14.2";
|
version = "2.14.2";
|
||||||
|
|
@ -10,12 +10,14 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
# put packages that needs to be overriden in the py package scope
|
# put packages that needs to be overriden in the py package scope
|
||||||
py = import ./python-packages.nix { inherit stdenv python lib src version; };
|
py = import ./python-packages.nix {
|
||||||
|
inherit stdenv lib src version;
|
||||||
|
python = python3;
|
||||||
|
};
|
||||||
in
|
in
|
||||||
py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
|
||||||
pname = "azure-cli";
|
pname = "azure-cli";
|
||||||
inherit version src;
|
inherit version src;
|
||||||
disabled = python.isPy27; # namespacing assumes PEP420, which isn't compat with py2
|
|
||||||
|
|
||||||
sourceRoot = "source/src/azure-cli";
|
sourceRoot = "source/src/azure-cli";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "abcm2ps";
|
pname = "abcm2ps";
|
||||||
version = "8.14.9";
|
version = "8.14.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "leesavide";
|
owner = "leesavide";
|
||||||
repo = "abcm2ps";
|
repo = "abcm2ps";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0h4qzj9k5ng09nbkfipvr82piq68c576akjwmhsqn05rvgirmhx7";
|
sha256 = "0x20vmf94n9s4r2q45543yi39fkc0jg9wd1imihjcqmb2sz3x3vm";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
|
{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
|
||||||
, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio
|
, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio
|
||||||
, xlibsWrapper, gsettings-desktop-schemas
|
, xlibsWrapper, gsettings-desktop-schemas
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
|
@ -17,12 +17,18 @@ stdenv.mkDerivation rec {
|
||||||
patches = [
|
patches = [
|
||||||
# https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701
|
# https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701
|
||||||
./fix-wayland.patch
|
./fix-wayland.patch
|
||||||
|
|
||||||
|
# https://github.com/christophgysin/pasystray/issues/98
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://sources.debian.org/data/main/p/pasystray/0.7.1-1/debian/patches/0001-Build-against-ayatana-appindicator.patch";
|
||||||
|
sha256 = "0hijphrf52n2zfwdnrmxlp3a7iwznnkb79awvpzplz0ia2lqywpw";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
|
nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gnome3.adwaita-icon-theme
|
gnome3.adwaita-icon-theme
|
||||||
avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
|
avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,6 @@ with stdenv;
|
||||||
homepage = "https://irods.org";
|
homepage = "https://irods.org";
|
||||||
license = stdenv.lib.licenses.bsd3;
|
license = stdenv.lib.licenses.bsd3;
|
||||||
maintainers = [ stdenv.lib.maintainers.bzizou ];
|
maintainers = [ stdenv.lib.maintainers.bzizou ];
|
||||||
platforms = stdenv.lib.platforms.all;
|
platforms = stdenv.lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,13 +15,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gmic";
|
pname = "gmic";
|
||||||
version = "2.9.3";
|
version = "2.9.4";
|
||||||
|
|
||||||
outputs = [ "out" "lib" "dev" "man" ];
|
outputs = [ "out" "lib" "dev" "man" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
|
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
|
||||||
sha256 = "1pj3rwycwnspw2lm5j0w4647677y6s3446zsx9s6br9bc7v7w5s6";
|
sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue