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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-14 18:16:14 +00:00 committed by GitHub
commit 4f3b8e7b41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 209 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/gitlab.nix
View File

@ -454,7 +454,7 @@ in {
authentication = mkOption {
type = with types; nullOr str;
default = null;
description = "Authentitcation type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html";
description = "Authentication type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html";
};
enableStartTLSAuto = mkOption {

5
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -7,7 +7,7 @@
# the VM in the host. On the other hand, the root filesystem is a
# read/writable disk image persistent across VM reboots.
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, options, ... }:
with lib;
with import ../../lib/qemu-flags.nix { inherit pkgs; };
@ -266,6 +266,8 @@ in
options = {
virtualisation.fileSystems = options.fileSystems;
virtualisation.memorySize =
mkOption {
default = 384;
@ -659,6 +661,7 @@ in
# attribute should be disregarded for the purpose of building a VM
# test image (since those filesystems don't exist in the VM).
fileSystems = mkVMOverride (
cfg.fileSystems //
{ "/".device = cfg.bootDevice;
${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
{ device = "store";

2
nixos/tests/bees.nix
View File

@ -8,7 +8,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux2 /dev/vdc
'';
virtualisation.emptyDiskImages = [ 4096 4096 ];
fileSystems = lib.mkVMOverride {
virtualisation.fileSystems = {
"/aux1" = { # filesystem configured to be deduplicated
device = "/dev/disk/by-label/aux1";
fsType = "btrfs";

2
nixos/tests/fsck.nix
View File

@ -4,7 +4,7 @@ import ./make-test-python.nix {
machine = { lib, ... }: {
virtualisation.emptyDiskImages = [ 1 ];
fileSystems = lib.mkVMOverride {
virtualisation.fileSystems = {
"/mnt" = {
device = "/dev/vdb";
fsType = "ext4";

4
nixos/tests/glusterfs.nix
View File

@ -3,7 +3,7 @@ import ./make-test-python.nix ({pkgs, lib, ...}:
let
client = { pkgs, ... } : {
environment.systemPackages = [ pkgs.glusterfs ];
fileSystems = pkgs.lib.mkVMOverride
virtualisation.fileSystems =
{ "/gluster" =
{ device = "server1:/gv0";
fsType = "glusterfs";
@ -22,7 +22,7 @@ let
virtualisation.emptyDiskImages = [ 1024 ];
fileSystems = pkgs.lib.mkVMOverride
virtualisation.fileSystems =
{ "/data" =
{ device = "/dev/disk/by-label/data";
fsType = "ext4";

2
nixos/tests/hardened.nix
View File

@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : {
boot.initrd.postDeviceCommands = ''
${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb
'';
fileSystems = lib.mkVMOverride {
virtualisation.fileSystems = {
"/efi" = {
device = "/dev/disk/by-label/EFISYS";
fsType = "vfat";

2
nixos/tests/locate.nix
View File

@ -7,7 +7,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
nodes = rec {
a = {
environment.systemPackages = with pkgs; [ sshfs ];
fileSystems = lib.mkVMOverride {
virtualisation.fileSystems = {
"/ssh" = {
device = "alice@b:/";
fsType = "fuse.sshfs";

2
nixos/tests/misc.nix
View File

@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
environment.variables.EDITOR = mkOverride 0 "emacs";
documentation.nixos.enable = mkOverride 0 true;
systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];
fileSystems = mkVMOverride { "/tmp2" =
virtualisation.fileSystems = { "/tmp2" =
{ fsType = "tmpfs";
options = [ "mode=1777" "noauto" ];
};

2
nixos/tests/nextcloud/basic.nix
View File

@ -15,7 +15,7 @@ in {
echo "http://nextcloud/remote.php/webdav/ ${adminuser} ${adminpass}" > /tmp/davfs2-secrets
chmod 600 /tmp/davfs2-secrets
'';
fileSystems = pkgs.lib.mkVMOverride {
virtualisation.fileSystems = {
"/mnt/dav" = {
device = "http://nextcloud/remote.php/webdav/";
fsType = "davfs";

2
nixos/tests/nfs/kerberos.nix
View File

@ -40,7 +40,7 @@ in
networking.domain = "nfs.test";
networking.hostName = "client";
fileSystems = lib.mkVMOverride
virtualisation.fileSystems =
{ "/data" = {
device = "server.nfs.test:/";
fsType = "nfs";

2
nixos/tests/nfs/simple.nix
View File

@ -4,7 +4,7 @@ let
client =
{ pkgs, ... }:
{ fileSystems = pkgs.lib.mkVMOverride
{ virtualisation.fileSystems =
{ "/data" =
{ # nfs4 exports the export with fsid=0 as a virtual root directory
device = if (version == 4) then "server:/" else "server:/data";

2
nixos/tests/orangefs.nix
View File

@ -9,7 +9,7 @@ let
virtualisation.emptyDiskImages = [ 4096 ];
fileSystems = pkgs.lib.mkVMOverride
virtualisation.fileSystems =
{ "/data" =
{ device = "/dev/disk/by-label/data";
fsType = "ext4";

2
nixos/tests/samba.nix
View File

@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
nodes =
{ client =
{ pkgs, ... }:
{ fileSystems = pkgs.lib.mkVMOverride
{ virtualisation.fileSystems =
{ "/public" = {
fsType = "cifs";
device = "//server/public";

2
nixos/tests/snapper.nix
View File

@ -9,7 +9,7 @@ import ./make-test-python.nix ({ ... }:
virtualisation.emptyDiskImages = [ 4096 ];
fileSystems = lib.mkVMOverride {
virtualisation.fileSystems = {
"/home" = {
device = "/dev/disk/by-label/aux";
fsType = "btrfs";

2
nixos/tests/systemd.nix
View File

@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
environment.systemPackages = [ pkgs.cryptsetup ];
fileSystems = lib.mkVMOverride {
virtualisation.fileSystems = {
"/test-x-initrd-mount" = {
device = "/dev/vdb";
fsType = "ext2";

2
nixos/tests/zfs.nix
View File

@ -29,7 +29,7 @@ let
# Setup regular fileSystems machinery to ensure forceImportAll can be
# tested via the regular service units.
fileSystems = lib.mkVMOverride {
virtualisation.fileSystems = {
"/forcepool" = {
device = "forcepool";
fsType = "zfs";

4
pkgs/applications/misc/archivy/default.nix
View File

@ -5,11 +5,11 @@ watchdog, wtforms, html2text, flask-compress }:
python3.pkgs.buildPythonApplication rec {
pname = "archivy";
version = "1.0.0";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "FDyUfahjv4zqOVFr0nRhcgxr7mskFP1W/PlhZWx/6E8=";
sha256 = "53a43e26e9081ac266412d8643c66c07c289c4639bbaec374fd5147441253a4f";
};
# Relax some dependencies

4
pkgs/applications/misc/calibre/default.nix
View File

@ -27,11 +27,11 @@
mkDerivation rec {
pname = "calibre";
version = "5.10.1";
version = "5.11.0";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
sha256 = "18pnqxdyvgmw12yarxhvsgs4jk6c5hp05gf8khybcd78330954v9";
sha256 = "sha256-PI+KIMnslhoagv9U6Mcmo9Onfu8clVqASNlDir8JzUw=";
};
patches = [

4
pkgs/applications/misc/diff-pdf/default.nix
View File

@ -9,13 +9,13 @@ let
in
stdenv.mkDerivation rec {
pname = "diff-pdf";
version = "0.4.1";
version = "0.5";
src = fetchFromGitHub {
owner = "vslavik";
repo = "diff-pdf";
rev = "v${version}";
sha256 = "1y5ji4c4m69vzs0z051fkhfdrjnyxb6kzac5flhdkfb2hgp1jnxl";
sha256 = "sha256-Si8v5ZY1Q/AwQTaxa1bYG8bgqxWj++c4Hh1LzXSmSwE=";
};
nativeBuildInputs = [ autoconf automake pkg-config ];

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "atlantis";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "runatlantis";
repo = "atlantis";
rev = "v${version}";
sha256 = "sha256-1sak6CaqFhiBIoaa7kERXLHsgn24oMgBlOJaQDuF61E=";
sha256 = "sha256-D549pInoK8ispgcn8LYdix19Hp7wO6w2/d2Y1L/9Px8=";
};
vendorSha256 = null;

4
pkgs/applications/networking/p2p/gnunet/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnunet";
version = "0.13.2";
version = "0.14.0";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
sha256 = "0b4a6bxwhpmj274d281vhny7i5rwydrdmab76xk6ji8vf0p705dn";
sha256 = "sha256-2u9gO9Mu0dM1yixcaqOnZcDfGcp69dc5CH5tkl6vRas=";
};
enableParallelBuilding = true;

114
pkgs/development/compilers/sbcl/2.1.1.nix Normal file
View File

@ -0,0 +1,114 @@
{ lib, stdenv, fetchurl, writeText, sbclBootstrap
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system)
, disableImmobileSpace ? false
# Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
# Note that the created binaries still need `patchelf --set-interpreter ...`
# to get rid of ${glibc} dependency.
, purgeNixReferences ? false
, texinfo
}:
stdenv.mkDerivation rec {
pname = "sbcl";
version = "2.1.1";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
sha256 = "sha256:15wa66sachhzgvg5n35vihmkpasg100lh561c1d1bdrql0p8kbd9";
};
buildInputs = [texinfo];
patchPhase = ''
echo '"${version}.nixos"' > version.lisp-expr
pwd
# SBCL checks whether files are up-to-date in many places..
# Unfortunately, same timestamp is not good enough
sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp
#sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp
sed -i src/cold/slam.lisp -e \
'/file-write-date input/a)'
sed -i src/cold/slam.lisp -e \
'/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))'
sed -i src/code/target-load.lisp -e \
'/date defaulted-fasl/a)'
sed -i src/code/target-load.lisp -e \
'/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
# Fix the tests
sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
# Use whatever `cc` the stdenv provides
substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc
substituteInPlace src/runtime/Config.x86-64-darwin \
--replace mmacosx-version-min=10.4 mmacosx-version-min=10.5
''
+ (if purgeNixReferences
then
# This is the default location to look for the core; by default in $out/lib/sbcl
''
sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \
-i src/runtime/runtime.c
''
else
# Fix software version retrieval
''
sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \
src/code/run-program.lisp
''
);
preBuild = ''
export INSTALL_ROOT=$out
mkdir -p test-home
export HOME=$PWD/test-home
'';
enableFeatures = with lib;
optional threadSupport "sb-thread" ++
optional stdenv.isAarch32 "arm";
disableFeatures = with lib;
optional (!threadSupport) "sb-thread" ++
optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ];
buildPhase = ''
sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${
lib.concatStringsSep " "
(builtins.map (x: "--with-${x}") enableFeatures ++
builtins.map (x: "--without-${x}") disableFeatures)
}
(cd doc/manual ; make info)
'';
installPhase = ''
INSTALL_ROOT=$out sh install.sh
''
+ lib.optionalString (!purgeNixReferences) ''
cp -r src $out/lib/sbcl
cp -r contrib $out/lib/sbcl
cat >$out/lib/sbcl/sbclrc <<EOF
(setf (logical-pathname-translations "SYS")
'(("SYS:SRC;**;*.*.*" #P"$out/lib/sbcl/src/**/*.*")
("SYS:CONTRIB;**;*.*.*" #P"$out/lib/sbcl/contrib/**/*.*")))
EOF
'';
setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" ''
addEnvHooks "$targetOffset" _setSbclHome
_setSbclHome() {
export SBCL_HOME='@out@/lib/sbcl/'
}
'');
meta = sbclBootstrap.meta // {
inherit version;
updateWalker = true;
};
}

2
pkgs/development/coq-modules/dpdgraph/default.nix
View File

@ -9,6 +9,7 @@ mkCoqDerivation {
repo = "coq-dpdgraph";
inherit version;
defaultVersion = switch coq.coq-version [
{ case = "8.13"; out = "0.6.9"; }
{ case = "8.12"; out = "0.6.8"; }
{ case = "8.11"; out = "0.6.7"; }
{ case = "8.10"; out = "0.6.6"; }
@ -19,6 +20,7 @@ mkCoqDerivation {
{ case = "8.5"; out = "0.6"; }
] null;
release."0.6.9".sha256 = "11mbydpcgk7y8pqzickbzx0ig7g9k9al71i9yfrcscd2xj8fwj8z";
release."0.6.8".sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps";
release."0.6.7".sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09";
release."0.6.6".sha256 = "1gjrm5zjzw4cisiwdr5b3iqa7s4cssa220xr0k96rwgk61rcjd8w";

4
pkgs/development/libraries/libxc/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }:
let
version = "5.1.0";
version = "5.1.2";
in stdenv.mkDerivation {
pname = "libxc";
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
owner = "libxc";
repo = "libxc";
rev = version;
sha256 = "0qbxh0lfx4cab1fk1qfnx72g4yvs376zqrq74jn224vy32nam2x7";
sha256 = "1bcj7x0kaal62m41v9hxb4h1d2cxs2ynvsfqqg7c5yi7829nvapb";
};
buildInputs = [ gfortran ];

2
pkgs/development/ocaml-modules/re/default.nix
View File

@ -6,6 +6,8 @@ buildDunePackage rec {
minimumOCamlVersion = "4.02";
useDune2 = lib.versionAtLeast ocaml.version "4.08";
src = fetchurl {
url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz";
sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj";

4
pkgs/development/php-packages/maxminddb/default.nix
View File

@ -1,7 +1,7 @@
{ buildPecl, lib, pkgs }:
let
pname = "maxminddb";
version = "1.9.0";
version = "1.10.0";
in
buildPecl {
inherit pname version;
@ -10,7 +10,7 @@ buildPecl {
owner = "maxmind";
repo = "MaxMind-DB-Reader-php";
rev = "v${version}";
sha256 = "sha256-sNG2FhnxzbHA4Lmzj97al1WFwSU70Mr1R2i5ygF1L6Y=";
sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ=";
};
buildInputs = [ pkgs.libmaxminddb ];

4
pkgs/development/php-packages/psalm/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }:
let
pname = "psalm";
version = "4.4.1";
version = "4.5.0";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
sha256 = "sha256-4hqgAPflzNmeQQaxQATpWYBB5Pz7jKu8Vlw3BiMyhtw=";
sha256 = "sha256-FVgUxeV+N5Hqn5KQmI+KuQnKmvNScz9A+g02WNMxgmA=";
};
phases = [ "installPhase" ];

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

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.38.1";
version = "0.38.3";
src = fetchFromGitHub {
owner = "tfsec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ezTmtKR6ng3fuVJzLP81o0aoaqu3XPUMF0BIKFCwXdw=";
sha256 = "0vw62cagggqpv3q68ypz3wykhyghz6dzl59hxsahy8lr9b1npy8a";
};
goPackagePath = "github.com/tfsec/tfsec";

6
pkgs/development/tools/rust/cargo-udeps/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
version = "0.1.17";
version = "0.1.18";
src = fetchFromGitHub {
owner = "est31";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qVmp2DTnQjvN5QWchiGa6huM30+o41zLmby45APfxgk=";
sha256 = "sha256-o02MQC0/sc/+qbIXJVN84a2SKxSJaUSXXtBs0h+lQes=";
};
cargoSha256 = "sha256-zuJbs25lyDRTQPJdI0QBzO3xrdH48+cVhLqIkP7nLbE=";
cargoSha256 = "sha256-tlAA2Aw5OQ9/FCyTckS559s6Zp4Nx8m34yLT9q5F3nI=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/games/osu-lazer/default.nix
View File

@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
version = "2021.205.1";
version = "2021.212.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "US8auytRXqtYGGNi+vxIzxCxpetWYeUkBRjgtJkPpMs=";
sha256 = "JQUQEAZlVdyKhazhr7aI2I0+cHMQ303DZXUVgQiMaNs=";
};
patches = [ ./bypass-tamper-detection.patch ];

4
pkgs/games/osu-lazer/deps.nix generated
View File

@ -736,8 +736,8 @@
})
(fetchNuGet {
name = "ppy.osu.Game.Resources";
version = "2020.1202.0";
sha256 = "1m5156gkyyhf52ii6y7yqmsgpwcxn6zgji3nnyny6lk9glmc9vvs";
version = "2021.211.1";
sha256 = "0rqv5blmyzvcpk0b1r6fzr1bla62kr2fwkr1f9ahir9zafvk2wmm";
})
(fetchNuGet {
name = "ppy.osuTK.NS20";

26
pkgs/misc/emulators/py65/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, fetchPypi, buildPythonApplication }:
buildPythonApplication rec {
pname = "py65";
version = "1.1.0";
format = "wheel";
src = fetchPypi {
inherit pname version format;
sha256 = "Q7rjiHJ/Ew985vut/8fVAf/wWYW5aBPSvNPm8A6g1zg=";
};
meta = with lib; {
homepage = "https://py65.readthedocs.io/";
description = "Emulate 6502-based microcomputer systems in Python";
longDescription = ''
Py65 includes a program called Py65Mon that functions as a machine
language monitor. This kind of program is sometimes also called a
debugger. Py65Mon provides a command line with many convenient commands
for interacting with the simulated 6502-based system.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; all;
};
}

14
pkgs/tools/misc/pgcenter/default.nix
View File

@ -2,16 +2,24 @@
buildGoModule rec {
pname = "pgcenter";
version = "0.6.6";
version = "0.7.0";
src = fetchFromGitHub {
owner = "lesovsky";
repo = "pgcenter";
rev = "v${version}";
sha256 = "1axwsclssxsg38ppdmd4v1lbs87ksrwj5z76ckjk8jjfni1xp9sr";
sha256 = "sha256-W/UUc0qwOvLSXYWepkCydst113BqR9EsZK0Es+6HSt8=";
};
vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2";
vendorSha256 = "sha256-9hYiyZ34atmSL7JvuXyiGU7HR4E6qN7bGZlyU+hP+FU=";
subPackages = [ "cmd" ];
buildFlagsArray = [ "-ldflags=-w -s -X main.gitTag=${src.rev} -X main.gitCommit=${src.rev} -X main.gitBranch=master" ];
postInstall = ''
mv $out/bin/cmd $out/bin/pgcenter
'';
doCheck = false;

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

@ -3,12 +3,12 @@
let
inherit (lib.versions) majorMinor;
in stdenv.mkDerivation rec {
version = "2.5.1";
version = "2.6";
pname = "ferm";
src = fetchurl {
url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz";
sha256 = "0awl9s243sxgayr2fcmfks8xydhrmb9gy8bd9sfq738dgq7vybjb";
sha256 = "sha256-aJVBRl58Bzy9YEyc0Y8RPDHAtBuxJhRyalmxfkQFiIU=";
};
# perl is used at build time to gather the ferm version.

10
pkgs/tools/networking/mailutils/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "mailutils";
version = "3.10";
version = "3.12";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
sha256 = "17smrxjdgbbzbzakik30vj46q4iib85ksqhb82jr4vjp57akszh9";
sha256 = "0n51ng1f8yf5zfsnh8s0pj9bnw6icb2r0y78gl2kzijaghhzlhvd";
};
postPatch = ''
@ -31,12 +31,6 @@ stdenv.mkDerivation rec {
patches = [
./fix-build-mb-len-max.patch
./path-to-cat.patch
# mailquota.c:277: undefined reference to `get_size'
# https://lists.gnu.org/archive/html/bug-mailutils/2020-08/msg00002.html
(fetchpatch {
url = "http://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=37713b42a501892469234b90454731d8d8b7a3e6";
sha256 = "1mwj77nxvf4xvqf26yjs59jyksnizj0lmbymbzg4kmqynzq3zjny";
})
# Fix cross-compilation
# https://lists.gnu.org/archive/html/bug-mailutils/2020-11/msg00038.html
(fetchpatch {

4
pkgs/tools/system/freeipmi/default.nix
View File

@ -1,12 +1,12 @@
{ fetchurl, lib, stdenv, libgcrypt, readline, libgpgerror }:
stdenv.mkDerivation rec {
version = "1.6.6";
version = "1.6.7";
pname = "freeipmi";
src = fetchurl {
url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
sha256 = "1ava5s0babfwx6dqi87phzyzjjgyah7avhljrxrjwn2cniwh38yg";
sha256 = "1gyyx99q02p3v2nqm3h53mkjd33l0hrapwg4alg6qr9k74qik1dv";
};
buildInputs = [ libgcrypt readline libgpgerror ];

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

@ -1743,6 +1743,8 @@ in
bsod = callPackage ../misc/emulators/bsod { };
py65 = python3Packages.callPackage ../misc/emulators/py65 { };
simh = callPackage ../misc/emulators/simh { };
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
@ -10886,6 +10888,7 @@ in
sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {};
sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {};
sbcl = callPackage ../development/compilers/sbcl {};
scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };