Merge branch 'master' into staging-next
... to resolve a trivial conflict in libpcap.
This commit is contained in:
Vladimír Čunát
commit
13add13388
@ -5154,6 +5154,12 @@
|
||||
fingerprint = "3196 83D3 9A1B 4DE1 3DC2 51FD FEA8 88C9 F5D6 4F62";
|
||||
}];
|
||||
};
|
||||
mir06 = {
|
||||
email = "armin.leuprecht@uni-graz.at";
|
||||
github = "mir06";
|
||||
githubId = 8479244;
|
||||
name = "Armin Leuprecht";
|
||||
};
|
||||
mirdhyn = {
|
||||
email = "mirdhyn@gmail.com";
|
||||
github = "mirdhyn";
|
||||
|
||||
@ -17,6 +17,10 @@ in {
|
||||
|
||||
###### interface
|
||||
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "services" "opensmtpd" "addSendmailToSystemPath" ] [ "services" "opensmtpd" "setSendmail" ])
|
||||
];
|
||||
|
||||
options = {
|
||||
|
||||
services.opensmtpd = {
|
||||
@ -34,13 +38,10 @@ in {
|
||||
description = "The OpenSMTPD package to use.";
|
||||
};
|
||||
|
||||
addSendmailToSystemPath = mkOption {
|
||||
setSendmail = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to add OpenSMTPD's sendmail binary to the
|
||||
system path or not.
|
||||
'';
|
||||
description = "Whether to set the system sendmail to OpenSMTPD's.";
|
||||
};
|
||||
|
||||
extraServerArgs = mkOption {
|
||||
@ -82,7 +83,7 @@ in {
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = mkIf cfg.enable rec {
|
||||
users.groups = {
|
||||
smtpd.gid = config.ids.gids.smtpd;
|
||||
smtpq.gid = config.ids.gids.smtpq;
|
||||
@ -101,6 +102,14 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
security.wrappers.smtpctl = {
|
||||
group = "smtpq";
|
||||
setgid = true;
|
||||
source = "${cfg.package}/bin/smtpctl";
|
||||
};
|
||||
|
||||
services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail security.wrappers.smtpctl;
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/spool/smtpd 711 root - - -"
|
||||
"d /var/spool/smtpd/offline 770 root smtpq - -"
|
||||
@ -119,7 +128,5 @@ in {
|
||||
serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";
|
||||
environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
|
||||
};
|
||||
|
||||
environment.systemPackages = mkIf cfg.addSendmailToSystemPath [ sendmail ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -179,6 +179,8 @@ in
|
||||
${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so.* mr,
|
||||
${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so.* mr,
|
||||
${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so.* mr,
|
||||
${getLib pkgs.gcc.cc.lib}/lib/libstdc++.so.* mr,
|
||||
${getLib pkgs.gcc.cc.lib}/lib/libgcc_s.so.* mr,
|
||||
|
||||
@{PROC}/sys/kernel/random/uuid r,
|
||||
@{PROC}/sys/vm/overcommit_memory r,
|
||||
|
||||
@ -11,8 +11,8 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "16zchjp72m6n6za4ak5kn2ax1s5pjfn7l082d6gfbb2y62isvs7q";
|
||||
x86_64-darwin = "0w35s6nxagcnd6xcm6bp0m63agkqxffig61cr3nnmpbcgj9zc969";
|
||||
x86_64-linux = "0zdg6z6h0h8vvwdrnihwd76bik41spv6xbw7cdh7hz97sjsh15zq";
|
||||
x86_64-darwin = "1c5c24vj8nqsxx8hwfj04as7vsl9gnl97yniw36pdfgv88v8qzin";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
@ -21,7 +21,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.45.0";
|
||||
version = "1.45.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
@ -11,8 +11,8 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1wb4s2jw90irlawgl6539gwl0xwaxglaksmbcddbvnr6rq3ypn8n";
|
||||
x86_64-darwin = "16c1r7knfd5pfqhnk77nanh82azkc28pwkqfcyasbdgm70k17d3p";
|
||||
x86_64-linux = "1m965d8ggg2ffbhyrgadfrgikcavyjszc3sgbsd930b8pxrmqlxp";
|
||||
x86_64-darwin = "017fj7imjxa0n3r7c9kcz7192rxkw18bry6rfkv2hycfja70j5qj";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
@ -27,7 +27,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.45.0";
|
||||
version = "1.45.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -6,11 +6,11 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "feh";
|
||||
version = "3.4";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0r83zincbfnk8g13xwm2qaccml9srnwlsmpc1f0nhwjkqyjmqm0q";
|
||||
sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, openssl }:
|
||||
|
||||
let
|
||||
version = "6.4.5";
|
||||
version = "6.4.6";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "fetchmail";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
||||
sha256 = "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk";
|
||||
sha256 = "04b0sq1xad6gs1bfhkbmhsn1kq6y4gsx9l9ywjvd5d0rc15yrvqn";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.13.6";
|
||||
version = "1.14.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17hgryj8qsxcx3c96ir25q0wsh5q0s6c6fb33lqfdbrfxrjcixbk";
|
||||
sha256 = "0ckqxibyf14lgl1aj5pv79bmfanacgcc96x6mdwfp2dnbvfjk71b";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
42
pkgs/applications/misc/qsudo/default.nix
Normal file
42
pkgs/applications/misc/qsudo/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qtbase
|
||||
, sudo
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qsudo";
|
||||
version = "2020.03.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-trident";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src-qt5";
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
sudo
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace qsudo.pro --replace /usr/bin $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Graphical sudo utility from Project Trident";
|
||||
homepage = "https://github.com/project-trident/qsudo";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
@ -13,6 +13,7 @@
|
||||
, bison, gperf
|
||||
, glib, gtk3, dbus-glib
|
||||
, glibc
|
||||
, xorg
|
||||
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
|
||||
, protobuf, speechd, libXdamage, cups
|
||||
, ffmpeg, libxslt, libxml2, at-spi2-core
|
||||
@ -123,7 +124,8 @@ let
|
||||
ninja which python2Packages.python perl pkgconfig
|
||||
python2Packages.ply python2Packages.jinja2 nodejs
|
||||
gnutar
|
||||
] ++ optional (versionAtLeast version "83") python2Packages.setuptools;
|
||||
] ++ optional (versionAtLeast version "83") python2Packages.setuptools
|
||||
++ optional (versionAtLeast version "84") (xorg.xcbproto.override { python = python2Packages.python; });
|
||||
|
||||
buildInputs = defaultDependencies ++ [
|
||||
nspr nss systemd
|
||||
@ -224,6 +226,11 @@ let
|
||||
ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang
|
||||
ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++
|
||||
ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
|
||||
'' + optionalString (versionAtLeast version "84") ''
|
||||
substituteInPlace ui/gfx/x/BUILD.gn \
|
||||
--replace \
|
||||
'/usr/share/xcb' \
|
||||
'${xorg.xcbproto}/share/xcb/'
|
||||
'';
|
||||
|
||||
gnFlags = mkGnFlags (optionalAttrs (versionRange "0" "84") {
|
||||
|
||||
@ -12,6 +12,7 @@ with stdenv.lib;
|
||||
let
|
||||
version = "3.2.4";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
pcap = libpcap.override { withBluez = stdenv.isLinux; };
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "wireshark-${variant}";
|
||||
@ -35,7 +36,7 @@ in stdenv.mkDerivation {
|
||||
] ++ optional withQt qt5.wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
|
||||
gettext pcre perl pcap lua5 libssh nghttp2 openssl libgcrypt
|
||||
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
|
||||
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
|
||||
++ optionals stdenv.isLinux [ libcap libnl ]
|
||||
|
||||
@ -17,14 +17,14 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.30.2";
|
||||
version = "14.31.0";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "0f9sxhxyqrd1vvmq566v1zpzzlci37pm9j7alzak766x5dg5yyz1";
|
||||
sha256 = "14p823vxb8sfis1dgq8i9kj0rqf3cb8d0l8pspb8nz30fcvp1q7f";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -4,12 +4,12 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marvin";
|
||||
version = "20.12.0";
|
||||
version = "20.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "marvin-${version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
|
||||
sha256 = "1imfr56nbq2mbcyapwa8xmcmj5rjhbjz9r438387s73kd1avd6yl";
|
||||
sha256 = "1mbbl7z215l6z4acwdrmqnvlvc2hv4znz4dmng9iw7rrqns3jjlv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitui";
|
||||
version = "0.3.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "extrawurst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0rdaschf6030zprz81g7xnx57idjsq3bjhjp5d9387ha5njq0bp1";
|
||||
sha256 = "0z3k83nfnl765ably4naybjf614qfizzpqb40ppwljijj9nqlng1";
|
||||
};
|
||||
|
||||
cargoSha256 = "1k24xabhgwwdvslq81w6b8jnnjxbafj4s0zpcq2c4hals2xxwfy4";
|
||||
cargoSha256 = "11y4q56vl5dp2vdc7dc5q44l2m0mn590hfg6i134m11r8988am6y";
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
let
|
||||
pname = "gnome-applets";
|
||||
version = "3.36.3";
|
||||
version = "3.36.4";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "02jwh5yxka2mnzdqnr55lfijplvscy97isv7lqx1zvsi2p7hy38m";
|
||||
sha256 = "1cd7y2air9cjznqmnynadbsayvq4dpsi39avnz46vv0bavx1aiwz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fluxbox
|
||||
, libarchive
|
||||
, numlockx
|
||||
, qmake
|
||||
, qtbase
|
||||
@ -33,6 +34,7 @@ mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
fluxbox # window manager for Lumina DE
|
||||
libarchive # make `bsdtar` available for lumina-archiver
|
||||
numlockx # required for changing state of numlock at login
|
||||
qtbase
|
||||
qtmultimedia
|
||||
@ -66,9 +68,12 @@ mkDerivation rec {
|
||||
substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \
|
||||
--replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox"
|
||||
|
||||
# Add full path of bsdtar to lumina-archiver
|
||||
substituteInPlace src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp \
|
||||
--replace '"bsdtar"' '"${stdenv.lib.getBin libarchive}/bin/bsdtar"'
|
||||
|
||||
# Fix desktop files
|
||||
for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do
|
||||
echo ===== $i
|
||||
substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina'
|
||||
done
|
||||
'';
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "joker";
|
||||
version = "0.15.3";
|
||||
version = "0.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn";
|
||||
sha256 = "1ad6cdqadd1zs9zh85zyhdiiv6ir28k28w034vzsx5zaipvy4kml";
|
||||
};
|
||||
|
||||
vendorSha256 = "1rn8ijq3v3fzlbyvm7g4i3qpwcl3vrl4rbcvlbzv05wxrgcw9iqb";
|
||||
vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl";
|
||||
|
||||
preBuild = ''
|
||||
go generate ./...
|
||||
|
||||
@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetds";
|
||||
version = "1.1.39";
|
||||
version = "1.1.40";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1p5ixc1hxh9mmhplndf1j87cw9989bp0fh0nsbx6l3p2wnqz9nyl";
|
||||
sha256 = "0wc7xxf8fzpp3pc3hpsamnykn0vjkq53qp53nyxjjcri8g0ch7wq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcloudproviders";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.gnome.org/World/${pname}/repository/archive.tar.gz?ref=${version}";
|
||||
sha256 = "1hby7vhxn6fw4ih3xbx6ab9vqp3a3dmlhr0z7mrwr73b7ankly0l";
|
||||
sha256 = "0zazjhj3xbwxyzi2b2aws7qdnwn092zg9yrk9v3wd19m3mxq5na3";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
27
pkgs/development/libraries/liberfa/default.nix
Normal file
27
pkgs/development/libraries/liberfa/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "erfa";
|
||||
version = "1.7.0";
|
||||
|
||||
buildInputs = [ autoreconfHook ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liberfa";
|
||||
repo = "erfa";
|
||||
rev = "v${version}";
|
||||
sha256 = "1z4k2phrw6wwi0kax6ac80jk9c036gi7pmhmg6gaf3lk81k6xz2r";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-shared" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Essential Routines for Fundamental Astronomy";
|
||||
homepage = "https://github.com/liberfa/erfa";
|
||||
maintainers = with maintainers; [ mir06 ];
|
||||
license = {
|
||||
url = "https://github.com/liberfa/erfa/blob/master/LICENSE";
|
||||
free = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,6 @@
|
||||
{ stdenv, fetchurl, flex, bison }:
|
||||
{ stdenv, fetchurl, flex, bison, bluez, pkgconfig, withBluez ? false }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpcap";
|
||||
@ -9,7 +11,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex bison ];
|
||||
nativeBuildInputs = [ flex bison ]
|
||||
++ optionals withBluez [ bluez.dev pkgconfig ];
|
||||
|
||||
# We need to force the autodetection because detection doesn't
|
||||
# work in pure build enviroments.
|
||||
@ -18,11 +21,10 @@ stdenv.mkDerivation rec {
|
||||
linux = "linux";
|
||||
darwin = "bpf";
|
||||
}.${stdenv.hostPlatform.parsed.kernel.name})
|
||||
] ++ stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
|
||||
"ac_cv_linux_vers=2"
|
||||
];
|
||||
] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform)
|
||||
[ "ac_cv_linux_vers=2" ];
|
||||
|
||||
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
prePatch = optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure --replace " -arch i386" ""
|
||||
'';
|
||||
|
||||
@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
rm -f $out/lib/libpcap.a
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = {
|
||||
homepage = "https://www.tcpdump.org";
|
||||
description = "Packet Capture Library";
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mm-common";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1m4w33da9f4rx2d6kdj3ix3kl0gn16ml82v2mdn4hljr3q29nzdr";
|
||||
sha256 = "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -32,7 +32,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pipewire";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" ];
|
||||
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "pipewire";
|
||||
repo = "pipewire";
|
||||
rev = version;
|
||||
sha256 = "1x0rsq68vsl39bps2g397pa097q37mdjh595bjf7rd2lm9yf21ws";
|
||||
sha256 = "0g149vyaigf4gzm764fcgxxci9niw19z0af9afs4diwq5xzr1qd3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -160,6 +160,9 @@ let
|
||||
|
||||
thelounge = super.thelounge.override {
|
||||
buildInputs = [ self.node-pre-gyp ];
|
||||
postInstall = ''
|
||||
echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home
|
||||
'';
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
||||
@ -9,13 +9,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nix-prefetch-github";
|
||||
version = "2.3.2";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18xj618zjs13ib7f996fnl0xiqig0w48yns45nvy3xab55wximdx";
|
||||
sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E=";
|
||||
};
|
||||
|
||||
# The tests for this package require nix and network access. That's
|
||||
# why we cannot execute them inside the building process.
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
click
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.1.4";
|
||||
version = "2.2.1";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
sha256 = "0jgwvc9flqdm88q9kknzjs125j9d3j5l5adcpngfy17ljgziy4nn";
|
||||
sha256 = "0ijgvp2ifs4wnqmxidinwdcpv41iia74nk0xahasnjm8ljvgnnqh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hopper";
|
||||
version = "4.5.27";
|
||||
version = "4.5.28";
|
||||
rev = "v${lib.versions.major version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
|
||||
sha256 = "1c0lyj20kvb6ljf7zk6hzs70bl5fwnmyiv6w3hhr079bgn4fq4m0";
|
||||
sha256 = "0mjpkd5c9igkxp9jg8cvrgrxw9x7ag1p5xivjbzhb3vld6xjm4dh";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "cmake-language-server";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "regen100";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09rijjksx07inbwxjinrsqihkxb011l2glysasmwpkhy0rmmhbcm";
|
||||
sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, jre_headless, makeWrapper }:
|
||||
let
|
||||
version = "6.4.2";
|
||||
version = "6.4.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "flyway";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
|
||||
sha256 = "1m5i7mw3ml2iaqy09h8nmykn602rwkjfgh2mrmc1gss9q3klj1r8";
|
||||
sha256 = "05gbqc3hvi7yiqf03iwyamvvhc3jmyfvv1989527psdzhxs8gw7b";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-watch";
|
||||
version = "7.4.0";
|
||||
version = "7.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "passcod";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0yg6im7hzwzl84gxcg7wbix5h0ciq4l4ql6ili7k0k7j8bhrxn82";
|
||||
sha256 = "1nq7sfdxvqldj94laz562y4cvgagm67b6a5b7bzxdip0sf1l11f8";
|
||||
};
|
||||
|
||||
cargoSha256 = "1y299mvg9k568f16d2r92y0bgwfrng6idw21wcsd5mnsd28fsww1";
|
||||
cargoSha256 = "1rjx3k8li8ck5cdygm4pd2i5wkslr6d9z9vl2vp0x6hqv1gcv5zh";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin CoreServices;
|
||||
|
||||
|
||||
@ -22,179 +22,187 @@
|
||||
, setuptools
|
||||
, send2trash
|
||||
, CoreAudio
|
||||
# This little flag adds a huge number of dependencies, but we assume that
|
||||
# everyone wants Anki to draw plots with statistics by default.
|
||||
# This little flag adds a huge number of dependencies, but we assume that
|
||||
# everyone wants Anki to draw plots with statistics by default.
|
||||
, plotsSupport ? true
|
||||
# manual
|
||||
# manual
|
||||
, asciidoc
|
||||
}:
|
||||
|
||||
let
|
||||
# when updating, also update rev-manual to a recent version of
|
||||
# https://github.com/dae/ankidocs
|
||||
# The manual is distributed independently of the software.
|
||||
version = "2.1.15";
|
||||
sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss";
|
||||
rev-manual = "8f6387867ac37ef3fe9d0b986e70f898d1a49139";
|
||||
sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml";
|
||||
# when updating, also update rev-manual to a recent version of
|
||||
# https://github.com/dae/ankidocs
|
||||
# The manual is distributed independently of the software.
|
||||
version = "2.1.15";
|
||||
sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss";
|
||||
rev-manual = "8f6387867ac37ef3fe9d0b986e70f898d1a49139";
|
||||
sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml";
|
||||
|
||||
manual = stdenv.mkDerivation {
|
||||
pname = "anki-manual";
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "dae";
|
||||
repo = "ankidocs";
|
||||
rev = rev-manual;
|
||||
sha256 = sha256-manual;
|
||||
};
|
||||
phases = [ "unpackPhase" "patchPhase" "buildPhase" ];
|
||||
nativeBuildInputs = [ asciidoc ];
|
||||
patchPhase = ''
|
||||
# rsync isnt needed
|
||||
# WEB is the PREFIX
|
||||
# We remove any special ankiweb output generation
|
||||
# and rename every .mako to .html
|
||||
sed -e 's/rsync -a/cp -a/g' \
|
||||
-e "s|\$(WEB)/docs|$out/share/doc/anki/html|" \
|
||||
-e '/echo asciidoc/,/mv $@.tmp $@/c \\tasciidoc -b html5 -o $@ $<' \
|
||||
-e 's/\.mako/.html/g' \
|
||||
-i Makefile
|
||||
# patch absolute links to the other language manuals
|
||||
sed -e 's|https://apps.ankiweb.net/docs/|link:./|g' \
|
||||
-i {manual.txt,manual.*.txt}
|
||||
# there’s an artifact in most input files
|
||||
sed -e '/<%def.*title.*/d' \
|
||||
-i *.txt
|
||||
mkdir -p $out/share/doc/anki/html
|
||||
'';
|
||||
manual = stdenv.mkDerivation {
|
||||
pname = "anki-manual";
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "dae";
|
||||
repo = "ankidocs";
|
||||
rev = rev-manual;
|
||||
sha256 = sha256-manual;
|
||||
};
|
||||
phases = [ "unpackPhase" "patchPhase" "buildPhase" ];
|
||||
nativeBuildInputs = [ asciidoc ];
|
||||
patchPhase = ''
|
||||
# rsync isnt needed
|
||||
# WEB is the PREFIX
|
||||
# We remove any special ankiweb output generation
|
||||
# and rename every .mako to .html
|
||||
sed -e 's/rsync -a/cp -a/g' \
|
||||
-e "s|\$(WEB)/docs|$out/share/doc/anki/html|" \
|
||||
-e '/echo asciidoc/,/mv $@.tmp $@/c \\tasciidoc -b html5 -o $@ $<' \
|
||||
-e 's/\.mako/.html/g' \
|
||||
-i Makefile
|
||||
# patch absolute links to the other language manuals
|
||||
sed -e 's|https://apps.ankiweb.net/docs/|link:./|g' \
|
||||
-i {manual.txt,manual.*.txt}
|
||||
# there’s an artifact in most input files
|
||||
sed -e '/<%def.*title.*/d' \
|
||||
-i *.txt
|
||||
mkdir -p $out/share/doc/anki/html
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "anki";
|
||||
inherit version;
|
||||
pname = "anki";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz"
|
||||
# "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
|
||||
# "http://ankisrs.net/download/mirror/${name}.tgz"
|
||||
# "http://ankisrs.net/download/mirror/archive/${name}.tgz"
|
||||
];
|
||||
sha256 = sha256-pkg;
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator
|
||||
markdown jsonschema setuptools
|
||||
]
|
||||
++ lib.optional plotsSupport matplotlib
|
||||
++ lib.optional stdenv.isDarwin [ CoreAudio ]
|
||||
;
|
||||
|
||||
checkInputs = [ pytest glibcLocales nose ];
|
||||
|
||||
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
|
||||
buildInputs = [ lame mplayer libpulseaudio ];
|
||||
|
||||
patches = [
|
||||
# Disable updated version check.
|
||||
./no-version-check.patch
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz"
|
||||
# "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
|
||||
# "http://ankisrs.net/download/mirror/${name}.tgz"
|
||||
# "http://ankisrs.net/download/mirror/archive/${name}.tgz"
|
||||
];
|
||||
sha256 = sha256-pkg;
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
# Dummy build phase
|
||||
# Anki does not use setup.py
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyqtwebengine
|
||||
sqlalchemy
|
||||
beautifulsoup4
|
||||
send2trash
|
||||
pyaudio
|
||||
requests
|
||||
decorator
|
||||
markdown
|
||||
jsonschema
|
||||
setuptools
|
||||
]
|
||||
++ lib.optional plotsSupport matplotlib
|
||||
++ lib.optional stdenv.isDarwin [ CoreAudio ]
|
||||
;
|
||||
|
||||
checkInputs = [ pytest glibcLocales nose ];
|
||||
|
||||
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
|
||||
buildInputs = [ lame mplayer libpulseaudio ];
|
||||
|
||||
patches = [
|
||||
# Disable updated version check.
|
||||
./no-version-check.patch
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
# Dummy build phase
|
||||
# Anki does not use setup.py
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Remove unused starter. We'll create our own, minimalistic,
|
||||
# starter.
|
||||
# rm anki/anki
|
||||
|
||||
# Remove QT translation files. We'll use the standard QT ones.
|
||||
rm "locale/"*.qm
|
||||
|
||||
# hitting F1 should open the local manual
|
||||
substituteInPlace anki/consts.py \
|
||||
--replace 'HELP_SITE="http://ankisrs.net/docs/manual.html"' \
|
||||
'HELP_SITE="${manual}/share/doc/anki/html/manual.html"'
|
||||
'';
|
||||
|
||||
# UTF-8 locale needed for testing
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
checkPhase = ''
|
||||
# - Anki writes some files to $HOME during tests
|
||||
# - Skip tests using network
|
||||
env HOME=$TMP pytest --ignore tests/test_sync.py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
pp=$out/lib/${python.libPrefix}/site-packages
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/applications
|
||||
mkdir -p $doc/share/doc/anki
|
||||
mkdir -p $man/share/man/man1
|
||||
mkdir -p $out/share/mime/packages
|
||||
mkdir -p $out/share/pixmaps
|
||||
mkdir -p $pp
|
||||
|
||||
cat > $out/bin/anki <<EOF
|
||||
#!${python}/bin/python
|
||||
import aqt
|
||||
aqt.run()
|
||||
EOF
|
||||
chmod 755 $out/bin/anki
|
||||
|
||||
cp -v anki.desktop $out/share/applications/
|
||||
cp -v README* LICENSE* $doc/share/doc/anki/
|
||||
cp -v anki.1 $man/share/man/man1/
|
||||
cp -v anki.xml $out/share/mime/packages/
|
||||
cp -v anki.{png,xpm} $out/share/pixmaps/
|
||||
cp -rv locale $out/share/
|
||||
cp -rv anki aqt web $pp/
|
||||
|
||||
# copy the manual into $doc
|
||||
cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${qtWrapperArgs[@]}"
|
||||
--prefix PATH ':' "${lame}/bin:${mplayer}/bin"
|
||||
)
|
||||
'';
|
||||
|
||||
# now wrapPythonPrograms from postFixup will add both python and qt env variables
|
||||
|
||||
passthru = {
|
||||
inherit manual;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.ankiweb.net/";
|
||||
description = "Spaced repetition flashcard program";
|
||||
longDescription = ''
|
||||
Anki is a program which makes remembering things easy. Because it is a lot
|
||||
more efficient than traditional study methods, you can either greatly
|
||||
decrease your time spent studying, or greatly increase the amount you learn.
|
||||
|
||||
Anyone who needs to remember things in their daily life can benefit from
|
||||
Anki. Since it is content-agnostic and supports images, audio, videos and
|
||||
scientific markup (via LaTeX), the possibilities are endless. For example:
|
||||
learning a language, studying for medical and law exams, memorizing
|
||||
people's names and faces, brushing up on geography, mastering long poems,
|
||||
or even practicing guitar chords!
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# Remove unused starter. We'll create our own, minimalistic,
|
||||
# starter.
|
||||
# rm anki/anki
|
||||
|
||||
# Remove QT translation files. We'll use the standard QT ones.
|
||||
rm "locale/"*.qm
|
||||
|
||||
# hitting F1 should open the local manual
|
||||
substituteInPlace anki/consts.py \
|
||||
--replace 'HELP_SITE="http://ankisrs.net/docs/manual.html"' \
|
||||
'HELP_SITE="${manual}/share/doc/anki/html/manual.html"'
|
||||
'';
|
||||
|
||||
# UTF-8 locale needed for testing
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
checkPhase = ''
|
||||
# - Anki writes some files to $HOME during tests
|
||||
# - Skip tests using network
|
||||
env HOME=$TMP pytest --ignore tests/test_sync.py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
pp=$out/lib/${python.libPrefix}/site-packages
|
||||
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/applications
|
||||
mkdir -p $doc/share/doc/anki
|
||||
mkdir -p $man/share/man/man1
|
||||
mkdir -p $out/share/mime/packages
|
||||
mkdir -p $out/share/pixmaps
|
||||
mkdir -p $pp
|
||||
|
||||
cat > $out/bin/anki <<EOF
|
||||
#!${python}/bin/python
|
||||
import aqt
|
||||
aqt.run()
|
||||
EOF
|
||||
chmod 755 $out/bin/anki
|
||||
|
||||
cp -v anki.desktop $out/share/applications/
|
||||
cp -v README* LICENSE* $doc/share/doc/anki/
|
||||
cp -v anki.1 $man/share/man/man1/
|
||||
cp -v anki.xml $out/share/mime/packages/
|
||||
cp -v anki.{png,xpm} $out/share/pixmaps/
|
||||
cp -rv locale $out/share/
|
||||
cp -rv anki aqt web $pp/
|
||||
|
||||
# copy the manual into $doc
|
||||
cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${qtWrapperArgs[@]}"
|
||||
--prefix PATH ':' "${lame}/bin:${mplayer}/bin"
|
||||
)
|
||||
'';
|
||||
|
||||
# now wrapPythonPrograms from postFixup will add both python and qt env variables
|
||||
|
||||
passthru = {
|
||||
inherit manual;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.ankiweb.net/";
|
||||
description = "Spaced repetition flashcard program";
|
||||
longDescription = ''
|
||||
Anki is a program which makes remembering things easy. Because it is a lot
|
||||
more efficient than traditional study methods, you can either greatly
|
||||
decrease your time spent studying, or greatly increase the amount you learn.
|
||||
|
||||
Anyone who needs to remember things in their daily life can benefit from
|
||||
Anki. Since it is content-agnostic and supports images, audio, videos and
|
||||
scientific markup (via LaTeX), the possibilities are endless. For example:
|
||||
learning a language, studying for medical and law exams, memorizing
|
||||
people's names and faces, brushing up on geography, mastering long poems,
|
||||
or even practicing guitar chords!
|
||||
'';
|
||||
license = licenses.agpl3Plus;
|
||||
broken = stdenv.hostPlatform.isAarch64;
|
||||
platforms = platforms.mesaPlatforms;
|
||||
maintainers = with maintainers; [ oxij Profpatsch enzime ];
|
||||
};
|
||||
license = licenses.agpl3Plus;
|
||||
broken = stdenv.hostPlatform.isAarch64;
|
||||
platforms = platforms.mesaPlatforms;
|
||||
maintainers = with maintainers; [ oxij Profpatsch enzime ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl
|
||||
, python, munge, perl, pam, openssl, zlib
|
||||
, python, munge, perl, pam, openssl, zlib, shadow, coreutils
|
||||
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
|
||||
, readline, freeipmi, libssh2, xorg, lz4, rdma-core
|
||||
, readline, freeipmi, libssh2, xorg, lz4, rdma-core, nixosTests
|
||||
# enable internal X11 support via libssh2
|
||||
, enableX11 ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slurm";
|
||||
version = "19.05.5.1";
|
||||
version = "19.05.7.1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
@ -17,15 +17,18 @@ stdenv.mkDerivation rec {
|
||||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "0f0gv3sirp6sxdrbwydsbcqicjbmrpm58yhgbsar8v6nx3g6y3hx";
|
||||
sha256 = "115f40k8y7d569nbl6g0mkyshgv925lawlwar7ib5296g30p97f0";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
prePatch = stdenv.lib.optional enableX11 ''
|
||||
prePatch = ''
|
||||
substituteInPlace src/common/env.c \
|
||||
--replace "/bin/echo" "${coreutils}/bin/echo"
|
||||
'' + (stdenv.lib.optionalString enableX11 ''
|
||||
substituteInPlace src/common/x11_util.c \
|
||||
--replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
|
||||
'';
|
||||
'');
|
||||
|
||||
# nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'
|
||||
# https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es
|
||||
@ -36,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
curl python munge perl pam openssl zlib
|
||||
libmysqlclient ncurses gtk2 lz4 rdma-core
|
||||
lua hwloc numactl readline freeipmi
|
||||
lua hwloc numactl readline freeipmi shadow.su
|
||||
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
|
||||
|
||||
configureFlags = with stdenv.lib;
|
||||
@ -64,6 +67,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests.slurm = nixosTests.slurm;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.schedmd.com/";
|
||||
description = "Simple Linux Utility for Resource Management";
|
||||
|
||||
@ -107,8 +107,13 @@ let
|
||||
|
||||
You can install it anyway by whitelisting this package, using the
|
||||
following methods:
|
||||
|
||||
a) To temporarily allow all insecure packages, you can use an environment variable
|
||||
for a single invocation of the nix tools:
|
||||
|
||||
$ export NIXPKGS_ALLOW_INSECURE=1
|
||||
|
||||
a) for `nixos-rebuild` you can add ‘${getName attrs}’ to
|
||||
b) for `nixos-rebuild` you can add ‘${getName attrs}’ to
|
||||
`nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
|
||||
like so:
|
||||
|
||||
@ -118,7 +123,7 @@ let
|
||||
];
|
||||
}
|
||||
|
||||
b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
|
||||
c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
|
||||
‘${getName attrs}’ to `permittedInsecurePackages` in
|
||||
~/.config/nixpkgs/config.nix, like so:
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, lvm2, libgcrypt, libuuid, pkgconfig, popt
|
||||
{ stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkgconfig, popt
|
||||
, enablePython ? true, python ? null
|
||||
}:
|
||||
|
||||
@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with glibc >= 2.28
|
||||
# https://github.com/NixOS/nixpkgs/issues/86403
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryptsetup/files/cryptsetup-1.7.1-sysmacros.patch?id=d72316f97ebcc7fe622b21574442a9ac59b9115f";
|
||||
sha256 = "0xbhazgl44bimqhcrhajk016w9wi7bkrgwyfq13xmrvyrllqvgdx";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-cryptsetup-reencrypt" ]
|
||||
++ stdenv.lib.optional enablePython "--enable-python";
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ let
|
||||
|
||||
cryptsetup = import ./cryptsetup.nix {
|
||||
inherit stdenv fetchurl python;
|
||||
inherit (pkgs) pkgconfig libgcrypt libuuid popt lvm2;
|
||||
inherit (pkgs) fetchpatch pkgconfig libgcrypt libuuid popt lvm2;
|
||||
};
|
||||
|
||||
dmraid = import ./dmraid.nix {
|
||||
@ -27,17 +27,17 @@ let
|
||||
|
||||
lvm2 = import ./lvm2.nix {
|
||||
inherit stdenv fetchurl;
|
||||
inherit (pkgs) pkgconfig utillinux systemd coreutils;
|
||||
inherit (pkgs) fetchpatch pkgconfig utillinux systemd coreutils;
|
||||
};
|
||||
|
||||
multipath_tools = import ./multipath-tools.nix {
|
||||
inherit stdenv fetchurl lvm2;
|
||||
inherit (pkgs) readline systemd libaio gzip;
|
||||
inherit (pkgs) fetchpatch readline systemd libaio gzip;
|
||||
};
|
||||
|
||||
parted = import ./parted.nix {
|
||||
inherit stdenv fetchurl;
|
||||
inherit (pkgs) utillinux readline libuuid gettext check lvm2;
|
||||
inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2;
|
||||
};
|
||||
|
||||
pyblock = import ./pyblock.nix {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils }:
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }:
|
||||
|
||||
let
|
||||
v = "2.02.106";
|
||||
@ -12,6 +12,18 @@ stdenv.mkDerivation {
|
||||
sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with glibc >= 2.28
|
||||
# https://github.com/NixOS/nixpkgs/issues/86403
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lvmteam/lvm2/commit/92d5a8441007f578e000b492cecf67d6b8a87405.patch";
|
||||
sha256 = "1yqd6jng0b370k53vks1shg57yhfyribhpmv19km5zsjqf0qqx2d";
|
||||
excludes = [
|
||||
"libdm/libdm-stats.c"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-readline"
|
||||
"--enable-udev_rules"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# FIXME: unify with pkgs/os-specific/linux/multipath-tools/default.nix.
|
||||
|
||||
{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd }:
|
||||
{ stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "multipath-tools-0.4.9";
|
||||
@ -10,6 +10,18 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with glibc >= 2.28
|
||||
# https://github.com/NixOS/nixpkgs/issues/86403
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch?id=eb22b954c177b5c1e2b6ed5c7cdd02f40f40d757";
|
||||
sha256 = "1an0cgmz7g03c4qjimhpm9fcf2iswws18lwqxi688k87qm3xb5qd";
|
||||
excludes = [
|
||||
"libmultipath/util.c"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
buildInputs = [ lvm2 libaio readline gzip ];
|
||||
@ -26,6 +38,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id
|
||||
substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id
|
||||
|
||||
sed -i -re '
|
||||
s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
|
||||
' libmultipath/defaults.h
|
||||
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, lvm2, libuuid, gettext, readline
|
||||
{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
|
||||
, utillinux, check, enableStatic ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with glibc >= 2.28
|
||||
# https://github.com/NixOS/nixpkgs/issues/86403
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-block/parted/files/parted-3.2-sysmacros.patch?id=8e2414f551c14166f259f9a25a594aec7a5b9ea0";
|
||||
sha256 = "0fdgifjbri7n28hv74zksac05gw72p2czzvyar0jp62b9dnql3mp";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ libuuid ]
|
||||
++ stdenv.lib.optional (readline != null) readline
|
||||
++ stdenv.lib.optional (gettext != null) gettext
|
||||
|
||||
12
pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch
Normal file
12
pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/dm.c b/dm.c
|
||||
index 5daa0e5..d5b84c8 100644
|
||||
--- a/dm.c
|
||||
+++ b/dm.c
|
||||
@@ -19,6 +19,7 @@
|
||||
#define _GNU_SOURCE
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdarg.h>
|
||||
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with glibc >= 2.28
|
||||
# https://github.com/NixOS/nixpkgs/issues/86403
|
||||
./pyblock-sysmacros.h.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e 's|/usr/include/python|${python}/include/python|' \
|
||||
-e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile
|
||||
|
||||
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A cat(1) clone with syntax highlighting and Git integration";
|
||||
homepage = "https://github.com/sharkdp/bat";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ dywedir lilyball ];
|
||||
maintainers = with maintainers; [ dywedir lilyball zowoq ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -57,6 +57,6 @@ buildRustPackage rec {
|
||||
'';
|
||||
homepage = "https://the.exa.website";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ehegnes lilyball globin ];
|
||||
maintainers = with maintainers; [ ehegnes lilyball globin zowoq ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,8 +7,8 @@ with skawarePackages;
|
||||
|
||||
buildPackage {
|
||||
pname = "execline";
|
||||
version = "2.6.0.0";
|
||||
sha256 = "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al";
|
||||
version = "2.6.1.0";
|
||||
sha256 = "0mj565xml3hvw27finydms0s9abbbpgbr29vnr8gwi7zjzq7ck52";
|
||||
|
||||
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
homepage = "https://github.com/sharkdp/fd";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ dywedir globin ma27 ];
|
||||
maintainers = with maintainers; [ dywedir globin ma27 zowoq ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -60,7 +60,7 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/junegunn/fzf";
|
||||
description = "A command-line fuzzy finder written in Go";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ filalex77 ma27 ];
|
||||
maintainers = with maintainers; [ filalex77 ma27 zowoq ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "For when you really just want to serve some files over HTTP right now!";
|
||||
homepage = "https://github.com/svenstaro/miniserve";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ nequissimus ];
|
||||
maintainers = with maintainers; [ nequissimus zowoq ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://dev.yorhel.nl/ncdu";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
maintainers = with maintainers; [ pSub zowoq ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "0.41.3";
|
||||
version = "0.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0f3d95abivbmjqdzw9pbdbis96sfds26xv3k8k9skxml8iqzq29c";
|
||||
sha256 = "17wc9f07308a97dsmrkq74w2r639sqms0hwh8gavwxycj7wq7xz2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
--replace "/bin/echo" "echo"
|
||||
'';
|
||||
|
||||
cargoSha256 = "10h0arvl3gf5hg530d24ypj4yzk3zhm8mgkhz0v61y0jcdy2zdrm";
|
||||
cargoSha256 = "1nvs68qxygi2l43vxw890r40px35dvzbcg6qmrm09g60ykd8pjv2";
|
||||
checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "dnscrypt-proxy2";
|
||||
version = "2.0.42";
|
||||
version = "2.0.43";
|
||||
|
||||
goPackagePath = "github.com/jedisct1/dnscrypt-proxy";
|
||||
vendorSha256 = null;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jedisct1";
|
||||
owner = "DNSCrypt";
|
||||
repo = "dnscrypt-proxy";
|
||||
rev = version;
|
||||
sha256 = "1v4n0pkwcilxm4mnj4fsd4gf8pficjj40jnmfkiwl7ngznjxwkyw";
|
||||
sha256 = "1c12y8h7dww72a3agb74vr5fzxzy6k8394rdbgz9knk82fdwah1c";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Command line client for Mega.co.nz";
|
||||
homepage = "https://megatools.megous.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.viric maintainers.AndersonTorres ];
|
||||
maintainers = with maintainers; [ viric AndersonTorres zowoq ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,24 @@
|
||||
{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3,
|
||||
networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, libnma }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, substituteAll
|
||||
, openfortivpn
|
||||
, gettext
|
||||
, pkg-config
|
||||
, file
|
||||
, glib
|
||||
, gtk3
|
||||
, networkmanager
|
||||
, ppp
|
||||
, libsecret
|
||||
, withGnome ? true
|
||||
, gnome3
|
||||
, fetchpatch
|
||||
, libnma
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "NetworkManager-fortisslvpn";
|
||||
version = "1.2.10";
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
@ -17,6 +31,7 @@ in stdenv.mkDerivation {
|
||||
src = ./fix-paths.patch;
|
||||
inherit openfortivpn;
|
||||
})
|
||||
|
||||
# Don't use etc/dbus-1/system.d
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/merge_requests/11.patch";
|
||||
@ -24,21 +39,34 @@ in stdenv.mkDerivation {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ openfortivpn networkmanager ppp ]
|
||||
++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
pkg-config
|
||||
file
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ intltool pkgconfig file ];
|
||||
buildInputs = [
|
||||
openfortivpn
|
||||
networkmanager
|
||||
ppp
|
||||
glib
|
||||
] ++ stdenv.lib.optionals withGnome [
|
||||
gtk3
|
||||
libsecret
|
||||
libnma
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--without-libnm-glib"
|
||||
"--with-gnome=${if withGnome then "yes" else "no"}"
|
||||
"--localstatedir=/var"
|
||||
"--enable-absolute-paths"
|
||||
];
|
||||
|
||||
# the installer only create an empty directory in localstatedir, so
|
||||
# we can drop it
|
||||
installFlags = [ "localstatedir=." ];
|
||||
installFlags = [
|
||||
# the installer only creates an empty directory in localstatedir, so
|
||||
# we can drop it
|
||||
"localstatedir=."
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
@ -48,9 +76,8 @@ in stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "NetworkManager's FortiSSL plugin";
|
||||
description = "NetworkManager’s FortiSSL plugin";
|
||||
inherit (networkmanager.meta) maintainers platforms;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "facter";
|
||||
version = "3.14.10";
|
||||
version = "3.14.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0yblz8k30kv9jpfs6bd0hcx5nfr23l7nxyw0q7p7c4ygkx3mb1ji";
|
||||
sha256 = "1x7m11bda86xkr8mncy50nga9q3gnvnklcvwwpa7frka99kgai26";
|
||||
rev = version;
|
||||
repo = pname;
|
||||
owner = "puppetlabs";
|
||||
|
||||
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
|
||||
homepage = "https://github.com/BurntSushi/ripgrep";
|
||||
license = with licenses; [ unlicense /* or */ mit ];
|
||||
maintainers = with maintainers; [ tailhook globin ma27 ];
|
||||
maintainers = with maintainers; [ tailhook globin ma27 zowoq ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,5 +24,6 @@ buildGoModule rec {
|
||||
You can feed it standard input, any number of files or any number of directories to recurse into.
|
||||
'';
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ zowoq ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -4903,6 +4903,8 @@ in
|
||||
|
||||
libepc = callPackage ../development/libraries/libepc { };
|
||||
|
||||
liberfa = callPackage ../development/libraries/liberfa { };
|
||||
|
||||
libestr = callPackage ../development/libraries/libestr { };
|
||||
|
||||
libevdev = callPackage ../development/libraries/libevdev { };
|
||||
@ -21747,6 +21749,8 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
qsudo = libsForQt5.callPackage ../applications/misc/qsudo { };
|
||||
|
||||
qsynth = libsForQt5.callPackage ../applications/audio/qsynth { };
|
||||
|
||||
qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user