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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-02 18:17:39 +00:00
committed by GitHub
parent c770b491e3 6040ffb45f
commit 4b97c2a726
53 changed files with 253 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/stage-1-init.sh
+10 -5
View File
@@ -614,11 +614,16 @@ echo /sbin/modprobe > /proc/sys/kernel/modprobe
# Start stage 2. `switch_root' deletes all files in the ramfs on the
# current root. Note that $stage2Init might be an absolute symlink,
# in which case "-e" won't work because we're not in the chroot yet.
if [ ! -e "$targetRoot/$stage2Init" ] && [ ! -L "$targetRoot/$stage2Init" ] ; then
echo "stage 2 init script ($targetRoot/$stage2Init) not found"
fail
# current root. The path has to be valid in the chroot not outside.
if [ ! -e "$targetRoot/$stage2Init" ]; then
stage2Check=${stage2Init}
while [ "$stage2Check" != "${stage2Check%/*}" ] && [ ! -L "$targetRoot/$stage2Check" ]; do
stage2Check=${stage2Check%/*}
done
if [ ! -L "$targetRoot/$stage2Check" ]; then
echo "stage 2 init script ($targetRoot/$stage2Init) not found"
fail
fi
fi
mkdir -m 0755 -p $targetRoot/proc $targetRoot/sys $targetRoot/dev $targetRoot/run
pkgs/applications/blockchains/ledger-live-desktop/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, makeDesktopItem, appimageTools, imagemagick }:
{ lib, fetchurl, appimageTools, imagemagick }:
let
pname = "ledger-live-desktop";
pkgs/applications/editors/standardnotes/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
, fetchurl, runtimeShell, libsecret, gtk3, gsettings-desktop-schemas }:
, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }:
let
version = "3.5.18";
pkgs/applications/misc/clipit/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ fetchFromGitHub, fetchpatch, lib, stdenv
{ fetchFromGitHub, lib, stdenv
, autoreconfHook, intltool, pkg-config
, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }:
pkgs/applications/misc/megasync/default.nix
-1
View File
@@ -6,7 +6,6 @@
, curl
, doxygen
, fetchFromGitHub
, fetchpatch
, ffmpeg_3
, libmediainfo
, libraw
pkgs/applications/networking/instant-messengers/ripcord/default.nix
+7 -9
View File
@@ -1,7 +1,7 @@
{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools,
qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats,
autoPatchelfHook, desktop-file-utils, imagemagick, makeWrapper,
twemoji-color-font, xorg, libsodium, libopus, libGL, zlib, alsaLib }:
{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools
, qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats
, autoPatchelfHook, desktop-file-utils, imagemagick
, twemoji-color-font, xorg, libsodium, libopus, libGL, alsaLib }:
mkDerivation rec {
pname = "ripcord";
@@ -19,9 +19,9 @@ mkDerivation rec {
};
nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ];
buildInputs = [ libsodium libopus libGL alsaLib ] ++
[ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++
(with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]);
buildInputs = [ libsodium libopus libGL alsaLib ]
++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ]
++ (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]);
fontsConf = makeFontsConf {
fontDirectories = [ twemoji-color-font ];
@@ -60,10 +60,8 @@ mkDerivation rec {
meta = with lib; {
description = "Desktop chat client for Slack and Discord";
homepage = "https://cancel.fm/ripcord/";
# See: https://cancel.fm/ripcord/shareware-redistribution/
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ infinisil ];
platforms = [ "x86_64-linux" ];
};
pkgs/applications/networking/modem-manager-gui/default.nix
-1
View File
@@ -10,7 +10,6 @@
, itstool
, libayatana-appindicator-gtk3
, perlPackages
, glibcLocales
, meson
, ninja
}:
pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+17 -30
View File
@@ -1,47 +1,29 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4, boost, bzip2, libX11
, fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, bzip2, libX11
, mkDerivation, qtbase, qttools, qtmultimedia, qtscript
, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "eiskaltdcpp";
version = "2.2.10";
version = "2.4.1";
src = fetchFromGitHub {
owner = "eiskaltdcpp";
repo = "eiskaltdcpp";
rev = "v${version}";
sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682";
sha256 = "0ln8dafa8sni3289g30ndv1wr3ij5lz4abcb2qwcabb79zqxl8hy";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]
buildInputs = [ qtbase qttools qtmultimedia qtscript boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext
(perl.withPackages (p: with p; [
GetoptLong
RpcXML
TermShellUI
])) ]
++ lib.optional stdenv.isDarwin libiconv;
patches = [
(fetchpatch {
url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b7b56bd7060b426b1f1bfded392ae6853644e2e.patch";
sha256 = "1rqjdsvirn3ks9w9qn893fb73mz84xm04wl13fvsvj8p42i5cjas";
})
(fetchpatch {
url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/bb9eb364a943fe2a67b3ea52ec6a3f9e911f07dc.patch";
sha256 = "1hjhf9a9j4z8v24g5qh5mcg3n0540lbn85y7kvxsh3khc5v3cywx";
})
(fetchpatch {
url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/ef4426f1f9a8255e335b0862234e6cc28befef5e.patch";
sha256 = "13j018c499n4b5as2n39ws64yj0cf4fskxbqab309vmnjkirxv6x";
})
(fetchpatch {
url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/a9c136c8707280d0eeb66be6b289d9718287c55c.patch";
sha256 = "0w8v4mbrzk7pmzc475ff96mzzwlh8a0p62kk7p829m5yqdwj4sc9";
})
(fetchpatch {
url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/3b9c502ff5c98856d4f8fdb7ed3c6ef34448bfb7.patch";
sha256 = "0fjwaq0wd9a164k5ysdjy89hx0ixnxc6q7cvyn1ba28snm0pgxb8";
})
];
cmakeFlags = [
"-DUSE_ASPELL=ON"
"-DUSE_QT_QML=ON"
"-DFREE_SPACE_BAR_C=ON"
"-DUSE_MINIUPNP=ON"
"-DLOCAL_MINIUPNP=ON"
@@ -54,6 +36,11 @@ stdenv.mkDerivation rec {
"-DWITH_LUASCRIPTS=ON"
];
preFixup = ''
substituteInPlace $out/bin/eiskaltdcpp-cli-xmlrpc \
--replace "/usr/local" "$out"
'';
meta = with lib; {
description = "A cross-platform program that uses the Direct Connect and ADC protocols";
homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp";
pkgs/applications/office/timeular/default.nix
+5 -6
View File
@@ -1,8 +1,7 @@
{
lib,
fetchurl,
appimageTools,
libsecret
{ lib
, fetchurl
, appimageTools
, libsecret
}:
let
@@ -37,7 +36,7 @@ in appimageTools.wrapType2 rec {
Assign an activity to each side and flip to start tracking your time.
The desktop app tell you where every minute of your day is spent.
'';
homepage = https://timeular.com;
homepage = "https://timeular.com";
license = licenses.unfree;
maintainers = with maintainers; [ ktor ];
platforms = [ "x86_64-linux" ];
pkgs/applications/virtualization/qemu/default.nix
+1 -1
View File
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
postFixup = ''
# the .desktop is both invalid and pointless
test -e $out/share/applications/qemu.desktop && rm -f $out/share/applications/qemu.desktop
rm -f $out/share/applications/qemu.desktop
# copy qemu-ga (guest agent) to separate output
mkdir -p $ga/bin
pkgs/applications/virtualization/singularity/default.nix
-1
View File
@@ -5,7 +5,6 @@
, openssl
, libuuid
, coreutils
, go
, which
, makeWrapper
, cryptsetup
pkgs/applications/virtualization/virtualbox/default.nix
+2
View File
@@ -103,6 +103,8 @@ in stdenv.mkDerivation {
qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}";
})
++ [
# NOTE: the patch for linux 5.11 can be removed when the next version of VirtualBox is released
./linux-5-11.patch
./qtx11extras.patch
];
pkgs/applications/virtualization/virtualbox/linux-5-11.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
index 7033b45..c8178a6 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -39,6 +39,7 @@
#endif
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
#include <linux/rtnetlink.h>
#include <linux/miscdevice.h>
#include <linux/inetdevice.h>
pkgs/data/fonts/joypixels/default.nix
+6 -6
View File
@@ -58,15 +58,15 @@ in
stdenv.mkDerivation rec {
pname = "joypixels";
version = "6.0.0";
version = "6.5.0";
src = assert !acceptLicense -> throwLicense;
with systemSpecific; fetchurl {
name = fontFile;
url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}";
sha256 = {
darwin = "1s1dibgpv4lc9cwbgykgwjxxhg2rbn5g9fyd10r6apj9xhfn8cyn";
}.${kernel.name} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s";
darwin = "034bwxy6ljvhx9zlm6jkb8vw222sg79sjwlcjfql51rk6zkmv4wx";
}.${kernel.name} or "1v6hz0qhbnzayxhs5j9qfa2ggn7nak53ij7kr06m93wcmlnnln86";
};
dontUnpack = true;
@@ -82,9 +82,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "The finest emoji you can use legally (formerly EmojiOne)";
longDescription = ''
New for 2020! JoyPixels 6.0 includes 3,342 originally crafted icon
designs and is 100% Unicode 13 compatible. We offer the largest selection
of files ranging from png, svg, iconjar, sprites, and fonts.
Updated for 2021! JoyPixels 6.5 includes 3,559 originally crafted icon
designs and is 100% Unicode 13.1 compatible. We offer the largest
selection of files ranging from png, svg, iconjar, sprites, and fonts.
'';
homepage = "https://www.joypixels.com/fonts";
license =
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
-1
View File
@@ -1,7 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, nix-update-script
, substituteAll
, desktop-file-utils
, pkg-config
, writeScript
pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }:
mkXfceDerivation {
category = "apps";
pkgs/development/compilers/ocaml/3.08.0.nix
-21
View File
@@ -1,21 +0,0 @@
{ stdenv, fetchurl, xlibsWrapper }:
stdenv.mkDerivation rec {
pname = "ocaml";
version = "3.08.0";
builder = ./builder.sh;
src = fetchurl {
url = "http://tarballs.nixos.org/${pname}-${version}.tar.gz";
sha256 = "135g5waj7djzrj0dbc8z1llasfs2iv5asq41jifhldxb4l2b97mx";
};
configureScript = ./configure-3.08.0;
dontAddPrefix = "True";
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
buildFlags = ["world" "bootstrap" "opt"];
checkTarget = ["opt.opt"];
meta = {
platforms = lib.platforms.linux;
};
}
pkgs/development/compilers/ocaml/3.10.0.nix
-34
View File
@@ -1,34 +0,0 @@
{ stdenv, fetchurl, xlibsWrapper, ncurses }:
stdenv.mkDerivation (rec {
pname = "ocaml";
version = "3.10.0";
src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${pname}-${version}.tar.bz2";
sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
buildFlags = [ "world" "bootstrap" "world.opt" ];
buildInputs = [xlibsWrapper ncurses];
installTargets = "install installopt";
patchPhase = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
'';
postBuild = ''
mkdir -p $out/include
ln -sv $out/lib/ocaml/caml $out/include/caml
'';
meta = {
homepage = "http://caml.inria.fr/ocaml";
license = with lib.licenses; [ qpl lgpl2 ];
description = "Most popular variant of the Caml language";
platforms = lib.platforms.linux;
};
})
pkgs/development/compilers/ocaml/3.11.2.nix
-75
View File
@@ -1,75 +0,0 @@
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
let
useX11 = stdenv.isi686 || stdenv.isx86_64;
useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
inherit (lib) optionals optionalString;
in
stdenv.mkDerivation rec {
pname = "ocaml";
version = "3.11.2";
src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2";
sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143";
};
# Needed to avoid a SIGBUS on the final executable on mips
NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else "";
patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ] ++
[ (fetchurl {
name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch";
url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug";
sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
})
];
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
prePatch = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
patch -p0 < ${./mips64.patch}
'';
postBuild = ''
mkdir -p $out/include
ln -sv $out/lib/ocaml/caml $out/include/caml
'';
meta = with lib; {
homepage = "http://caml.inria.fr/ocaml";
license = with licenses; [
qpl /* compiler */
lgpl2 /* library */
];
description = "Most popular variant of the Caml language";
longDescription =
'' Objective Caml is the most popular variant of the Caml language.
From a language standpoint, it extends the core Caml language with a
fully-fledged object-oriented layer, as well as a powerful module
system, all connected by a sound, polymorphic type system featuring
type inference.
The Objective Caml system is an industrial-strength implementation
of this language, featuring a high-performance native-code compiler
(ocamlopt) for 9 processor architectures (IA32, PowerPC, AMD64,
Alpha, Sparc, Mips, IA64, HPPA, StrongArm), as well as a bytecode
compiler (ocamlc) and an interactive read-eval-print loop (ocaml)
for quick development and portability. The Objective Caml
distribution includes a comprehensive standard library, a replay
debugger (ocamldebug), lexer (ocamllex) and parser (ocamlyacc)
generators, a pre-processor pretty-printer (camlp4) and a
documentation generator (ocamldoc).
'';
platforms = with platforms; linux ++ darwin;
};
}
pkgs/development/compilers/ocaml/3.12.1-darwin-fix-configure.patch
-32
View File
@@ -1,32 +0,0 @@
diff -Nuar ocaml-3.12.1/configure ocaml-3.12.1-fix-configure/configure
--- ocaml-3.12.1/configure 2011-07-04 23:15:01.000000000 +0200
+++ ocaml-3.12.1-fix-configure/configure 2012-06-06 22:20:40.000000000 +0200
@@ -259,7 +259,7 @@
bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
mathlib="";;
*,*-*-darwin*)
- bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings"
+ bytecccompopts="-fno-defer-pop $gcc_warnings"
mathlib=""
# Tell gcc that we can use 32-bit code addresses for threaded code
# unless we are compiled for a shared library (-fPIC option)
@@ -739,7 +739,7 @@
*,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
if $arch64; then partialld="ld -r -arch ppc64"; fi;;
*,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";;
- amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
+ amd64,gcc*,macosx,*) partialld="ld -r";;
amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
*,gcc*,*,*) nativecccompopts="$gcc_warnings";;
esac
@@ -752,8 +752,8 @@
asppprofflags='-pg -DPROFILING';;
alpha,*,*) as='as'
aspp='gcc -c';;
- amd64,*,macosx) as='as -arch x86_64'
- aspp='gcc -arch x86_64 -c';;
+ amd64,*,macosx) as='as'
+ aspp='gcc -c';;
amd64,*,solaris) as='as --64'
aspp='gcc -m64 -c';;
amd64,*,*) as='as'
pkgs/development/compilers/ocaml/3.12.1.nix
-69
View File
@@ -1,69 +0,0 @@
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
let
useX11 = !stdenv.isAarch32 && !stdenv.isMips;
useNativeCompilers = !stdenv.isMips;
inherit (lib) optionals optionalString;
in
stdenv.mkDerivation rec {
pname = "ocaml";
version = "3.12.1";
src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2";
sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd";
};
prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ];
preConfigure = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
'';
postBuild = ''
mkdir -p $out/include
ln -sv $out/lib/ocaml/caml $out/include/caml
'';
passthru = {
nativeCompilers = useNativeCompilers;
};
meta = with lib; {
homepage = "http://caml.inria.fr/ocaml";
branch = "3.12";
license = with licenses; [
qpl /* compiler */
lgpl2 /* library */
];
description = "Most popular variant of the Caml language";
longDescription =
''
OCaml is the most popular variant of the Caml language. From a
language standpoint, it extends the core Caml language with a
fully-fledged object-oriented layer, as well as a powerful module
system, all connected by a sound, polymorphic type system featuring
type inference.
The OCaml system is an industrial-strength implementation of this
language, featuring a high-performance native-code compiler (ocamlopt)
for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc,
Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc)
and an interactive read-eval-print loop (ocaml) for quick development
and portability. The OCaml distribution includes a comprehensive
standard library, a replay debugger (ocamldebug), lexer (ocamllex) and
parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4)
and a documentation generator (ocamldoc).
'';
platforms = with platforms; linux;
};
}
pkgs/development/libraries/crypto++/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, nasm, which
{ lib, stdenv, fetchFromGitHub
, enableStatic ? stdenv.hostPlatform.isStatic
, enableShared ? !enableStatic
}:
pkgs/development/libraries/libayatana-appindicator/default.nix
-5
View File
@@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk";
};
prePatch = ''
substituteInPlace configure.ac \
--replace "codegendir pygtk-2.0" "codegendir pygobject-2.0"
'';
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ];
buildInputs =
pkgs/development/libraries/silgraphite/default.nix
-22
View File
@@ -1,22 +0,0 @@
{ stdenv, fetchurl, pkg-config, freetype, libXft, pango, fontconfig }:
stdenv.mkDerivation rec {
version = "2.3.1";
name = "silgraphite-2.3.1";
src = fetchurl {
url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz";
sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ freetype libXft pango fontconfig];
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
meta = {
description = "An advanced font engine";
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux;
};
}
pkgs/development/ocaml-modules/janestreet/0.14.nix
+2 -1
View File
@@ -158,7 +158,8 @@ rec {
base = janePackage {
pname = "base";
hash = "1d5ynzzq58g9qammhba5dasrg734p9vndq28a7kg80bdxb8gh3kp";
version = "0.14.1";
hash = "1hizjxmiqlj2zzkwplzjamw9rbnl0kh44sxgjpzdij99qnfkzylf";
minimumOCamlVersion = "4.07";
meta.description = "Full standard library replacement for OCaml";
buildInputs = [ dune-configurator ];
pkgs/development/python-modules/asyncwhois/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "asyncwhois";
version = "0.2.4";
version = "0.3.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pogzyb";
repo = pname;
rev = "v${version}";
sha256 = "17w007hjnpggj6jvkv8wxwllxk6mir1q2nhw0dqg7glm4lfbx8kr";
sha256 = "1514fz942yix7fh4yg982mxjp8c0qb6a0i4fw5wsc3xx4g86zcdg";
};
propagatedBuildInputs = [
pkgs/development/python-modules/gviz-api/default.nix
+1 -2
View File
@@ -8,8 +8,7 @@ buildPythonPackage rec {
format = "wheel";
src = fetchPypi {
inherit pname version;
format = "wheel";
inherit pname version format;
sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg";
};
pkgs/development/python-modules/httpbin/default.nix
-1
View File
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, flask
, flask-limiter
, markupsafe
pkgs/development/python-modules/johnnycanencrypt/default.nix
-1
View File
@@ -5,7 +5,6 @@
, rustPlatform
, llvmPackages
, pkg-config
, maturin
, pcsclite
, nettle
, requests
pkgs/development/python-modules/jq/default.nix
+5
View File
@@ -8,10 +8,15 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "77e747c6ad10ce65479f5f9064ab036483bf307bf71fdd7d6235ef895fcc506e";
};
patches = [ ./jq-py-setup.patch ];
buildInputs = [ jq ];
# no tests executed
doCheck = false;
pythonImportsCheck = [ "jq" ];
meta = {
description = "Python bindings for jq, the flexible JSON processor";
homepage = "https://github.com/mwilliamson/jq.py";
pkgs/development/python-modules/knack/default.nix
-1
View File
@@ -4,7 +4,6 @@
, argcomplete
, colorama
, jmespath
, knack
, pygments
, pyyaml
, six
pkgs/development/python-modules/papis/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser
, click, python-slugify, habanero, isbnlib, typing-extensions
, prompt_toolkit, pygments, stevedore, tqdm, lxml
, python-doi, isPy3k, pythonOlder, pytestcov
, python-doi, isPy3k, pytestcov
#, optional, dependencies
, whoosh, pytest
, stdenv
pkgs/development/python-modules/powerline/default.nix
-1
View File
@@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, python
, buildPythonPackage
, socat
, psutil
pkgs/development/python-modules/pytest-vcr/default.nix
-1
View File
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pytest
, vcrpy
}:
pkgs/development/python-modules/requests/default.nix
+3
View File
@@ -8,6 +8,7 @@
, pytest-xdist
, pytestCheckHook
, urllib3
, isPy27
}:
buildPythonPackage rec {
@@ -55,5 +56,7 @@ buildPythonPackage rec {
homepage = "http://docs.python-requests.org/en/latest/";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
# AttributeError: 'KeywordMapping' object has no attribute 'get'
broken = isPy27;
};
}
pkgs/development/python-modules/secretstorage/default.nix
+2 -2
View File
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "secretstorage";
version = "3.3.0";
version = "3.3.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
pname = "SecretStorage";
inherit version;
sha256 = "1aj669d5s8pmr6y2d286fxd13apnxzw0ivd1dr6xdni9i3rdxkrh";
sha256 = "15ginv4gzxrx77n7517xnvf2jcpqc6ran12s951hc85zlr8nqrpx";
};
propagatedBuildInputs = [
pkgs/development/python-modules/tqdm/default.nix
+18 -7
View File
@@ -1,28 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, coverage
, glibcLocales
, flake8
, setuptools_scm
, pytestCheckHook
, pytest-asyncio
, pytest-timeout
, numpy
, pandas
, rich
, tkinter
}:
buildPythonPackage rec {
pname = "tqdm";
version = "4.54.1";
version = "4.58.0";
src = fetchPypi {
inherit pname version;
sha256 = "1x9chlh3msikddmq8p8p5s5kgqqs48bclxgzz3vb9ygcwjimidiq";
sha256 = "1fjvaag1wy70gglxjkfnn0acrya7fbhzi4adbs1bpap8x03wffn2";
};
nativeBuildInputs = [
setuptools_scm
];
checkInputs = [ nose coverage glibcLocales flake8 pytestCheckHook ];
checkInputs = [
pytestCheckHook
pytest-asyncio
pytest-timeout
# tests of optional features
numpy
pandas
rich
tkinter
];
# Remove performance testing.
# Too sensitive for on Hydra.
pkgs/development/tools/build-managers/sbt-extras/default.nix
+3 -3
View File
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "f080234ba899bb49b0cf977b3683e6446b38c477";
version = "2021-02-24";
rev = "dc4f350f112580fcdf5f6fa7e8d5d2116475f84a";
version = "2021-03-01";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "01n25s60ssxls8lkwrni91k35622lyaizymmprcqh243dg3g2qiv";
sha256 = "00qlmxnxmsjs5z03sd46j9spcz1jjkabip4z6f6r43pahjqyd0dk";
};
dontBuild = true;
pkgs/development/tools/dockle/default.nix
+5 -8
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dockle";
version = "0.3.10";
version = "0.3.11";
src = fetchFromGitHub {
owner = "goodwithtech";
repo = pname;
rev = "v${version}";
sha256 = "sha256-oS3ZGQkDSRdVLluLNg56VGp6MCrRDlgjk1va1+xocas=";
sha256 = "sha256-TAV+bdHURclrwM0ByfbM2S4GdAnHrwclStyUlGraOpw=";
};
vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4=";
@@ -16,12 +16,9 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ btrfs-progs lvm2 ];
buildFlagsArray = [
"-ldflags="
"-s"
"-w"
"-X main.version=${version}"
];
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X main.version=${version}")
'';
preCheck = ''
# Remove tests that use networking
pkgs/development/tools/golint/default.nix
+7 -8
View File
@@ -1,11 +1,10 @@
{ lib, buildGoPackage, fetchgit }:
{ lib, buildGoModule, fetchgit }:
buildGoPackage rec {
buildGoModule rec {
pname = "lint";
version = "20181026-${lib.strings.substring 0 7 rev}";
rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
version = "20201208-${lib.strings.substring 0 7 rev}";
rev = "83fdc39ff7b56453e3793356bcff3070b9b96445";
goPackagePath = "golang.org/x/lint";
excludedPackages = "testdata";
# we must allow references to the original `go` package, as golint uses
@@ -15,15 +14,15 @@ buildGoPackage rec {
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/lint";
sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765";
sha256 = "sha256-g4Z9PREOxGoN7n/XhutawsITBznJlbz6StXeDYvOQ1c=";
};
goDeps = ./deps.nix;
vendorSha256 = "sha256-dPadFoymYu2Uw2AXZfbaBfxsN8IWMuK1TrcknHco3Bo=";
meta = with lib; {
homepage = "https://golang.org";
description = "Linter for Go source code";
license = licenses.bsd3;
maintainers = with maintainers; [ jhillyerd ];
maintainers = with maintainers; [ jhillyerd tomberek ];
};
}
pkgs/development/tools/golint/deps.nix
Generated
-12
View File
@@ -1,12 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "golang.org/x/tools";
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
rev = "91f80e683c10fea00e7f965a1a7cac482ce52541";
sha256 = "16a2vppy5hnp663f28yak6592l8p968ihsc91pigamxx3vk1qh5d";
};
}
]
pkgs/development/tools/misc/tie/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
cc tie.c -o tie
${stdenv.cc.targetPrefix}cc tie.c -o tie
'';
installPhase = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.ctan.org/tex-archive/web/tie";
description = "Allow multiple web change files";
platforms = with platforms; unix;
platforms = platforms.all;
maintainers = with maintainers; [ vrthra ];
license = licenses.abstyles;
};
pkgs/games/factorio/versions.json
+12 -12
View File
@@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.25.tar.xz",
"name": "factorio_alpha_x64-1.1.26.tar.xz",
"needsAuth": true,
"sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi",
"sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.25/alpha/linux64",
"version": "1.1.25"
"url": "https://factorio.com/get-download/1.1.26/alpha/linux64",
"version": "1.1.26"
},
"stable": {
"name": "factorio_alpha_x64-1.1.25.tar.xz",
@@ -20,12 +20,12 @@
},
"demo": {
"experimental": {
"name": "factorio_demo_x64-1.1.25.tar.xz",
"name": "factorio_demo_x64-1.1.26.tar.xz",
"needsAuth": false,
"sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj",
"sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.25/demo/linux64",
"version": "1.1.25"
"url": "https://factorio.com/get-download/1.1.26/demo/linux64",
"version": "1.1.26"
},
"stable": {
"name": "factorio_demo_x64-1.1.25.tar.xz",
@@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.25.tar.xz",
"name": "factorio_headless_x64-1.1.26.tar.xz",
"needsAuth": false,
"sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1",
"sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.25/headless/linux64",
"version": "1.1.25"
"url": "https://factorio.com/get-download/1.1.26/headless/linux64",
"version": "1.1.26"
},
"stable": {
"name": "factorio_headless_x64-1.1.25.tar.xz",
pkgs/misc/emulators/wine/sources.nix
+3 -3
View File
@@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.2";
version = "6.3";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-tmCWCaOrzGrZJ83WXHQL4BFiuAFSPg97qf1mkYALvxk=";
sha256 = "sha256-aCp3wf0S9WNHyiCA2F/hfe8bZV0yQdlFgvh1kdnQzDs=";
inherit (stable) mono gecko32 gecko64;
patches = [
@@ -58,7 +58,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-swhd5gTIWTz8eEk6f78iXG8bmA3y4ynO0/wBm0/Kimk=";
sha256 = "sha256-Fok0jdGBQtH84PL6LVnuCR7ZVSUIHECqPUI/2lLXs44=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
pkgs/os-specific/linux/kernel/linux-5.11.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.11.1";
version = "5.11.2";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1gmrckvl3039z80rr740c0d5knwgj6p1dmhw4x9gwc7rxli6az85";
sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/pam/default.nix
+3 -1
View File
@@ -1,5 +1,6 @@
{ lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext
, nixosTests
, withLibxcrypt ? false, libxcrypt
}:
stdenv.mkDerivation rec {
@@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ flex ]
++ lib.optional stdenv.buildPlatform.isDarwin gettext;
buildInputs = [ cracklib db4 ];
buildInputs = [ cracklib db4 ]
++ lib.optional withLibxcrypt libxcrypt;
enableParallelBuilding = true;
pkgs/tools/admin/aws-google-auth/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
buildPythonApplication rec {
pname = "aws-google-auth";
version = "0.0.36";
version = "0.0.37";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
# https://github.com/cevoaustralia/aws-google-auth/issues/120
@@ -28,7 +28,7 @@ buildPythonApplication rec {
owner = "cevoaustralia";
repo = "aws-google-auth";
rev = version;
sha256 = "099r020v33sij2b3816cjp4fpy35c886l559szfxqx6kgy19y9z7";
sha256 = "1bh733n4m5rsslpbjvhdigx6768nrvacybkakrm9704d2md9vkqd";
};
propagatedBuildInputs = [
pkgs/tools/inputmethods/fcitx/unwrapped.nix
+7 -2
View File
@@ -2,7 +2,7 @@
, libxml2, enchant2, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, extra-cmake-modules
, xkeyboard_config, pcre, libuuid
, xkeyboard_config, pcre, libuuid, xorg, makeWrapper
, withPinyin ? true
, fetchFromGitLab
}:
@@ -68,7 +68,12 @@ stdenv.mkDerivation rec {
patchShebangs cmake/
'';
nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre ];
postInstall = ''
wrapProgram $out/bin/fcitx \
--prefix PATH : "${xorg.xmodmap}/bin"
'';
nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre makeWrapper ];
buildInputs = [
xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
pkgs/tools/networking/p2p/amule/default.nix
+4 -5
View File
@@ -2,11 +2,8 @@
, enableDaemon ? false # build amule daemon
, httpServer ? false # build web interface for the daemon
, client ? false # build amule remote gui
, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
, autoreconfHook, pkg-config, makeWrapper, libX11 ? null }:
assert httpServer -> libpng != null;
assert client -> libX11 != null;
, fetchFromGitHub, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng
, autoreconfHook, pkg-config, makeWrapper, libX11 }:
stdenv.mkDerivation rec {
pname = "amule";
@@ -78,5 +75,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ phreedom ];
platforms = platforms.unix;
# Could not find crypto++ installation or sources.
broken = true;
};
}
pkgs/tools/security/cryptomator/default.nix
+91
View File
@@ -0,0 +1,91 @@
{ lib, stdenv, fetchFromGitHub
, autoPatchelfHook
, fuse, packer
, maven, jdk, jre, makeWrapper, glib, wrapGAppsHook
}:
let
pname = "cryptomator";
version = "1.5.13";
src = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator";
rev = version;
sha256 = "1s9jl3nl6yfjzmilz9b8azk8592nd39xflzfdf38v6s4iiq86r8j";
};
icons = fetchFromGitHub {
owner = "cryptomator";
repo = "cryptomator-linux";
rev = version;
sha256 = "1x6h6wp6yxnj576874xj3d2jm8jmb7918wprqvlz4sryxhlcssa7";
};
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
deps = stdenv.mkDerivation {
name = "cryptomator-${version}-deps";
inherit src;
nativeBuildInputs = [ jdk maven ];
buildPhase = ''
cd main
while mvn -Prelease package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
echo "timeout, restart maven to continue downloading"
done
'';
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
installPhase = ''
find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete
find $out/.m2 -type f -iname '*.pom' -exec sed -i -e 's/\r\+$//' {} \;
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "06q8bqdz3c4i84wxl9z5861zwdsw8jzcvsbgxqrnh8rwi7500sa7";
};
in stdenv.mkDerivation rec {
inherit pname version src;
buildPhase = ''
cd main
mvn -Prelease package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
'';
installPhase = ''
mkdir -p $out/bin/ $out/usr/share/cryptomator/libs/
cp buildkit/target/libs/* buildkit/target/linux-libs/* $out/usr/share/cryptomator/libs/
makeWrapper ${jre}/bin/java $out/bin/cryptomator \
--add-flags "-classpath '$out/usr/share/cryptomator/libs/*'" \
--add-flags "-Dcryptomator.settingsPath='~/.config/Cryptomator/settings.json'" \
--add-flags "-Dcryptomator.ipcPortPath='~/.config/Cryptomator/ipcPort.bin'" \
--add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \
--add-flags "-Dcryptomator.mountPointsDir='~/.local/share/Cryptomator/mnt'" \
--add-flags "-Djdk.gtk.version=3" \
--add-flags "-Xss20m" \
--add-flags "-Xmx512m" \
--add-flags "org.cryptomator.launcher.Cryptomator" \
--prefix PATH : "$out/usr/share/cryptomator/libs/:${lib.makeBinPath [ jre glib ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse ]}" \
--set JAVA_HOME "${jre.home}"
# install desktop entry and icons
cp -r ${icons}/resources/appimage/AppDir/usr $out/
'';
nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ];
buildInputs = [ fuse packer jre glib ];
meta = with lib; {
description = "Free client-side encryption for your cloud files";
homepage = "https://cryptomator.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ bachp ];
platforms = platforms.linux;
};
}
pkgs/tools/security/gitleaks/default.nix
+8 -4
View File
@@ -1,21 +1,25 @@
{ buildGoModule
{ lib
, buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "gitleaks";
version = "7.2.0";
version = "7.2.2";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "1pdbkjx8h6ijypsxyv34lykymaqf8wnfyjk3ldp49apbx01bl34y";
sha256 = "sha256-G/7Ezyfp9vkG1QHTG9Xg6mZ3qhQpx952i7rsSr3fFwY=";
};
vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}")
'';
meta = with lib; {
description = "Scan git repos (or files) for secrets";
longDescription = ''
pkgs/tools/typesetting/sile/default.nix
+2 -2
View File
@@ -39,11 +39,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.10.14";
version = "0.10.15";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "100f6iangpiwlv8k55d134w856r0xwsgw90s1rkkmqa5syziwni5";
sha256 = "0p1w3s6j34qi93aycqmqggfm277n90z90nlmm1j3qizxxwq5gda9";
};
configureFlags = [
pkgs/top-level/all-packages.nix
+3 -4
View File
@@ -18934,6 +18934,8 @@ in
criu = callPackage ../os-specific/linux/criu { };
cryptomator = callPackage ../tools/security/cryptomator { };
cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { };
@@ -24655,10 +24657,7 @@ in
qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { };
eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp {
lua5 = lua5_1;
miniupnpc = miniupnpc_1;
};
eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };
qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {};