nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 07:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-12-27 18:11:34 +01:00
commit 10afccf145
84 changed files with 1945 additions and 7207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/CODEOWNERS vendored
View File

@ -55,7 +55,7 @@
/pkgs/top-level/python-packages.nix @FRidh
/pkgs/development/interpreters/python @FRidh
/pkgs/development/python-modules @FRidh
/doc/languages-frameworks/python.md @FRidh
/doc/languages-frameworks/python.section.md @FRidh
# Haskell
/pkgs/development/compilers/ghc @peti @ryantm @basvandijk

2
nixos/modules/hardware/video/nvidia.nix
View File

@ -20,6 +20,8 @@ let
kernelPackages.nvidia_x11_legacy304
else if elem "nvidiaLegacy340" drivers then
kernelPackages.nvidia_x11_legacy340
else if elem "nvidiaLegacy390" drivers then
kernelPackages.nvidia_x11_legacy390
else null;
nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;

7
nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix Normal file
View File

@ -0,0 +1,7 @@
{ pkgs, ... }:
{
imports = [ ./sd-image-aarch64.nix ];
boot.kernelPackages = pkgs.linuxPackages_latest;
}

1
nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
View File

@ -26,7 +26,6 @@ in
boot.loader.generic-extlinux-compatible.enable = true;
boot.consoleLogLevel = lib.mkDefault 7;
boot.kernelPackages = pkgs.linuxPackages_latest;
# The serial ports listed here are:
# - ttyS0: for Tegra (Jetson TX1)

12
nixos/modules/profiles/hardened.nix
View File

@ -20,6 +20,12 @@ with lib;
security.allowUserNamespaces = mkDefault false;
security.protectKernelImage = mkDefault true;
security.allowSimultaneousMultithreading = mkDefault false;
security.virtualization.flushL1DataCache = mkDefault "always";
security.apparmor.enable = mkDefault true;
boot.kernelParams = [
@ -28,9 +34,6 @@ with lib;
# Disable legacy virtual syscalls
"vsyscall=none"
# Disable hibernation (allows replacing the running kernel)
"nohibernate"
];
boot.blacklistedKernelModules = [
@ -44,9 +47,6 @@ with lib;
# (e.g., parent/child)
boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkOverride 500 1;
# Prevent replacing the running kernel image w/o reboot
boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true;
# Restrict access to kernel ring buffer (information leaks)
boot.kernel.sysctl."kernel.dmesg_restrict" = mkDefault true;

108
nixos/modules/security/misc.nix
View File

@ -22,18 +22,104 @@ with lib;
a user namespace fails with "no space left on device" (ENOSPC).
'';
};
security.protectKernelImage = mkOption {
type = types.bool;
default = false;
description = ''
Whether to prevent replacing the running kernel image.
'';
};
security.allowSimultaneousMultithreading = mkOption {
type = types.bool;
default = true;
description = ''
Whether to allow SMT/hyperthreading. Disabling SMT means that only
physical CPU cores will be usable at runtime, potentially at
significant performance cost.
</para>
<para>
The primary motivation for disabling SMT is to mitigate the risk of
leaking data between threads running on the same CPU core (due to
e.g., shared caches). This attack vector is unproven.
</para>
<para>
Disabling SMT is a supplement to the L1 data cache flushing mitigation
(see <xref linkend="opt-security.virtualization.flushL1DataCache"/>)
versus malicious VM guests (SMT could "bring back" previously flushed
data).
</para>
<para>
'';
};
security.virtualization.flushL1DataCache = mkOption {
type = types.nullOr (types.enum [ "never" "cond" "always" ]);
default = null;
description = ''
Whether the hypervisor should flush the L1 data cache before
entering guests.
See also <xref linkend="opt-security.allowSimultaneousMultithreading"/>.
</para>
<para>
<variablelist>
<varlistentry>
<term><literal>null</literal></term>
<listitem><para>uses the kernel default</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"never"</literal></term>
<listitem><para>disables L1 data cache flushing entirely.
May be appropriate if all guests are trusted.</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"cond"</literal></term>
<listitem><para>flushes L1 data cache only for pre-determined
code paths. May leak information about the host address space
layout.</para></listitem>
</varlistentry>
<varlistentry>
<term><literal>"always"</literal></term>
<listitem><para>flushes L1 data cache every time the hypervisor
enters the guest. May incur significant performance cost.
</para></listitem>
</varlistentry>
</variablelist>
'';
};
};
config = mkIf (!config.security.allowUserNamespaces) {
# Setting the number of allowed user namespaces to 0 effectively disables
# the feature at runtime. Note that root may raise the limit again
# at any time.
boot.kernel.sysctl."user.max_user_namespaces" = 0;
config = mkMerge [
(mkIf (!config.security.allowUserNamespaces) {
# Setting the number of allowed user namespaces to 0 effectively disables
# the feature at runtime. Note that root may raise the limit again
# at any time.
boot.kernel.sysctl."user.max_user_namespaces" = 0;
assertions = [
{ assertion = config.nix.useSandbox -> config.security.allowUserNamespaces;
message = "`nix.useSandbox = true` conflicts with `!security.allowUserNamespaces`.";
}
];
};
assertions = [
{ assertion = config.nix.useSandbox -> config.security.allowUserNamespaces;
message = "`nix.useSandbox = true` conflicts with `!security.allowUserNamespaces`.";
}
];
})
(mkIf config.security.protectKernelImage {
# Disable hibernation (allows replacing the running kernel)
boot.kernelParams = [ "nohibernate" ];
# Prevent replacing the running kernel image w/o reboot
boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true;
})
(mkIf (!config.security.allowSimultaneousMultithreading) {
boot.kernelParams = [ "nosmt" ];
})
(mkIf (config.security.virtualization.flushL1DataCache != null) {
boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualization.flushL1DataCache}" ];
})
];
}

8
nixos/release.nix
View File

@ -172,6 +172,14 @@ in rec {
inherit system;
});
sd_image_new_kernel = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
module = {
aarch64-linux = ./modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix;
}.${system};
type = "minimal-new-kernel";
inherit system;
});
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
ova = forMatchingSystems [ "x86_64-linux" ] (system:

6
nixos/tests/hardened.nix
View File

@ -70,5 +70,11 @@ import ./make-test.nix ({ pkgs, ...} : {
$machine->fail("su -l nobody -s /bin/sh -c 'nix ping-store'");
$machine->succeed("su -l alice -c 'nix ping-store'") =~ "OK";
};
# Test kernel image protection
subtest "kernelimage", sub {
$machine->fail("systemctl hibernate");
$machine->fail("systemctl kexec");
};
'';
})

4
pkgs/applications/audio/csound/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# When updating, please check if https://github.com/csound/csound/issues/1078
# has been fixed in the new version so we can use the normal fluidsynth
# version and remove fluidsynth 1.x from nixpkgs again.
version = "6.12.0";
version = "6.12.2";
enableParallelBuilding = true;
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "csound";
repo = "csound";
rev = version;
sha256 = "0pv4s54cayvavdp6y30n3r1l5x83x9whyyd2v24y0dh224v3hbxi";
sha256 = "01krxcf0alw9k7p5sv0s707600an4sl7lhw3bymbwgqrj0v2p9z2";
};
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

4
pkgs/applications/audio/kid3/default.nix
View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
name = "kid3-${version}";
version = "3.6.2";
version = "3.7.0";
src = fetchurl {
url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
sha256 = "19yq39fqj19g98cxd4cdgv0f935ckfw0c43cxaxbf27x5f5dj0yz";
sha256 = "1bj4kq9hklgfp81rbxcjzbxmdgxjqksx7cqnw3m9dc0pnns5jx0x";
};
buildInputs = with stdenv.lib;

4
pkgs/applications/editors/emacs/macport.nix
View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
emacsVersion = "26.1";
emacsName = "emacs-${emacsVersion}";
macportVersion = "7.2";
macportVersion = "7.4";
name = "emacs-mac-${emacsVersion}-${macportVersion}";
src = fetchurl {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
sha256 = "0j4dcjv7kh84d6lzzxdzambk6ybbdr2j7r63nkbivssjv29z7zag";
sha256 = "1xl3rfqw1f3jil20xf6iy0f1hdk9adj8rnv7xhcjq4pymj4w8ka6";
};
hiresSrc = fetchurl {

4
pkgs/applications/editors/featherpad/default.nix
View File

@ -3,13 +3,13 @@
with qt5;
stdenv.mkDerivation rec {
version = "0.9.1";
version = "0.9.2";
name = "featherpad-${version}";
src = fetchFromGitHub {
owner = "tsujan";
repo = "FeatherPad";
rev = "V${version}";
sha256 = "053j14f6fw31cdnfr8hqpxw6jh2v65z43qchdsymbrk5zji8gxla";
sha256 = "1kpv8x3m4hiz7q9k7qadgbrys5nyzm7v5mhjyk22hawnp98m9x4q";
};
nativeBuildInputs = [ qmake pkgconfig qttools ];
buildInputs = [ qtbase qtsvg qtx11extras ];

6
pkgs/applications/misc/alacritty/default.nix
View File

@ -43,16 +43,16 @@ let
];
in buildRustPackage rec {
name = "alacritty-${version}";
version = "0.2.3";
version = "0.2.4";
src = fetchFromGitHub {
owner = "jwilm";
repo = "alacritty";
rev = "v${version}";
sha256 = "0p9q5cpxw5v2ka1ylaa009sfbncnlrva9yam4hag6npcnd8x4f95";
sha256 = "1mf0x8dc196qf08lqpm0n4a5954cx9qfb09dq8ab7mp3xnyrnqzx";
};
cargoSha256 = "0664fi16kyly8hhfj0hgddsnfdk3y0z31758gvb0xq13ssdb6sv6";
cargoSha256 = "0p3bygvmpmy09h7972nhmma51lxp8q91cdlaw3s6p35i79hq3bmp";
nativeBuildInputs = [
cmake

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

@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
version = "3.31.0";
version = "3.36.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
sha256 = "1xg1bx0klvrywqry5rhci37fr7shpvb2wbx4bva20vhqkal169rw";
sha256 = "0fbf4b29vkka3gg8c5n9dc7qhv43jpw6naz6w83jkz7andypikb8";
};
patches = [

4
pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
View File

@ -6,7 +6,7 @@ index 938ab24..1e095f8 100644
description = _('Extract common e-book formats from archive files '
'(ZIP/RAR). Also try to autodetect if they are actually '
'CBZ/CBR files.')
- file_types = set(['zip', 'rar'])
+ file_types = set(['zip'])
- file_types = {'zip', 'rar'}
+ file_types = {'zip'}
supported_platforms = ['windows', 'osx', 'linux']
on_import = True

14
pkgs/applications/misc/cura/default.nix
View File

@ -2,24 +2,26 @@
mkDerivation rec {
name = "cura-${version}";
version = "3.4.1";
version = "3.6.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = version;
sha256 = "03s9nf1aybbnbf1rzqja41m9g6991bbvrcly1lcrfqksianfn06w";
sha256 = "0wzkbqdd1670smw1vnq634rkpcjwnhwcvimhvjq904gy2fylgr90";
};
materials = fetchFromGitHub {
owner = "Ultimaker";
repo = "fdm_materials";
rev = "3.4.1";
sha256 = "1pw30clxqd7qgnidsyx6grizvlgfn8rhj6rd5ppkvv3rdjh0gj28";
rev = version;
sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12";
};
buildInputs = [ qtbase qtquickcontrols2 ];
propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ];
propagatedBuildInputs = with python3.pkgs; [
libsavitar numpy-stl pyserial requests uranium zeroconf
];
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
cmakeFlags = [
@ -44,7 +46,7 @@ mkDerivation rec {
meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework";
homepage = https://github.com/Ultimaker/Cura;
license = licenses.agpl3;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};

12
pkgs/applications/misc/curaengine/default.nix
View File

@ -2,23 +2,15 @@
stdenv.mkDerivation rec {
name = "curaengine-${version}";
version = "3.4.1";
version = "3.6.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4";
sha256 = "1iwmblvs3qw57698i8bbazyxha18bj9irnkcscdb0596g8q93fcm";
};
patches = [
# Fixed upstream, but not yet released
(fetchpatch {
url = "https://github.com/Ultimaker/CuraEngine/commit/5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch";
sha256 = "1hxbslzhkvdg8p33mvlbrpw62gwfqpsdbfca6yhdng9hifl86j3f";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ libarcus stb ];

10
pkgs/applications/misc/dmrconfig/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "dmrconfig-${version}";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "sergev";
repo = "dmrconfig";
rev = version;
sha256 = "1bb3hahfdb5phxyzp1m5ibqwz3mcqplzaibb1aq7w273xcfrd9l9";
sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab";
};
buildInputs = [
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace Makefile \
--replace /usr/local/bin/dmrconfig $out/bin/dmrconfig \
--replace "\$(shell git describe --tags --abbrev=0)" ${version} \
--replace "\$(shell git rev-list HEAD --count)" 0
--replace /usr/local/bin/dmrconfig $out/bin/dmrconfig
'';
makeFlags = "VERSION=${version} GITCOUNT=0";
installPhase = ''
mkdir -p $out/bin $out/lib/udev/rules.d
make install

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gpsprune-${version}";
version = "19.1";
version = "19.2";
src = fetchurl {
url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
sha256 = "1drw30z21sdzjc2mcm13yqb5aipvcxmslb2yn6xs3b6b2mx3h2zy";
sha256 = "1q2kpkkh75b9l1x7fkmv88s8k84gzcdnrg5sgf8ih0zrp49lawg9";
};
nativeBuildInputs = [ makeWrapper ];

7
pkgs/applications/misc/opentx/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, cmake, gcc-arm-embedded, binutils-arm-embedded, python
, qt5, SDL, gmock
, qt5, SDL, gtest
, dfu-util, avrdude
}:
@ -29,7 +29,7 @@ in stdenv.mkDerivation {
buildInputs = with qt5; [
python python.pkgs.pyqt4
qtbase qtmultimedia qttranslations
SDL gmock
SDL
];
postPatch = ''
@ -38,11 +38,12 @@ in stdenv.mkDerivation {
'';
cmakeFlags = [
"-DGTEST_ROOT=${gtest.src}/googletest"
"-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations"
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
"-DNANO=OFF"
"-DNANO=NO"
];
meta = with stdenv.lib; {

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
version = "4.2.1";
version = "4.3.0";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
rev = "v${version}";
sha256 = "1rmsrpf5vlqhnyyrhq8apndny88ld2qvfjx6258653pqbimv7mx5";
sha256 = "1ild2p2lv89yj74fbbdsg3jb8dxpzdamsw0l0xs5h20fd2lsrwcd";
};
nativeBuildInputs = [

8
pkgs/applications/networking/cluster/minishift/default.nix
View File

@ -4,10 +4,9 @@
}:
let
version = "1.27.0";
version = "1.29.0";
# Update these on version bumps according to Makefile
b2dIsoVersion = "v1.3.0";
centOsIsoVersion = "v1.13.0";
openshiftVersion = "v3.11.0";
@ -19,7 +18,7 @@ in buildGoPackage rec {
owner = "minishift";
repo = "minishift";
rev = "v${version}";
sha256 = "1zd9fjw90h8dlr5w7pdf1agvm51b1zckf3grwwjdg64jqpzdwg9f";
sha256 = "17scvv60hgk7s9fy4s9z26sc8a69ryh33rhr1f7p92kb5wfh2x40";
};
nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
@ -41,7 +40,6 @@ in buildGoPackage rec {
buildFlagsArray = ''
-ldflags=
-X ${goPackagePath}/pkg/version.minishiftVersion=${version}
-X ${goPackagePath}/pkg/version.b2dIsoVersion=${b2dIsoVersion}
-X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}
-X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}
'';
@ -65,7 +63,7 @@ in buildGoPackage rec {
or develop with it, day-to-day, on your local host.
'';
homepage = https://github.com/minishift/minishift;
maintainers = with maintainers; [ fpletz ];
maintainers = with maintainers; [ fpletz vdemeester ];
platforms = platforms.linux;
license = licenses.asl20;
};

4
pkgs/applications/networking/insync/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "insync-${version}";
version = "1.4.5.37069";
version = "1.5.5.37367";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
sha256 = "0mkqgpq4isngkj20c0ygmxf4cj975d446svhwvl3cqdrjkjm1ybd";
sha256 = "1yz8l8xjr0pm30hvv4w59wzs569xzkpn8lv12pyl82r1l16h5zp3";
}
else
throw "${name} is not supported on ${stdenv.hostPlatform.system}";

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

@ -10,13 +10,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
version = "4.1.4";
version = "4.1.5";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qbittorrent";
rev = "release-${version}";
sha256 = "1hclyahgzj775h1fnv2rck9cw3r2yp2r6p1q263mj890n32gf3hp";
sha256 = "09zcygaxfv9g6av0vsvlyzv4v65wvj766xyfx31yz5ig3xan6ak1";
};
# NOTE: 2018-05-31: CMake is working but it is not officially supported

4
pkgs/applications/science/biology/igv/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "igv-${version}";
version = "2.4.15";
version = "2.4.16";
src = fetchurl {
url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
sha256 = "000l9hnkjbl9js7v8fyssgl4imrl0qd15mgz37qx2bwvimdp75gh";
sha256 = "0bsl20zw7sgw16xadh1hmlg6d6ijyb1dhpnyvf4kxk3nk0abrmn1";
};
buildInputs = [ unzip jre ];

4
pkgs/applications/video/clipgrab/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "clipgrab-${version}";
version = "3.7.1";
version = "3.7.2";
src = fetchurl {
sha256 = "0bhzkmcinlsfp5ldgqp59xnkaz6ikzdnq78drcdf1w7q4z05ipxd";
sha256 = "1xkap4zgx8k0h0qfcqfwi3lj7s3mqsj0dp1cddiqmxbibbmg3rcc";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${name}.tar.gz";
};

6
pkgs/build-support/docker/default.nix
View File

@ -157,7 +157,7 @@ rec {
};
inherit fromImage fromImageName fromImageTag;
buildInputs = [ utillinux e2fsprogs jshon rsync ];
buildInputs = [ utillinux e2fsprogs jshon rsync jq ];
} ''
rm -rf $out
@ -202,8 +202,8 @@ rec {
extractionID=$((extractionID + 1))
mkdir -p image/$extractionID/layer
tar -C image/$extractionID/layer -xpf $layerTar
rm $layerTar
tar -C image/$extractionID/layer -xpf image/$layerTar
rm image/$layerTar
find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;

8
pkgs/misc/themes/matcha/default.nix → pkgs/data/themes/matcha/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "matcha-${version}";
version = "2018-11-12";
version = "2018-12-24";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "matcha";
rev = version;
sha256 = "04alnwb3r0546y7xk2lx8bsdm47q6j89vld3g19rfb3622iv85la";
sha256 = "178y5s5jfprkw8y6clqb8ss4kvfswivfrh6cn67fk4z7wg72i3yc";
};
buildInputs = [ gdk_pixbuf librsvg ];
@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
installPhase = ''
patchShebangs .
substituteInPlace Install --replace '$HOME/.themes' "$out/share/themes"
./Install
mkdir -p $out/share/themes
name= ./Install -d $out/share/themes
install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml
'';

4
pkgs/desktops/enlightenment/terminology.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "terminology-${version}";
version = "1.3.0";
version = "1.3.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
sha256 = "07vw28inkimi9avp16j0rqcfqjq16081554qsv29pcqhz18xp59r";
sha256 = "1kclxzadmk272s9spa7n704pcb1c611ixxrq88w5zk22va0i25xm";
};
nativeBuildInputs = [

4
pkgs/development/compilers/gprolog/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "gprolog-1.4.4";
name = "gprolog-1.4.5";
src = fetchurl {
urls = [
"mirror://gnu/gprolog/${name}.tar.gz"
"http://www.gprolog.org/${name}.tar.gz"
];
sha256 = "13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q";
sha256 = "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z";
};
hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";

54
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -51,7 +51,6 @@ self: super: {
clock = dontCheck super.clock;
Dust-crypto = dontCheck super.Dust-crypto;
hasql-postgres = dontCheck super.hasql-postgres;
hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; };
hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; };
hspec-expectations = dontCheck super.hspec-expectations;
HTTP = dontCheck super.HTTP;
@ -869,10 +868,6 @@ self: super: {
testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps];
});
# These packages depend on each other, forming an infinite loop.
scalendar = markBroken (super.scalendar.override { SCalendar = null; });
SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
# Needs QuickCheck <2.10, which we don't have.
edit-distance = doJailbreak super.edit-distance;
blaze-markup = doJailbreak super.blaze-markup;
@ -948,9 +943,9 @@ self: super: {
# hledger needs a newer megaparsec version than we have in LTS 12.x.
hledger-lib = super.hledger-lib.overrideScope (self: super: {
cassava-megaparsec = self.cassava-megaparsec_2_0_0;
hspec-megaparsec = self.hspec-megaparsec_2_0_0;
megaparsec = self.megaparsec_7_0_4;
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
# megaparsec = self.megaparsec_7_0_4;
});
# Copy hledger man pages from data directory into the proper place. This code
@ -979,10 +974,10 @@ self: super: {
cp -v *.info* $out/share/info/
'';
})).overrideScope (self: super: {
cassava-megaparsec = self.cassava-megaparsec_2_0_0;
config-ini = self.config-ini_0_2_4_0;
hspec-megaparsec = self.hspec-megaparsec_2_0_0;
megaparsec = self.megaparsec_7_0_4;
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
# config-ini = self.config-ini_0_2_4_0;
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
# megaparsec = self.megaparsec_7_0_4;
});
hledger-web = overrideCabal super.hledger-web (drv: {
postInstall = ''
@ -1087,19 +1082,15 @@ self: super: {
haddock-library = doJailbreak (dontCheck super.haddock-library);
# haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
# The tool needs a newer hpack version than the one mandated by LTS-12.x.
# Also generate shell completions.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix"
(super.cabal2nix.overrideScope (self: super: {
hpack = self.hpack_0_31_1;
yaml = self.yaml_0_11_0_0;
}));
stack2nix = super.stack2nix.overrideScope (self: super: {
hpack = self.hpack_0_31_1;
yaml = self.yaml_0_11_0_0;
});
# Break out of "aeson <1.3, temporary <1.3".
stack = generateOptparseApplicativeCompletion "stack" (doJailbreak super.stack);
# Break out of tasty >=0.10 && <1.2.
aeson-compat = doJailbreak super.aeson-compat;
# Break out of pretty-show >=1.6 && <1.9
hedgehog = doJailbreak super.hedgehog;
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
stack = generateOptparseApplicativeCompletion "stack" super.stack;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
@ -1131,9 +1122,6 @@ self: super: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [self.QuickCheck];
})) ./patches/sexpr-0.2.1.patch;
# Can be removed once yi-language >= 0.18 is in the LTS
yi-core = super.yi-core.overrideScope (self: super: { yi-language = self.yi-language_0_18_0; });
# https://github.com/haskell/hoopl/issues/50
hoopl = dontCheck super.hoopl;
@ -1143,22 +1131,12 @@ self: super: {
# Generate shell completions
purescript = generateOptparseApplicativeCompletion "purs" super.purescript;
# https://github.com/NixOS/nixpkgs/issues/46467
safe-money-aeson = super.safe-money-aeson.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
safe-money-store = super.safe-money-store.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
safe-money-cereal = super.safe-money-cereal.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
safe-money-serialise = super.safe-money-serialise.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
safe-money-xmlbf = super.safe-money-xmlbf.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
# https://github.com/adinapoli/mandrill/pull/52
mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
});
# Can be removed once vinyl >= 0.10 is in the LTS.
Frames = super.Frames.overrideScope (self: super: { vinyl = self.vinyl_0_10_0; });
# https://github.com/Euterpea/Euterpea2/pull/22
Euterpea = overrideSrc super.Euterpea {
src = pkgs.fetchFromGitHub {

69
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -41,44 +41,39 @@ self: super: {
unix = null;
xhtml = null;
# Use to be a core-library, but no longer is since GHC 8.4.x.
hoopl = self.hoopl_3_10_2_2;
# LTS-12.x versions do not compile.
base-orphans = self.base-orphans_0_8;
brick = self.brick_0_45;
cassava-megaparsec = doJailbreak super.cassava-megaparsec;
config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
contravariant = self.contravariant_1_5;
fgl = self.fgl_5_7_0_1;
free = self.free_5_1;
haddock-library = dontCheck super.haddock-library_1_7_0;
HaTeX = doJailbreak super.HaTeX;
hpack = self.hpack_0_31_1;
hslua = self.hslua_1_0_1;
hslua-module-text = self.hslua-module-text_0_2_0;
hspec = self.hspec_2_6_0;
hspec-contrib = self.hspec-contrib_0_5_1;
hspec-core = self.hspec-core_2_6_0;
hspec-discover = self.hspec-discover_2_6_0;
hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
hspec-meta = self.hspec-meta_2_6_0;
JuicyPixels = self.JuicyPixels_3_3_3;
lens = self.lens_4_17;
megaparsec = dontCheck (doJailbreak super.megaparsec);
pandoc = self.pandoc_2_5;
pandoc-citeproc = self.pandoc-citeproc_0_15;
pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
patience = markBrokenVersion "0.1.1" super.patience;
polyparse = self.polyparse_1_12_1;
primitive = self.primitive_0_6_4_0;
QuickCheck = self.QuickCheck_2_12_6_1;
semigroupoids = self.semigroupoids_5_3_1;
tagged = self.tagged_0_8_6;
vty = self.vty_5_25_1;
wizards = doJailbreak super.wizards;
wl-pprint-extras = doJailbreak super.wl-pprint-extras;
yaml = self.yaml_0_11_0_0;
# base-orphans = self.base-orphans_0_8;
# brick = self.brick_0_45;
# cassava-megaparsec = doJailbreak super.cassava-megaparsec;
# config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
# contravariant = self.contravariant_1_5;
# fgl = self.fgl_5_7_0_1;
# free = self.free_5_1;
# haddock-library = dontCheck super.haddock-library_1_7_0;
# HaTeX = doJailbreak super.HaTeX;
# hpack = self.hpack_0_31_1;
# hslua = self.hslua_1_0_1;
# hslua-module-text = self.hslua-module-text_0_2_0;
# hspec = self.hspec_2_6_0;
# hspec-contrib = self.hspec-contrib_0_5_1;
# hspec-core = self.hspec-core_2_6_0;
# hspec-discover = self.hspec-discover_2_6_0;
# hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
# hspec-meta = self.hspec-meta_2_6_0;
# JuicyPixels = self.JuicyPixels_3_3_3;
# lens = self.lens_4_17;
# megaparsec = dontCheck (doJailbreak super.megaparsec);
# pandoc = self.pandoc_2_5;
# pandoc-citeproc = self.pandoc-citeproc_0_15;
# pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
# patience = markBrokenVersion "0.1.1" super.patience;
# polyparse = self.polyparse_1_12_1;
# semigroupoids = self.semigroupoids_5_3_1;
# tagged = self.tagged_0_8_6;
# vty = self.vty_5_25_1;
# wizards = doJailbreak super.wizards;
# wl-pprint-extras = doJailbreak super.wl-pprint-extras;
# yaml = self.yaml_0_11_0_0;
# https://github.com/tibbe/unordered-containers/issues/214
unordered-containers = dontCheck super.unordered-containers;

1043
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

File diff suppressed because it is too large Load Diff

7105
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/interpreters/gauche/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gauche-${version}";
version = "0.9.6";
version = "0.9.7";
src = fetchurl {
url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
sha256 = "1bwwwvyxsrp2a4cfib6hn0hcgwzmp2znylm088w09f331miji2fd";
sha256 = "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd";
};
nativeBuildInputs = [ pkgconfig texinfo ];

10
pkgs/development/interpreters/python/cpython/3.6/default.nix
View File

@ -69,12 +69,6 @@ in stdenv.mkDerivation {
patches = [
./no-ldconfig.patch
] ++ optionals stdenv.isDarwin [
# Fix for https://bugs.python.org/issue24658
(fetchpatch {
url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
})
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals hasDistutilsCxxPatch [
@ -83,8 +77,8 @@ in stdenv.mkDerivation {
# only works for GCC and Apple Clang. This makes distutils to call C++
# compiler when needed.
(fetchpatch {
url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch";
sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii";
url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
})
];

4
pkgs/development/interpreters/python/cpython/3.7/default.nix
View File

@ -83,8 +83,8 @@ in stdenv.mkDerivation {
# only works for GCC and Apple Clang. This makes distutils to call C++
# compiler when needed.
(fetchpatch {
url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch";
sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii";
url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
})
];

15
pkgs/development/interpreters/ruby/default.nix
View File

@ -32,7 +32,7 @@ let
generic = { version, sha256 }: let
ver = version;
tag = ver.gitTag;
isRuby25 = ver.majMin == "2.5";
atLeast25 = lib.versionAtLeast ver.majMin "2.5";
baseruby = self.override { useRailsExpress = false; };
self = lib.makeOverridable (
{ stdenv, buildPackages, lib
@ -56,7 +56,7 @@ let
rev = tag;
sha256 = sha256.git;
} else fetchurl {
url = "http://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz";
url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz";
sha256 = sha256.src;
};
in
@ -83,6 +83,7 @@ let
++ (op opensslSupport openssl)
++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml)
++ (op atLeast25 autoconf)
# Looks like ruby fails to build on darwin without readline even if curses
# support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're
@ -105,7 +106,7 @@ let
popd
'';
postPatch = if isRuby25 then ''
postPatch = if atLeast25 then ''
sed -i configure.ac -e '/config.guess/d'
cp --remove-destination ${config}/config.guess tool/
cp --remove-destination ${config}/config.sub tool/
@ -220,4 +221,12 @@ in {
git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2";
};
};
ruby_2_6 = generic {
version = rubyVersion "2" "6" "0" "";
sha256 = {
src = "0wn0gxlx6xhhqrm2caxp0h6cj4nw7knnv5gh27qqzj0i9a95phzk";
git = "0bwbl4hz18dd5aij2l4s6xy90dc17d03kk577gdl34l9mbd9m7mn";
};
};
}

2
pkgs/development/interpreters/ruby/patchsets.nix
View File

@ -16,4 +16,6 @@ rec {
"${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
];
"2.6.0" = ops useRailsExpress [ # no Rails Express patchset yet (2018-12-26)
];
}

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "appstream-${version}";
version = "0.12.3";
version = "0.12.4";
src = fetchFromGitHub {
owner = "ximion";
repo = "appstream";
rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
sha256 = "154yfn10vm5v7vwa2jz60bgpcznzm3nkjg31g92rm9b39rd2y1ja";
sha256 = "1ag00w13fqvv584svcml7cykvgy0mi709qsm5mgy2ygy9d8r2vfw";
};
nativeBuildInputs = [

4
pkgs/development/libraries/arrow-cpp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest_static, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
let
parquet-testing = fetchFromGitHub {
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
FLATBUFFERS_HOME = flatbuffers;
GFLAGS_HOME = gflags;
GLOG_HOME = glog;
GTEST_HOME = gtest;
GTEST_HOME = symlinkJoin { name="gtest-wrap"; paths = [ gtest_static gtest_static.dev ]; };
LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; };
RAPIDJSON_HOME = rapidjson;
SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; };

129
pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch Normal file
View File

@ -0,0 +1,129 @@
From 698e34dd6e8d98a1818ae00d3313b69a86340771 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 17 Dec 2018 14:58:14 +0100
Subject: DateTime: include "clock-format" gsettings key here
---
data/io.elementary.granite.gschema.xml | 15 +++++++++++++++
data/meson.build | 4 ++++
lib/DateTime.vala | 4 ++--
meson.build | 11 +++++++++++
meson/post_install.py | 5 +++++
5 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 data/io.elementary.granite.gschema.xml
create mode 100644 data/meson.build
diff --git a/data/io.elementary.granite.gschema.xml b/data/io.elementary.granite.gschema.xml
new file mode 100644
index 0000000..1540fb0
--- /dev/null
+++ b/data/io.elementary.granite.gschema.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <enum id="io.elementary.granite.clock-formats">
+ <value nick="12h" value="0" />
+ <value nick="24h" value="1" />
+ <value nick="ISO8601" value="2" />
+ </enum>
+ <schema id="io.elementary.granite" path="/io/elementary/granite/">
+ <key name="clock-format" enum="io.elementary.granite.clock-formats">
+ <default>"12h"</default>
+ <summary>Whether the clock displays in 12h or 24h format</summary>
+ <description>Whether the clock displays in 12h or 24h format</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 0000000..96cc3b1
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,4 @@
+install_data(
+ rdnn + '.gschema.xml',
+ install_dir: schema_dir
+)
diff --git a/lib/DateTime.vala b/lib/DateTime.vala
index aea2ec6..3d81191 100644
--- a/lib/DateTime.vala
+++ b/lib/DateTime.vala
@@ -104,13 +104,13 @@ namespace Granite.DateTime {
}
/**
- * Gets the //clock-format// key from //org.gnome.desktop.interface// schema
+ * Gets the //clock-format// key from //io.elementary.granite// schema
* and determines if the clock format is 12h based
*
* @return true if the clock format is 12h based, false otherwise.
*/
private static bool is_clock_format_12h () {
- var h24_settings = new Settings ("io.elementary.desktop.wingpanel.datetime");
+ var h24_settings = new Settings ("io.elementary.granite");
var format = h24_settings.get_string ("clock-format");
return (format.contains ("12h"));
}
diff --git a/meson.build b/meson.build
index 8b98eeb..f0abcdf 100644
--- a/meson.build
+++ b/meson.build
@@ -4,6 +4,8 @@ project(
version: '5.2.2'
)
+rdnn = 'io.elementary.' + meson.project_name()
+
if meson.get_compiler('vala').version().version_compare('<0.40.0')
error('vala compiler version 0.40.0 or newer is required.')
endif
@@ -52,10 +54,18 @@ icons_dir = join_paths(
'hicolor'
)
+schema_dir = join_paths(
+ get_option('prefix'),
+ get_option('datadir'),
+ 'glib-2.0',
+ 'schemas'
+)
+
pkgconfig = import('pkgconfig')
i18n = import('i18n')
subdir('lib')
+subdir('data')
subdir('demo')
subdir('icons')
subdir('po')
@@ -68,5 +78,6 @@ endif
meson.add_install_script(
join_paths(meson.current_source_dir(), 'meson', 'post_install.py'),
'--iconsdir', icons_dir,
+ '--schemadir', schema_dir,
)
diff --git a/meson/post_install.py b/meson/post_install.py
index 1864515..5313f96 100755
--- a/meson/post_install.py
+++ b/meson/post_install.py
@@ -6,11 +6,16 @@ import subprocess
parser = argparse.ArgumentParser()
parser.add_argument("--iconsdir", action="store", required=True)
+parser.add_argument("--schemadir", action="store", required=True)
args = vars(parser.parse_args())
icons_dir = args["iconsdir"]
+schema_dir = args["schemadir"]
if not os.environ.get('DESTDIR'):
print('Compiling icon cache ...')
subprocess.run(['gtk-update-icon-cache', icons_dir])
+ print('Compiling GSettings schemas ...')
+ subprocess.run(['glib-compile-schemas', schema_dir])
+
--
2.20.1

36
pkgs/development/libraries/granite/default.nix
View File

@ -1,38 +1,54 @@
{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext }:
{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "granite";
version = "5.2.1";
name = "${pname}-${version}";
version = "5.2.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "18rw1lv6zk5w2cq8bv6b869z3cdikn9gzk30gw1s9f8n06bh737h";
sha256 = "1zp0pp5v3j8k6ail724p7h5jj2zmznj0a2ybwfw5sspfdw5bfydh";
};
cmakeFlags = [
"-DINTROSPECTION_GIRDIR=share/gir-1.0/"
"-DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"
patches = [
# Add Meson support that hit after 5.2.2
(fetchpatch {
url = "https://github.com/elementary/granite/commit/2066b377226cf327cb2d5399b6b40a2d36d47b11.patch";
sha256 = "1bxjgq8wvl1sb79cwhmh9kwawnkkfn7c5q67cyz1fjxmamwyyi85";
})
(fetchpatch {
url = "https://github.com/elementary/granite/commit/f1b29f52e3aaf0f5d6bba44c42617da265f679c8.patch";
sha256 = "0cdp9ny6fj1lpcirab641p1qn1rbsvnsaa03hnr6zsdpim96jlvs";
})
# Resolve the circular dependency between granite and the datetime wingpanel indicator
# See: https://github.com/elementary/granite/pull/242
./02-datetime-clock-format-gsettings.patch
];
nativeBuildInputs = [
cmake
gettext
gobject-introspection
meson
ninja
pkgconfig
python3
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
wrapGAppsHook
];
buildInputs = [
glib
gnome3.libgee
gtk3
hicolor-icon-theme
gnome3.libgee
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
meta = with stdenv.lib; {
description = "An extension to GTK+ used by elementary OS";
longDescription = ''

12
pkgs/development/libraries/gtest/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, cmake, ninja, fetchFromGitHub }:
{ stdenv, cmake, ninja, fetchFromGitHub
, static ? false }:
stdenv.mkDerivation rec {
name = "gtest-${version}";
version = "1.8.1";
@ -12,11 +14,13 @@ stdenv.mkDerivation rec {
sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk";
};
patches = [
./fix-cmake-config-includedir.patch
];
nativeBuildInputs = [ cmake ninja ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
];
cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON";
meta = with stdenv.lib; {
description = "Google's framework for writing C++ tests";

30
pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch Normal file
View File

@ -0,0 +1,30 @@
--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
@@ -106,10 +106,10 @@
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
target_include_directories(gmock SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_include_directories(gmock_main SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
endif()
########################################################################
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -126,10 +126,10 @@
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
target_include_directories(gtest SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_include_directories(gtest_main SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
endif()
target_link_libraries(gtest_main PUBLIC gtest)

4
pkgs/development/libraries/intel-gmmlib/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "intel-gmmlib-${version}";
version = "18.3.0";
version = "18.4.1";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = name;
sha256 = "1x1p4xvi870vjka2ag6rmmw897hl7zhav1sgwhnrzrggsx9jrw80";
sha256 = "1nxbz54a0md9hf0asdbyglvi6kiggksy24ffmk4wzvkai6vinm17";
};
nativeBuildInputs = [ cmake ];

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

@ -1,13 +1,13 @@
{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
let version = "4.0.3"; in
let version = "4.0.4"; in
stdenv.mkDerivation {
name = "libcec-${version}";
src = fetchurl {
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
sha256 = "1713qs4nrynkcr3mgs1i7xj10lcyaxqipwiz9p0lfn4xrzjdd47g";
sha256 = "02j09y06csaic4m0fyb4dr9l3hl15nxbbniwq0i1qlccpxjak0j3";
};
nativeBuildInputs = [ pkgconfig ];

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "lmdb-${version}";
version = "0.9.22";
version = "0.9.23";
src = fetchFromGitHub {
owner = "LMDB";
repo = "lmdb";
rev = "LMDB_${version}";
sha256 = "0lng4ra2qrbqcf8klvqp68qarha0z4bkqhhv8lhh45agsxyrhfkj";
sha256 = "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6";
};
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
let
name = "log4cplus-2.0.2";
name = "log4cplus-2.0.3";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
sha256 = "0y9yy32lhgrcss8i2gcc9incdy55rcrr16dx051gkia1vdzfkay4";
sha256 = "0rwzwskvv94cqg2nn7jsvzlak7y01k37v345fcm040klrjvkbc3w";
};
meta = {

4
pkgs/development/libraries/qt-5/README.md
View File

@ -5,7 +5,7 @@
Let `$major` be the major version number, e.g. `5.9`.
1. Change the version number in the `$major/fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/qt-5/$major`
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$major`
from the top of the Nixpkgs tree.
See below if it is necessary to update any patches.
@ -16,7 +16,7 @@ Let `$major` be the new major version number, e.g. `5.10`.
1. Copy the subdirectory from the previous major version to `$major`.
2. Change the version number in `$major/fetch.sh`.
3. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/qt-5/$major`
3. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$major`
from the top of the Nixpkgs tree.
4. Add a top-level attribute in `pkgs/top-level/all-packages.nix` for the new
major version.

2
pkgs/development/libraries/science/math/mkl/default.nix
View File

@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation rec {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = if stdenvNoCC.isDarwin
then "0000000000000000000000000000000000000000000000000000"
then "00d49ls9vcjan1ngq2wx2q4p6lnm05zwh67hsmj7bnq43ykrfibw"
else "1amagcaan0hk3x9v7gg03gkw02n066v4kmjb32yyzsy5rfrivb1a";
meta = with stdenvNoCC.lib; {

4
pkgs/development/python-modules/antlr4-python3-runtime/default.nix
View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "antlr4-python3-runtime";
version = "4.7.1";
version = "4.7.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1lrzmagawmavyw1n1z0qarvs2jmbnbv0p89dah8g7klj8hnbf9hv";
sha256 = "02xm7ccsf51vh4xsnhlg6pvchm1x3ckgv9kwm222w5drizndr30n";
};
meta = {

4
pkgs/development/python-modules/breathe/default.nix
View File

@ -1,12 +1,12 @@
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:
buildPythonPackage rec {
version = "4.11.0";
version = "4.11.1";
pname = "breathe";
src = fetchPypi {
inherit pname version;
sha256 = "05x3qrvsriy0cn0p4bxnzhp27pvxbq2vxlxncr2wqh003gpbp4fa";
sha256 = "1mps0cfli6iq2gqsv3d24fs1cp7sq7crd9ji6lw63b9r40998ylv";
};
propagatedBuildInputs = [ docutils six sphinx ];

4
pkgs/development/python-modules/django-extensions/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "django-extensions";
version = "2.1.3";
version = "2.1.4";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0ns1m9sdkcbbz84wvzgxa4f8hf4a8z656jzwx4bw8np9kh96zfjy";
sha256 = "1bp0ybarkrj66qx2gn9954vsjqq2ya1w4bppfhr763mkis8qnb4f";
};
postPatch = ''

4
pkgs/development/python-modules/graph-tool/2.x.x.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "graph-tool";
format = "other";
version = "2.26";
version = "2.27";
meta = with stdenv.lib; {
description = "Python module for manipulation and statistical analysis of graphs";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz";
sha256 = "04s31qwlfcl7bwsggnic8gqcqmx2wsrmfw77nf7vzgnz42bwch27";
};
patches = [

4
pkgs/development/python-modules/influxdb/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "influxdb";
version = "5.2.0";
version = "5.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "0fqnshmsgifvp79pd4g9a1kyfxvpa9vczv0dv8x2jr2c5m1mi99v";
sha256 = "1dp3fakzp0fqdajf6xsfmisdwj1avk4lvxjmw5k9wkhdbpi6vnbm";
};
# ImportError: No module named tests

6
pkgs/development/python-modules/libarcus/default.nix
View File

@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "libarcus";
version = "3.4.1";
version = "3.6.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libArcus";
rev = version;
sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk";
sha256 = "1zbp6axai47k3p2q497wiajls1h17wss143zynbwbwrqinsfiw43";
};
disabled = pythonOlder "3.4.0";
@ -26,7 +26,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Communication library between internal components for Ultimaker software";
homepage = https://github.com/Ultimaker/libArcus;
license = licenses.agpl3;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};

33
pkgs/development/python-modules/libsavitar/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, cmake, sip }:
buildPythonPackage rec {
pname = "libsavitar";
version = "3.6.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libSavitar";
rev = version;
sha256 = "1bz8ga0n9aw65hqzajbr93dcv5g555iaihbhs1jq2k47cx66klzv";
};
postPatch = ''
# To workaround buggy SIP detection which overrides PYTHONPATH
sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
'';
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ sip ];
disabled = pythonOlder "3.4.0";
meta = with stdenv.lib; {
description = "C++ implementation of 3mf loading with SIP python bindings";
homepage = https://github.com/Ultimaker/libSavitar;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar orivej ];
};
}

10
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -8,7 +8,9 @@ let
pname = "PyQt";
version = "5.11.3";
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python sip enum34;
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
sip = pythonPackages.sip.override { sip-module = "PyQt5.sip"; };
in buildPythonPackage {
pname = pname;
@ -32,10 +34,10 @@ in buildPythonPackage {
nativeBuildInputs = [ pkgconfig qmake lndir ];
buildInputs = [ dbus ];
buildInputs = [ dbus sip ];
propagatedBuildInputs = [
sip qtbase qtsvg qtwebkit qtwebengine
qtbase qtsvg qtwebkit qtwebengine
] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;
configurePhase = ''
@ -65,7 +67,7 @@ in buildPythonPackage {
'';
postInstall = ''
ln -s ${sip}/${python.sitePackages}/PyQt5/* $out/${python.sitePackages}/PyQt5
ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/
for i in $out/bin/*; do
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
done

8
pkgs/development/python-modules/pytest-xdist/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock }:
{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, filelock, six }:
buildPythonPackage rec {
pname = "pytest-xdist";
@ -9,9 +9,9 @@ buildPythonPackage rec {
sha256 = "909bb938bdb21e68a28a8d58c16a112b30da088407b678633efb01067e3923de";
};
nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ pytest pytest-forked filelock ];
propagatedBuildInputs = [ execnet ];
nativeBuildInputs = [ setuptools_scm pytest ];
checkInputs = [ pytest filelock ];
propagatedBuildInputs = [ execnet pytest-forked six ];
checkPhase = ''
# Excluded tests access file system

21
pkgs/development/python-modules/pywal/convert.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/pywal/backends/wal.py b/pywal/backends/wal.py
index a75fdc5..4339680 100644
--- a/pywal/backends/wal.py
+++ b/pywal/backends/wal.py
@@ -21,15 +21,7 @@ def imagemagick(color_count, img, magick_command):
def has_im():
"""Check to see if the user has im installed."""
- if shutil.which("magick"):
- return ["magick", "convert"]
-
- if shutil.which("convert"):
- return ["convert"]
-
- logging.error("Imagemagick wasn't found on your system.")
- logging.error("Try another backend. (wal --backend)")
- sys.exit(1)
+ return ["@convert@"]
def gen_colors(img):

15
pkgs/tools/graphics/pywal/default.nix → pkgs/development/python-modules/pywal/default.nix
View File

@ -9,16 +9,21 @@ python3Packages.buildPythonApplication rec {
sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic";
};
# necessary for imagemagick to be found during tests
buildInputs = [ imagemagick ];
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ imagemagick feh ]}" ];
preCheck = ''
mkdir tmp
HOME=$PWD/tmp
'';
patches = [
./convert.patch
./feh.patch
];
postPatch = ''
substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert"
substituteInPlace pywal/wallpaper.py --subst-var-by feh "${feh}/bin/feh"
'';
meta = with lib; {
description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3.";
homepage = https://github.com/dylanaraps/pywal;

39
pkgs/development/python-modules/pywal/feh.patch Normal file
View File

@ -0,0 +1,39 @@
commit c31faa212e09aa62c232d9008e05976b1cdc9ee5
Author: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed Dec 26 12:54:32 2018 +0100
nix: hardcode feh
diff --git a/pywal/wallpaper.py b/pywal/wallpaper.py
index ba61e66..fad34f7 100644
--- a/pywal/wallpaper.py
+++ b/pywal/wallpaper.py
@@ -47,27 +47,7 @@ def xfconf(path, img):
def set_wm_wallpaper(img):
"""Set the wallpaper for non desktop environments."""
- if shutil.which("feh"):
- util.disown(["feh", "--bg-fill", img])
-
- elif shutil.which("nitrogen"):
- util.disown(["nitrogen", "--set-zoom-fill", img])
-
- elif shutil.which("bgs"):
- util.disown(["bgs", "-z", img])
-
- elif shutil.which("hsetroot"):
- util.disown(["hsetroot", "-fill", img])
-
- elif shutil.which("habak"):
- util.disown(["habak", "-mS", img])
-
- elif shutil.which("display"):
- util.disown(["display", "-backdrop", "-window", "root", img])
-
- else:
- logging.error("No wallpaper setter found.")
- return
+ return util.disown(["@feh@", "--bg-fill", img])
def set_desktop_wallpaper(desktop, img):

10
pkgs/development/python-modules/sip/default.nix
View File

@ -1,24 +1,26 @@
{ lib, fetchurl, buildPythonPackage, python, isPyPy }:
{ lib, fetchurl, buildPythonPackage, python, isPyPy, sip-module ? "sip" }:
buildPythonPackage rec {
pname = "sip";
pname = sip-module;
version = "4.19.13";
format = "other";
disabled = isPyPy;
src = fetchurl {
url = "mirror://sourceforge/pyqt/sip/${pname}-${version}/${pname}-${version}.tar.gz";
url = "mirror://sourceforge/pyqt/sip/sip-${version}/sip-${version}.tar.gz";
sha256 = "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3";
};
configurePhase = ''
${python.executable} ./configure.py \
--sip-module PyQt5.sip \
--sip-module ${sip-module} \
-d $out/lib/${python.libPrefix}/site-packages \
-b $out/bin -e $out/include
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/";

10
pkgs/development/python-modules/uranium/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, python, cmake
, pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }:
, pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
buildPythonPackage rec {
version = "3.5.1";
version = "3.6.0";
pname = "uranium";
format = "other";
@ -10,13 +10,13 @@ buildPythonPackage rec {
owner = "Ultimaker";
repo = "Uranium";
rev = version;
sha256 = "1qfci5pl4yhirkkck1rm4i766j8gi56p81mfc6vgbdnhchcjyhy9";
sha256 = "02hid13h8anb9bgv2hhrcdg10bxdxa9hj9pbdv3gw3lpn9r2va98";
};
disabled = pythonOlder "3.5.0";
buildInputs = [ python gettext ];
propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcus ];
nativeBuildInputs = [ cmake doxygen ];
postPatch = ''
@ -30,7 +30,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "A Python framework for building Desktop applications";
homepage = https://github.com/Ultimaker/Uranium;
license = licenses.agpl3;
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};

4
pkgs/development/tools/misc/global/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "global-${version}";
version = "6.6.2";
version = "6.6.3";
src = fetchurl {
url = "mirror://gnu/global/${name}.tar.gz";
sha256 = "0zvi5vxwiq0dy8mq2cgs64m8harxs0fvkmsnvi0ayb0w608lgij3";
sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb";
};
nativeBuildInputs = [ libtool makeWrapper ];

4
pkgs/os-specific/linux/ena/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, kernel }:
stdenv.mkDerivation rec {
version = "1.5.2";
version = "2.0.2";
name = "ena-${version}-${kernel.version}";
src = fetchFromGitHub {
owner = "amzn";
repo = "amzn-drivers";
rev = "ena_linux_${version}";
sha256 = "18wf36092kr3zlpnqdkcdlim3vvjxy5f24zzsv4fwa7xg12mcfjm";
sha256 = "0vb8s0w7ddwajk5gj5nqqlqc63p8p556f9ccwviwda2zvgqmk2pb";
};
hardeningDisable = [ "pic" ];

10
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -58,4 +58,14 @@ rec {
};
};
# Reverts a change related to the overlayfs overhaul in 4.19
# https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626
revert-vfs-dont-open-real = rec {
name = "revert-vfs-dont-open-real";
patch = fetchpatch {
name = name + ".patch";
url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch;
sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq";
};
};
}

3
pkgs/os-specific/linux/lvm2/default.nix
View File

@ -40,7 +40,8 @@ stdenv.mkDerivation {
sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
'';
enableParallelBuilding = true;
# gcc: error: ../../device_mapper/libdevice-mapper.a: No such file or directory
enableParallelBuilding = false;
#patches = [ ./purity.patch ];
patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [

4
pkgs/os-specific/linux/ndiswrapper/default.nix
View File

@ -34,8 +34,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "pgiri";
repo = "ndiswrapper";
rev = "f4d16afb29ab04408d02e38d4ea1148807778e21";
sha256 = "0iaw0vhchmqf1yh14v4a6whnbg4sx1hag8a4hrsh4fzgw9fx0ij4";
rev = "5e29f6a9d41df949b435066c173e3b1947f179d3";
sha256 = "0sprrmxxkf170bmh1nz9xw00gs89dddr84djlf666bn5bhy6jffi";
};
buildInputs = [ perl libelf ];

22
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -16,17 +16,20 @@ let
in
rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_410 else stable_390;
stable = if stdenv.hostPlatform.system != "x86_64-linux"
then legacy_390
else generic {
version = "410.78";
sha256_64bit = "1ciabnmvh95gsfiaakq158x2yws3m9zxvnxws3p32lz9riblpdjx";
settingsSha256 = "1677g7rcjbcs5fja1s4p0syhhz46g9x2qqzyn3wwwrjsj7rwaz77";
persistencedSha256 = "01kvd3zp056i4n8vazj7gx1xw0h4yjdlpazmspnsmwg24ijb82x4";
};
stable_410 = generic {
version = "410.78";
sha256_64bit = "1ciabnmvh95gsfiaakq158x2yws3m9zxvnxws3p32lz9riblpdjx";
settingsSha256 = "1677g7rcjbcs5fja1s4p0syhhz46g9x2qqzyn3wwwrjsj7rwaz77";
persistencedSha256 = "01kvd3zp056i4n8vazj7gx1xw0h4yjdlpazmspnsmwg24ijb82x4";
};
# No active beta right now
beta = stable;
# Last one supporting x86
stable_390 = generic {
legacy_390 = generic {
version = "390.87";
sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw";
sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q";
@ -36,9 +39,6 @@ rec {
patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
};
# No active beta right now
beta = stable;
legacy_340 = generic {
version = "340.107";
sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd";

4
pkgs/servers/dns/bind/default.nix
View File

@ -8,14 +8,14 @@
assert enableSeccomp -> libseccomp != null;
assert enablePython -> python3 != null;
let version = "9.12.3"; in
let version = "9.12.3-P1"; in
stdenv.mkDerivation rec {
name = "bind-${version}";
src = fetchurl {
url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
sha256 = "0f5rjs6zsq8sp6iv5r4q5y65xv05dk2sgvsj6lcir3i564k7d00f";
sha256 = "0wzdbn6ig851354cjdys5q3gvqcvl2gmmih1gzr8ldl7sy4r7dvc";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

4
pkgs/servers/http/couchdb/2.0.0.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "couchdb-${version}";
version = "2.2.0";
version = "2.3.0";
src = fetchurl {
url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
sha256 = "11brqv302j999sd5x8amhj9iqns9cbrlkjg2l9a8xbvkmf5fng0f";
sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "check_ssl_cert-${version}";
version = "1.78.0";
version = "1.79.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "v${version}";
sha256 = "0s03625xzb30f6dbn34zkp0wcajzlir7wzkgi9rmms76gk4jqq6h";
sha256 = "0pqk09xypa9vdxw5lbaa1j8w3mbmdwh2y1sq768rqq0izyfynf4d";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/shells/zsh/grml-zsh-config/default.nix
View File

@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
name = "grml-zsh-config-${version}";
version = "0.15.1";
version = "0.15.2";
src = fetchFromGitHub {
owner = "grml";
repo = "grml-etc-core";
rev = "v${version}";
sha256 = "13mm1vjmb600l4g0ssr56xrlx6lwpv1brrpmf2v2pp2d5ki0d47x";
sha256 = "15cr8pv1idshhq5d9sq4smgfl00iz55ji5mrxclsl3a35wg0djnw";
};
buildInputs = [ zsh coreutils txt2tags procps ]

24
pkgs/tools/X11/wpgtk/default.nix
View File

@ -1,24 +1,17 @@
{ stdenv, python36Packages, fetchFromGitHub, pywal, feh, libxslt, imagemagick,
{ stdenv, python3Packages, fetchFromGitHub, feh, libxslt,
gobject-introspection, gtk3, wrapGAppsHook, gnome3 }:
python36Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "wpgtk";
version = "5.7.4";
version = "5.8.6";
src = fetchFromGitHub {
owner = "deviantfero";
repo = "wpgtk";
rev = "${version}";
sha256 = "0c0kmc18lbr7nk3hh44hai9z06lfsgwxnjdv02hpjwrxg40zh726";
sha256 = "1i29zdmgm8knp6mmz3nfl0dwn3vd2wcvf5vn0gg8sv2wjgk3i10y";
};
pythonPath = [
python36Packages.pygobject3
python36Packages.pillow
pywal
imagemagick
];
buildInputs = [
wrapGAppsHook
gtk3
@ -27,11 +20,20 @@ python36Packages.buildPythonApplication rec {
libxslt
];
propagatedBuildInputs = with python3Packages; [
pygobject3
pillow
pywal
];
# The $HOME variable must be set to build the package. A "permission denied" error will occur otherwise
preBuild = ''
export HOME=$(pwd)
'';
# No test exist
doCheck = false;
meta = with stdenv.lib; {
description = "Template based wallpaper/colorscheme generator and manager";
longDescription = ''

4
pkgs/tools/backup/bacula/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
stdenv.mkDerivation rec {
name = "bacula-9.2.2";
name = "bacula-9.4.1";
src = fetchurl {
url = "mirror://sourceforge/bacula/${name}.tar.gz";
sha256 = "0bi2jwvgs2ppdvksx41z69b5r5qr39kasxcgyhd08d6i8z89j87h";
sha256 = "0hpxk0f81yx4p1xndsjbwnj7hvvplqlgrw74gv1scq6krabn2pvb";
};
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]

4
pkgs/tools/filesystems/mtools/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "mtools-4.0.22";
name = "mtools-4.0.23";
src = fetchurl {
url = "mirror://gnu/mtools/${name}.tar.bz2";
sha256 = "08shiy9am4x65yg8l5mplj8jrvsimzbaf2id8cmfc02b00i0yb35";
sha256 = "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i";
};
patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

4
pkgs/tools/misc/doitlive/default.nix
View File

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "doitlive";
version = "4.2.0";
version = "4.2.1";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0yabw2gqsjdivivlwsc2q7p3qq72cccx3xzfc1a4gd8d74f84nrw";
sha256 = "0sffr78h0hdrlpamg6v0iw2cgrkv7wy82mvrbzri0w1jqd29s526";
};
propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ];

7
pkgs/tools/networking/ip2unix/default.nix
View File

@ -5,21 +5,22 @@
stdenv.mkDerivation rec {
name = "ip2unix-${version}";
version = "1.2.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "nixcloud";
repo = "ip2unix";
rev = "v${version}";
sha256 = "0blrhcmska06ydkl15jjgblygkwrimdnbaq3hhifgmffymfk2652";
sha256 = "0xxwx1ip5jhkq93b91gcqd1i4njlvl9c4vjzijbdhjrrzz971iwk";
};
nativeBuildInputs = [
meson ninja pkgconfig asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl
libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout
systemd
];
buildInputs = [ libyamlcpp systemd ];
buildInputs = [ libyamlcpp ];
doCheck = true;

10
pkgs/tools/package-management/cargo-release/default.nix
View File

@ -1,17 +1,19 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
{ stdenv, rustPlatform, fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
name = "cargo-release-${version}";
version = "0.10.0";
version = "0.10.5";
src = fetchFromGitHub {
owner = "sunng87";
repo = "cargo-release";
rev = "${version}";
sha256 = "1wp7x6nmmhi019iyvyva26k14f4fsxrh424s2pgrr09nqlrfjbz0";
sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc";
};
cargoSha256 = "0qxwkp6w7ir3hs0r587k3jmh69afc7j411bsy6k8hlm8g9clgby5";
cargoSha256 = "1f0wgggsjpmcijq07abm3yw06z2ahsdr9iwn4izljvkc1nkqk6jq";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
meta = with stdenv.lib; {
description = ''Cargo subcommand "release": everything about releasing a rust crate'';

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

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "facter-${version}";
version = "3.12.1";
version = "3.12.2";
src = fetchFromGitHub {
sha256 = "08mhsf9q9mhjfdzn8qkm12i1k5l7fnm6hqx6rqr8ni5iprl73b3d";
sha256 = "021z0r6m5nyi37045ycjpw0lawvw70w4pjl56cj1mwz99pq1qqns";
rev = version;
repo = "facter";
owner = "puppetlabs";

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

@ -3147,7 +3147,8 @@ in
gt5 = callPackage ../tools/system/gt5 { };
gtest = callPackage ../development/libraries/gtest {};
gtest = callPackage ../development/libraries/gtest { };
gtest_static = callPackage ../development/libraries/gtest { static = true; };
gmock = gtest; # TODO: move to aliases.nix
gbenchmark = callPackage ../development/libraries/gbenchmark {};
@ -4695,6 +4696,13 @@ in
mkdir -p $out/share/man/man1
cp man/pandoc.1 $out/share/man/man1/
'';
# Newer tasty version works
# https://github.com/jgm/pandoc/commit/3bf398b15ff28a39133a8ce27ba3d2728d255b17#diff-d37211f38c72504621b9d03eef12ffd7
# Note the patch doesn't apply because we fetch the cabal file from elsewhere
# This should be removed with pandoc 2.6.
postPatch = ''
substituteInPlace pandoc.cabal --replace "tasty >= 0.11 && < 1.2" "tasty >= 0.11 && < 1.3"
'';
});
pamtester = callPackage ../tools/security/pamtester { };
@ -5001,7 +5009,7 @@ in
pytrainer = callPackage ../applications/misc/pytrainer { };
pywal = callPackage ../tools/graphics/pywal {};
pywal = with python3Packages; toPythonApplication pywal;
remarshal = callPackage ../development/tools/remarshal { };
@ -6979,7 +6987,7 @@ in
haskell = callPackage ./haskell-packages.nix { };
haskellPackages = haskell.packages.ghc844.override {
haskellPackages = haskell.packages.ghc863.override {
overrides = config.haskellPackageOverrides or haskell.packageOverrides;
};
@ -7437,7 +7445,9 @@ in
cargo-download = callPackage ../tools/package-management/cargo-download { };
cargo-edit = callPackage ../tools/package-management/cargo-edit { };
cargo-release = callPackage ../tools/package-management/cargo-release { };
cargo-release = callPackage ../tools/package-management/cargo-release {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-tree = callPackage ../tools/package-management/cargo-tree { };
cargo-update = callPackage ../tools/package-management/cargo-update { };
@ -8046,7 +8056,8 @@ in
})
ruby_2_3
ruby_2_4
ruby_2_5;
ruby_2_5
ruby_2_6;
ruby = ruby_2_5;
@ -14551,20 +14562,16 @@ in
linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
# kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
kernelPatches.revert-vfs-dont-open-real
];
};
linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
# kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
kernelPatches.revert-vfs-dont-open-real
];
};
@ -14656,6 +14663,7 @@ in
nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
nvidia_x11_legacy390 = nvidiaPackages.legacy_390;
nvidia_x11_beta = nvidiaPackages.beta;
nvidia_x11 = nvidiaPackages.stable;
@ -14742,7 +14750,7 @@ in
});
# The current default kernel / kernel modules.
linuxPackages = linuxPackages_4_14;
linuxPackages = linuxPackages_4_19;
linux = linuxPackages.kernel;
# Update this when adding the newest kernel major version!
@ -15597,6 +15605,8 @@ in
man-pages = callPackage ../data/documentation/man-pages { };
matcha = callPackage ../data/themes/matcha { };
materia-theme = callPackage ../data/themes/materia-theme { };
material-icons = callPackage ../data/fonts/material-icons { };
@ -22367,8 +22377,6 @@ in
martyr = callPackage ../development/libraries/martyr { };
matcha = callPackage ../misc/themes/matcha { };
mess = callPackage ../misc/emulators/mess {
inherit (pkgs.gnome2) GConf;
};

8
pkgs/top-level/python-packages.nix
View File

@ -2824,6 +2824,8 @@ in {
fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
libarcus = callPackage ../development/python-modules/libarcus { };
libcloud = callPackage ../development/python-modules/libcloud { };
libgpuarray = callPackage ../development/python-modules/libgpuarray {
@ -2842,6 +2844,8 @@ in {
inherit (pkgs) libsodium;
};
libsavitar = callPackage ../development/python-modules/libsavitar { };
libplist = disabledIf isPy3k
(toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
@ -3733,6 +3737,8 @@ in {
pyutil = callPackage ../development/python-modules/pyutil { };
pywal = callPackage ../development/python-modules/pywal { };
pywebkitgtk = callPackage ../development/python-modules/pywebkitgtk { };
pywinrm = callPackage ../development/python-modules/pywinrm { };
@ -4491,8 +4497,6 @@ in {
inherit (pkgs) libasyncns pkgconfig;
};
libarcus = callPackage ../development/python-modules/libarcus { };
pybrowserid = callPackage ../development/python-modules/pybrowserid { };
pyzmq = callPackage ../development/python-modules/pyzmq { };