public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-30 06:21:40 +00:00 committed by GitHub
commit c6548b2832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 1362 additions and 398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/ccache.nix
View File

@ -17,7 +17,7 @@ in {
type = types.listOf types.str; type = types.listOf types.str;
description = "Nix top-level packages to be compiled using CCache"; description = "Nix top-level packages to be compiled using CCache";
default = []; default = [];
example = [ "wxGTK30" "qt48" "ffmpeg_3_3" "libav_all" ]; example = [ "wxGTK30" "ffmpeg" "libav_all" ];
}; };
}; };

125
pkgs/applications/audio/cantata/default.nix
View File

@ -1,22 +1,42 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config { mkDerivation
, qtbase, qtsvg, qttools, perl , lib
, fetchFromGitHub
, cmake
, pkg-config
, qtbase
, qtsvg
, qttools
, perl
# Cantata doesn't build with cdparanoia enabled so we disable that # Cantata doesn't build with cdparanoia enabled so we disable that
# default for now until I (or someone else) figure it out. # default for now until I (or someone else) figure it out.
, withCdda ? false, cdparanoia , withCdda ? false
, withCddb ? false, libcddb , cdparanoia
, withLame ? false, lame , withCddb ? false
, withMusicbrainz ? false, libmusicbrainz5 , libcddb
, withLame ? false
, lame
, withMusicbrainz ? false
, libmusicbrainz5
, withTaglib ? true, taglib, taglib_extras , withTaglib ? true
, withHttpStream ? true, qtmultimedia , taglib
, withReplaygain ? true, ffmpeg_3, speex, mpg123 , taglib_extras
, withMtp ? true, libmtp , withHttpStream ? true
, qtmultimedia
, withReplaygain ? true
, ffmpeg
, speex
, mpg123
, withMtp ? true
, libmtp
, withOnlineServices ? true , withOnlineServices ? true
, withDevices ? true, udisks2 , withDevices ? true
, udisks2
, withDynamic ? true , withDynamic ? true
, withHttpServer ? true , withHttpServer ? true
, withLibVlc ? false, libvlc , withLibVlc ? false
, libvlc
, withStreams ? true , withStreams ? true
}: }:
@ -31,22 +51,25 @@ assert withReplaygain -> withTaglib;
assert withLibVlc -> withHttpStream; assert withLibVlc -> withHttpStream;
let let
version = "2.4.2"; fstat = x: fn:
pname = "cantata"; "-DENABLE_${fn}=${if x then "ON" else "OFF"}";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x); fstats = x:
map (fstat x);
withUdisks = (withTaglib && withDevices); withUdisks = (withTaglib && withDevices);
perl' = perl.withPackages (ppkgs: [ ppkgs.URI ]); perl' = perl.withPackages (ppkgs: with ppkgs; [ URI ]);
in mkDerivation { in
name = "${pname}-${version}"; mkDerivation rec {
pname = "cantata";
version = "2.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CDrummond"; owner = "CDrummond";
repo = "cantata"; repo = "cantata";
rev = "v${version}"; rev = "v${version}";
sha256 = "15qfx9bpfdplxxs08inwf2j8kvf7g5cln5sv1wj1l2l41vbf1mjr"; sha256 = "15qfx9bpfdplxxs08inwf2j8kvf7g5cln5sv1wj1l2l41vbf1mjr";
}; };
@ -63,44 +86,44 @@ in mkDerivation {
buildInputs = [ qtbase qtsvg perl' ] buildInputs = [ qtbase qtsvg perl' ]
++ lib.optionals withTaglib [ taglib taglib_extras ] ++ lib.optionals withTaglib [ taglib taglib_extras ]
++ lib.optionals withReplaygain [ ffmpeg_3 speex mpg123 ] ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
++ lib.optional withHttpStream qtmultimedia ++ lib.optional withHttpStream qtmultimedia
++ lib.optional withCdda cdparanoia ++ lib.optional withCdda cdparanoia
++ lib.optional withCddb libcddb ++ lib.optional withCddb libcddb
++ lib.optional withLame lame ++ lib.optional withLame lame
++ lib.optional withMtp libmtp ++ lib.optional withMtp libmtp
++ lib.optional withMusicbrainz libmusicbrainz5 ++ lib.optional withMusicbrainz libmusicbrainz5
++ lib.optional withUdisks udisks2 ++ lib.optional withUdisks udisks2
++ lib.optional withLibVlc libvlc; ++ lib.optional withLibVlc libvlc;
nativeBuildInputs = [ cmake pkg-config qttools ]; nativeBuildInputs = [ cmake pkg-config qttools ];
cmakeFlags = lib.flatten [ cmakeFlags = lib.flatten [
(fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
(fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
(fstat withHttpStream "HTTP_STREAM_PLAYBACK") (fstat withHttpStream "HTTP_STREAM_PLAYBACK")
(fstat withCdda "CDPARANOIA") (fstat withCdda "CDPARANOIA")
(fstat withCddb "CDDB") (fstat withCddb "CDDB")
(fstat withLame "LAME") (fstat withLame "LAME")
(fstat withMtp "MTP") (fstat withMtp "MTP")
(fstat withMusicbrainz "MUSICBRAINZ") (fstat withMusicbrainz "MUSICBRAINZ")
(fstat withOnlineServices "ONLINE_SERVICES") (fstat withOnlineServices "ONLINE_SERVICES")
(fstat withDynamic "DYNAMIC") (fstat withDynamic "DYNAMIC")
(fstat withDevices "DEVICES_SUPPORT") (fstat withDevices "DEVICES_SUPPORT")
(fstat withHttpServer "HTTP_SERVER") (fstat withHttpServer "HTTP_SERVER")
(fstat withLibVlc "LIBVLC") (fstat withLibVlc "LIBVLC")
(fstat withStreams "STREAMS") (fstat withStreams "STREAMS")
(fstat withUdisks "UDISKS2") (fstat withUdisks "UDISKS2")
"-DENABLE_HTTPS_SUPPORT=ON" "-DENABLE_HTTPS_SUPPORT=ON"
]; ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/cdrummond/cantata";
description = "A graphical client for MPD"; description = "A graphical client for MPD";
license = licenses.gpl3; homepage = "https://github.com/cdrummond/cantata";
license = licenses.gpl3Only;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
# Technically Cantata can run on Windows so if someone wants to # Technically, Cantata should run on Darwin/Windows so if someone wants to
# bother figuring that one out, be my guest. # bother figuring that one out, be my guest.
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

14
pkgs/applications/audio/opusfile/default.nix
View File

@ -1,23 +1,27 @@
{ lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }: { lib, stdenv, fetchurl, pkg-config, openssl, libogg, libopus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "opusfile-0.12"; pname = "opusfile";
version = "0.12";
src = fetchurl { src = fetchurl {
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; url = "http://downloads.xiph.org/releases/opus/opusfile-${version}.tar.gz";
sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i"; sha256 = "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl libogg ]; buildInputs = [ openssl libogg ];
propagatedBuildInputs = [ libopus ]; propagatedBuildInputs = [ libopus ];
patches = [ ./include-multistream.patch ]; patches = [ ./include-multistream.patch ]
# fixes problem with openssl 1.1 dependency
# see https://github.com/xiph/opusfile/issues/13
++ lib.optionals stdenv.hostPlatform.isWindows [ ./disable-cert-store.patch ];
configureFlags = [ "--disable-examples" ]; configureFlags = [ "--disable-examples" ];
meta = with lib; { meta = with lib; {
description = "High-level API for decoding and seeking in .opus files"; description = "High-level API for decoding and seeking in .opus files";
homepage = "https://www.opus-codec.org/"; homepage = "https://www.opus-codec.org/";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.all;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ taeer ];
}; };
} }

35
pkgs/applications/audio/opusfile/disable-cert-store.patch Normal file
View File

@ -0,0 +1,35 @@
diff --git a/src/http.c b/src/http.c
index bd08562..3a3592c 100644
--- a/src/http.c
+++ b/src/http.c
@@ -327,10 +327,12 @@ static int op_poll_win32(struct pollfd *_fds,nfds_t _nfds,int _timeout){
typedef ptrdiff_t ssize_t;
# endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
/*Load certificates from the built-in certificate store.*/
int SSL_CTX_set_default_verify_paths_win32(SSL_CTX *_ssl_ctx);
# define SSL_CTX_set_default_verify_paths \
SSL_CTX_set_default_verify_paths_win32
+#endif
# else
/*Normal Berkeley sockets.*/
diff --git a/src/wincerts.c b/src/wincerts.c
index 409a4e0..c355952 100644
--- a/src/wincerts.c
+++ b/src/wincerts.c
@@ -33,6 +33,8 @@
# include <openssl/err.h>
# include <openssl/x509.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+
static int op_capi_new(X509_LOOKUP *_lu){
HCERTSTORE h_store;
h_store=CertOpenStore(CERT_STORE_PROV_SYSTEM_A,0,0,
@@ -171,3 +173,4 @@ int SSL_CTX_set_default_verify_paths_win32(SSL_CTX *_ssl_ctx){
}
#endif
+#endif

43
pkgs/applications/audio/scream/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, lib, config, fetchFromGitHub, cmake, pkg-config
, alsaSupport ? stdenv.isLinux, alsaLib
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
}:
stdenv.mkDerivation rec {
pname = "scream";
version = "3.6";
src = fetchFromGitHub {
owner = "duncanthrax";
repo = pname;
rev = version;
sha256 = "01k2zhfb781gfj3apmcjqbm5m05m6pvnh7fb5k81zwvqibai000v";
};
buildInputs = lib.optional pulseSupport libpulseaudio
++ lib.optional alsaSupport alsaLib;
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [
"-DPULSEAUDIO_ENABLE=${if pulseSupport then "ON" else "OFF"}"
"-DALSA_ENABLE=${if alsaSupport then "ON" else "OFF"}"
];
cmakeDir = "../Receivers/unix";
doInstallCheck = true;
installCheckPhase = ''
set +o pipefail
# Programs exit with code 1 when testing help, so grep for a string
$out/bin/scream -h 2>&1 | grep -q Usage:
'';
meta = with lib; {
description = "Audio receiver for the Scream virtual network sound card";
homepage = "https://github.com/duncanthrax/scream";
license = licenses.mspl;
platforms = platforms.linux;
maintainers = with maintainers; [ arcnmx ];
};
}

32
pkgs/applications/misc/jp2a/default.nix
View File

@ -1,25 +1,43 @@
{ lib, stdenv, fetchFromGitHub, libjpeg, autoreconfHook }: { lib
, stdenv
, fetchFromGitHub
, libjpeg
, libpng
, ncurses
, autoreconfHook
, autoconf-archive
, pkg-config
, bash-completion
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.7"; version = "1.1.0";
pname = "jp2a"; pname = "jp2a";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cslarsen"; owner = "Talinx";
repo = "jp2a"; repo = "jp2a";
rev = "v${version}"; rev = "v${version}";
sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql"; sha256 = "1dz2mrhl45f0vwyfx7qc3665xma78q024c10lfsgn6farrr0c2lb";
}; };
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [
buildInputs = [ libjpeg ]; autoreconfHook
autoconf-archive
pkg-config
bash-completion
];
buildInputs = [ libjpeg libpng ncurses ];
installFlags = [ "bashcompdir=\${out}/share/bash-completion/completions" ];
meta = with lib; { meta = with lib; {
homepage = "https://csl.name/jp2a/"; homepage = "https://csl.name/jp2a/";
description = "A small utility that converts JPG images to ASCII"; description = "A small utility that converts JPG images to ASCII";
license = licenses.gpl2; license = licenses.gpl2Only;
maintainers = [ maintainers.FlorianFranzen ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

4
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -26,9 +26,11 @@
, libXrandr , libXrandr
, libXrender , libXrender
, libXtst , libXtst
, libdrm
, libnotify , libnotify
, libpulseaudio , libpulseaudio
, libuuid , libuuid
, mesa
, nspr , nspr
, nss , nss
, pango , pango
@ -88,9 +90,11 @@ in stdenv.mkDerivation rec {
libXrandr libXrandr
libXrender libXrender
libXtst libXtst
libdrm
libnotify libnotify
libuuid libuuid
libxcb libxcb
mesa
nspr nspr
nss nss
pango pango

11
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, fetchzip, fetchpatch, python3 { lib, fetchurl, fetchzip, python3
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
, libxslt, gst_all_1 ? null , libxslt, gst_all_1 ? null
@ -31,12 +31,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec { in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser"; pname = "qutebrowser";
version = "2.2.0"; version = "2.2.1";
# the release tarballs are different from the git checkout! # the release tarballs are different from the git checkout!
src = fetchurl { src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256:0anxhrkxqb35mxr7jr820xcfw0v514s92wffsiqap2a2sqaj0pgs"; sha256 = "sha256-JHymxnNPdMsVma3TUKCS+iRCe9J7I0A6iISP5OXtJm8=";
}; };
# Needs tox # Needs tox
@ -69,11 +69,6 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
patches = [ patches = [
./fix-restart.patch ./fix-restart.patch
(fetchpatch {
name = "add-qtwebengine-version-override.patch";
url = "https://github.com/qutebrowser/qutebrowser/commit/febb921040b6670d9b1694a6ce55ae39384d1306.patch";
sha256 = "15p11kk8via7c7m14jiqgzc63qwxxzayr2bkl93jd10l2gx7pk9v";
})
]; ];
dontWrapGApps = true; dontWrapGApps = true;

4
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.29.0"; version = "0.29.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Ubft+R2nBUNRx3SfksORxBbKY/mSvY+tKkz1UcGXyjw="; sha256 = "sha256-fr33DRFZrUZQELYMf8z5ShOZobwylgoiW+yi6qdtFP4=";
}; };
vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8=";

306
pkgs/development/compilers/gcc/11/Added-mcf-thread-model-support-from-mcfgthread.patch Normal file
View File

@ -0,0 +1,306 @@
From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001
From: Liu Hao <lh_mouse@126.com>
Date: Wed, 25 Apr 2018 21:54:19 +0800
Subject: [PATCH] Added 'mcf' thread model support from mcfgthread.
Signed-off-by: Liu Hao <lh_mouse@126.com>
---
config/gthr.m4 | 1 +
gcc/config.gcc | 3 +++
gcc/config/i386/mingw-mcfgthread.h | 1 +
gcc/config/i386/mingw-w64.h | 2 +-
gcc/config/i386/mingw32.h | 11 ++++++++++-
gcc/configure | 2 +-
gcc/configure.ac | 2 +-
libatomic/configure.tgt | 2 +-
libgcc/config.host | 6 ++++++
libgcc/config/i386/gthr-mcf.h | 1 +
libgcc/config/i386/t-mingw-mcfgthread | 2 ++
libgcc/configure | 1 +
libstdc++-v3/configure | 1 +
libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++
libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++
libstdc++-v3/src/c++11/thread.cc | 9 +++++++++
16 files changed, 80 insertions(+), 5 deletions(-)
create mode 100644 gcc/config/i386/mingw-mcfgthread.h
create mode 100644 libgcc/config/i386/gthr-mcf.h
create mode 100644 libgcc/config/i386/t-mingw-mcfgthread
diff --git a/config/gthr.m4 b/config/gthr.m4
index 7b29f1f3327..82e21fe1709 100644
--- a/config/gthr.m4
+++ b/config/gthr.m4
@@ -21,6 +21,7 @@ case $1 in
tpf) thread_header=config/s390/gthr-tpf.h ;;
vxworks) thread_header=config/gthr-vxworks.h ;;
win32) thread_header=config/i386/gthr-win32.h ;;
+ mcf) thread_header=config/i386/gthr-mcf.h ;;
esac
AC_SUBST(thread_header)
])
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 46a9029acec..112c24e95a3 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
if test x$enable_threads = xposix ; then
tm_file="${tm_file} i386/mingw-pthread.h"
fi
+ if test x$enable_threads = xmcf ; then
+ tm_file="${tm_file} i386/mingw-mcfgthread.h"
+ fi
tm_file="${tm_file} i386/mingw32.h"
# This makes the logic if mingw's or the w64 feature set has to be used
case ${target} in
diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h
new file mode 100644
index 00000000000..ec381a7798f
--- /dev/null
+++ b/gcc/config/i386/mingw-mcfgthread.h
@@ -0,0 +1 @@
+#define TARGET_USE_MCFGTHREAD 1
diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h
index 484dc7a9e9f..a15bbeea500 100644
--- a/gcc/config/i386/mingw-w64.h
+++ b/gcc/config/i386/mingw-w64.h
@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see
"%{mwindows:-lgdi32 -lcomdlg32} " \
"%{fvtable-verify=preinit:-lvtv -lpsapi; \
fvtable-verify=std:-lvtv -lpsapi} " \
- "-ladvapi32 -lshell32 -luser32 -lkernel32"
+ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
#undef SPEC_32
#undef SPEC_64
diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index 0612b87199a..76cea94f3b7 100644
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see
| MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \
| MASK_MS_BITFIELD_LAYOUT)
+#ifndef TARGET_USE_MCFGTHREAD
+#define CPP_MCFGTHREAD() ((void)0)
+#define LIB_MCFGTHREAD ""
+#else
+#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__"))
+#define LIB_MCFGTHREAD " -lmcfgthread "
+#endif
+
/* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS
is for compatibility with native compiler. */
#define EXTRA_OS_CPP_BUILTINS() \
@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see
builtin_define_std ("WIN64"); \
builtin_define ("_WIN64"); \
} \
+ CPP_MCFGTHREAD(); \
} \
while (0)
@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see
"%{mwindows:-lgdi32 -lcomdlg32} " \
"%{fvtable-verify=preinit:-lvtv -lpsapi; \
fvtable-verify=std:-lvtv -lpsapi} " \
- "-ladvapi32 -lshell32 -luser32 -lkernel32"
+ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32"
/* Weak symbols do not get resolved if using a Windows dll import lib.
Make the unwind registration references strong undefs. */
diff --git a/gcc/configure b/gcc/configure
index 6121e163259..52f0e00efe6 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -11693,7 +11693,7 @@ case ${enable_threads} in
target_thread_file='single'
;;
aix | dce | lynx | mipssde | posix | rtems | \
- single | tpf | vxworks | win32)
+ single | tpf | vxworks | win32 | mcf)
target_thread_file=${enable_threads}
;;
*)
diff --git a/gcc/configure.ac b/gcc/configure.ac
index b066cc609e1..4ecdba88de7 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1612,7 +1612,7 @@ case ${enable_threads} in
target_thread_file='single'
;;
aix | dce | lynx | mipssde | posix | rtems | \
- single | tpf | vxworks | win32)
+ single | tpf | vxworks | win32 | mcf)
target_thread_file=${enable_threads}
;;
*)
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
index ea8c34f8c71..23134ad7363 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -145,7 +145,7 @@ case "${target}" in
*-*-mingw*)
# OS support for atomic primitives.
case ${target_thread_file} in
- win32)
+ win32 | mcf)
config_path="${config_path} mingw"
;;
posix)
diff --git a/libgcc/config.host b/libgcc/config.host
index 11b4acaff55..9fbd38650bd 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -737,6 +737,9 @@ i[34567]86-*-mingw*)
posix)
tmake_file="i386/t-mingw-pthread $tmake_file"
;;
+ mcf)
+ tmake_file="i386/t-mingw-mcfgthread $tmake_file"
+ ;;
esac
# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
if test x$ac_cv_sjlj_exceptions = xyes; then
@@ -761,6 +764,9 @@ x86_64-*-mingw*)
posix)
tmake_file="i386/t-mingw-pthread $tmake_file"
;;
+ mcf)
+ tmake_file="i386/t-mingw-mcfgthread $tmake_file"
+ ;;
esac
# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
if test x$ac_cv_sjlj_exceptions = xyes; then
diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h
new file mode 100644
index 00000000000..5ea2908361f
--- /dev/null
+++ b/libgcc/config/i386/gthr-mcf.h
@@ -0,0 +1 @@
+#include <mcfgthread/gthread.h>
diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread
new file mode 100644
index 00000000000..4b9b10e32d6
--- /dev/null
+++ b/libgcc/config/i386/t-mingw-mcfgthread
@@ -0,0 +1,2 @@
+SHLIB_PTHREAD_CFLAG =
+SHLIB_PTHREAD_LDFLAG = -lmcfgthread
diff --git a/libgcc/configure b/libgcc/configure
index b2f3f870844..eff889dc3b3 100644
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -5451,6 +5451,7 @@ case $target_thread_file in
tpf) thread_header=config/s390/gthr-tpf.h ;;
vxworks) thread_header=config/gthr-vxworks.h ;;
win32) thread_header=config/i386/gthr-win32.h ;;
+ mcf) thread_header=config/i386/gthr-mcf.h ;;
esac
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index ba094be6f15..979a5ab9ace 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -15187,6 +15187,7 @@ case $target_thread_file in
tpf) thread_header=config/s390/gthr-tpf.h ;;
vxworks) thread_header=config/gthr-vxworks.h ;;
win32) thread_header=config/i386/gthr-win32.h ;;
+ mcf) thread_header=config/i386/gthr-mcf.h ;;
esac
diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc
index de920d714c6..665fb74bd6b 100644
--- a/libstdc++-v3/libsupc++/atexit_thread.cc
+++ b/libstdc++-v3/libsupc++/atexit_thread.cc
@@ -25,6 +25,22 @@
#include <cstdlib>
#include <new>
#include "bits/gthr.h"
+
+#ifdef __USING_MCFGTHREAD__
+
+#include <mcfgthread/gthread.h>
+
+extern "C" int
+__cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *),
+ void *obj, void *dso_handle)
+ _GLIBCXX_NOTHROW
+{
+ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1;
+ (void)dso_handle;
+}
+
+#else // __USING_MCFGTHREAD__
+
#ifdef _GLIBCXX_THREAD_ATEXIT_WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha
}
#endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */
+
+#endif // __USING_MCFGTHREAD__
diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
index 3a2ec3ad0d6..8b4cc96199b 100644
--- a/libstdc++-v3/libsupc++/guard.cc
+++ b/libstdc++-v3/libsupc++/guard.cc
@@ -28,6 +28,27 @@
#include <cxxabi.h>
#include <exception>
#include <new>
+
+#ifdef __USING_MCFGTHREAD__
+
+#include <mcfgthread/gthread.h>
+
+namespace __cxxabiv1 {
+
+extern "C" int __cxa_guard_acquire(__guard *g){
+ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial;
+}
+extern "C" void __cxa_guard_abort(__guard *g) throw() {
+ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g);
+}
+extern "C" void __cxa_guard_release(__guard *g) throw() {
+ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g);
+}
+
+}
+
+#else // __USING_MCFGTHREAD__
+
#include <ext/atomicity.h>
#include <ext/concurrence.h>
#include <bits/atomic_lockfree_defines.h>
@@ -425,3 +446,5 @@ namespace __cxxabiv1
#endif
}
}
+
+#endif
diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc
index 8238817c2e9..0c6a1f85f6f 100644
--- a/libstdc++-v3/src/c++11/thread.cc
+++ b/libstdc++-v3/src/c++11/thread.cc
@@ -55,6 +55,15 @@ static inline int get_nprocs()
#elif defined(_GLIBCXX_USE_SC_NPROC_ONLN)
# include <unistd.h>
# define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN)
+#elif defined(_WIN32)
+# include <windows.h>
+static inline int get_nprocs()
+{
+ SYSTEM_INFO sysinfo;
+ GetSystemInfo(&sysinfo);
+ return (int)sysinfo.dwNumberOfProcessors;
+}
+# define _GLIBCXX_NPROCS get_nprocs()
#else
# define _GLIBCXX_NPROCS 0
#endif
--
2.17.0

299
pkgs/development/compilers/gcc/11/default.nix Normal file
View File

@ -0,0 +1,299 @@
{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
, langAda ? false
, langObjC ? stdenv.targetPlatform.isDarwin
, langObjCpp ? stdenv.targetPlatform.isDarwin
, langGo ? false
, reproducibleBuild ? true
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, # N.B. the defult is intentionally not from an `isStatic`. See
# https://gcc.gnu.org/install/configure.html - this is about target
# platform libraries not host platform ones unlike normal. But since
# we can't rebuild those without also rebuilding the compiler itself,
# we opt to always build everything unlike our usual policy.
enableShared ? true
, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which, patchelf
, libelf # optional, for link-time optimizations (LTO)
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null
, gnatboot ? null
, enableMultilib ? false
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
, libcCross ? null
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system
&& stdenv.targetPlatform.system == stdenv.hostPlatform.system
, gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
}:
# LTO needs libelf and zlib.
assert libelf != null -> zlib != null;
# Make sure we get GNU sed.
assert stdenv.hostPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
assert langAda -> gnatboot != null;
# threadsCross is just for MinGW
assert threadsCross != null -> stdenv.targetPlatform.isWindows;
# profiledCompiler builds inject non-determinism in one of the compilation stages.
# If turned on, we can't provide reproducible builds anymore
assert reproducibleBuild -> profiledCompiler == false;
with lib;
with builtins;
let majorVersion = "11";
version = "${majorVersion}.1.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
/* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
sha256 = ""; # TODO: uncomment and check hash when available.
}) */
++ optional langAda ../gnat-cflags.patch
++ optional langFortran ../gfortran-driving.patch
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
# Obtain latest patch with ../update-mcfgthread-patches.sh
++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch;
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
inherit version;
builder = ../builder.sh;
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "1pwxrjhsymv90xzh0x42cxfnmhjinf2lnrrf3hj5jq1rm2w6yjjc";
};
inherit patches;
outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib";
setOutputFlags = false;
NIX_NO_SELF_RPATH = true;
libc_dev = stdenv.cc.libc_dev;
hardeningDisable = [ "format" "pie" ];
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
prePatch = lib.optionalString hostPlatform.isDarwin ''
substituteInPlace gcc/config/darwin-c.c \
--replace 'if (stdinc)' 'if (0)'
substituteInPlace libgcc/config/t-slibgcc-darwin \
--replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name ''${!outputLib}/lib/\$(SHLIB_INSTALL_NAME)"
substituteInPlace libgfortran/configure \
--replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname"
'';
postPatch = ''
configureScripts=$(find . -name configure)
for configureScript in $configureScripts; do
patchShebangs $configureScript
done
'' + (
if targetPlatform != hostPlatform || stdenv.cc.libc != null then
# On NixOS, use the right path to the dynamic linker instead of
# `/lib/ld*.so'.
let
libc = if libcCross != null then libcCross else stdenv.cc.libc;
in
(
'' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..."
for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
do
grep -q _DYNAMIC_LINKER "$header" || continue
echo " fixing \`$header'..."
sed -i "$header" \
-e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \
-e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
done
''
+ lib.optionalString (targetPlatform.libc == "musl")
''
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
''
)
else "")
+ lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'LIMITS_H_TEST=false'
)
'';
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl);
# For building runtime libs
depsBuildTarget =
(
if hostPlatform == buildPlatform then [
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
] else assert targetPlatform == hostPlatform; [ # build != host == target
stdenv.cc
]
)
++ optional targetPlatform.isLinux patchelf;
buildInputs = [
gmp mpfr libmpc libelf
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional langAda gnatboot)
;
depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version hostPlatform gnatboot langAda langGo langJit;
};
dontDisableStatic = true;
configurePlatforms = [ "build" "host" "target" ];
configureFlags = import ../common/configure-flags.nix {
inherit
lib
stdenv
targetPackages
crossStageStatic libcCross
version
gmp mpfr libmpc libelf isl
enableLTO
enableMultilib
enablePlugin
enableShared
langC
langCC
langFortran
langAda
langGo
langObjC
langObjCpp
langJit
;
};
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
installTargets = optional stripped "install-strip";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled.
#
# Likewise, the LTO code doesn't find zlib.
#
# Cross-compiling, we need gcc not to read ./specs in order to build the g++
# compiler (after the specs for the cross-gcc are created). Having
# LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.
CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]
++ optional (zlib != null) zlib
));
LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
inherit
(import ../common/extra-target-flags.nix {
inherit lib stdenv crossStageStatic libcCross threadsCross;
})
EXTRA_FLAGS_FOR_TARGET
EXTRA_LDFLAGS_FOR_TARGET
;
passthru = {
inherit langC langCC langObjC langObjCpp langAda langFortran langGo version;
isGNU = true;
};
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
meta = {
homepage = "https://gcc.gnu.org/";
license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
description = "GNU Compiler Collection, version ${version}"
+ (if stripped then "" else " (with debugging info)");
longDescription = ''
The GNU Compiler Collection includes compiler front ends for C, C++,
Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
libraries for these languages (libstdc++, libgomp,...).
GCC development is a part of the GNU Project, aiming to improve the
compiler used in the GNU system including the GNU/Linux variant.
'';
maintainers = with lib.maintainers; [ synthetica ];
platforms =
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
)

4
pkgs/development/libraries/avro-c/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: { lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
let let
version = "1.9.1"; version = "1.10.2";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "avro-c"; pname = "avro-c";
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
sha256 = "0hj6w1w5mqkhnhkvjc0zz5njnnrbcjv5ml4f8gq80wff2cgbrxvx"; sha256 = "sha256-rj+zK+xKBon1Rn4JIBGS7cbo80ITTvBq1FLKhw9Wt+I=";
}; };
postPatch = '' postPatch = ''

2
pkgs/development/libraries/libopus/default.nix
View File

@ -24,6 +24,6 @@ stdenv.mkDerivation {
description = "Open, royalty-free, highly versatile audio codec"; description = "Open, royalty-free, highly versatile audio codec";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
homepage = "https://www.opus-codec.org/"; homepage = "https://www.opus-codec.org/";
platforms = platforms.unix; platforms = platforms.all;
}; };
} }

12
pkgs/development/libraries/lmdb/default.nix
View File

@ -1,13 +1,15 @@
{ lib, stdenv, fetchgit }: { lib, stdenv, fetchFromGitLab }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lmdb"; pname = "lmdb";
version = "0.9.29"; version = "0.9.29";
src = fetchgit { src = fetchFromGitLab {
url = "https://git.openldap.org/openldap/openldap.git"; domain = "git.openldap.org";
owner = "openldap";
repo = "openldap";
rev = "LMDB_${version}"; rev = "LMDB_${version}";
sha256 = "0airps4cd0d91nbgy7hgvifa801snxwxzwxyr6pdv61plsi7h8l3"; sha256 = "19zq5s1amrv1fhw1aszcn2w2xjrk080l6jj5hc9f46yiqf98jjg3";
}; };
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
@ -52,7 +54,7 @@ stdenv.mkDerivation rec {
offering the persistence of standard disk-based databases, and is only offering the persistence of standard disk-based databases, and is only
limited to the size of the virtual address space. limited to the size of the virtual address space.
''; '';
homepage = "http://symas.com/mdb/"; homepage = "https://symas.com/lmdb/";
maintainers = with maintainers; [ jb55 vcunat ]; maintainers = with maintainers; [ jb55 vcunat ];
license = licenses.openldap; license = licenses.openldap;
platforms = platforms.all; platforms = platforms.all;

4
pkgs/development/libraries/science/astronomy/indilib/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "indilib"; pname = "indilib";
version = "1.8.9"; version = "1.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "indilib"; owner = "indilib";
repo = "indi"; repo = "indi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-W6LfrKL56K1B6srEfbNcq1MZwg7Oj8qoJkQ83ZhYhFs="; sha256 = "sha256-YdVBzhz+Gim27/Js5MhEJNukoXp5eK9/dZ+JQVyls0M=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

60
pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
View File

@ -1,6 +1,5 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub
, cmake , cmake
, cfitsio , cfitsio
, libusb1 , libusb1
@ -18,39 +17,54 @@
, libdc1394 , libdc1394
, gpsd , gpsd
, ffmpeg , ffmpeg
, version
, src
, withFirmware ? false
, firmware ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "indi-3rdparty"; pname = "indi-3rdparty";
version = "1.8.9";
src = fetchFromGitHub { inherit version src;
owner = "indilib";
repo = pname;
rev = "v${version}";
sha256 = "0klvknhp7l6y2ab4vyv4jq7znk1gjl5b3709kyplm7dsh4b8bppy";
};
cmakeFlags = [
"-DINDI_DATA_DIR=\${CMAKE_INSTALL_PREFIX}/share/indi"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
"-DRULES_INSTALL_DIR=lib/udev/rules.d"
"-DWITH_SX=off"
"-DWITH_SBIG=off"
"-DWITH_APOGEE=off"
"-DWITH_FISHCAMP=off"
"-DWITH_DSI=off"
"-DWITH_QHY=off"
"-DWITH_ARMADILLO=off"
"-DWITH_PENTAX=off"
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd
libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw
] ++ lib.optionals withFirmware [
firmware
];
postPatch = ''
for f in indi-qsi/CMakeLists.txt \
indi-dsi/CMakeLists.txt \
indi-armadillo-platypus/CMakeLists.txt
do
substituteInPlace $f \
--replace "/lib/udev/rules.d" "lib/udev/rules.d" \
--replace "/etc/udev/rules.d" "lib/udev/rules.d" \
--replace "/lib/firmware" "lib/firmware"
done
'';
cmakeFlags = [
"-DINDI_DATA_DIR=share/indi"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
"-DRULES_INSTALL_DIR=lib/udev/rules.d"
# Pentax, Atik, and SX cmakelists are currently broken
"-DWITH_PENTAX=off"
"-DWITH_ATIK=off"
"-DWITH_SX=off"
] ++ lib.optionals (!withFirmware) [
"-DWITH_APOGEE=off"
"-DWITH_DSI=off"
"-DWITH_QHY=off"
"-DWITH_ARMADILLO=off"
"-DWITH_FISHCAMP=off"
"-DWITH_SBIG=off"
]; ];
meta = with lib; { meta = with lib; {

66
pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix Normal file
View File

@ -0,0 +1,66 @@
{ stdenv
, lib
, cmake
, cfitsio
, libusb1
, zlib
, boost
, libnova
, curl
, libjpeg
, gsl
, fftw
, indilib
, libgphoto2
, libraw
, libftdi1
, libdc1394
, gpsd
, ffmpeg
, version
, src
}:
stdenv.mkDerivation rec {
pname = "indi-firmware";
inherit version src;
nativeBuildInputs = [ cmake ];
buildInputs = [
indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd
libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw
];
cmakeFlags = [
"-DINDI_DATA_DIR=\${CMAKE_INSTALL_PREFIX}/share/indi"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
"-DRULES_INSTALL_DIR=lib/udev/rules.d"
"-DFIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware"
"-DCONF_DIR=etc"
"-DBUILD_LIBS=1"
"-DWITH_PENTAX=off"
];
postPatch = ''
for f in libfishcamp/CMakeLists.txt libsbig/CMakeLists.txt
do
substituteInPlace $f --replace "/lib/firmware" "lib/firmware"
done
'';
postFixup = ''
rm $out/lib/udev/rules.d/99-fli.rules
'';
meta = with lib; {
homepage = "https://www.indilib.org/";
description = "Third party firmware for the INDI astronomical software suite";
changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ];
platforms = platforms.linux;
};
}

27
pkgs/development/libraries/science/astronomy/indilib/indi-full.nix
View File

@ -1,11 +1,30 @@
{ callPackage, indilib, indi-3rdparty }: { stdenv, lib, callPackage, fetchFromGitHub, indilib }:
let let
indi-with-drivers = ./indi-with-drivers.nix; indi-version = "1.9.0";
indi-3rdparty-src = fetchFromGitHub {
owner = "indilib";
repo = "indi-3rdparty";
rev = "v${indi-version}";
sha256 = "sha256-5VR1MN52a0ZtaHYw4lD6LWmnvc1oHlfE5GLGbfBKvqE=";
};
indi-firmware = callPackage ./indi-firmware.nix {
version = indi-version;
src = indi-3rdparty-src;
};
indi-3rdparty = callPackage ./indi-3rdparty.nix {
version = indi-version;
src = indi-3rdparty-src;
withFirmware = stdenv.isx86_64;
firmware = indi-firmware;
};
in in
callPackage indi-with-drivers { callPackage ./indi-with-drivers.nix {
pkgName = "indi-full"; pname = "indi-full";
version = indi-version;
extraDrivers = [ extraDrivers = [
indi-3rdparty indi-3rdparty
] ++ lib.optionals stdenv.isx86_64 [
indi-firmware
]; ];
} }

4
pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix
View File

@ -1,7 +1,7 @@
{ buildEnv, indilib ? indilib, extraDrivers ? null , pkgName ? "indi-with-drivers" }: { buildEnv, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }:
buildEnv { buildEnv {
name = pkgName; name = "${pname}-${version}";
paths = [ paths = [
indilib indilib
] ]

2
pkgs/development/libraries/zlib/default.nix
View File

@ -84,7 +84,7 @@ stdenv.mkDerivation (rec {
'' ''
# Non-typical naming confuses libtool which then refuses to use zlib's DLL # Non-typical naming confuses libtool which then refuses to use zlib's DLL
# in some cases, e.g. when compiling libpng. # in some cases, e.g. when compiling libpng.
+ lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt" && shared) ''
ln -s zlib1.dll $out/bin/libz.dll ln -s zlib1.dll $out/bin/libz.dll
''; '';

4
pkgs/development/python-modules/deepdiff/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "deepdiff"; pname = "deepdiff";
version = "5.3.0"; version = "5.5.0";
format = "setuptools"; format = "setuptools";
# pypi source does not contain all fixtures required for tests # pypi source does not contain all fixtures required for tests
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "seperman"; owner = "seperman";
repo = "deepdiff"; repo = "deepdiff";
rev = version; rev = version;
sha256 = "1izw2qpd93nj948zakamjn7q7dlmmr7sapg0c65hxvs0nmij8sl4"; sha256 = "sha256-PQijGub0sAW0aBYI+Ir89SraXaWx7OcQ+txZSqodJ6w=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/tools/analysis/flow/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flow"; pname = "flow";
version = "0.149.0"; version = "0.150.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "flow"; repo = "flow";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-/pNCEsCKfYh/jo+3x7usRyPNBRJB4gDu2TAgosSw37c="; sha256 = "sha256-75QSM2v4xDCkDnxW6Qb2ZGiWClOSDCd0jSrUdupMXxY=";
}; };
installPhase = '' installPhase = ''

6
pkgs/development/tools/aws-sam-cli/default.nix
View File

@ -5,11 +5,11 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "aws-sam-cli"; pname = "aws-sam-cli";
version = "1.14.0"; version = "1.23.0";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "E+xIS0Z3M/ilBswH8XwXWnGb9gbDRuuKKE39qau9fFc="; sha256 = "0j0q6p08c3l9z0yc2cggw797k47cjh6ljpchiqgg0fh6mk32215f";
}; };
# Tests are not included in the PyPI package # Tests are not included in the PyPI package
@ -40,10 +40,8 @@ python3.pkgs.buildPythonApplication rec {
# fix over-restrictive version bounds # fix over-restrictive version bounds
postPatch = '' postPatch = ''
substituteInPlace requirements/base.txt \ substituteInPlace requirements/base.txt \
--replace "boto3~=1.14.23" "boto3~=1.14" \
--replace "dateparser~=0.7" "dateparser>=0.7" \ --replace "dateparser~=0.7" "dateparser>=0.7" \
--replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "docker~=4.2.0" "docker>=4.2.0" \
--replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \
--replace "requests==2.23.0" "requests~=2.24" \ --replace "requests==2.23.0" "requests~=2.24" \
--replace "watchdog==0.10.3" "watchdog" --replace "watchdog==0.10.3" "watchdog"
''; '';

14
pkgs/development/tools/electron/default.nix
View File

@ -104,12 +104,12 @@ rec {
headers = "00gln9jlb621gvxx1z7s212wakjbdigdqv02vx1pjvkg62aazg8j"; headers = "00gln9jlb621gvxx1z7s212wakjbdigdqv02vx1pjvkg62aazg8j";
}; };
electron_12 = mkElectron "12.0.4" { electron_12 = mkElectron "12.0.5" {
x86_64-linux = "6419716f614f396954981e6432afe77277dff2b64ecb84e2bbd6d740362ea01c"; x86_64-linux = "e89c97f7ee43bf08f2ddaba12c3b78fb26a738c0ea7608561f5e06c8ef37e22b";
x86_64-darwin = "3072f1854eb5b91d5f24e03a313583bb85d696cda48381bdf3e40ee2c93dfe34"; x86_64-darwin = "c5a5e8128478e2dd09fc7222fb0f562ed3aefa3c12470f1811345be03e9d3b76";
i686-linux = "fa241874aacca8fe4b4f940fa9133fe65fdcf9ef0847322332f0c67ee7b42aa0"; i686-linux = "6ef8d93be6b05b66cb7c1f1640228dc1215d02851e190e7f16e4313d8ccd6135";
armv7l-linux = "8d88d13bf117820bc3b46501d34004f18ebf402f2817836a2a7ba4fc60433653"; armv7l-linux = "7312956ee48b1a8c02d778cac00e644e8cb27706cf4b387e91c3b062a1599a75";
aarch64-linux = "c5cbcbb5b397407e45e682480b30da4fcf94154ac92d8f6eea4c79a50d56626a"; aarch64-linux = "7b2dc425ce70b94ef71b74ed59416e70c4285ae13ef7ea03505c1aafab44904f";
headers = "121falvhz0bfxc2h7wwvyfqdagr3aznida4f4phzqp0ja3rznxf3"; headers = "1aqjhams0zvgq2bm9hc578ylmahi6qggzjfc69kh9vpv2sylimy9";
}; };
} }

22
pkgs/development/tools/flip-link/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "flip-link";
version = "0.1.3";
src = fetchFromGitHub {
owner = "knurling-rs";
repo = pname;
rev = "v${version}";
sha256 = "0x6l5aps0aryf3iqiyk969zrq77bm95jvm6f0f5vqqqizxjd3yfl";
};
cargoSha256 = "13rgpbwaz2b928rg15lbaszzjymph54pwingxpszp5paihx4iayr";
meta = with lib; {
description = "Adds zero-cost stack overflow protection to your embedded programs";
homepage = "https://github.com/knurling-rs/flip-link";
license = with licenses; [ asl20 mit ];
maintainers = [ maintainers.FlorianFranzen ];
};
}

4
pkgs/development/tools/git-quick-stats/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-quick-stats"; pname = "git-quick-stats";
version = "2.1.8"; version = "2.1.9";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "git-quick-stats"; repo = "git-quick-stats";
owner = "arzzen"; owner = "arzzen";
rev = version; rev = version;
sha256 = "sha256-sK8HOfeiV0xn540bU7inZl/hV6uzitJ4Szqk96a8DMc="; sha256 = "sha256-2rrwbEXwBBuussybCZFbAEjNwm/ztbXw1jUlTnxPINA=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

463
pkgs/development/tools/rust/svd2rust/cargo-lock.patch
View File

@ -2,102 +2,149 @@ diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/Cargo.lock +++ b/Cargo.lock
@@ -0,0 +1,278 @@ @@ -0,0 +1,469 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]] +[[package]]
+name = "ansi_term" +name = "ansi_term"
+version = "0.11.0" +version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "anyhow"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "atty" +name = "atty"
+version = "0.2.11" +version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "autocfg" +name = "autocfg"
+version = "0.1.1" +version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "backtrace"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "bitflags"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "bitflags" +name = "bitflags"
+version = "1.0.4" +version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "cast" +name = "cast"
+version = "0.2.2" +version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cc"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+ +
+[[package]] +[[package]]
+name = "cfg-if" +name = "cfg-if"
+version = "0.1.6" +version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "clap" +name = "clap"
+version = "2.32.0" +version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "either" +name = "either"
+version = "1.5.0" +version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "error-chain" +name = "env_logger"
+version = "0.11.0" +version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "humantime"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
@ -106,115 +153,232 @@ new file mode 100644
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc" +name = "libc"
+version = "0.2.46" +version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "log"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "memoffset"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "quote" +name = "quote"
+version = "0.3.15" +version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "redox_termios"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "rustc-demangle" +name = "rayon"
+version = "0.1.13" +version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon-core 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.23"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "strsim" +name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0" +version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "svd-parser" +name = "svd-parser"
+version = "0.6.0" +version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xmltree 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "once_cell 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xmltree 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "svd2rust" +name = "svd2rust"
+version = "0.14.0" +version = "0.18.0"
+dependencies = [ +dependencies = [
+ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cast 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "svd-parser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "svd-parser 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "syn" +name = "syn"
+version = "0.11.11" +version = "1.0.70"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "synom" +name = "termcolor"
+version = "0.11.3" +version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "termion"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "textwrap" +name = "textwrap"
+version = "0.10.0" +version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "thiserror-impl 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "unicode-width" +name = "unicode-width"
+version = "0.1.5" +version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "unicode-xid" +name = "unicode-xid"
+version = "0.0.4" +version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "vec_map" +name = "vec_map"
+version = "0.8.1" +version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "winapi" +name = "winapi"
+version = "0.3.6" +version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -227,57 +391,84 @@ new file mode 100644
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu" +name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0" +version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+ +
+[[package]] +[[package]]
+name = "xml-rs" +name = "xml-rs"
+version = "0.3.6" +version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[[package]] +[[package]]
+name = "xmltree" +name = "xmltree"
+version = "0.3.2" +version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index" +source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [ +dependencies = [
+ "xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+] +]
+ +
+[metadata] +[metadata]
+"checksum aho-corasick 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" +"checksum anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
+"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727" +"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5" +"checksum autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" +"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" +"checksum cast 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" +"checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" +"checksum clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)" = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" +"checksum crossbeam-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" +"checksum crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" +"checksum crossbeam-epoch 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
+"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0" +"checksum crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
+"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" +"checksum either 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+"checksum hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+"checksum inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" +"checksum inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
+"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd" +"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" +"checksum libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)" = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
+"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2" +"checksum log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" +"checksum memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619" +"checksum memoffset 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
+"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" +"checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+"checksum svd-parser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f22b4579485b26262f36086d6b74903befc043a57f8377dfcf05bcf5335cb251" +"checksum once_cell 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +"checksum proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" +"checksum quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" +"checksum rayon 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +"checksum rayon-core 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" +"checksum regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum regex-syntax 0.6.23 (registry+https://github.com/rust-lang/crates.io-index)" = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" +"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+"checksum svd-parser 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6b787831d8f6a1549ccd1b0d62772d0526425a7da687f0f98591ab18e53bfe98"
+"checksum syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883"
+"checksum termcolor 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+"checksum thiserror-impl 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+"checksum vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562" +"checksum xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2"
+"checksum xmltree 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "472a9d37c7c53ab2391161df5b89b1f3bf76dab6ab150d7941ecbdd832282082" +"checksum xmltree 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8eaee9d17062850f1e6163b509947969242990ee59a35801af437abe041e70"

9
pkgs/development/tools/rust/svd2rust/default.nix
View File

@ -4,20 +4,17 @@ with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
pname = "svd2rust"; pname = "svd2rust";
version = "0.14.0"; version = "0.18.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-embedded"; owner = "rust-embedded";
repo = "svd2rust"; repo = "svd2rust";
rev = "v${version}"; rev = "v${version}";
sha256 = "1a0ldmjkhyv5c52gcq8p8avkj0cgj1b367w6hm85bxdf5j4y8rra"; sha256 = "1p0zq3q4g9lr0ghavp7v1dwsqq19lkljkm1i2hsb1sk3pxa1f69n";
}; };
cargoPatches = [ ./cargo-lock.patch ]; cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "0n0xc8b982ra007l6gygssf1n60gfc2rphwyi7n95dbys1chciyg"; cargoSha256 = "0c0f86x17fzav5q76z3ha3g00rbgyz2lm5a5v28ggy0jmg9xgsv6";
# doc tests fail due to missing dependency
doCheck = false;
meta = with lib; { meta = with lib; {
description = "Generate Rust register maps (`struct`s) from SVD files"; description = "Generate Rust register maps (`struct`s) from SVD files";

1
pkgs/games/shticker-book-unwritten/default.nix
View File

@ -8,6 +8,7 @@ in buildFHSUserEnv {
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
alsaLib alsaLib
xorg.libX11 xorg.libX11
xorg.libXcursor
xorg.libXext xorg.libXext
libglvnd libglvnd
shticker-book-unwritten-unwrapped shticker-book-unwritten-unwrapped

2
pkgs/games/shticker-book-unwritten/unwrapped.nix
View File

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
}; };
cargoPatches = [ ./cargo-lock.patch ]; cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1lnhdr8mri1ns9lxj6aks4vs2v4fvg7mcriwzwj78inpi1l0xqk5"; cargoSha256 = "1d4mnfzkdbqnjmqk7fl4bsy27lr7wnq997nz0hflaybnx2d3nisn";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

56
pkgs/misc/scream-receivers/default.nix
View File

@ -1,56 +0,0 @@
{ stdenv, lib, fetchFromGitHub, alsaLib
, pulseSupport ? false, libpulseaudio ? null
}:
stdenv.mkDerivation rec {
pname = "scream-receivers";
version = "3.4";
src = fetchFromGitHub {
owner = "duncanthrax";
repo = "scream";
rev = version;
sha256 = "1ig89bmzfrm57nd8lamzsdz5z81ks5vjvq3f0xhgm2dk2mrgjsj3";
};
buildInputs = [ alsaLib ] ++ lib.optional pulseSupport libpulseaudio;
buildPhase = ''
(cd Receivers/alsa && make)
(cd Receivers/alsa-ivshmem && make)
'' + lib.optionalString pulseSupport ''
(cd Receivers/pulseaudio && make)
(cd Receivers/pulseaudio-ivshmem && make)
'';
installPhase = ''
mkdir -p $out/bin
mv ./Receivers/alsa/scream-alsa $out/bin/
mv ./Receivers/alsa-ivshmem/scream-ivshmem-alsa $out/bin/
'' + lib.optionalString pulseSupport ''
mv ./Receivers/pulseaudio/scream-pulse $out/bin/
mv ./Receivers/pulseaudio-ivshmem/scream-ivshmem-pulse $out/bin/
'';
doInstallCheck = true;
installCheckPhase = ''
export PATH=$PATH:$out/bin
set -o verbose
set +o pipefail
# Programs exit with code 1 when testing help, so grep for a string
scream-alsa -h 2>&1 | grep -q Usage:
scream-ivshmem-alsa 2>&1 | grep -q Usage:
'' + lib.optionalString pulseSupport ''
scream-pulse -h 2>&1 | grep -q Usage:
scream-ivshmem-pulse 2>&1 | grep -q Usage:
'';
meta = with lib; {
description = "Audio receivers for the Scream virtual network sound card";
homepage = "https://github.com/duncanthrax/scream";
license = licenses.mspl;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
};
}

12
pkgs/misc/vim-plugins/generated.nix
View File

@ -1761,6 +1761,18 @@ let
meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
}; };
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox-nvim";
version = "2021-04-23";
src = fetchFromGitHub {
owner = "npxbr";
repo = "gruvbox.nvim";
rev = "9dc9ea64fd2fb255a39210e227fc7146855434af";
sha256 = "04d8knfhidxdm8lzc15hklq1mm6i5kmdkik4iln4cbhd3cg33iqy";
};
meta.homepage = "https://github.com/npxbr/gruvbox.nvim/";
};
gundo-vim = buildVimPluginFrom2Nix { gundo-vim = buildVimPluginFrom2Nix {
pname = "gundo-vim"; pname = "gundo-vim";
version = "2021-02-21"; version = "2021-02-21";

6
pkgs/misc/vim-plugins/overrides.nix
View File

@ -273,6 +273,10 @@ self: super: {
dependencies = with self; [ plenary-nvim ]; dependencies = with self; [ plenary-nvim ];
}); });
gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: {
dependencies = with self; [ lush-nvim ];
});
jedi-vim = super.jedi-vim.overrideAttrs (old: { jedi-vim = super.jedi-vim.overrideAttrs (old: {
# checking for python3 support in vim would be neat, too, but nobody else seems to care # checking for python3 support in vim would be neat, too, but nobody else seems to care
buildInputs = [ python3.pkgs.jedi ]; buildInputs = [ python3.pkgs.jedi ];
@ -601,7 +605,7 @@ self: super: {
libiconv libiconv
]; ];
cargoSha256 = "25UkYKhlGmlDg4fz1jZHjpQn5s4k5FKlFK0MU8YM5SE="; cargoSha256 = "1c8bwvwd23d7c3bk1ky1i8xgfz10dr8nqqcvp20g8rldjl8p2r08";
}; };
in in
'' ''

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -437,6 +437,7 @@ norcalli/nvim-colorizer.lua
norcalli/nvim-terminal.lua norcalli/nvim-terminal.lua
norcalli/snippets.nvim norcalli/snippets.nvim
npxbr/glow.nvim@main npxbr/glow.nvim@main
npxbr/gruvbox.nvim@main
ntpeters/vim-better-whitespace ntpeters/vim-better-whitespace
numirias/semshi numirias/semshi
nvie/vim-flake8 nvie/vim-flake8

5
pkgs/os-specific/windows/libgnurx/default.nix
View File

@ -10,6 +10,11 @@ in stdenv.mkDerivation rec {
sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi"; sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi";
}; };
# file looks for libgnurx.a when compiling statically
postInstall = lib.optionalString stdenv.hostPlatform.isStatic ''
ln -s $out/lib/libgnurx{.dll.a,.a}
'';
meta = { meta = {
platforms = lib.platforms.windows; platforms = lib.platforms.windows;
}; };

14
pkgs/tools/backup/kopia/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, coreutils }: { lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "kopia"; pname = "kopia";
version = "0.7.3"; version = "0.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1dnk764y71c9k9nghn9q06f2zz9igsvm4z826azil2d58h5d06j6"; sha256 = "sha256-Or6RL6yT/X3rVIySqt5lWbXbI25f8HNLBpY3cOhMC0g=";
}; };
vendorSha256 = "1mnhq6kn0pn67l55a9k6irmjlprr295218nms3klsk2720syzdwq"; vendorSha256 = "sha256-1FK5IIvm2iyzGqj8IPL3/qvxFj0dC37aycQQ5MO0mBI=";
doCheck = false; doCheck = false;
@ -23,12 +23,6 @@ buildGoModule rec {
-X github.com/kopia/kopia/repo.BuildInfo=${src.rev} -X github.com/kopia/kopia/repo.BuildInfo=${src.rev}
''; '';
postConfigure = ''
# speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \
--replace "/bin/stty" "${coreutils}/bin/stty"
'';
meta = with lib; { meta = with lib; {
homepage = "https://kopia.io"; homepage = "https://kopia.io";
description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication"; description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication";

46
pkgs/tools/misc/togglesg-download/default.nix
View File

@ -1,46 +0,0 @@
{ lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }:
pythonPackages.buildPythonApplication {
pname = "togglesg-download-git";
version = "2017-12-07";
src = fetchFromGitHub {
owner = "0x776b7364";
repo = "toggle.sg-download";
rev = "e64959f99ac48920249987a644eefceee923282f";
sha256 = "0j317wmyzpwfcixjkybbq2vkg52vij21bs40zg3n1bs61rgmzrn8";
};
nativeBuildInputs = [ makeWrapper ];
doCheck = false;
dontBuild = true;
dontStrip = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/doc/togglesg-download}
substitute $src/download_toggle_video2.py $out/bin/download_toggle_video2.py \
--replace "ffmpeg_download_cmd = 'ffmpeg" "ffmpeg_download_cmd = '${lib.getBin ffmpeg_3}/bin/ffmpeg"
chmod 0755 $out/bin/download_toggle_video2.py
cp LICENSE README.md $out/share/doc/togglesg-download
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/0x776b7364/toggle.sg-download";
description = "Command-line tool to download videos from toggle.sg written in Python";
longDescription = ''
toggle.sg requires SilverLight in order to view videos. This tool will
allow you to download the video files for viewing in your media player and
on your OS of choice.
'';
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
}

4
pkgs/tools/networking/croc/test-local-relay.nix
View File

@ -12,8 +12,8 @@ stdenv.mkDerivation {
${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" & ${croc}/bin/croc --relay localhost:11111 send --code correct-horse-battery-staple --text "$MSG" &
# wait for things to settle # wait for things to settle
sleep 1 sleep 1
# receive # receive, as of croc 9 --overwrite is required for noninteractive use
MSG2=$(${croc}/bin/croc --relay localhost:11111 --yes correct-horse-battery-staple) MSG2=$(${croc}/bin/croc --overwrite --relay localhost:11111 --yes correct-horse-battery-staple)
# compare # compare
[ "$MSG" = "$MSG2" ] && touch $out [ "$MSG" = "$MSG2" ] && touch $out
''; '';

4
pkgs/tools/networking/minidlna/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: { lib, stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:
let version = "1.3.0"; in let version = "1.3.0"; in
@ -15,7 +15,7 @@ stdenv.mkDerivation {
export makeFlags="INSTALLPREFIX=$out" export makeFlags="INSTALLPREFIX=$out"
''; '';
buildInputs = [ ffmpeg_3 flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
postInstall = '' postInstall = ''
mkdir -p $out/share/man/man{5,8} mkdir -p $out/share/man/man{5,8}

1
pkgs/top-level/aliases.nix
View File

@ -668,6 +668,7 @@ mapAliases ({
rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31
togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained";
urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02 urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02
urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02 urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02

26
pkgs/top-level/all-packages.nix
View File

@ -4569,6 +4569,8 @@ in
flawfinder = callPackage ../development/tools/flawfinder { }; flawfinder = callPackage ../development/tools/flawfinder { };
flip-link = callPackage ../development/tools/flip-link { };
flips = callPackage ../tools/compression/flips { }; flips = callPackage ../tools/compression/flips { };
fmbt = callPackage ../development/tools/fmbt { fmbt = callPackage ../development/tools/fmbt {
@ -8197,9 +8199,7 @@ in
scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { };
scream-receivers = callPackage ../misc/scream-receivers { scream = callPackage ../applications/audio/scream { };
pulseSupport = config.pulseaudio or false;
};
scimark = callPackage ../misc/scimark { }; scimark = callPackage ../misc/scimark { };
@ -10319,6 +10319,7 @@ in
gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8;
gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9;
gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10; gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10;
gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11;
# This is not intended for use in nixpkgs but for providing a faster-running # This is not intended for use in nixpkgs but for providing a faster-running
# compiler to nixpkgs users by building gcc with reproducibility-breaking # compiler to nixpkgs users by building gcc with reproducibility-breaking
@ -10514,7 +10515,21 @@ in
isl = if !stdenv.isDarwin then isl_0_20 else null; isl = if !stdenv.isDarwin then isl_0_20 else null;
})); }));
gcc_latest = gcc10; gcc11 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/11 {
inherit noSysDirs;
reproducibleBuild = true;
profiledCompiler = false;
enableLTO = !stdenv.isi686;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null;
isl = if !stdenv.isDarwin then isl_0_20 else null;
}));
gcc_latest = gcc11;
gfortran = gfortran9; gfortran = gfortran9;
@ -15125,7 +15140,6 @@ in
indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { }; indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { };
indilib = callPackage ../development/libraries/science/astronomy/indilib { }; indilib = callPackage ../development/libraries/science/astronomy/indilib { };
indi-3rdparty = callPackage ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { };
indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { };
inih = callPackage ../development/libraries/inih { }; inih = callPackage ../development/libraries/inih { };
@ -30945,8 +30959,6 @@ in
mpvc = callPackage ../applications/misc/mpvc { }; mpvc = callPackage ../applications/misc/mpvc { };
togglesg-download = callPackage ../tools/misc/togglesg-download { };
discord = import ../applications/networking/instant-messengers/discord { discord = import ../applications/networking/instant-messengers/discord {
branch = "stable"; branch = "stable";
inherit pkgs; inherit pkgs;