alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge staging into staging-next

Browse source
This commit is contained in:
Frederik Rietdijk 2020-09-04 20:21:44 +02:00
parent 48299fdffb 3157bf1db7
commit 6bb5343a81
164 changed files with 966 additions and 363 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/config/fonts/fontconfig.nix
View file

@ -35,7 +35,7 @@ let
in
pkgs.writeText "fc-00-nixos-cache.conf" ''
<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig>
<!-- Font directories -->
${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}
@ -53,7 +53,7 @@ let
# priority 10
renderConf = pkgs.writeText "fc-10-nixos-rendering.conf" ''
<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig>
<!-- Default rendering settings -->
@ -110,7 +110,7 @@ let
in
pkgs.writeText "fc-52-nixos-default-fonts.conf" ''
<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig>
<!-- Default fonts -->
@ -129,7 +129,7 @@ let
# priority 53
rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" ''
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
${optionalString (!cfg.allowBitmaps) ''
@ -157,7 +157,7 @@ let
# priority 53
rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" ''
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<!-- Reject Type 1 fonts -->

8
nixos/modules/system/boot/stage-1.nix
View file

@ -87,9 +87,7 @@ let
# copy what we need. Instead of using statically linked binaries,
# we just copy what we need from Glibc and use patchelf to make it
# work.
extraUtils = let
# Use lvm2 without udev support, which is the same lvm2 we already have in the closure anyways
lvm2 = pkgs.lvm2.override { udev = null; }; in pkgs.runCommandCC "extra-utils"
extraUtils = pkgs.runCommandCC "extra-utils"
{ nativeBuildInputs = [pkgs.buildPackages.nukeReferences];
allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
}
@ -113,8 +111,8 @@ let
copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid
# Copy dmsetup and lvm.
copy_bin_and_libs ${getBin lvm2}/bin/dmsetup
copy_bin_and_libs ${getBin lvm2}/bin/lvm
copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup
copy_bin_and_libs ${getBin pkgs.lvm2}/bin/lvm
# Add RAID mdadm tool.
copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm

1
nixos/tests/installer.nix
View file

@ -317,7 +317,6 @@ let
texinfo
unionfs-fuse
xorg.lndir
(lvm2.override { udev = null; }) # for initrd (extra-utils)
# add curl so that rather than seeing the test attempt to download
# curl's tarball, we see what it's trying to download

4
pkgs/applications/audio/mpg123/default.nix
View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "mpg123-1.26.2";
name = "mpg123-1.26.3";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
sha256 = "1wrgds46wj6xsnqa6bi8kkh3wd29i2nxclbps34w5kjglrzbzxq0";
sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

30
pkgs/applications/editors/emacs/generic.nix
View file

@ -11,7 +11,7 @@
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, jansson, harfbuzz
, libgccjit, targetPlatform, binutils, binutils-unwrapped, makeWrapper # native-comp params
, libgccjit, targetPlatform, makeWrapper # native-comp params
, systemd ? null
, withX ? !stdenv.isDarwin
, withNS ? stdenv.isDarwin
@ -67,18 +67,23 @@ in stdenv.mkDerivation {
# Make native compilation work both inside and outside of nix build
(lib.optionalString nativeComp (let
libPath = lib.concatStringsSep ":" [
"${lib.getLib libgccjit}/lib/gcc/${targetPlatform.config}/${libgccjit.version}"
"${lib.getLib stdenv.cc.cc}/lib"
"${lib.getLib stdenv.glibc}/lib"
];
backendPath = (lib.concatStringsSep " "
(builtins.map (x: ''\"-B${x}\"'') [
# Paths necessary so the JIT compiler finds its libraries:
"${lib.getLib libgccjit}/lib"
"${lib.getLib libgccjit}/lib/gcc"
"${lib.getLib stdenv.cc.libc}/lib"
# Executable paths necessary for compilation (ld, as):
"${lib.getBin stdenv.cc.cc}"
"${lib.getBin stdenv.cc.bintools}"
"${lib.getBin stdenv.cc.bintools.bintools}"
]));
in ''
substituteInPlace lisp/emacs-lisp/comp.el --replace \
"(defcustom comp-async-env-modifier-form nil" \
"(defcustom comp-async-env-modifier-form '((setenv \"LIBRARY_PATH\" (string-join (seq-filter (lambda (v) (null (eq v nil))) (list (getenv \"LIBRARY_PATH\") \"${libPath}\")) \":\")))"
"(defcustom comp-native-driver-options nil" \
"(defcustom comp-native-driver-options '(${backendPath})"
''))
""
];
@ -156,11 +161,6 @@ in stdenv.mkDerivation {
"$out/bin/emacs"
patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs"
'')
(lib.optionalString nativeComp ''
wrapProgram $out/bin/emacs-* --prefix PATH : "${lib.makeBinPath [ binutils binutils-unwrapped ]}"
'')
];
passthru = {

4
pkgs/applications/editors/vim/common.nix
View file

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "8.2.1123";
version = "8.2.1522";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
sha256 = "01fgfm5pnmbq12z84d7g3x0iq5gj1irdyihx41c4r2bww55v5q0c";
sha256 = "0dah3392cq06pagik5y7kcq61mslqvfsh7vqldv3kvhr5ilqb8qy";
};
enableParallelBuilding = true;

2
pkgs/applications/gis/openorienteering-mapper/default.nix
View file

@ -56,8 +56,6 @@ mkDerivation rec {
"-DLICENSING_PROVIDER:BOOL=OFF"
"-DMapper_MANUAL_QTHELP:BOOL=OFF"
] ++ stdenv.lib.optionals stdenv.isDarwin [
# Usually enabled on Darwin
"-DCMAKE_FIND_FRAMEWORK=never"
# FindGDAL is broken and always finds /Library/Framework unless this is
# specified
"-DGDAL_INCLUDE_DIR=${gdal}/include"

23
pkgs/applications/kde/default.nix
View file

@ -92,8 +92,14 @@ let
kaddressbook = callPackage ./kaddressbook.nix {};
kalarm = callPackage ./kalarm.nix {};
kalarmcal = callPackage ./kalarmcal.nix {};
kalzium = callPackage ./kalzium.nix {};
kapman = callPackage ./kapman.nix {};
kapptemplate = callPackage ./kapptemplate.nix { };
kate = callPackage ./kate.nix {};
katomic = callPackage ./katomic.nix {};
kblackbox = callPackage ./kblackbox.nix {};
kblocks = callPackage ./kblocks.nix {};
kbounce = callPackage ./kbounce.nix {};
kbreakout = callPackage ./kbreakout.nix {};
kcachegrind = callPackage ./kcachegrind.nix {};
kcalc = callPackage ./kcalc.nix {};
@ -110,6 +116,7 @@ let
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
kdialog = callPackage ./kdialog.nix {};
kdiamond = callPackage ./kdiamond.nix {};
keditbookmarks = callPackage ./keditbookmarks.nix {};
kfind = callPackage ./kfind.nix {};
kfloppy = callPackage ./kfloppy.nix {};
@ -119,22 +126,32 @@ let
khelpcenter = callPackage ./khelpcenter.nix {};
kidentitymanagement = callPackage ./kidentitymanagement.nix {};
kig = callPackage ./kig.nix {};
kigo = callPackage ./kigo.nix {};
killbots = callPackage ./killbots.nix {};
kimap = callPackage ./kimap.nix {};
kipi-plugins = callPackage ./kipi-plugins.nix {};
kitinerary = callPackage ./kitinerary.nix {};
kio-extras = callPackage ./kio-extras.nix {};
kldap = callPackage ./kldap.nix {};
kleopatra = callPackage ./kleopatra.nix {};
klettres = callPackage ./klettres.nix {};
klines = callPackage ./klines.nix {};
kmag = callPackage ./kmag.nix {};
kmahjongg = callPackage ./kmahjongg.nix {};
kmail = callPackage ./kmail.nix {};
kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};
kmailtransport = callPackage ./kmailtransport.nix {};
kmbox = callPackage ./kmbox.nix {};
kmime = callPackage ./kmime.nix {};
kmines = callPackage ./kmines.nix {};
kmix = callPackage ./kmix.nix {};
kmplot = callPackage ./kmplot.nix {};
knavalbattle = callPackage ./knavalbattle.nix {};
knetwalk = callPackage ./knetwalk.nix {};
knights = callPackage ./knights.nix {};
knotes = callPackage ./knotes.nix {};
kolf = callPackage ./kolf.nix {};
kollision = callPackage ./kollision.nix {};
kolourpaint = callPackage ./kolourpaint.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
@ -149,15 +166,21 @@ let
ksquares = callPackage ./ksquares.nix {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
kpkpass = callPackage ./kpkpass.nix {};
kreversi = callPackage ./kreversi.nix {};
krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {};
kruler = callPackage ./kruler.nix {};
kshisen = callPackage ./kshisen.nix {};
kspaceduel = callPackage ./kspaceduel.nix {};
ksudoku = callPackage ./ksudoku.nix {};
ksystemlog = callPackage ./ksystemlog.nix {};
kteatime = callPackage ./kteatime.nix {};
ktimer = callPackage ./ktimer.nix {};
ktnef = callPackage ./ktnef.nix {};
ktouch = callPackage ./ktouch.nix {};
kturtle = callPackage ./kturtle.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
kwave = callPackage ./kwave.nix {};
libgravatar = callPackage ./libgravatar.nix {};
libkcddb = callPackage ./libkcddb.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};

26
pkgs/applications/kde/kalzium.nix Normal file
View file

@ -0,0 +1,26 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }:
mkDerivation {
name = "kalzium";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium";
description = "Kalzium is a program that shows you the Periodic Table of Elements";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
qtscript
#avogadro
kdoctools
ki18n
kio
openbabel
kparts
kplotting
kunitconversion
];
}

21
pkgs/applications/kde/kapman.nix Normal file
View file

@ -0,0 +1,21 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation {
name = "kapman";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kapman";
description = "Kapman is a clone of the well known game Pac-Man";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kdoctools
ki18n
kio
];
}

22
pkgs/applications/kde/katomic.nix Normal file
View file

@ -0,0 +1,22 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }:
mkDerivation {
name = "katomic";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.katomic";
description = "KAtomic is a fun educational game built around molecular geometry";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
knewstuff
libkdegames
kdoctools
ki18n
kio
];
}

21
pkgs/applications/kde/kblackbox.nix Normal file
View file

@ -0,0 +1,21 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation {
name = "kblackbox";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kblackbox";
description = "KBlackbox is a game of hide and seek played on a grid of boxes";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kdoctools
ki18n
kio
];
}

21
pkgs/applications/kde/kblocks.nix Normal file
View file

@ -0,0 +1,21 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation {
name = "kblocks";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kblocks";
description = "KBlocks is the classic falling blocks game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kdoctools
ki18n
kio
];
}

22
pkgs/applications/kde/kbounce.nix Normal file
View file

@ -0,0 +1,22 @@
{ mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kio, ki18n }:
mkDerivation {
name = "kbounce";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kbounce";
description = "KBounce is a single player arcade game with the elements of puzzle";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kconfig
kcrash
kio
ki18n
];
}

23
pkgs/applications/kde/kdiamond.nix Normal file
View file

@ -0,0 +1,23 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kconfig, knotifyconfig }:
mkDerivation {
name = "kdiamond";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kdiamond";
description = "KDiamond is a single player puzzle game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
knotifyconfig
kconfig
kdoctools
ki18n
kio
];
}

22
pkgs/applications/kde/kigo.nix Normal file
View file

@ -0,0 +1,22 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }:
mkDerivation {
name = "kigo";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kigo";
description = "An open-source implementation of the popular Go game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
knewstuff
kdoctools
ki18n
kio
];
}

21
pkgs/applications/kde/killbots.nix Normal file
View file

@ -0,0 +1,21 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation {
name = "killbots";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.killbots";
description = "A game where you avoid robots";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kdoctools
ki18n
kio
];
}

22
pkgs/applications/kde/klettres.nix Normal file
View file

@ -0,0 +1,22 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, phonon, knewstuff }:
mkDerivation {
name = "klettres";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.klettres";
description = "KLettres is an application specially designed to help the user to learn an alphabet";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
phonon
knewstuff
kdoctools
ki18n
kio
];
}

21
pkgs/applications/kde/klines.nix Normal file
View file

@ -0,0 +1,21 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation {
name = "klines";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.klines";
description = "KLines is a simple but highly addictive one player game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kdoctools
ki18n
kio
];
}

20
pkgs/applications/kde/kmag.nix Normal file
View file

@ -0,0 +1,20 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }:
mkDerivation {
name = "kmag";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kmag";
description = "KMag is a small utility for Linux to magnify a part of the screen";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kdoctools
ki18n
kio
];
}

23
pkgs/applications/kde/kmines.nix Normal file
View file

@ -0,0 +1,23 @@
{ mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kdoctools, ki18n, kio }:
mkDerivation {
name = "kmines";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kmines";
description = "KMines is a classic Minesweeper game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kconfig
kcrash
kio
kdoctools
ki18n
];
}

22
pkgs/applications/kde/knavalbattle.nix Normal file
View file

@ -0,0 +1,22 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kdnssd }:
mkDerivation {
name = "knavalbattle";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle";
description = "Naval Battle is a ship sinking game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kdoctools
ki18n
kio
kdnssd
];
}

21
pkgs/applications/kde/knetwalk.nix Normal file
View file

@ -0,0 +1,21 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation {
name = "knetwalk";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.knetwalk";
description = "KNetWalk is a single player logic game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kdoctools
ki18n
kio
];
}

23
pkgs/applications/kde/knights.nix Normal file
View file

@ -0,0 +1,23 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, kplotting, plasma-framework, libkdegames }:
mkDerivation {
name = "knights";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.knights";
description = "KNights is a chess game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
plasma-framework
kplotting
kdoctools
ki18n
kio
];
}

21
pkgs/applications/kde/kollision.nix Normal file
View file

@ -0,0 +1,21 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }:
mkDerivation {
name = "kollision";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kollision";
description = "Kollision is a casual game";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
kdoctools
ki18n
kio
];
}

19
pkgs/applications/kde/kreversi.nix Normal file
View file

@ -0,0 +1,19 @@
{ mkDerivation, lib, extra-cmake-modules, libkdegames, kdeclarative }:
mkDerivation {
name = "kreversi";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kreversi";
description = "KReversi is a simple one player strategy game played against the computer";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kdeclarative
libkdegames
];
}

22
pkgs/applications/kde/kshisen.nix Normal file
View file

@ -0,0 +1,22 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, libkmahjongg }:
mkDerivation {
name = "kshisen";
meta = with lib; {
homepage = "https://kde.org/applications/en/games/org.kde.kshisen";
description = "KShisen is a solitaire-like game played using the standard set of Mahjong tiles";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
libkdegames
libkmahjongg
kdoctools
ki18n
kio
];
}

23
pkgs/applications/kde/kteatime.nix Normal file
View file

@ -0,0 +1,23 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kconfig, kcrash, kiconthemes, knotifyconfig }:
mkDerivation {
name = "kteatime";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime";
description = "KTeaTime is a handy timer for steeping tea";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kdoctools
ki18n
kconfig
kcrash
kiconthemes
knotifyconfig
];
}

20
pkgs/applications/kde/ktimer.nix Normal file
View file

@ -0,0 +1,20 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }:
mkDerivation {
name = "ktimer";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer";
description = "KTimer is a little tool to execute programs after some time";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kdoctools
ki18n
kio
];
}

21
pkgs/applications/kde/kturtle.nix Normal file
View file

@ -0,0 +1,21 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, knewstuff }:
mkDerivation {
name = "kturtle";
meta = with lib; {
homepage = "https://kde.org/applications/en/utilities/org.kde.kturtle";
description = "KTurtle is an educational programming environment for learning how to program";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
kdoctools
ki18n
kio
knewstuff
];
}

37
pkgs/applications/kde/kwave.nix Normal file
View file

@ -0,0 +1,37 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig, kcrash, kiconthemes, kio, audiofile, libsamplerate
, alsaLib, libpulseaudio, flac, id3lib, libogg, libmad, libopus, libvorbis, fftw, librsvg }:
mkDerivation {
name = "kwave";
meta = with lib; {
homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave";
description = "KWave is a simple media player";
maintainers = with maintainers; [ freezeboy ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
nativeBuildInputs = [
extra-cmake-modules
];
buildInputs = [
alsaLib
audiofile
kcrash
kdoctools
qtmultimedia
kcompletion
kconfig
kiconthemes
kio
libpulseaudio
libsamplerate
flac
fftw
id3lib
libogg
libmad
libopus
libvorbis
librsvg
];
}

1
pkgs/applications/misc/octoprint/default.nix
View file

@ -30,6 +30,7 @@ let
(mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
(mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")
(mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051")
(mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s")
# Built-in dependency
(

2
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -44,7 +44,7 @@ let
"-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360
"-DENABLE_PHP=OFF"
]
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"]
++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
;

4
pkgs/applications/office/ledger/default.nix
View file

@ -27,10 +27,6 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DBUILD_DOCS:BOOL=ON"
(lib.optionalString usePython "-DUSE_PYTHON=true")
] ++ lib.optionals (usePython && stdenv.isDarwin) [
# Fix python lookup on Darwin. Not necessary after
# https://github.com/NixOS/nixpkgs/pull/94090 lands in master
"-DPython_ROOT_DIR=${python}"
];
# by default, it will query the python interpreter for it's sitepackages location

39
pkgs/applications/version-management/fossil/default.nix
View file

@ -1,6 +1,16 @@
{ stdenv
, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which
, tcllib, withJson ? true
, installShellFiles
, tcl
, libiconv
, fetchurl
, zlib
, openssl
, readline
, sqlite
, ed
, which
, tcllib
, withJson ? true
}:
stdenv.mkDerivation rec {
@ -16,26 +26,33 @@ stdenv.mkDerivation rec {
sha256 = "00v6gmn2wpfms5jzf103hkm5s8i3bfs5mzacmznlhdzdrzzjc8w2";
};
nativeBuildInputs = [ installShellFiles tcl ];
buildInputs = [ zlib openssl readline sqlite which ed ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
nativeBuildInputs = [ tcl ];
++ stdenv.lib.optional stdenv.isDarwin libiconv;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
configureFlags = [ "--disable-internal-sqlite" ]
++ stdenv.lib.optional withJson "--json";
preCheck = ''
export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"
'';
configureFlags = stdenv.lib.optional withJson "--json";
preBuild=''
preBuild = ''
export USER=nonexistent-but-specified-user
'';
installPhase = ''
mkdir -p $out/bin
INSTALLDIR=$out/bin make install
installManPage fossil.1
installShellCompletion --name fossil.bash tools/fossil-autocomplete.bash
'';
meta = {
meta = with stdenv.lib; {
description = "Simple, high-reliability, distributed software configuration management";
longDescription = ''
Fossil is a software configuration management system. Fossil is
@ -45,11 +62,7 @@ stdenv.mkDerivation rec {
from the others by being extremely simple to setup and operate.
'';
homepage = "http://www.fossil-scm.org/";
license = stdenv.lib.licenses.bsd2;
platforms = with stdenv.lib.platforms; all;
maintainers = [ #Add your name here!
stdenv.lib.maintainers.maggesi
stdenv.lib.maintainers.viric
];
license = licenses.bsd2;
maintainers = with maintainers; [ maggesi viric ];
};
}

2
pkgs/applications/video/lightworks/default.nix
View file

@ -47,7 +47,7 @@ let
# This adds it to lightworks' search path while keeping the default
# using the FONTCONFIG_FILE env variable
echo "<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig>
<dir>/usr/share/fonts/truetype</dir>
<include>/etc/fonts/fonts.conf</include>

6
pkgs/build-support/wrapper-common/utils.bash
View file

@ -69,9 +69,9 @@ badPath() {
# directory (including the build directory).
test \
"$p" != "/dev/null" -a \
"${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
"${p:0:4}" != "/tmp" -a \
"${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
"${p#${NIX_STORE}}" = "$p" -a \
"${p#${TMP:-/tmp}}" = "$p" -a \
"${p#${NIX_BUILD_TOP}}" = "$p"
}
expandResponseParams() {

2
pkgs/data/fonts/caladea/cambria-alias.conf
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<!-- Configure Caladea as a metric-compatible alias for the
Microsoft Cambria font family. -->

2
pkgs/data/fonts/carlito/calibri-alias.conf
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<!-- Configure Carlito as a metric-compatible alias for the
Microsoft Calibri font family. -->

2
pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<!-- Configure Comic Relief as a metric-compatible alias for the
Microsoft Comic Sans font family. -->

2
pkgs/data/fonts/corefonts/no-op.conf
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<!-- This configuation is intentionally left empty in order to
override any other font package that may wish to set up an

5
pkgs/data/fonts/liberation-fonts/default.nix
View file

@ -2,6 +2,7 @@
let
inherit (python3.pkgs) fonttools;
commonNativeBuildInputs = [ fontforge python3 ];
common =
{ version, repo, sha256, nativeBuildInputs, postPatch ? null }:
stdenv.mkDerivation rec {
@ -50,13 +51,13 @@ in
liberation_ttf_v1 = common {
repo = "liberation-1.7-fonts";
version = "1.07.5";
nativeBuildInputs = [ fontforge ];
nativeBuildInputs = commonNativeBuildInputs ;
sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
};
liberation_ttf_v2 = common {
repo = "liberation-fonts";
version = "2.1.0";
nativeBuildInputs = [ fontforge fonttools ];
nativeBuildInputs = commonNativeBuildInputs ++ [ fonttools ];
postPatch = ''
substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
'font = ttLib.TTFont(fontfile)' \

2
pkgs/data/fonts/vista-fonts-chs/no-op.conf
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<!-- This configuation is intentionally left empty in order to
override any other font package that may wish to set up an

2
pkgs/data/fonts/vista-fonts/no-op.conf
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<!-- This configuation is intentionally left empty in order to
override any other font package that may wish to set up an

2
pkgs/development/compilers/gcc/9/default.nix
View file

@ -184,7 +184,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit (stdenv) lib;
inherit version hostPlatform gnatboot langAda langGo;
inherit version hostPlatform gnatboot langAda langGo langJit;
};
dontDisableStatic = true;

2
pkgs/development/compilers/gcc/builder.sh
View file

@ -261,7 +261,7 @@ postInstall() {
fi
if type "install_name_tool"; then
for i in "${!outputLib}"/lib/*.*.dylib; do
for i in "${!outputLib}"/lib/*.*.dylib "${!outputLib}"/lib/*.so.[0-9]; do
install_name_tool -id "$i" "$i" || true
for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do
new_path=`echo "$old_path" | sed "s,$out,${!outputLib},"`

9
pkgs/development/compilers/gcc/common/pre-configure.nix
View file

@ -2,6 +2,7 @@
, gnatboot ? null
, langAda ? false
, langJava ? false
, langJit ? false
, langGo }:
assert langJava -> lib.versionOlder version "7";
@ -49,3 +50,11 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+ lib.optionalString (hostPlatform.isDarwin) ''
export ac_cv_func_aligned_alloc=no
''
# In order to properly install libgccjit on macOS Catalina, strip(1)
# upon installation must not remove external symbols, otherwise the
# install step errors with "symbols referenced by indirect symbol
# table entries that can't be stripped".
+ lib.optionalString (hostPlatform.isDarwin && langJit) ''
export STRIP='strip -x'
''

2
pkgs/development/compilers/mozart/default.nix
View file

@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
# gcc together as compilers and we need clang for the sources generation.
# However, clang emits tons of warnings about gcc's atomic-base library.
"-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init"
] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";
];
fixupPhase = ''
wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs

24
pkgs/development/interpreters/perl/default.nix
View file

@ -175,11 +175,11 @@ let
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
};
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
crossVersion = "1.3.4"; # Jun 2, 2020
crossVersion = "15ca5359f99698ef0a199bc307b7956c08907abc"; # Aug 27, 2020
perl-cross-src = fetchurl {
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
sha256 = "15wvlafhpsh9h66s3vazhx46hf8ik75473acrvf6722ijd1wpz45";
sha256 = "0pcwv2ac02i2l0fjc8drdw70q6gwbypj2c5a53x2449m919v37h9";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@ -195,14 +195,6 @@ let
setupHook = ./setup-hook-cross.sh;
});
in {
# Maint version
perl528 = common {
perl = pkgs.perl528;
buildPerl = buildPackages.perl528;
version = "5.28.3";
sha256 = "052if351m81yhaab429i1kv77v9b15qm0g48kr6y2yjrc7bc3jdg";
};
# Maint version
perl530 = common {
perl = pkgs.perl530;
@ -211,11 +203,19 @@ in {
sha256 = "0vs0wwwlw47sswxaflkk4hw0y45cmc7arxx788kwpbminy5lrq1j";
};
# Maint version
perl532 = common {
perl = pkgs.perl532;
buildPerl = buildPackages.perl532;
version = "5.32.0";
sha256 = "1d6001cjnpxfv79000bx00vmv2nvdz7wrnyas451j908y7hirszg";
};
# the latest Devel version
perldevel = common {
perl = pkgs.perldevel;
buildPerl = buildPackages.perldevel;
version = "5.32.0-RC0";
sha256 = "02i6n1xa4j0ksp014yy8q0j7scjcy5mr0yd4iash2ryrrfv5yw5k";
version = "5.33.1";
sha256 = "1rlnqqqzyhal79ys5dv7fwm3mg81s43dwks28b74x2gcmsngjnw9";
};
}

8
pkgs/development/interpreters/python/default.nix
View file

@ -68,10 +68,10 @@ in {
sourceVersion = {
major = "3";
minor = "6";
patch = "11";
patch = "12";
suffix = "";
};
sha256 = "dB69y8Tjk3pf8jUX3UVev31UPqn+9vXPb0blddbE/aQ=";
sha256 = "cJU6m11okdkuZdGEw1EhJqFYFL7hXh7/LdzOBDNOmpk=";
inherit (darwin) configd;
inherit passthruFun;
};
@ -81,10 +81,10 @@ in {
sourceVersion = {
major = "3";
minor = "7";
patch = "8";
patch = "9";
suffix = "";
};
sha256 = "Q6VDQEs2PwA3+J34R48Z2y28DW8//uMQvCmX+nGFSmM=";
sha256 = "008v6g1jkrjrdmiqlgjlq6msbbj848bvkws6ppwva1ahn03k14li";
inherit (darwin) configd;
inherit passthruFun;
};

4
pkgs/development/libraries/enchant/2.x.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "enchant";
version = "2.2.9";
version = "2.2.10";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0g1gf86jzxxhnhkn7jvgi0k9agzav2zr8pjnpgdwpvgmfci3v6mj";
sha256 = "1hxx5kb015a5rvjimrpcb5050xb3988dgc52fd5m5n270v238nva";
};
nativeBuildInputs = [

2
pkgs/development/libraries/fontconfig/make-fonts-cache.nix
View file

@ -16,7 +16,7 @@ runCommand "fc-cache"
cat > fonts.conf << EOF
<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig>
<include>${fontconfig.out}/etc/fonts/fonts.conf</include>
<cachedir>$out</cachedir>

2
pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
View file

@ -12,7 +12,7 @@
extension-element-prefixes="str"
>
<xsl:output method='xml' encoding="UTF-8" doctype-system="fonts.dtd" />
<xsl:output method='xml' encoding="UTF-8" doctype-system="urn:fontconfig:fonts.dtd" />
<xsl:param name="fontDirectories" />
<xsl:param name="fontconfig" />

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

@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec {
pname = "glib";
version = "2.64.4";
version = "2.64.5";
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0l6fggcgdnjif9kzy4crq7520f43bbrgzxz0c821ya3jn8jv7q7p";
sha256 = "04fczq693wivkqd2qxvvi3sncqgznsvzfiiwsll1rbayf795pgcw";
};
patches = optionals stdenv.isDarwin [

7
pkgs/development/libraries/glibmm/default.nix
View file

@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig gnum4 ];
nativeBuildInputs = [
pkgconfig
gnum4
glib # for glib-compile-schemas
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
Cocoa
]);

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

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patchShebangs test_jbig2dec.py
'';
buildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook ];
checkInputs = [ python3 ];
doCheck = true;

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

@ -8,7 +8,7 @@
# files.
let
version = "1.1.0";
version = "1.2.0";
in
stdenv.mkDerivation {
pname = "libmpc";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnu/mpc/mpc-${version}.tar.gz";
sha256 = "0biwnhjm3rx3hc0rfpvyniky4lpzsvdcwhmcn7f0h4iw2hwcb1b9";
sha256 = "19pxx3gwhwl588v496g3aylhcw91z1dk1d5x3a8ik71sancjs3z9";
};
buildInputs = [ gmp mpfr ];

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, enableShared ? true }:
stdenv.mkDerivation (rec {
version = "4.10.1";
version = "4.11.0";
pname = "libpfm";
src = fetchurl {
url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz";
sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766";
sha256 = "1k7yp6xfsglp2b6271r622sjinlbys0dk24n9iiv656y5f3zi9ax";
};
makeFlags = [

5
pkgs/development/libraries/libseccomp/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, getopt, makeWrapper, utillinux, gperf }:
{ stdenv, fetchurl, getopt, utillinux, gperf }:
stdenv.mkDerivation rec {
pname = "libseccomp";
@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" "man" ];
buildInputs = [ getopt makeWrapper gperf ];
nativeBuildInputs = [ gperf ];
buildInputs = [ getopt ];
patchPhase = ''
patchShebangs .

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

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "0mxbpg01kgbk5nh6524b0m4xk7ywkyzmc3yhi5asqcsd3rbhjj98";
};
outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
propagatedBuildInputs =
@ -31,8 +31,6 @@ stdenv.mkDerivation rec {
dontDisableStatic = withStatic;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
configureFlags = stdenv.lib.optional (!enableSystemd) "--disable-udev";
preFixup = stdenv.lib.optionalString enableSystemd ''

15
pkgs/development/libraries/mesa/default.nix
View file

@ -4,7 +4,6 @@
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, python3Packages
, libglvnd
, patchelf, autoreconfHook, fetchFromGitHub
, enableRadv ? true
, galliumDrivers ? ["auto"]
, driDrivers ? ["auto"]
@ -32,7 +31,7 @@ with stdenv.lib;
let
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
version = "20.1.6";
version = "20.1.7";
branch = versions.major version;
in
@ -47,7 +46,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
];
sha256 = "0g59gxbgr884a9xvg0fls10zkllyhz675zjvr50dcfmh2h0x9gi3";
sha256 = "1252mgwiy05nz8mm4gjkzmnjfvdz5yv1shnsr837cdnan86dvsad";
};
prePatch = "patchShebangs .";
@ -148,16 +147,6 @@ stdenv.mkDerivation {
depsBuildBuild = [ pkgconfig ];
nativeBuildInputs = [
(patchelf.overrideAttrs (pa: {
src = fetchFromGitHub {
owner = "NixOS";
repo = "patchelf";
rev = "61bc10176"; # current master; what matters is merge of #225
sha256 = "0cy77mn77w3mn64ggp20f4ygnbxfjmddhjjhfwkva53lsirg6w93";
};
nativeBuildInputs = pa.nativeBuildInputs or [] ++ [ autoreconfHook ];
}))
] ++ [
pkgconfig meson ninja
intltool bison flex file
python3Packages.python python3Packages.Mako

17
pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch
View file

@ -1,4 +1,4 @@
From 00f3c6d1b771c11ecc08c3d8bd793a51d6e64166 Mon Sep 17 00:00:00 2001
From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 26 Jul 2020 17:29:49 -0300
Subject: [PATCH] link radv with ld_args_build_id
@ -9,18 +9,17 @@ This is needed for radv_device_get_cache_uuid to work correctly.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index efcf2dd6c89..590f286b8cb 100644
index eec026e8f60..a07a0821938 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -173,7 +173,7 @@ libvulkan_radeon = shared_library(
@@ -183,7 +183,7 @@ libvulkan_radeon = shared_library(
],
c_args : [c_vis_args, no_override_init_args, radv_flags],
cpp_args : [cpp_vis_args, radv_flags],
- link_args : [ld_args_bsymbolic, ld_args_gc_sections],
+ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections],
- link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],
+ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args],
link_depends : [libvulkan_radeon_link_depends,],
install : true,
)
--
2.27.0
--
2.28.0

7
pkgs/development/libraries/p11-kit/default.nix
View file

@ -16,7 +16,12 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev"];
outputBin = "dev";
nativeBuildInputs = [ autoreconfHook pkgconfig which ];
# for cross platform builds of p11-kit, libtasn1 in nativeBuildInputs
# provides the asn1Parser binary on the hostPlatform needed for building.
# at the same time, libtasn1 in buildInputs provides the libasn1 library
# to link against for the target platform.
# hence, libtasn1 is required in both native and build inputs.
nativeBuildInputs = [ autoreconfHook pkgconfig which libtasn1 ];
buildInputs = [ gettext libffi libiconv libtasn1 ];
autoreconfPhase = ''

18
pkgs/development/python-modules/aioesphomeapi/default.nix
View file

@ -1,14 +1,16 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }:
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, attrs, protobuf, zeroconf }:
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "2.6.1";
version = "2.6.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "139d1d348fcfe2f34926a210a32dff069935d17167c4e1cb66e8b039cbb4d6c1";
src = fetchFromGitHub {
owner = "esphome";
repo = pname;
rev = "v${version}";
sha256 = "1lbjxqdx63fc7qxx7xwq4b9dafmdafj7p1ggs48hyhbqfwkrv9p7";
};
propagatedBuildInputs = [ attrs protobuf zeroconf ];
@ -16,14 +18,12 @@ buildPythonPackage rec {
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "aioesphomeapi" ];
meta = with lib; {
description = "Python Client for ESPHome native API";
homepage = "https://github.com/esphome/aioesphomeapi";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
# Home Assistant should pin protobuf to the correct version. Can be tested using
# nix-build -E "with import ./. {}; home-assistant.override { extraPackages = ps: [ ps.aioesphomeapi ]; }"
broken = !lib.hasPrefix "3.6.1" protobuf.version;
};
}

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

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "aioftp";
version = "0.17.1";
version = "0.17.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "87869958fa98c4691acad0815840a94c1b50c6925d037d4dbb51331ddf4911f3";
sha256 = "8433ff21317e71ef1f4d8cb8f7fe58365c04b5174142d9643e22343cfb35da1b";
};
checkInputs = [

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

@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "asdf";
version = "2.7.0";
version = "2.7.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "687d741f19db663b769eb188458dafd4fe5cc10201640ffed3210c7f138f15d0";
sha256 = "4ba2e31cb24b974a10dfae3edee23db2e6bea2d00608604d062366aa3af6e81a";
};
postPatch = ''

4
pkgs/development/python-modules/atlassian-python-api/default.nix
View file

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
version = "1.16.0";
version = "1.16.1";
src = fetchPypi {
inherit pname version;
sha256 = "1sp036192vdl5nqifcswg2j838vf8i9k8bfd0w4qh1vz4f0pjz7y";
sha256 = "b672131be7cc5e239c465909454542623c0aeb0a4d3b05e6a25ee9459959c11d";
};
checkInputs = [ pytestrunner pytest ];

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

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "awkward1";
version = "0.2.33";
version = "0.2.35";
src = fetchPypi {
inherit pname version;
sha256 = "bf3de210d0a88fb14a97c296f54ed2d5b686a785bb5fd7a31277f22b8daa9513";
sha256 = "563868f0f2d0cb398ce3616ee3f9734cc68cee9a612d35cab830ec5c728f1474";
};
nativeBuildInputs = [ cmake ];

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

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.14.43"; # N.B: if you change this, change botocore too
version = "1.14.51"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
sha256 = "a6c9a3d3abbad2ff2e5751af599492a9271633a7c9fef343482524464c53e451";
sha256 = "a6bdb808e948bd264af135af50efb76253e85732c451fa605b7a287faf022432";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.17.43"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.17.51"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "3fb144d2b5d705127f394f7483737ece6fa79577ca7c493e4f42047ac8636200";
sha256 = "198a62d387eb64b4c1dde33a9c41e96b07884c68c1442dd7c7d38123592aae7c";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/catalogue/default.nix
View file

@ -2,8 +2,8 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, pytestCheckHook
, importlib-metadata
, pytestCheckHook
}:
buildPythonPackage rec {

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

@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "cheroot";
version = "8.4.4";
version = "8.4.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "ca92669cc90fbd0920fda1ebcc431147e7d3ae6887216ce404f85f1b3133fa93";
sha256 = "b6c18caf5f79cdae668c35fc8309fc88ea4a964cce9e2ca8504fab13bcf57301";
};
nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ];

2
pkgs/development/python-modules/clifford/default.nix
View file

@ -3,6 +3,7 @@
, fetchPypi
, numpy
, scipy
, sparse
, numba
, future
, h5py
@ -23,6 +24,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
numpy
scipy
sparse
numba
future
h5py

2
pkgs/development/python-modules/cloudflare/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, beautifulsoup4
, requests
, future
, pyyaml
@ -17,6 +18,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
beautifulsoup4
requests
future
pyyaml

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

@ -6,11 +6,11 @@
}:
buildPythonPackage rec {
pname = "cmd2";
version = "1.3.3";
version = "1.3.8";
src = fetchPypi {
inherit pname version;
sha256 = "38015008ff4639edfd66591063a0e9bb75a62dccb14ee3ec7bf3a6cb130de5cf";
sha256 = "b6f6254def8ba479088702f97bca1b999c12e0c38ac5d82dc50a44db93c7108c";
};
LC_ALL="en_US.UTF-8";

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "codecov";
version = "2.1.8";
version = "2.1.9";
src = fetchPypi {
inherit pname version;
sha256 = "0be9cd6358cc6a3c01a1586134b0fb524dfa65ccbec3a40e9f28d5f976676ba2";
sha256 = "355fc7e0c0b8a133045f0d6089bde351c845e7b52b99fec5903b4ea3ab5f6aab";
};
checkInputs = [ unittest2 ]; # Tests only

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

@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "cryptography";
version = "3.0"; # Also update the hash in vectors.nix
version = "3.1"; # Also update the hash in vectors.nix
src = fetchPypi {
inherit pname version;
sha256 = "0lr06a9317n2iwfqwz9mpalqm99acqwk1478arvyj1jj0ay4v4lf";
sha256 = "021yccbqr446zh1c9l8yj79h9bgbd1cwv0ppj168w9y67i3rlh16";
};
outputs = [ "out" "dev" ];

2
pkgs/development/python-modules/cryptography/vectors.nix
View file

@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "0fa26ggksyhknb43cja1g0jwp35qkdbavivdq6yynj1igd2z1vsj";
sha256 = "10hixzqf2ppw8j61f6p04rgnq8ra6pjml68330s5af8df8xbqq16";
};
# No tests included

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

@ -30,11 +30,11 @@
buildPythonPackage rec {
pname = "datashader";
version = "0.11.0";
version = "0.11.1";
src = fetchPypi {
inherit pname version;
sha256 = "05p81aff7x70yj8llclclgz6klvfzqixwxfng6awn3y5scv18w40";
sha256 = "b1f80415f72f92ccb660aaea7b2881ddd35d07254f7c44101709d42e819d6be6";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/django-dynamic-preferences/default.nix
View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-dynamic-preferences";
version = "1.10";
version = "1.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "2310291c7f40606be045938d65e117383549aa8a979c6c4b700464c6a6204a34";
sha256 = "e4b2bb7b2563c5064ba56dd76441c77e06b850ff1466a386a1cd308909a6c7de";
};
propagatedBuildInputs = [ six django persisting-theory ];

4
pkgs/development/python-modules/django/2_2.nix
View file

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
version = "2.2.14";
version = "2.2.15";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "14b1w00hrf4n7hla6d6nf2p5r4k6jh3fcmv7bd1v04vpcpvfrw7d";
sha256 = "3e2f5d172215862abf2bac3138d8a04229d34dbd2d0dab42c6bf33876cc22323";
};
patches = stdenv.lib.optional withGdal

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "django-nose";
version = "1.4.6";
version = "1.4.7";
src = fetchPypi {
inherit pname version;
sha256 = "01wah0ci5xdpiikash68x6lprxlvnkxg72ly9kjrc9lklq34m4sq";
sha256 = "a4885cd002d65fd2de96e2bb2563ef477c3fbe207009360c015fca5c3b5561b7";
};
# vast dependency list

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

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "docker";
version = "4.3.0";
version = "4.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "431a268f2caf85aa30613f9642da274c62f6ee8bae7d70d968e01529f7d6af93";
sha256 = "bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2";
};
nativeBuildInputs = lib.optional isPy27 mock;

13
pkgs/development/python-modules/dogpile.cache/default.nix
View file

@ -1,10 +1,19 @@
{ stdenv, buildPythonPackage, fetchPypi
, pytest, pytestcov, mock, Mako, decorator, stevedore
{ stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
, pytest
, pytestcov
, mock
, Mako
, decorator
, stevedore
}:
buildPythonPackage rec {
pname = "dogpile.cache";
version = "1.0.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;

3
pkgs/development/python-modules/executor/default.nix
View file

@ -1,8 +1,9 @@
{ lib, buildPythonPackage, fetchFromGitHub, coloredlogs, property-manager, fasteners, pytest, mock, virtualenv }:
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, coloredlogs, property-manager, fasteners, pytest, mock, virtualenv }:
buildPythonPackage rec {
pname = "executor";
version = "21.3";
disabled = isPy27;
src = fetchFromGitHub {
owner = "xolox";

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

@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
buildPythonPackage rec {
pname = "Faker";
version = "4.1.1";
version = "4.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "c006b3664c270a2cfd4785c5e41ff263d48101c4e920b5961cf9c237131d8418";
sha256 = "ff188c416864e3f7d8becd8f9ee683a4b4101a2a2d2bcdcb3e84bb1bdd06eaae";
};
nativeBuildInputs = [ pytestrunner ];

4
pkgs/development/python-modules/flufl/bounce.nix
View file

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "flufl.bounce";
version = "3.0";
version = "3.0.1";
buildInputs = [ nose2 ];
propagatedBuildInputs = [ atpublic zope_interface ];
src = fetchPypi {
inherit pname version;
sha256 = "0k5kjqa3x6gvwwxyzb2vwi1g1i6asm1zw5fivylxz3d583y4kid2";
sha256 = "e432fa1ca25ddbf23e2716b177d4d1c6ab6c078e357df56b0106b92bc10a8f06";
};
}

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

@ -9,11 +9,11 @@
buildPythonApplication rec {
pname = "gdown";
version = "3.12.0";
version = "3.12.2";
src = fetchPypi {
inherit pname version;
sha256 = "bf5f001e3a7add296e5298240c64db88ba88e5c136bd1fe84fcbd542feb6fccd";
sha256 = "4b3a1301e57bfd8dce939bf25ef8fbb4b23967fd0f878eede328bdcc41386bac";
};
propagatedBuildInputs = [ filelock requests tqdm setuptools ];

4
pkgs/development/python-modules/globus-sdk/default.nix
View file

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "globus-sdk";
version = "1.9.0";
version = "1.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "1fm0iqfbzd13m1lkd4h3ss4y9isp5cadd2w2k0qr3yqwfmrqqba2";
sha256 = "883a862ddd17b0f4868ec55d6697a64c13d91c41b9fa5103198d2140053abac2";
};
checkPhase = ''

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

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
version = "2.0.0";
version = "2.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "5af43d30adbb19023f9fec9d481b1d2d35be690d2a8dcdf9d6abc2c1d302cc17";
sha256 = "c590a8ab12a3f776ab35e570d21c0881f9d73c444bd509e54321a4c715233372";
};
checkInputs = [ pytest mock ];

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

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "howdoi";
version = "2.0.4";
version = "2.0.5";
src = fetchPypi {
inherit pname version;
sha256 = "0hq5biy0mpycbji2mikfbflw4r39prylr47iqhlz234kvwdy0jsg";
sha256 = "8e4d048ae7ca6182d648f62a66d07360cca2504fe46649c32748b6ef2735f7f4";
};
postPatch = ''

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

@ -10,7 +10,7 @@ buildPythonPackage rec {
# pytz fake_factory django numpy pytest
# If you need these, you can just add them to your environment.
version = "5.11.0";
version = "5.30.0";
pname = "hypothesis";
# Use github tarballs that includes tests
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "HypothesisWorks";
repo = "hypothesis-python";
rev = "hypothesis-python-${version}";
sha256 = "1ca2dwih65s4r8vazwqm963ywngdr3v854ldnfyny7bvx1v28m8k";
sha256 = "0fmc4jfaksr285fjhp18ibj2rr8cxmbd0pwx370r5wf8jnhm6jb3";
};
postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "identify";
version = "1.4.27";
version = "1.4.29";
src = fetchPypi {
inherit pname version;
sha256 = "4c3646d765127b003d2bed8db1e125d68f5f83ad0cd85e21c908ef87a5e24be1";
sha256 = "9f5fcf22b665eaece583bd395b103c2769772a0f646ffabb5b1f155901b07de2";
};
# Tests not included in PyPI tarball

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

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "inflection";
version = "0.5.0";
version = "0.5.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "f576e85132d34f5bf7df5183c2c6f94cfb32e528f53065345cf71329ba0b8924";
sha256 = "1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417";
};
checkInputs = [ pytest ];

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

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "ipyvuetify";
version = "1.5.0";
version = "1.5.1";
# GitHub version tries to run npm (Node JS)
src = fetchPypi {
inherit pname version;
sha256 = "5c311308d3ec9c92e48ab6ca021b5b51295e9e39de640f69827e30d5f03a244b";
sha256 = "593f5d6761e304cbb78bca967030485d8835e8d310ef7d83ac1b0e6a13e4911c";
};
propagatedBuildInputs = [ ipyvue ];

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jq";
version = "0.1.6";
version = "0.1.8";
src = fetchPypi {
inherit pname version;
sha256 = "34bdf9f9e49e522e1790afc03f3584c6b57329215ea0567fb2157867d6d6f602";
sha256 = "9b6bb376237133080185ab556ca2a724e8be5b31946eb2053d4a1f17ae9df9a8";
};
patches = [ ./jq-py-setup.patch ];

4
pkgs/development/python-modules/junos-eznc/default.nix
View file

@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "junos-eznc";
version = "2.5.1";
version = "2.5.3";
src = fetchPypi {
inherit pname version;
sha256 = "0e3a1e74b9254b4832a6cdbf8e6f26f9a269f574cb8cf2dd292dc131e0f4b245";
sha256 = "521659fe94da796897abc16773c3d84fa44d3e1f5386c71fbaef44cb80159855";
};

4
pkgs/development/python-modules/jupyter_client/5.nix
View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "jupyter_client";
version = "5.3.4";
version = "5.3.5";
src = fetchPypi {
inherit pname version;
sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910";
sha256 = "5efdf4131124d4a0d5789101e74827022585f172d2f4b60cf6fa98e0a7511b25";
};
propagatedBuildInputs = [

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "jupyter_client";
version = "6.1.6";
version = "6.1.7";
src = fetchPypi {
inherit pname version;
sha256 = "b360f8d4638bc577a4656e93f86298db755f915098dc763f6fc05da0c5d7a595";
sha256 = "49e390b36fe4b4226724704ea28d9fb903f1a3601b6882ce3105221cd09377a1";
};
propagatedBuildInputs = [

2
pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix
View file

@ -11,7 +11,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "12xby5j7wmi6qsbb2fjd5qbckkcg5fmdij8qpc9n7ci8vfxq303m";
sha256 = "758081bbdb28b26313bb18c9d8aa2b8fcdc9162e4d3ab196c626567e64f1ab8b";
};
# No tests implemented

Some files were not shown because too many files have changed in this diff Show more