Merge branch 'master' into staging-next

launchpad/nixpkgs/master
Jan Tojnar 3 years ago
commit e6f926d910
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
  1. 2
      pkgs/applications/audio/fluidsynth/default.nix
  2. 6
      pkgs/applications/audio/iannix/default.nix
  3. 4
      pkgs/applications/audio/pianobar/default.nix
  4. 4
      pkgs/applications/editors/kdevelop5/kdevelop.nix
  5. 6
      pkgs/applications/misc/razergenie/default.nix
  6. 67
      pkgs/applications/networking/browsers/firefox/common.nix
  7. 45
      pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch
  8. 8
      pkgs/applications/networking/browsers/firefox/wrapper.nix
  9. 4
      pkgs/applications/networking/browsers/google-chrome/default.nix
  10. 8
      pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
  11. 6
      pkgs/applications/video/molotov/default.nix
  12. 9
      pkgs/data/fonts/3270font/default.nix
  13. 92
      pkgs/development/compilers/elm/default.nix
  14. 8
      pkgs/development/compilers/elm/packages/elm-json.nix
  15. 5
      pkgs/development/libraries/botan/generic.nix
  16. 4
      pkgs/development/libraries/grpc/default.nix
  17. 4
      pkgs/development/libraries/libvirt/default.nix
  18. 4
      pkgs/development/python-modules/build/default.nix
  19. 4
      pkgs/development/python-modules/check-manifest/default.nix
  20. 3
      pkgs/development/python-modules/cot/default.nix
  21. 8
      pkgs/development/python-modules/grpcio-tools/default.nix
  22. 1
      pkgs/development/python-modules/notebook/default.nix
  23. 16
      pkgs/development/python-modules/pipx/default.nix
  24. 19
      pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
  25. 4
      pkgs/development/python-modules/ufoprocessor/default.nix
  26. 3
      pkgs/development/tools/winpdb/default.nix
  27. 4
      pkgs/development/web/nodejs/v15.nix
  28. 7
      pkgs/games/steam/fhsenv.nix
  29. 16
      pkgs/os-specific/linux/nixos-rebuild/default.nix
  30. 4
      pkgs/servers/mail/sympa/default.nix
  31. 12
      pkgs/servers/nosql/victoriametrics/default.nix
  32. 6
      pkgs/shells/fish/babelfish.nix
  33. 4
      pkgs/tools/admin/mycli/default.nix
  34. 4
      pkgs/tools/misc/routino/default.nix
  35. 4
      pkgs/tools/misc/swaglyrics/default.nix
  36. 19
      pkgs/tools/video/svt-av1/default.nix
  37. 13
      pkgs/top-level/all-packages.nix

@ -40,7 +40,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications";
homepage = "http://www.fluidsynth.org";
homepage = "https://www.fluidsynth.org";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ goibhniu lovek323 ];
platforms = platforms.unix;

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "iannix";
version = "0.9.20-b";
version = "unstable-2020-12-09";
src = fetchFromGitHub {
owner = "iannix";
repo = "IanniX";
rev = "v${version}";
sha256 = "6jjgMvD2VkR3ztU5LguqhtNd+4/ZqRy5pVW5xQ6K20Q=";
rev = "287b51d9b90b3e16ae206c0c4292599619f7b159";
sha256 = "AhoP+Ok78Vk8Aee/RP572hJeM8O7v2ZTvFalOZZqRy8=";
};
nativeBuildInputs = [ pkgconfig qmake ];

@ -1,11 +1,11 @@
{ fetchurl, lib, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }:
stdenv.mkDerivation rec {
name = "pianobar-2020.04.05";
name = "pianobar-2020.11.28";
src = fetchurl {
url = "http://6xq.net/projects/pianobar/${name}.tar.bz2";
sha256 = "1034f9ilj9xjw12d6n4vadhl5jzrx0jv8gq1w0rg9hfc55mkn5vc";
sha256 = "1znlwybfpxsjqr1jmr8j0ci8wzmpzmk2yxb0qcx9w9a8nnbgnfv5";
};
nativeBuildInputs = [ pkgconfig ];

@ -10,11 +10,11 @@
mkDerivation rec {
pname = "kdevelop";
version = "5.6.0";
version = "5.6.1";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0cpmavxz5fi0f1rjinvn6id1nplvjwg00l0n36s0ybygqkacgb9q";
sha256 = "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y";
};
nativeBuildInputs = [

@ -5,7 +5,7 @@
}:
let
version = "0.8.1";
version = "0.9.0";
pname = "razergenie";
in stdenv.mkDerivation {
@ -15,7 +15,7 @@ in stdenv.mkDerivation {
owner = "z3ntu";
repo = "RazerGenie";
rev = "v${version}";
sha256 = "1ggxnaidxbbpkv1h3zwwyci6886sssgslk5adbikbhz9kc9qg239";
sha256 = "17xlv26q8sdbav00wdm043449pg2424l3yaf8fvkc9rrlqkv13a4";
};
nativeBuildInputs = [
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
homepage = "https://github.com/z3ntu/RazerGenie";
description = "Qt application for configuring your Razer devices under GNU/Linux";
license = licenses.gpl3;
maintainers = with maintainers; [ f4814n ];
maintainers = with maintainers; [ f4814n Mogria ];
platforms = platforms.linux;
};
}

@ -2,9 +2,9 @@
, src, unpackPhase ? null, patches ? []
, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }:
{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip
{ lib, stdenv, pkgconfig, pango, perl, python3, zip
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, nss_3_53, libnotify
, freetype, fontconfig, file, nspr, nss, nss_3_53
, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libXdamage, libevent, libstartup_notification
, libvpx_1_8
@ -23,8 +23,7 @@
, ffmpegSupport ? true
, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
, waylandSupport ? true, libxkbcommon
# LTO is disabled since it caused segfaults on wayland see https://github.com/NixOS/nixpkgs/issues/101429
, ltoSupport ? false, overrideCC, buildPackages
, ltoSupport ? stdenv.isLinux, overrideCC, buildPackages
, gssSupport ? true, kerberos
, pipewireSupport ? waylandSupport && webrtcSupport, pipewire
@ -91,11 +90,19 @@ let
then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS"
else "/bin";
# 78 ESR won't build with rustc 1.47
inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
rustc cargo;
# Darwin's stdenv provides the default llvmPackages version, match that since
# clang LTO on Darwin is broken so the stdenv is not being changed.
# Target the LLVM version that rustc -Vv reports it is built with for LTO.
# rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11
llvmPackages = if stdenv.isDarwin
then buildPackages.llvmPackages
else buildPackages.llvmPackages_10;
else if lib.versionAtLeast rustc.llvm.version "11"
then buildPackages.llvmPackages_11
else buildPackages.llvmPackages_10;
# When LTO for Darwin is fixed, the following will need updating as lld
# doesn't work on it. For now it is fine since ltoSupport implies no Darwin.
@ -103,10 +110,6 @@ let
then overrideCC stdenv llvmPackages.lldClang
else stdenv;
# 78 ESR won't build with rustc 1.47
inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
rustc cargo;
nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss;
in
@ -121,13 +124,19 @@ buildStdenv.mkDerivation ({
] ++
lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++
lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++
lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++
lib.optional (ltoSupport && lib.versionAtLeast ffversion "84" && lib.versionOlder ffversion "86")
(fetchpatch {
url = "https://hg.mozilla.org/mozilla-central/raw-rev/fdff20c37be3";
sha256 = "135n9brliqy42lj3nqgb9d9if7x6x9nvvn0z4anbyf89bikixw48";
})
# there are two flavors of pipewire support
# The patches for the ESR release and the patches for the current stable
# release.
# Until firefox upstream stabilizes pipewire support we will have to continue
# tracking multiple versions here.
lib.optional (pipewireSupport && lib.versionOlder ffversion "83")
++ lib.optional (pipewireSupport && lib.versionOlder ffversion "83")
(fetchpatch {
# https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch
url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch";
@ -157,7 +166,7 @@ buildStdenv.mkDerivation ({
gtk2 perl zip libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
libnotify xorg.pixman yasm libGLU libGL
xorg.pixman yasm libGLU libGL
xorg.xorgproto
xorg.libXext unzip makeWrapper
libevent libstartup_notification /* cairo */
@ -173,24 +182,17 @@ buildStdenv.mkDerivation ({
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optional gtk3Support gtk3
++ lib.optional gssSupport kerberos
++ lib.optional ltoSupport llvmPackages.libunwind
++ lib.optionals waylandSupport [ libxkbcommon ]
++ lib.optionals pipewireSupport [ pipewire ]
++ lib.optionals (lib.versionAtLeast ffversion "82") [ gnum4 ]
++ lib.optional waylandSupport libxkbcommon
++ lib.optional pipewireSupport pipewire
++ lib.optional (lib.versionAtLeast ffversion "82") gnum4
++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos
AVFoundation MediaToolbox CoreLocation
Foundation libobjc AddressBook cups ];
NIX_LDFLAGS = lib.optionalString ltoSupport ''
-rpath ${placeholder "out"}/lib/${binaryName}
-rpath ${llvmPackages.libunwind.out}/lib
'';
NIX_CFLAGS_COMPILE = toString [
"-I${glib.dev}/include/gio-unix-2.0"
"-I${nss_pkg.dev}/include/nss"
];
MACH_USE_SYSTEM_PYTHON = "1";
postPatch = ''
@ -202,7 +204,7 @@ buildStdenv.mkDerivation ({
substituteInPlace \
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \
--replace /usr/include ${pipewire.dev}/include
'' + lib.optionalString (lib.versionAtLeast ffversion "80") ''
'' + lib.optionalString (lib.versionAtLeast ffversion "80" && lib.versionOlder ffversion "81") ''
substituteInPlace dom/system/IOUtils.h \
--replace '#include "nspr/prio.h"' '#include "prio.h"'
@ -221,7 +223,6 @@ buildStdenv.mkDerivation ({
nodejs
perl
pkgconfig
python2
python3
rust-cbindgen
rustc
@ -323,6 +324,13 @@ buildStdenv.mkDerivation ({
"MOZILLA_OFFICIAL=1"
"BUILD_OFFICIAL=1"
]
++ lib.optionals ltoSupport [
"AR=${llvmPackages.bintools}/bin/llvm-ar"
"LLVM_OBJDUMP=${llvmPackages.bintools}/bin/llvm-objdump"
"NM=${llvmPackages.bintools}/bin/llvm-nm"
"RANLIB=${llvmPackages.bintools}/bin/llvm-ranlib"
"STRIP=${llvmPackages.bintools}/bin/llvm-strip"
]
++ extraMakeFlags;
enableParallelBuilding = true;
@ -341,18 +349,6 @@ buildStdenv.mkDerivation ({
gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped")
'';
postFixup = lib.optionalString buildStdenv.isLinux ''
# Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712.
patchelf --set-rpath "${lib.getLib libnotify
}/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \
"$out"/lib/${binaryName}*/libxul.so
patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName}
${lib.optionalString (pipewireSupport && lib.versionAtLeast ffversion "83") ''
patchelf --add-needed "${lib.getLib pipewire}/lib/libpipewire-0.3.so" \
"$out"/lib/${binaryName}/${binaryName}
''}
'';
doInstallCheck = true;
installCheckPhase = ''
# Some basic testing
@ -365,6 +361,7 @@ buildStdenv.mkDerivation ({
isFirefox3Like = true;
gtk = gtk2;
inherit alsaSupport;
inherit pipewireSupport;
inherit nspr;
inherit ffmpegSupport;
inherit gssSupport;

@ -0,0 +1,45 @@
--- a/toolkit/library/build/dependentlibs.py
+++ b/toolkit/library/build/dependentlibs.py
@@ -36,26 +36,17 @@ def dependentlibs_win32_objdump(lib):
proc.wait()
return deps
-def dependentlibs_readelf(lib):
+def dependentlibs_elf_objdump(lib):
'''Returns the list of dependencies declared in the given ELF .so'''
- proc = subprocess.Popen([substs.get('TOOLCHAIN_PREFIX', '') + 'readelf', '-d', lib], stdout = subprocess.PIPE,
+ proc = subprocess.Popen([substs['LLVM_OBJDUMP'], '--private-headers', lib], stdout = subprocess.PIPE,
universal_newlines=True)
deps = []
for line in proc.stdout:
- # Each line has the following format:
- # tag (TYPE) value
- # or with BSD readelf:
- # tag TYPE value
- # Looking for NEEDED type entries
- tmp = line.split(' ', 3)
- if len(tmp) > 3 and 'NEEDED' in tmp[2]:
- # NEEDED lines look like:
- # 0x00000001 (NEEDED) Shared library: [libname]
- # or with BSD readelf:
- # 0x00000001 NEEDED Shared library: [libname]
- match = re.search('\[(.*)\]', tmp[3])
- if match:
- deps.append(match.group(1))
+ # We are looking for lines with the format:
+ # NEEDED libname
+ tmp = line.split()
+ if len(tmp) == 2 and tmp[0] == 'NEEDED':
+ deps.append(tmp[1])
proc.wait()
return deps
@@ -110,7 +101,7 @@ def gen_list(output, lib):
libpaths = [os.path.join(substs['DIST'], 'bin')]
binary_type = get_type(lib)
if binary_type == ELF:
- func = dependentlibs_readelf
+ func = dependentlibs_elf_objdump
elif binary_type == MACHO:
func = dependentlibs_mac_objdump
else:

@ -3,9 +3,9 @@
## various stuff that can be plugged in
, flashplayer, hal-flash
, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd
, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify
, gnome3/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow
, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
, tridactyl-native
, fx_cast_bridge
, udev
@ -51,6 +51,7 @@ let
ffmpegSupport = browser.ffmpegSupport or false;
gssSupport = browser.gssSupport or false;
alsaSupport = browser.alsaSupport or false;
pipewireSupport = browser.pipewireSupport or false;
plugins =
let
@ -80,7 +81,8 @@ let
++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
++ extraNativeMessagingHosts
);
libs = lib.optionals stdenv.isLinux [ udev libva mesa ]
libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ]
++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos
++ lib.optional useGlvnd libglvnd

@ -3,7 +3,7 @@
# Linked dynamic libraries.
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
, alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups
, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, kerberos, libdrm, mesa
, libxkbcommon, wayland # ozone/wayland
@ -53,7 +53,7 @@ let
deps = [
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
alsaLib libXdamage libXtst libXrandr expat cups
alsaLib libXdamage libXtst libXrandr libxshmfence expat cups
dbus gdk-pixbuf gcc-unwrapped.lib
systemd
libexif

@ -1,18 +1,18 @@
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest }:
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }:
buildPythonApplication rec {
pname = "pass-git-helper";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "languitar";
repo = "pass-git-helper";
rev = "v${version}";
sha256 = "18nvwlp0w4aqj268wly60rnjzqw2d8jl0hbs6bkwp3hpzzz5g6yd";
sha256 = "sha256-GdsFPpBdoEaOCmdKxw5xTuFOcGFH94w5q/lV891lCUs=";
};
propagatedBuildInputs = [ pyxdg ];
checkInputs = [ pytest ];
checkInputs = [ pytest pytest-mock ];
preCheck = ''
export HOME=$(mktemp -d)
'';

@ -2,11 +2,11 @@
let
pname = "molotov";
version = "4.2.2";
version = "4.4.0";
name = "${pname}-${version}";
src = fetchurl {
url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage";
sha256 = "00p8srf4yswbihlsi3s7kfkav02h902yvrq99wys11is63n01x8z";
sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in
@ -15,7 +15,7 @@ appimageTools.wrapType2 {
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D \
${appimageContents}/${pname}.desktop \
${appimageContents}/@molotovdesktop-wrapper.desktop \
$out/share/applications/${pname}.desktop
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'

@ -1,24 +1,25 @@
{ lib, fetchzip }:
let
version = "2.1.0";
version = "2.2.1";
in
fetchzip {
name = "3270font-${version}";
url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip";
url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_70de9c7.zip";
sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9";
sha256 = "0spz9abp87r3bncjim6hs47fmhg86qbgips4x6nfpqzg5qh2xd2m";
postFetch = ''
mkdir -p $out/share/fonts/
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff
unzip -j $downloadedFile \*.afm -d $out/share/fonts/type1
'';
meta = with lib; {
description = "Monospaced font based on IBM 3270 terminals";
homepage = "https://github.com/rbanffy/3270font";
changelog = "https://github.com/rbanffy/3270font/blob/v${version}/CHANGELOG.md";
license = [ licenses.bsd3 licenses.ofl ];
maintainers = [ maintainers.marsam ];
platforms = platforms.all;

@ -7,7 +7,7 @@ let
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
hsPkgs = haskell.packages.ghc883.override {
overrides = self: super: with haskell.lib;
overrides = self: super: with haskell.lib; with lib;
let elmPkgs = rec {
elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
# sadly with parallelism most of the time breaks compilation
@ -23,6 +23,11 @@ let
wrapProgram $out/bin/elm \
--prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
'';
description = "A delightful language for reliable webapps";
homepage = "https://elm-lang.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ domenkozar turbomack ];
});
/*
@ -31,6 +36,11 @@ let
*/
elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: {
jailbreak = true;
description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide";
homepage = "https://github.com/avh4/elm-format";
license = licenses.bsd3;
maintainers = with maintainers; [ turbomack ];
}));
elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: {
@ -39,6 +49,11 @@ let
hpack
'';
jailbreak = true;
description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler";
homepage = "https://github.com/stoeffel/elmi-to-json";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
}));
elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: {
@ -48,6 +63,11 @@ let
jailbreak = true;
# Tests are failing because of missing instances for Eq and Show type classes
doCheck = false;
description = "Instrument Elm code as a preprocessing step for elm-coverage";
homepage = "https://github.com/zwilias/elm-instrument";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
}));
inherit fetchElmDeps;
@ -74,9 +94,17 @@ let
inherit (hsPkgs.elmPkgs) elm;
};
elmRustPackages = {
elmRustPackages = {
elm-json = import ./packages/elm-json.nix {
inherit rustPlatform fetchurl openssl stdenv pkg-config;
} // {
meta = with lib; {
description = "Install, upgrade and uninstall Elm dependencies";
homepage = "https://github.com/zwilias/elm-json";
license = licenses.mit;
maintainers = [ maintainers.turbomack ];
platforms = platforms.linux;
};
};
};
@ -89,10 +117,24 @@ let
in with hsPkgs.elmPkgs; {
elm-test = patchBinwrap [elmi-to-json]
nodePkgs.elm-test;
nodePkgs.elm-test // {
meta = with stdenv.lib; {
description = "Runs elm-test suites from Node.js";
homepage = "https://github.com/rtfeldman/node-test-runner";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
elm-verify-examples = patchBinwrap [elmi-to-json]
nodePkgs.elm-verify-examples;
nodePkgs.elm-verify-examples // {
meta = with stdenv.lib; {
description = "Verify examples in your docs";
homepage = "https://github.com/stoeffel/elm-verify-examples";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
elm-coverage =
let patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage);
@ -111,17 +153,51 @@ let
mkdir -p unpacked_bin
ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument
'';
meta = with stdenv.lib; {
description = "Work in progress - Code coverage tooling for Elm";
homepage = "https://github.com/zwilias/elm-coverage";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
});
create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json]
nodePkgs.create-elm-app);
nodePkgs.create-elm-app) // {
meta = with stdenv.lib; {
description = "Create Elm apps with no build configuration";
homepage = "https://github.com/halfzebra/create-elm-app";
license = licenses.mit;
maintainers = [ maintainers.turbomack ];
};
};
elm-review = patchBinwrap [elmRustPackages.elm-json]
nodePkgs.elm-review;
nodePkgs.elm-review // {
meta = with stdenv.lib; {
description = "Analyzes Elm projects, to help find mistakes before your users find them";
homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
elm-language-server = nodePkgs."@elm-tooling/elm-language-server";
elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // {
meta = with stdenv.lib; {
description = "Language server implementation for Elm";
homepage = "https://github.com/elm-tooling/elm-language-server";
license = licenses.mit;
maintainers = [ maintainers.turbomack ];
};
};
elm-optimize-level-2 = nodePkgs."elm-optimize-level-2";
elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // {
meta = with stdenv.lib; {
description = "A second level of optimization for the Javascript that the Elm Compiler produces";
homepage = "https://github.com/mdgriffith/elm-optimize-level-2";
license = licenses.bsd3;
maintainers = [ maintainers.turbomack ];
};
};
inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse;
};

@ -18,12 +18,4 @@ rustPlatform.buildRustPackage rec {
# Tests perform networking and therefore can't work in sandbox
doCheck = false;
meta = with stdenv.lib; {
description = "Install, upgrade and uninstall Elm dependencies";
homepage = "https://github.com/zwilias/elm-json";
license = licenses.mit;
maintainers = [ maintainers.turbomack ];
platforms = platforms.linux;
};
}

@ -4,7 +4,8 @@
, sourceExtension ? "tar.xz"
, extraConfigureFlags ? ""
, postPatch ? null
, darwin
, CoreServices
, Security
, ...
}:
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
inherit postPatch;
buildInputs = [ python bzip2 zlib gmp openssl boost ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
configurePhase = ''
python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }

@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
version = "1.34.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
version = "1.34.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "0kipk26kg2x06mrkhb74k8vk5cn4mr89kw1f9mb04n616wkxjyxy";
sha256 = "0p6si9i0gg885ag2x87a7jyzhgd5lhx2bh2vjj2ra1jn6y3vg6qk";
fetchSubmodules = true;
};
patches = [

@ -88,8 +88,8 @@ in stdenv.mkDerivation rec {
in [
"--sysconfdir=/var/lib"
"-Dinstall_prefix=${placeholder "out"}"
"-Dlocalstatedir=/var/lib"
"-Drunstatedir=/var/run"
"-Dlocalstatedir=/var"
"-Drunstatedir=/run"
"-Dlibpcap=enabled"
"-Ddriver_qemu=enabled"
"-Ddriver_vmware=enabled"

@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "build";
version = "0.0.3.1";
version = "0.1.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "757b5542168326b6f1898a1ce1131bb2cf306ee4c7e54e39c815c5be217ff87d";
sha256 = "sha256-CLK1gJj/YX0RVAVsefinC+7Rj3z6cQvKI6ByGWkQ1bQ=";
};
nativeBuildInputs = [

@ -1,4 +1,4 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git }:
{ lib, stdenv, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }:
buildPythonPackage rec {
pname = "check-manifest";
@ -14,7 +14,7 @@ buildPythonPackage rec {
substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist"
'';
propagatedBuildInputs = [ pep517 toml ];
propagatedBuildInputs = [ build pep517 toml ];
checkInputs = [ mock breezy git ];

@ -35,9 +35,10 @@ buildPythonPackage rec {
"TestQCOW2"
"TestRAW"
"TestVMDKConversion"
] ++ lib.optionals stdenv.isDarwin [
"test_serial_fixup_invalid_host"
];
# argparse is part of the standardlib
prePatch = ''
substituteInPlace setup.py --replace "'argparse'," ""

@ -1,12 +1,12 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
{ lib, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.34.0";
version = "1.34.1";
src = fetchPypi {
inherit pname version;
sha256 = "db5a6f0130256d534cbe35eab37d37a448d96f4fd736e5051c6be1aee49cea1d";
sha256 = "b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08";
};
outputs = [ "out" "dev" ];
@ -18,6 +18,8 @@ buildPythonPackage rec {
# no tests in the package
doCheck = false;
pythonImportsCheck = [ "grpc_tools" ];
meta = with lib; {
description = "Protobuf code generator for gRPC";
license = licenses.asl20;

@ -68,6 +68,7 @@ buildPythonPackage rec {
"launch_socket"
"sock_server"
"test_list_formats" # tries to find python MIME type
"KernelCullingTest" # has a race condition failing on slower hardware
] ++ lib.optional stdenv.isDarwin [
"test_delete"
"test_checkpoints_follow_file"

@ -5,12 +5,13 @@
, userpath
, argcomplete
, packaging
, importlib-metadata
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pipx";
version = "0.15.6.0";
version = "0.16.0.0";
disabled = pythonOlder "3.6";
@ -19,10 +20,16 @@ buildPythonPackage rec {
owner = "pipxproject";
repo = pname;
rev = version;
sha256 = "1yffswayjfkmq86ygisja0mkg55pqj9pdml5nc0z05222sfnvn1a";
sha256 = "08mn7vm8iw20pg0gfn491y1jx8wcyjijps6f1hy7ipzd5ckynscn";
};
propagatedBuildInputs = [ userpath argcomplete packaging ];
propagatedBuildInputs = [
userpath
argcomplete
packaging
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
checkInputs = [ pytestCheckHook ];
@ -31,6 +38,7 @@ buildPythonPackage rec {
'';
# disable tests, which require internet connection
pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ];
disabledTests = [
"install"
"inject"
@ -38,10 +46,12 @@ buildPythonPackage rec {
"missing_interpreter"
"cache"
"internet"
"run"
"runpip"
"upgrade"
"suffix"
"legacy_venv"
"determination"
];
meta = with lib; {

@ -1,5 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
, oset, pybtex, pybtex-docutils, sphinx
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, oset
, pybtex
, pybtex-docutils
, sphinx
}:
buildPythonPackage rec {
@ -15,10 +21,13 @@ buildPythonPackage rec {
propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ];
meta = {
doCheck = false;
pythonImportsCheck = [ "sphinxcontrib.bibtex" ];
meta = with lib; {
description = "A Sphinx extension for BibTeX style citations";
homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex";
license = stdenv.lib.licenses.bsd2;
license = licenses.bsd2;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

@ -26,6 +26,10 @@ buildPythonPackage rec {
mutatormath
];
# tests require custom commands to run
doCheck = false;
pythonImportsCheck = [ "ufoProcessor" ];
meta = with lib; {
description = "Read, write and generate UFOs with designspace data";
homepage = "https://github.com/LettError/ufoProcessor";

@ -36,6 +36,9 @@ pythonPackages.buildPythonApplication rec {
cp artwork/winpdb-icon.svg "$out"/share/icons/winpdb.svg
'';
# no tests
doCheck = false;
meta = with lib; {
description = "Platform independent Python debugger";
longDescription = ''

@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "15.5.1";
sha256 = "0qbb4dwgsy1a82ihjxl6r8bj7mwjzb21s720y1rahisd5p69l8ic";
version = "15.6.0";
sha256 = "1liqkh1gz1h37fln8xr5krbs2mqjn38n3sws2ydvk84wrpfq3prr";
}

@ -284,12 +284,19 @@ in buildFHSUserEnv rec {
# this fixes certain issues where they don't render correctly
unshareIpc = false;
# Some applications such as Natron need access to MIT-SHM or other
# shared memory mechanisms. Unsharing the pid namespace
# breaks the ability for application to reference shared memory.
unsharePid = false;
passthru.run = buildFHSUserEnv {
name = "steam-run";
targetPkgs = commonTargetPkgs;
inherit multiPkgs extraBuildCommands;
inherit unshareIpc unsharePid;
runScript = writeScript "steam-run" ''
#!${runtimeShell}
run="$1"

@ -1,8 +1,16 @@
{ substituteAll, runtimeShell, jq, nix, lib }:
{ substituteAll
, runtimeShell
, coreutils
, gnused
, gnugrep
, jq
, nix
, lib
}:
let
fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
in substituteAll {
in
substituteAll {
name = "nixos-rebuild";
src = ./nixos-rebuild.sh;
dir = "bin";
@ -10,5 +18,5 @@ in substituteAll {
inherit runtimeShell nix;
nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux;
path = lib.makeBinPath [ jq ];
path = lib.makeBinPath [ coreutils jq gnused gnugrep ];
}

@ -63,13 +63,13 @@ let
in
stdenv.mkDerivation rec {
pname = "sympa";
version = "6.2.56";
version = "6.2.60";
src = fetchFromGitHub {
owner = "sympa-community";
repo = pname;
rev = version;
sha256 = "13cs2azpskmp2hkfy5zqf4qb6sb9r8d4wwzc8mw74mg2kdjnvfpy";
sha256 = "0mnpmkvxf3bmrmahkf3d0i5r6sj7xb1yca5v7xdnwnh5wh9vlx7v";
};
configureFlags = [

@ -1,19 +1,19 @@
{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoPackage rec {
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.42.0";
version = "1.52.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "10da15i3rn11dxnh82czaa2f9a4c3vf1d8kgfayp0dl7xs1xqhsd";
sha256 = "1sqzpr48sylgiy4zaf3f8hnwzv7imf57bxg6sin9lv291ybhxs68";
};
goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics";
vendorSha256 = null;
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/lib/buildinfo.Version=${version}" ];
buildFlagsArray = [ "-ldflags=-s -w -X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
passthru.tests = { inherit (nixosTests) victoriametrics; };

@ -1,16 +1,16 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "babelfish";
version = "0.1.3";
version = "1.0.0";
src = fetchFromGitHub {
owner = "bouk";
repo = "babelfish";
rev = "v${version}";
sha256 = "08i4y4fw60ynamr1jz8nkfkidxj06vcyhi1v4wxpl2macn6n4skk";
sha256 = "A5FUnER25FDkL/K7RCqudZI6Xd5wg9B8aLbYUw6+7BA=";
};
vendorSha256 = "0xjy50wciw329kq1nkd7hhaipcp4fy28hhk6cdq21qwid6g21gag";
vendorSha256 = "T70gnmmR4yBwY2ZCiIR35LIbFYSnTRvwTGLwyDgoXnY=";
meta = with lib; {
description = "Translate bash scripts to fish";

@ -7,11 +7,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "mycli";
version = "1.23.0";
version = "1.23.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-k1UHpEoszThUvoL4h59vGZ71bAx26VJ0iT/YuVQk/Lk=";
sha256 = "sha256-auGbFAvwLR7aDChhgeNZPZPNGJo+b9Q4TFDaOrmU2zI=";
};
propagatedBuildInputs = [

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "routino";
version = "3.3.2";
version = "3.3.3";
src = fetchurl {
url = "https://routino.org/download/${pname}-${version}.tgz";
sha256 = "1ccx3s99j8syxc1gqkzsaqkmyf44l7h3adildnc5iq2md7bp8wab";
sha256 = "1xa7l2bjn832nk6bc7b481nv8hd2gj41jwhg0d2qy10lqdvjpn5b";
};
patchFlags = [ "-p0" ];

@ -17,7 +17,9 @@ python3.pkgs.buildPythonApplication rec {
preConfigure = ''
substituteInPlace setup.py \
--replace 'requests>=2.24.0' 'requests~=2.23'
--replace 'requests>=2.24.0' 'requests~=2.23' \
--replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \
--replace 'colorama==0.4.3' 'colorama~=0.4'
'';
preBuild = "export HOME=$NIX_BUILD_TOP";

@ -15,8 +15,23 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "AV1-compliant encoder/decoder library core";
homepage = "https://github.com/AOMediaCodec/SVT-AV1";
license = licenses.bsd2;
longDescription = ''
The Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder) is an
AV1-compliant encoder/decoder library core. The SVT-AV1 encoder
development is a work-in-progress targeting performance levels applicable
to both VOD and Live encoding / transcoding video applications. The
SVT-AV1 decoder implementation is targeting future codec research
activities.
'';
inherit (src.meta) homepage;
changelog = "https://github.com/AOMediaCodec/SVT-AV1/blob/v${version}/CHANGELOG.md";
license = with licenses; [
bsd2
{
fullName = "Alliance for Open Media Patent License 1.0";
url = "https://aomedia.org/license/patent-license/";
}
];
platforms = platforms.unix;
broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init'
maintainers = with maintainers; [ chiiruno ];

@ -5067,7 +5067,7 @@ in
iasl = callPackage ../development/compilers/iasl { };
iannix = libsForQt514.callPackage ../applications/audio/iannix { };
iannix = libsForQt5.callPackage ../applications/audio/iannix { };
jamulus = libsForQt5.callPackage ../applications/audio/jamulus { };
@ -13002,8 +13002,14 @@ in
boost_process = callPackage ../development/libraries/boost-process { };
botan = callPackage ../development/libraries/botan { openssl = openssl_1_0_2; };
botan2 = callPackage ../development/libraries/botan/2.0.nix { };
botan = callPackage ../development/libraries/botan {
openssl = openssl_1_0_2;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
botan2 = callPackage ../development/libraries/botan/2.0.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
box2d = callPackage ../development/libraries/box2d { };
@ -13369,6 +13375,7 @@ in
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
svt-av1 = if stdenv.isAarch64 then null else svt-av1;
rav1e = null; # We already have SVT-AV1 for faster encoding
# The following need to be fixed on Darwin
libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug;

Loading…
Cancel
Save