mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Code Issues Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-03-07 00:41:13 +00:00 committed by GitHub
parent 6329ac8111 5ae3107a21
commit f9d4095295
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 368 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
nixos/modules/programs/fish_completion-generator.patch
View file

@ -1,13 +1,14 @@
--- a/create_manpage_completions.py
+++ b/create_manpage_completions.py
@@ -844,10 +844,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
@@ -879,10 +879,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
)
return False
built_command_output.insert(0, "# " + CMDNAME)
- # Output the magic word Autogenerated so we can tell if we can overwrite this
- built_command_output.insert(
- 0, "# " + CMDNAME + "\n# Autogenerated from man page " + manpage_path
- )
# built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABLE PARSER! Was really using Type2 but reporting TypeDeroffManParser
- # Output the magic word Autogenerated so we can tell if we can overwrite this
- built_command_output.insert(
- 1, "# Autogenerated from man page " + manpage_path
- )
# built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABILE PARSER! Was really using Type2 but reporting TypeDeroffManParser
for line in built_command_output:
for line in built_command_output:

2
pkgs/applications/audio/audacity/default.nix
View file

@ -132,6 +132,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.audacityteam.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ lheckemann ];
platforms = intersectLists platforms.linux platforms.x86; # fails on ARM
platforms = platforms.linux;
};
}

38
pkgs/applications/audio/freac/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ lib
, stdenv
, fetchFromGitHub
, boca
, smooth
, systemd
}:
stdenv.mkDerivation rec {
pname = "freac";
version = "1.1.3";
src = fetchFromGitHub {
owner = "enzo1982";
repo = "freac";
rev = "v${version}";
sha256 = "1sdrsc5pn5901bbds7dj02n71zn5rs4wnv2xxs8ffql4b7jjva0m";
};
buildInputs = [
boca
smooth
systemd
];
makeFlags = [
"prefix=$(out)"
];
meta = with lib; {
description = "The fre:ac audio converter project";
license = licenses.gpl2Plus;
homepage = "https://www.freac.org/";
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

12
pkgs/applications/editors/neovim/gnvim/default.nix
View file

@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
# The default build script tries to get the version through Git, so we
# replace it
prePatch = ''
postPatch = ''
cat << EOF > build.rs
use std::env;
use std::fs::File;
@ -31,13 +31,13 @@ rustPlatform.buildRustPackage rec {
f.write_all(b"const VERSION: &str = \"${version}\";").unwrap();
}
EOF
# Install the binary ourselves, since the Makefile doesn't have the path
# containing the target architecture
sed -e "/target\/release/d" -i Makefile
'';
buildPhase = ''
make build
'';
installPhase = ''
postInstall = ''
make install PREFIX="${placeholder "out"}"
'';

2
pkgs/applications/networking/browsers/nyxt/default.nix
View file

@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
homepage = "https://nyxt.atlas.engineer";
license = licenses.bsd3;
maintainers = with maintainers; [ lewo ];
platforms = [ "x86_64-linux" ];
platforms = platforms.all;
};
}

4
pkgs/applications/science/astronomy/kstars/default.nix
View file

@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kstars";
version = "3.5.1";
version = "3.5.2";
src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
sha256 = "sha256-gf+yaXiYQFuO1/nvdP6OOuD4QrRtPAQTwQZAbYNKxUU=";
sha256 = "sha256-iX7rMQbctdK3AeH4ZvH+T4rv1ZHwn55urJh150KoXXU=";
};
patches = [

4
pkgs/applications/virtualization/containerd/default.nix
View file

@ -10,13 +10,13 @@
buildGoPackage rec {
pname = "containerd";
version = "1.4.3";
version = "1.4.4";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0";
sha256 = "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb";
};
goPackagePath = "github.com/containerd/containerd";

4
pkgs/data/misc/osinfo-db/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20210202";
version = "20210215";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "sha256-C7Vq7d+Uos9IhTwOgsrK64c9mMGVkNgfvOrbBqORsRs=";
sha256 = "sha256-HIM3sq47+0nImiaw+CjjjgYnBIorwmA6UxaNefjYNZg=";
};
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];

10
pkgs/development/interpreters/clips/default.nix
View file

@ -3,18 +3,26 @@
stdenv.mkDerivation rec {
version = "6.31";
pname = "clips";
src = fetchurl {
url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${
builtins.replaceStrings [ "." ] [ "" ] version
}.tar.gz";
sha256 = "165k0z7dsv04q432sanmw0jxmxwf56cnhsdfw5ffjqxd3lzkjnv6";
};
postPatch = ''
substituteInPlace core/makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc'
'';
makeFlags = [ "-C" "core" ];
installPhase = ''
runHook preInstall
install -D -t $out/bin core/clips
runHook postInstall
'';
meta = with lib; {
description = "A Tool for Building Expert Systems";
homepage = "http://www.clipsrules.net/";
@ -26,6 +34,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.publicDomain;
maintainers = [ maintainers.league ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/babl/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "babl";
version = "0.1.84";
version = "0.1.86";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo=";
sha256 = "sha256-Cz9ZUVmtGyFs1ynAUEw6X2z3gMZB9Nxj/BZPPAOCyPA=";
};
nativeBuildInputs = [

51
pkgs/development/libraries/boca/default.nix Normal file
View file

@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, expat
, libcdio
, libcdio-paranoia
, libpulseaudio
, smooth
, uriparser
, zlib
}:
stdenv.mkDerivation rec {
pname = "BoCA";
version = "1.0.3";
src = fetchFromGitHub {
owner = "enzo1982";
repo = "boca";
rev = "v${version}";
sha256 = "0x6pqd5cdag0l283lkq01qaqwyf1skxbncdwig8b2s742nbzjlz8";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
expat
libcdio
libcdio-paranoia
libpulseaudio
smooth
uriparser
zlib
];
makeFlags = [
"prefix=$(out)"
];
meta = with lib; {
description = "A component library used by the fre:ac audio converter";
license = licenses.gpl2Plus;
homepage = "https://github.com/enzo1982/boca";
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

2
pkgs/development/libraries/boolstuff/default.nix
View file

@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
homepage = "${baseurl}/boolstuff.html";
license = "GPL";
maintainers = [ lib.maintainers.marcweber ];
platforms = lib.platforms.linux;
platforms = lib.platforms.all;
};
}

2
pkgs/development/libraries/cpptest/default.nix
View file

@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
description = "Simple C++ unit testing framework";
maintainers = with maintainers; [ bosu ];
license = lib.licenses.lgpl3;
platforms = with platforms; linux;
platforms = platforms.all;
};
}

2
pkgs/development/libraries/cpputest/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://cpputest.github.io/";
description = "Unit testing and mocking framework for C/C++";
platforms = platforms.linux ;
platforms = platforms.all;
license = licenses.bsd3;
maintainers = [ maintainers.juliendehos ];
};

4
pkgs/development/libraries/gtk-layer-shell/default.nix
View file

@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "gtk-layer-shell";
version = "0.5.2";
version = "0.6.0";
outputs = [ "out" "dev" "devdoc" ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "wmww";
repo = "gtk-layer-shell";
rev = "v${version}";
sha256 = "sha256-516N45q5EZTq5eLCqH/T/VV/AxgBsQhJ+yZdLOEeDUk=";
sha256 = "sha256-jLWXBoYcVoUSzw4OIYVM5iPvsmpy+Wg5TbDpo8cll80=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gtksourceview/4.x.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gtksourceview";
version = "4.8.0";
version = "4.8.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880";
sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE=";
};
propagatedBuildInputs = [

4
pkgs/development/libraries/libabigail/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "libabigail";
version = "1.8";
version = "1.8.2";
outputs = [ "bin" "out" "dev" ];
src = fetchurl {
url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz";
sha256 = "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw";
sha256 = "sha256-hjR8nwqGZvJj/WP4w/5MT5yxvbPsQmDsuvEX0Tfol4c=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libgxps/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "libgxps";
version = "0.3.1";
version = "0.3.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs";
sha256 = "bSeGclajXM+baSU+sqiKMrrKO5fV9O9/guNmf6Q1JRw=";
};
nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ];

43
pkgs/development/libraries/smooth/default.nix Normal file
View file

@ -0,0 +1,43 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, gtk3
, curl
, libxml2
}:
stdenv.mkDerivation rec {
pname = "smooth";
version = "0.9.6";
src = fetchFromGitHub {
owner = "enzo1982";
repo = "smooth";
rev = "v${version}";
sha256 = "05j5gk6kz2089x8bcq2l0kjspfiiymxn69jcxl4dh9lw96blbadr";
};
nativeBuildInputs = [
pkg-config
];
makeFlags = [
"prefix=$(out)"
];
buildInputs = [
gtk3
curl
libxml2
];
meta = with lib; {
description = "The smooth Class Library";
license = licenses.artistic2;
homepage = "http://www.smooth-project.org/";
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

4
pkgs/development/python-modules/desktop-notifier/default.nix
View file

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "desktop-notifier";
version = "3.2.2";
version = "3.2.3";
src = fetchPypi {
inherit pname version;
sha256 = "0b333594af6e54677f9620480226dbc88ec6dd7c004352de9268d01aa49467f4";
sha256 = "cf359450efc0944ac4db3106e50faa9d49dcef072307c3531e6af2c8a10cd523";
};
propagatedBuildInputs = [

38
pkgs/development/python-modules/python-magic/default.nix
View file

@ -1,25 +1,37 @@
{ buildPythonPackage, lib, fetchPypi, file, stdenv }:
{ lib
, stdenv
, python
, buildPythonPackage
, fetchFromGitHub
, substituteAll
, file
, glibcLocales
}:
buildPythonPackage rec {
pname = "python-magic";
version = "0.4.22";
src = fetchPypi {
inherit pname version;
sha256 = "ca884349f2c92ce830e3f498c5b7c7051fe2942c3ee4332f65213b8ebff15a62";
src = fetchFromGitHub {
owner = "ahupp";
repo = "python-magic";
rev = version;
sha256 = "0zbdjr5shijs0jayz7gycpx0kn6v2bh83dpanyajk2vmy47jvbd6";
};
postPatch = ''
substituteInPlace magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"
patches = [
(substituteAll {
src = ./libmagic-path.patch;
libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];
checkInputs = [ glibcLocales ];
checkPhase = ''
LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py
'';
doCheck = false;
# TODO: tests are failing
#checkPhase = ''
# ${python}/bin/${python.executable} ./test.py
#'';
meta = {
description = "A python interface to the libmagic file type identification library";
homepage = "https://github.com/ahupp/python-magic";

17
pkgs/development/python-modules/python-magic/libmagic-path.patch Normal file
View file

@ -0,0 +1,17 @@
diff --git a/magic/loader.py b/magic/loader.py
index 6b2bfcb..69778af 100644
--- a/magic/loader.py
+++ b/magic/loader.py
@@ -5,11 +5,7 @@ import glob
def load_lib():
libmagic = None
# Let's try to find magic or magic1
- dll = ctypes.util.find_library('magic') \
- or ctypes.util.find_library('magic1') \
- or ctypes.util.find_library('cygmagic-1') \
- or ctypes.util.find_library('libmagic-1') \
- or ctypes.util.find_library('msys-magic-1') # for MSYS2
+ dll = '@libmagic@'
# necessary because find_library returns None if it doesn't find the library
if dll:

2
pkgs/development/tools/misc/direvent/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
description = "Directory event monitoring daemon";
homepage = "https://www.gnu.org.ua/software/direvent/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ puffnfresh ];
};
}

37
pkgs/games/warsow/engine.nix
View file

@ -1,15 +1,9 @@
{ stdenv, lib, fetchurl, cmake, libogg, libvorbis, libtheora, curl, freetype
{ stdenv, lib, substituteAll, fetchurl, cmake, libogg, libvorbis, libtheora, curl, freetype
, libjpeg, libpng, SDL2, libGL, openal, zlib
}:
let
# The game loads all those via dlopen().
libs = lib.mapAttrs (name: x: lib.getLib x) {
inherit zlib curl libpng libjpeg libogg libvorbis libtheora freetype;
};
in stdenv.mkDerivation (libs // rec {
name = "warsow-engine-${version}";
stdenv.mkDerivation rec {
pname = "warsow-engine";
version = "2.1.0";
src = fetchurl {
@ -17,6 +11,13 @@ in stdenv.mkDerivation (libs // rec {
sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r";
};
patches = [
(substituteAll {
src = ./libpath.patch;
inherit zlib curl libpng libjpeg libogg libvorbis libtheora freetype;
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [
@ -24,28 +25,30 @@ in stdenv.mkDerivation (libs // rec {
libpng
];
patches = [ ./libpath.patch ];
postPatch = ''
cd source/source
substituteAllInPlace gameshared/q_arch.h
'';
cmakeFlags = [ "-DQFUSION_GAME=Warsow" ];
preConfigure = ''
cd source/source
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp -r libs $out/lib/warsow
for i in warsow.* wsw_server.* wswtv_server.*; do
install -Dm755 "$i" "$out/bin/''${i%.*}"
done
runHook postInstall
'';
meta = with lib; {
description = "Multiplayer FPS game designed for competitive gaming (engine only)";
homepage = "http://www.warsow.net";
license = licenses.gpl2;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ astsmtl abbradar ];
platforms = platforms.linux;
broken = stdenv.isAarch64;
};
})
}

2
pkgs/misc/emulators/libdsk/default.nix
View file

@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.seasip.info/Unix/LibDsk/";
license = licenses.gpl2Plus;
maintainers = [ ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/misc/emulators/mednafen/server.nix
View file

@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
homepage = "https://mednafen.github.io/";
license = licenses.gpl2;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/servers/minio/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "minio";
version = "2021-02-24T18-44-45Z";
version = "2021-03-01T04-20-55Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-htrIRZXpr3V7GoeldeULndSfJNMmLKPVOimg3l+UisA=";
sha256 = "sha256-VTmnpZzidongzv6BzPY01qggai0w+ztGL3grDv6VGD4=";
};
vendorSha256 = "sha256-m2Nv3OcPq/qc+4Cu/JUut59fZTDZwJn9gyG4jQ5n6Pg=";

65
pkgs/shells/fish/default.nix
View file

@ -17,6 +17,7 @@
, python3
, cmake
, fishPlugins
, procps
, runCommand
, writeText
@ -130,7 +131,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
version = "3.1.2";
version = "3.2.0";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@ -139,13 +140,44 @@ let
# the shell's actual version (and what it displays when running `fish
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm";
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-TwKT7Z9qa3fkfUHvq+YvMxnobvyL+DzFhzMET7xvkhE=";
};
# We don't have access to the codesign executable, so we patch this out.
# For more information, see: https://github.com/fish-shell/fish-shell/issues/6952
patches = lib.optional stdenv.isDarwin ./dont-codesign-on-mac.diff;
# Fix FHS paths in tests
postPatch = ''
# src/fish_tests.cpp
sed -i 's|/bin/ls|${coreutils}/bin/ls|' src/fish_tests.cpp
sed -i 's|L"/usr"|L"/nix"|' src/fish_tests.cpp
sed -i 's|L"/bin/echo"|L"${coreutils}/bin/echo"|' src/fish_tests.cpp
sed -i 's|L"/bin/c"|L"${coreutils}/bin/c"|' src/fish_tests.cpp
sed -i 's|L"/bin/ca"|L"${coreutils}/bin/ca"|' src/fish_tests.cpp
# tests/checks/cd.fish
sed -i 's|/bin/pwd|${coreutils}/bin/pwd|' tests/checks/cd.fish
# tests/checks/redirect.fish
sed -i 's|/bin/echo|${coreutils}/bin/echo|' tests/checks/redirect.fish
# tests/checks/vars_as_commands.fish
sed -i 's|/usr/bin|${coreutils}/bin|' tests/checks/vars_as_commands.fish
# tests/checks/jobs.fish
sed -i 's|ps -o stat|${procps}/bin/ps -o stat|' tests/checks/jobs.fish
sed -i 's|/bin/echo|${coreutils}/bin/echo|' tests/checks/jobs.fish
# tests/checks/job-control-noninteractive.fish
sed -i 's|/bin/echo|${coreutils}/bin/echo|' tests/checks/job-control-noninteractive.fish
# tests/checks/complete.fish
sed -i 's|/bin/ls|${coreutils}/bin/ls|' tests/checks/complete.fish
'' + lib.optionalString stdenv.isDarwin ''
# Tests use pkill/pgrep which are currently not built on Darwin
# See https://github.com/NixOS/nixpkgs/pull/103180
rm tests/pexpects/exit.py
rm tests/pexpects/job_summary.py
rm tests/pexpects/signals.py
'';
nativeBuildInputs = [
cmake
@ -159,6 +191,8 @@ let
cmakeFlags = [
"-DCMAKE_INSTALL_DOCDIR=${placeholder "out"}/share/doc/fish"
] ++ lib.optionals stdenv.isDarwin [
"-DMAC_CODESIGN_ID=OFF"
];
preConfigure = ''
@ -176,16 +210,23 @@ let
gettext
] ++ lib.optional (!stdenv.isDarwin) man-db;
doCheck = true;
checkInputs = [
coreutils
(python3.withPackages(ps: [ps.pexpect]))
procps
];
checkPhase = ''
make test
'';
postInstall = with lib; ''
sed -r "s|command grep|command ${gnugrep}/bin/grep|" \
-i "$out/share/fish/functions/grep.fish"
sed -i "s|which |${which}/bin/which |" \
"$out/share/fish/functions/type.fish"
sed -e "s|\|cut|\|${coreutils}/bin/cut|" \
-i "$out/share/fish/functions/fish_prompt.fish"
sed -e "s|gettext |${gettext}/bin/gettext |" \
-e "s|which |${which}/bin/which |" \
-i "$out/share/fish/functions/_.fish"
sed -e "s|uname|${coreutils}/bin/uname|" \
-i "$out/share/fish/functions/__fish_pwd.fish" \
"$out/share/fish/functions/prompt_pwd.fish"
@ -255,7 +296,7 @@ let
# if we don't set `delete=False`, the file will get cleaned up
# automatically (leading the test to fail because there's no
# tempfile to check)
sed -e "s@, mode='w'@, mode='w', delete=False@" -i webconfig.py
sed -e 's@, mode="w"@, mode="w", delete=False@' -i webconfig.py
# we delete everything after the fileurl is assigned
sed -e '/fileurl =/q' -i webconfig.py

12
pkgs/shells/fish/dont-codesign-on-mac.diff
View file

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d220a032..786b60e6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,6 @@ ENDFUNCTION(CODESIGN_ON_MAC target)
# Define a function to link dependencies.
FUNCTION(FISH_LINK_DEPS_AND_SIGN target)
TARGET_LINK_LIBRARIES(${target} fishlib)
- CODESIGN_ON_MAC(${target})
ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN)
# Define libfish.a.

4
pkgs/tools/graphics/gmic/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "gmic";
version = "2.9.5";
version = "2.9.6";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
sha256 = "sha256-KV/Ti6mPW+FASjug6q8Qfgra8L/TIyl/Y6JwANzQreE=";
sha256 = "sha256-0i/oUVrxbc0FDQmgvHEn7Cn0eVznMqDGw+r4OTVrwRo=";
};
nativeBuildInputs = [

2
pkgs/tools/inputmethods/anthy/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
homepage = "https://anthy.osdn.jp/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ericsagnes ];
platforms = platforms.linux;
platforms = platforms.unix;
};
src = fetchurl {

4
pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ibus-bamboo";
version = "0.6.8";
version = "0.6.9";
src = fetchFromGitHub {
owner = "BambooEngine";
repo = pname;
rev = "v${version}";
sha256 = "17zgxqlsjkqyjywynqzmymw310aypcsjdrwnc7hx7v7xwal8iwjk";
sha256 = "sha256-7UXURvZX5UrpLHFYgBnuTX/sKQkubnBlvkSD/WBa4ZU=";
};
nativeBuildInputs = [

2
pkgs/tools/misc/agedu/default.nix
View file

@ -32,6 +32,6 @@ stdenv.mkDerivation {
homepage = "https://www.chiark.greenend.org.uk/~sgtatham/agedu/";
license = licenses.mit;
maintainers = with maintainers; [ symphorien ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/tools/misc/pcb2gcode/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "pcb2gcode";
version = "2.2.2";
version = "2.2.3";
src = fetchFromGitHub {
owner = "pcb2gcode";
repo = "pcb2gcode";
rev = "v${version}";
sha256 = "sha256-GSLWpLp/InAxVolKmBIjljpe3ZzmS/87TWKwzax5SkY=";
sha256 = "sha256-CIhhwUsnX+Wx4hLNE8uQf17QbDDm4vCbv/XZVuCrWdw=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

11
pkgs/tools/misc/vimv/default.nix
View file

@ -1,24 +1,27 @@
{ lib, stdenv, bash, fetchFromGitHub }:
stdenv.mkDerivation {
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation {
pname = "vimv";
version = "unstable-2019-10-31";
src = fetchFromGitHub {
owner = "thameera";
repo = "vimv";
rev = "4152496c1946f68a13c648fb7e583ef23dac4eb8";
sha256 = "1fsrfx2gs6bqx7wk7pgcji2i2x4alqpsi66aif4kqvnpqfhcfzjd";
};
phases = [ "installPhase" ];
installPhase = ''
install -d $out/bin
install $src/vimv $out/bin/vimv
patchShebangs $out/bin/vimv
'';
meta = with lib; {
homepage = "https://github.com/thameera/vimv";
description = "Batch-rename files using Vim";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = [ maintainers.kmein ];
};
}

4
pkgs/tools/networking/dnsproxy/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dnsproxy";
version = "0.35.1";
version = "0.35.2";
src = fetchFromGitHub {
owner = "AdguardTeam";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+k8dGVYyCY+CI8+8OPBqoICu0KO2eM+6Hy8E+KyOqPs=";
sha256 = "sha256-XOTHvI80WMn5j52+N/bR/NfaPX9v6cRB2VCVWJ6fJw8=";
};
vendorSha256 = null;

2
pkgs/tools/networking/pcapfix/default.nix
View file

@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "Repair your broken pcap and pcapng files";
license = licenses.gpl3;
maintainers = [ maintainers.ehmry ];
platforms = platforms.linux;
platforms = platforms.all;
};
}

4
pkgs/tools/networking/stunnel/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "stunnel";
version = "5.56";
version = "5.58";
src = fetchurl {
url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
sha256 = "08kb4gi9fzqngrczykvba6xhaxhq9m4wmdbhxvgrva5rasrvz13k";
sha256 = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79";
# please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
# not the output of `nix-prefetch-url`
};

4
pkgs/tools/package-management/libdnf/default.nix
View file

@ -3,13 +3,13 @@
gcc9Stdenv.mkDerivation rec {
pname = "libdnf";
version = "0.58.0";
version = "0.60.0";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = pname;
rev = version;
sha256 = "0an8giv0lm0qqc76fpmqg42ra081mlj62b9r0s1p0sgb3270l76l";
sha256 = "sha256-cZlUhzmfplj2XEpWWwPfT/fiH2cj3lIc44UVrFHcl3s=";
};
patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ];

2
pkgs/tools/security/aespipe/default.nix
View file

@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = "http://loop-aes.sourceforge.net/aespipe.README";
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/tools/security/aide/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "aide";
version = "0.17.1";
version = "0.17.3";
src = fetchurl {
url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-pAHJUZOPEWnOrshozjWUc26JxciBV4wmPYqCSgawAC0=";
sha256 = "sha256-ousYg8r6rQVvvkPuHorgn9NsqjCgvI7f6l1HvWfEZPg=";
};
buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ];

3
pkgs/tools/security/hashdeep/default.nix
View file

@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
description = "A set of cross-platform tools to compute hashes";
homepage = "https://github.com/jessek/hashdeep";
license = licenses.gpl2;
# Build fails on Darwin:
# > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
# > void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); }
platforms = with platforms; linux ++ freebsd ++ openbsd;
maintainers = [ maintainers.karantan ];
};

2
pkgs/tools/system/loadwatch/default.nix
View file

@ -15,6 +15,6 @@ stdenv.mkDerivation {
description = "Run a program using only idle cycles";
license = licenses.gpl2;
maintainers = with maintainers; [ woffs ];
platforms = platforms.linux;
platforms = platforms.all;
};
}

11
pkgs/tools/text/cconv/default.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, autoreconfHook }:
let version = "0.6.3"; in
stdenv.mkDerivation {
{ lib, stdenv, fetchurl, autoreconfHook, libiconv }:
stdenv.mkDerivation rec {
pname = "cconv";
inherit version;
version = "0.6.3";
src = fetchurl {
url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";
@ -10,12 +10,13 @@ let version = "0.6.3"; in
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libiconv ];
meta = with lib; {
description = "A iconv based simplified-traditional chinese conversion tool";
homepage = "https://github.com/xiaoyjy/cconv";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = [ maintainers.redfish64 ];
};
}

4
pkgs/tools/text/dadadodo/default.nix
View file

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if";
};
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
mkdir -p $out/bin
cp dadadodo $out/bin
@ -20,6 +22,6 @@ stdenv.mkDerivation rec {
description = "Markov chain-based text generator";
homepage = "http://www.jwz.org/dadadodo";
maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux;
platforms = platforms.all;
};
}

1
pkgs/tools/text/dos2unix/default.nix
View file

@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
changelog = "https://sourceforge.net/p/dos2unix/dos2unix/ci/dos2unix-${version}/tree/dos2unix/NEWS.txt?format=raw";
license = licenses.bsd2;
maintainers = with maintainers; [ c0bw3b ];
platforms = platforms.all;
};
}

2
pkgs/tools/text/fanficfare/default.nix
View file

@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
description = "Tool for making eBooks from fanfiction web sites";
homepage = "https://github.com/JimmXinu/FanFicFare";
license = licenses.gpl3;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ dwarfmaster ];
};
}

2
pkgs/tools/text/podiff/default.nix
View file

@ -20,6 +20,6 @@ stdenv.mkDerivation {
homepage = "http://puszcza.gnu.org.ua/software/podiff";
license = licenses.gpl3Plus;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

6
pkgs/top-level/all-packages.nix
View file

@ -1721,6 +1721,8 @@ in
bmake = callPackage ../development/tools/build-managers/bmake { };
boca = callPackage ../development/libraries/boca { };
bochs = callPackage ../applications/virtualization/bochs { };
bubblewrap = callPackage ../tools/admin/bubblewrap { };
@ -4376,6 +4378,8 @@ in
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
};
freac = callPackage ../applications/audio/freac { };
freedroid = callPackage ../games/freedroid { };
freedroidrpg = callPackage ../games/freedroidrpg { };
@ -23022,6 +23026,8 @@ in
smallwm = callPackage ../applications/window-managers/smallwm { };
smooth = callPackage ../development/libraries/smooth { };
smos = callPackage ../applications/misc/smos { };
spectrwm = callPackage ../applications/window-managers/spectrwm { };

38
pkgs/top-level/php-packages.nix
View file

@ -268,7 +268,7 @@ lib.makeScope pkgs.newScope (self: with self; {
buildInputs = [ libxml2 ];
configureFlags = [ "--enable-dom" ]
# Required to build on darwin.
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
{ name = "enchant";
buildInputs = [ enchant1 ];
configureFlags = [ "--with-enchant=${enchant1}" ];
@ -331,10 +331,12 @@ lib.makeScope pkgs.newScope (self: with self; {
# interbase (7.3, 7.2)
{ name = "intl";
buildInputs = [ icu64 ];
patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch {
url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch";
sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";
});
patches = lib.optionals (lib.versionOlder php.version "7.4") [
(fetchpatch {
url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch";
sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";
})
];
}
{ name = "json"; enable = lib.versionOlder php.version "8.0"; }
{ name = "ldap";
@ -344,7 +346,9 @@ lib.makeScope pkgs.newScope (self: with self; {
"LDAP_DIR=${openldap.dev}"
"LDAP_INCDIR=${openldap.dev}/include"
"LDAP_LIBDIR=${openldap.out}/lib"
] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}";
] ++ lib.optionals stdenv.isLinux [
"--with-ldap-sasl=${cyrus_sasl.dev}"
];
doCheck = false; }
{ name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
pcre'
@ -374,7 +378,7 @@ lib.makeScope pkgs.newScope (self: with self; {
+----------------------------------------------------------------------+
| Copyright (c) The PHP Group |
'')
] ++ lib.optional (lib.versionOlder php.version "7.4.8") [
] ++ lib.optionals (lib.versionOlder php.version "7.4.8") [
(pkgs.writeText "mysqlnd_fix_compression.patch" ''
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@ -398,7 +402,7 @@ lib.makeScope pkgs.newScope (self: with self; {
buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
valgrind.dev
];
patches = [] ++ lib.optional (lib.versionOlder php.version "7.4") [
patches = [] ++ lib.optionals (lib.versionOlder php.version "7.4") [
(pkgs.writeText "zend_file_cache_config.patch" ''
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@ -468,7 +472,7 @@ lib.makeScope pkgs.newScope (self: with self; {
buildInputs = [ libxml2 pcre' ];
configureFlags = [ "--enable-simplexml" ]
# Required to build on darwin.
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
{ name = "snmp";
buildInputs = [ net-snmp openssl ];
configureFlags = [ "--with-snmp" ];
@ -479,7 +483,7 @@ lib.makeScope pkgs.newScope (self: with self; {
buildInputs = [ libxml2 ];
configureFlags = [ "--enable-soap" ]
# Required to build on darwin.
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
doCheck = false; }
{ name = "sockets"; doCheck = false; }
{ name = "sodium"; buildInputs = [ libsodium ]; }
@ -499,7 +503,7 @@ lib.makeScope pkgs.newScope (self: with self; {
buildInputs = [ libxml2 ];
configureFlags = [ "--enable-xml" ]
# Required to build on darwin.
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
doCheck = false; }
{ name = "xmlreader";
buildInputs = [ libxml2 ];
@ -507,19 +511,19 @@ lib.makeScope pkgs.newScope (self: with self; {
NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ];
configureFlags = [ "--enable-xmlreader" ]
# Required to build on darwin.
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
{ name = "xmlrpc";
buildInputs = [ libxml2 libiconv ];
# xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc
enable = lib.versionOlder php.version "8.0";
configureFlags = [ "--with-xmlrpc" ]
# Required to build on darwin.
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
{ name = "xmlwriter";
buildInputs = [ libxml2 ];
configureFlags = [ "--enable-xmlwriter" ]
# Required to build on darwin.
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
{ name = "xsl";
buildInputs = [ libxslt libxml2 ];
doCheck = lib.versionOlder php.version "8.0";
@ -528,8 +532,8 @@ lib.makeScope pkgs.newScope (self: with self; {
{ name = "zip";
buildInputs = [ libzip pcre' ];
configureFlags = [ "--with-zip" ]
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]
++ lib.optional (lib.versionOlder php.version "7.3") [ "--with-libzip" ];
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]
++ lib.optionals (lib.versionOlder php.version "7.3") [ "--with-libzip" ];
doCheck = false; }
{ name = "zlib";
buildInputs = [ zlib ];
@ -538,7 +542,7 @@ lib.makeScope pkgs.newScope (self: with self; {
../development/interpreters/php/zlib-darwin-tests.patch
];
configureFlags = [ "--with-zlib" ]
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]; }
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]; }
];
# Convert the list of attrs: