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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-02-18 16:09:19 +01:00
commit 9d88ee08f6
159 changed files with 4084 additions and 3564 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/builders/images/ocitools.xml
View File

@ -25,7 +25,7 @@
buildContainer { buildContainer {
args = [ (with pkgs; writeScript "run.sh" '' args = [ (with pkgs; writeScript "run.sh" ''
#!${bash}/bin/bash #!${bash}/bin/bash
${coreutils}/bin/exec ${bash}/bin/bash exec ${bash}/bin/bash
'').outPath ]; <co xml:id='ex-ociTools-buildContainer-1' /> '').outPath ]; <co xml:id='ex-ociTools-buildContainer-1' />
mounts = { mounts = {

6
maintainers/maintainer-list.nix
View File

@ -3003,6 +3003,12 @@
githubId = 12491746; githubId = 12491746;
name = "Masato Yonekawa"; name = "Masato Yonekawa";
}; };
i077 = {
email = "nixpkgs@imranhossa.in";
github = "i077";
githubId = 2789926;
name = "Imran Hossain";
};
iand675 = { iand675 = {
email = "ian@iankduncan.com"; email = "ian@iankduncan.com";
github = "iand675"; github = "iand675";

31
nixos/modules/services/databases/redis.nix
View File

@ -150,10 +150,20 @@ in
requirePass = mkOption { requirePass = mkOption {
type = with types; nullOr str; type = with types; nullOr str;
default = null; default = null;
description = "Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)"; description = ''
Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE).
Use requirePassFile to store it outside of the nix store in a dedicated file.
'';
example = "letmein!"; example = "letmein!";
}; };
requirePassFile = mkOption {
type = with types; nullOr path;
default = null;
description = "File with password for the database.";
example = "/run/keys/redis-password";
};
appendOnly = mkOption { appendOnly = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -192,6 +202,10 @@ in
###### implementation ###### implementation
config = mkIf config.services.redis.enable { config = mkIf config.services.redis.enable {
assertions = [{
assertion = cfg.requirePass != null -> cfg.requirePassFile == null;
message = "You can only set one services.redis.requirePass or services.redis.requirePassFile";
}];
boot.kernel.sysctl = (mkMerge [ boot.kernel.sysctl = (mkMerge [
{ "vm.nr_hugepages" = "0"; } { "vm.nr_hugepages" = "0"; }
( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } ) ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } )
@ -208,21 +222,26 @@ in
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
systemd.services.redis = systemd.services.redis = {
{ description = "Redis Server"; description = "Redis Server";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
preStart = ''
install -m 600 ${redisConfig} /run/redis/redis.conf
'' + optionalString (cfg.requirePassFile != null) ''
password=$(cat ${escapeShellArg cfg.requirePassFile})
echo "requirePass $password" >> /run/redis/redis.conf
'';
serviceConfig = { serviceConfig = {
ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}"; ExecStart = "${cfg.package}/bin/redis-server /run/redis/redis.conf";
RuntimeDirectory = "redis"; RuntimeDirectory = "redis";
StateDirectory = "redis"; StateDirectory = "redis";
Type = "notify"; Type = "notify";
User = "redis"; User = "redis";
}; };
}; };
}; };
} }

1
nixos/modules/services/x11/desktop-managers/mate.nix
View File

@ -86,6 +86,7 @@ in
pkgs.shared-mime-info pkgs.shared-mime-info
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
pkgs.mate.mate-settings-daemon pkgs.mate.mate-settings-daemon
pkgs.yelp # for 'Contents' in 'Help' menus
]; ];
programs.dconf.enable = true; programs.dconf.enable = true;

176
nixos/release-combined.nix
View File

@ -38,108 +38,90 @@ in rec {
nixpkgs = nixpkgsSrc; nixpkgs = nixpkgsSrc;
})) [ "unstable" ]; })) [ "unstable" ];
tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate { tested = pkgs.releaseTools.aggregate {
name = "nixos-${nixos.channel.version}"; name = "nixos-${nixos.channel.version}";
meta = { meta = {
description = "Release-critical builds for the NixOS channel"; description = "Release-critical builds for the NixOS channel";
maintainers = with pkgs.lib.maintainers; [ eelco fpletz ]; maintainers = with pkgs.lib.maintainers; [ eelco fpletz ];
}; };
constituents = constituents = [
let "nixos.channel"
# Except for the given systems, return the system-specific constituent "nixos.dummy.x86_64-linux"
except = systems: x: map (system: x.${system}) (pkgs.lib.subtractLists systems supportedSystems); "nixos.iso_minimal.aarch64-linux"
all = x: except [] x; "nixos.iso_minimal.i686-linux"
in [ "nixos.iso_minimal.x86_64-linux"
nixos.channel "nixos.iso_plasma5.x86_64-linux"
(all nixos.dummy) "nixos.manual.x86_64-linux"
(all nixos.manual) "nixos.ova.x86_64-linux"
"nixos.sd_image.aarch64-linux"
nixos.iso_plasma5.x86_64-linux or [] "nixos.tests.boot.biosCdrom.x86_64-linux"
nixos.iso_minimal.aarch64-linux or [] "nixos.tests.boot-stage1.x86_64-linux"
nixos.iso_minimal.i686-linux or [] "nixos.tests.boot.uefiCdrom.x86_64-linux"
nixos.iso_minimal.x86_64-linux or [] "nixos.tests.boot.uefiUsb.x86_64-linux"
nixos.ova.x86_64-linux or [] "nixos.tests.chromium.x86_64-linux"
nixos.sd_image.aarch64-linux or [] "nixos.tests.containers-imperative.x86_64-linux"
"nixos.tests.containers-ip.x86_64-linux"
#(all nixos.tests.containers) "nixos.tests.docker.x86_64-linux"
(all nixos.tests.containers-imperative) "nixos.tests.ecryptfs.x86_64-linux"
(all nixos.tests.containers-ip) "nixos.tests.env.x86_64-linux"
nixos.tests.chromium.x86_64-linux or [] "nixos.tests.firefox.x86_64-linux"
(all nixos.tests.firefox) "nixos.tests.firewall.x86_64-linux"
(all nixos.tests.firefox-esr) "nixos.tests.fontconfig-default-fonts.x86_64-linux"
(all nixos.tests.firewall) "nixos.tests.gnome3.x86_64-linux"
(all nixos.tests.fontconfig-default-fonts) "nixos.tests.gnome3-xorg.x86_64-linux"
(all nixos.tests.gnome3-xorg) "nixos.tests.hibernate.x86_64-linux"
(all nixos.tests.gnome3) "nixos.tests.i3wm.x86_64-linux"
(all nixos.tests.pantheon) "nixos.tests.installer.btrfsSimple.x86_64-linux"
nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only "nixos.tests.installer.btrfsSubvolDefault.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.lvm) "nixos.tests.installer.btrfsSubvols.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.luksroot) "nixos.tests.installer.luksroot.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.separateBoot) "nixos.tests.installer.lvm.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.separateBootFat) "nixos.tests.installer.separateBootFat.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.simple) "nixos.tests.installer.separateBoot.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.simpleLabels) "nixos.tests.installer.simpleLabels.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.simpleProvided) "nixos.tests.installer.simpleProvided.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.simpleUefiSystemdBoot) "nixos.tests.installer.simpleUefiSystemdBoot.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.swraid) "nixos.tests.installer.simple.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.btrfsSimple) "nixos.tests.installer.swraid.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.btrfsSubvols) "nixos.tests.ipv6.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.installer.btrfsSubvolDefault) "nixos.tests.lightdm.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.boot.biosCdrom) "nixos.tests.login.x86_64-linux"
#(except ["aarch64-linux"] nixos.tests.boot.biosUsb) # disabled due to issue #15690 "nixos.tests.misc.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.boot.uefiCdrom) "nixos.tests.mutableUsers.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.boot.uefiUsb) "nixos.tests.nat.firewall-conntrack.x86_64-linux"
(all nixos.tests.boot-stage1) "nixos.tests.nat.firewall.x86_64-linux"
(all nixos.tests.hibernate) "nixos.tests.nat.standalone.x86_64-linux"
nixos.tests.docker.x86_64-linux or [] "nixos.tests.networking.scripted.bond.x86_64-linux"
(all nixos.tests.ecryptfs) "nixos.tests.networking.scripted.bridge.x86_64-linux"
(all nixos.tests.env) "nixos.tests.networking.scripted.dhcpOneIf.x86_64-linux"
(all nixos.tests.ipv6) "nixos.tests.networking.scripted.dhcpSimple.x86_64-linux"
(all nixos.tests.i3wm) "nixos.tests.networking.scripted.loopback.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.keymap.azerty) "nixos.tests.networking.scripted.macvlan.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.keymap.colemak) "nixos.tests.networking.scripted.sit.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.keymap.dvorak) "nixos.tests.networking.scripted.static.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.keymap.dvp) "nixos.tests.networking.scripted.vlan.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.keymap.neo) "nixos.tests.nfs3.simple.x86_64-linux"
(except ["aarch64-linux"] nixos.tests.keymap.qwertz) "nixos.tests.nfs4.simple.x86_64-linux"
(all nixos.tests.plasma5) "nixos.tests.openssh.x86_64-linux"
(all nixos.tests.lightdm) "nixos.tests.pantheon.x86_64-linux"
(all nixos.tests.login) "nixos.tests.php-pcre.x86_64-linux"
(all nixos.tests.misc) "nixos.tests.plasma5.x86_64-linux"
(all nixos.tests.mutableUsers) "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux"
(all nixos.tests.nat.firewall) "nixos.tests.predictable-interface-names.predictable.x86_64-linux"
(all nixos.tests.nat.firewall-conntrack) "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux"
(all nixos.tests.nat.standalone) "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux"
(all nixos.tests.networking.scripted.loopback) "nixos.tests.printing.x86_64-linux"
(all nixos.tests.networking.scripted.static) "nixos.tests.proxy.x86_64-linux"
(all nixos.tests.networking.scripted.dhcpSimple) "nixos.tests.sddm.default.x86_64-linux"
(all nixos.tests.networking.scripted.dhcpOneIf) "nixos.tests.simple.x86_64-linux"
(all nixos.tests.networking.scripted.bond) "nixos.tests.switchTest.x86_64-linux"
(all nixos.tests.networking.scripted.bridge) "nixos.tests.udisks2.x86_64-linux"
(all nixos.tests.networking.scripted.macvlan) "nixos.tests.xfce.x86_64-linux"
(all nixos.tests.networking.scripted.sit) "nixos.tests.zfs.installer.i686-linux"
(all nixos.tests.networking.scripted.vlan) "nixpkgs.emacs.x86_64-linux"
(all nixos.tests.nfs3.simple) "nixpkgs.jdk.x86_64-linux"
(all nixos.tests.nfs4.simple) "nixpkgs.tarball"
(all nixos.tests.openssh)
(all nixos.tests.php-pcre)
(all nixos.tests.predictable-interface-names.predictable)
(all nixos.tests.predictable-interface-names.unpredictable)
(all nixos.tests.predictable-interface-names.predictableNetworkd)
(all nixos.tests.predictable-interface-names.unpredictableNetworkd)
(all nixos.tests.printing)
(all nixos.tests.proxy)
(all nixos.tests.sddm.default)
(all nixos.tests.simple)
(all nixos.tests.switchTest)
(all nixos.tests.udisks2)
(all nixos.tests.xfce)
nixpkgs.tarball
(all allSupportedNixpkgs.emacs)
# The currently available aarch64 JDK is unfree
(except ["aarch64-linux"] allSupportedNixpkgs.jdk)
]; ];
}); };
} }

38
nixos/release-small.nix
View File

@ -82,18 +82,42 @@ in rec {
vim; vim;
}; };
tested = lib.hydraJob (pkgs.releaseTools.aggregate { tested = pkgs.releaseTools.aggregate {
name = "nixos-${nixos.channel.version}"; name = "nixos-${nixos.channel.version}";
meta = { meta = {
description = "Release-critical builds for the NixOS channel"; description = "Release-critical builds for the NixOS channel";
maintainers = [ lib.maintainers.eelco ]; maintainers = [ lib.maintainers.eelco ];
}; };
constituents = constituents =
let all = x: map (system: x.${system}) supportedSystems; in [ "nixos.channel"
[ nixpkgs.tarball "nixos.dummy.x86_64-linux"
(all nixpkgs.jdk) "nixos.iso_minimal.x86_64-linux"
] "nixos.manual.x86_64-linux"
++ lib.collect lib.isDerivation nixos; "nixos.tests.boot.biosCdrom.x86_64-linux"
}); "nixos.tests.containers-imperative.x86_64-linux"
"nixos.tests.containers-ip.x86_64-linux"
"nixos.tests.firewall.x86_64-linux"
"nixos.tests.installer.lvm.x86_64-linux"
"nixos.tests.installer.separateBoot.x86_64-linux"
"nixos.tests.installer.simple.x86_64-linux"
"nixos.tests.ipv6.x86_64-linux"
"nixos.tests.login.x86_64-linux"
"nixos.tests.misc.x86_64-linux"
"nixos.tests.nat.firewall-conntrack.x86_64-linux"
"nixos.tests.nat.firewall.x86_64-linux"
"nixos.tests.nat.standalone.x86_64-linux"
"nixos.tests.nfs3.simple.x86_64-linux"
"nixos.tests.openssh.x86_64-linux"
"nixos.tests.php-pcre.x86_64-linux"
"nixos.tests.predictable-interface-names.predictable.x86_64-linux"
"nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux"
"nixos.tests.predictable-interface-names.unpredictable.x86_64-linux"
"nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux"
"nixos.tests.proxy.x86_64-linux"
"nixos.tests.simple.x86_64-linux"
"nixpkgs.jdk.x86_64-linux"
"nixpkgs.tarball"
];
};
} }

15
nixos/tests/glusterfs.nix
View File

@ -4,10 +4,11 @@ let
client = { pkgs, ... } : { client = { pkgs, ... } : {
environment.systemPackages = [ pkgs.glusterfs ]; environment.systemPackages = [ pkgs.glusterfs ];
fileSystems = pkgs.lib.mkVMOverride fileSystems = pkgs.lib.mkVMOverride
[ { mountPoint = "/gluster"; { "/gluster" =
{ device = "server1:/gv0";
fsType = "glusterfs"; fsType = "glusterfs";
device = "server1:/gv0"; };
} ]; };
}; };
server = { pkgs, ... } : { server = { pkgs, ... } : {
@ -22,11 +23,11 @@ let
virtualisation.emptyDiskImages = [ 1024 ]; virtualisation.emptyDiskImages = [ 1024 ];
fileSystems = pkgs.lib.mkVMOverride fileSystems = pkgs.lib.mkVMOverride
[ { mountPoint = "/data"; { "/data" =
device = "/dev/disk/by-label/data"; { device = "/dev/disk/by-label/data";
fsType = "ext4"; fsType = "ext4";
} };
]; };
}; };
in { in {
name = "glusterfs"; name = "glusterfs";

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

@ -5,13 +5,13 @@ let
client = client =
{ pkgs, ... }: { pkgs, ... }:
{ fileSystems = pkgs.lib.mkVMOverride { fileSystems = pkgs.lib.mkVMOverride
[ { mountPoint = "/data"; { "/data" =
# nfs4 exports the export with fsid=0 as a virtual root directory { # nfs4 exports the export with fsid=0 as a virtual root directory
device = if (version == 4) then "server:/" else "server:/data"; device = if (version == 4) then "server:/" else "server:/data";
fsType = "nfs"; fsType = "nfs";
options = [ "vers=${toString version}" ]; options = [ "vers=${toString version}" ];
} };
]; };
networking.firewall.enable = false; # FIXME: only open statd networking.firewall.enable = false; # FIXME: only open statd
}; };

8
nixos/tests/orangefs.nix
View File

@ -10,11 +10,11 @@ let
virtualisation.emptyDiskImages = [ 4096 ]; virtualisation.emptyDiskImages = [ 4096 ];
fileSystems = pkgs.lib.mkVMOverride fileSystems = pkgs.lib.mkVMOverride
[ { mountPoint = "/data"; { "/data" =
device = "/dev/disk/by-label/data"; { device = "/dev/disk/by-label/data";
fsType = "ext4"; fsType = "ext4";
} };
]; };
services.orangefs.server = { services.orangefs.server = {
enable = true; enable = true;

3
pkgs/applications/audio/milkytracker/default.nix
View File

@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ];
# Somehow this does not get set automatically
cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Music tracker application, similar to Fasttracker II"; description = "Music tracker application, similar to Fasttracker II";
homepage = http://milkytracker.org; homepage = http://milkytracker.org;

8
pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch Normal file
View File

@ -0,0 +1,8 @@
diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
index 4909ff1..02fa145 100644
--- a/src/she/CMakeLists.txt
+++ b/src/she/CMakeLists.txt
@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND)
add_definitions(-DUSE_MOUSE_POLLER)
+ add_definitions(-DALLEGRO_NO_FIX_ALIASES)
endif()

12
pkgs/applications/editors/aseprite/default.nix
View File

@ -6,12 +6,16 @@
, cmark , cmark
}: }:
# Unfree version is not redistributable:
# https://dev.aseprite.org/2016/09/01/new-source-code-license/
# Consider supporting the developer: https://aseprite.org/#buy
let let
skia = callPackage ./skia.nix {}; skia = callPackage ./skia.nix {};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aseprite"; pname = "aseprite";
version = if unfree then "1.2.11" else "1.1.7"; version = if unfree then "1.2.16.3" else "1.1.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aseprite"; owner = "aseprite";
@ -19,7 +23,7 @@ stdenv.mkDerivation rec {
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = if unfree sha256 = if unfree
then "1illr51jpg5g6nx29rav9dllyy5lzyyn7lj2fhrnpz1ysqgaq5p8" then "16yn7y9xdc5jd50cq7bmsm320gv23pp71lr8hg2nmynzc8ibyda8"
else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
}; };
@ -36,7 +40,9 @@ stdenv.mkDerivation rec {
skia libGL skia libGL
]; ];
patches = lib.optionals unfree [ patches = if !unfree then [
./allegro-glibc-2.30.patch
] else [
(fetchpatch { (fetchpatch {
url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch";
sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw";

4
pkgs/applications/editors/aseprite/skia.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja { stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja
, fontconfig, expat, icu58, libjpeg, libpng, libwebp, zlib , fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib
, mesa, libX11 , mesa, libX11
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ python2 gn ninja ]; nativeBuildInputs = [ python2 gn ninja ];
buildInputs = [ buildInputs = [
fontconfig expat icu58 libjpeg libpng libwebp zlib fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib
mesa libX11 mesa libX11
]; ];

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

@ -7,7 +7,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dbeaver-ce"; pname = "dbeaver-ce";
version = "6.3.4"; version = "6.3.5";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "dbeaver"; name = "dbeaver";
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "1b4ac7vsfz3c9vk7yv33pcfflcxl5fcnbzfdva1yfq63v28g38gk"; sha256 = "1ssxgnd23cy6br7sbfszvx283c5vz9hgfhx0vqyvm13wyr67hk45";
}; };
installPhase = '' installPhase = ''

1
pkgs/applications/misc/mapproxy/default.nix
View File

@ -38,6 +38,7 @@ buildPythonApplication rec {
substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
boto3 # needed for caches service
pillow pillow
pyyaml pyyaml
pyproj pyproj

20
pkgs/applications/misc/synergy/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, avahi-compat { stdenv, lib, fetchFromGitHub, cmake, openssl
, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver
, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, openssl , xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat
, withGUI ? true, wrapQtAppsHook }: , withGUI ? true, wrapQtAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,20 +35,19 @@ stdenv.mkDerivation rec {
chmod -R +w ext/ chmod -R +w ext/
''; '';
cmakeFlags = lib.optionals stdenv.isDarwin [ cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF";
"-DOSX_TARGET_MAJOR=10"
"-DOSX_TARGET_MINOR=7"
] ++ lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF";
nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook; nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook;
dontWrapQtApps = true; dontWrapQtApps = true;
buildInputs = [ buildInputs = [
openssl avahi-compat openssl
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
ApplicationServices Carbon Cocoa CoreServices ScreenSaver ApplicationServices Carbon Cocoa CoreServices ScreenSaver
] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; ] ++ lib.optionals stdenv.isLinux [
xlibsWrapper libX11 libXi libXtst libXrandr xinput avahi-compat
];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
@ -56,10 +55,15 @@ stdenv.mkDerivation rec {
'' + lib.optionalString withGUI '' '' + lib.optionalString withGUI ''
cp bin/synergy $out/bin/ cp bin/synergy $out/bin/
wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]} wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]}
'' + lib.optionalString stdenv.isLinux ''
mkdir -p $out/share/icons/hicolor/scalable/apps mkdir -p $out/share/icons/hicolor/scalable/apps
cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
mkdir -p $out/share/applications mkdir -p $out/share/applications
substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications/
mv bundle/Synergy.app $out/Applications/
ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS
''; '';
doCheck = true; doCheck = true;

61
pkgs/applications/misc/todoist-electron/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf
, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat
, udev, libpulseaudio, utillinux, makeWrapper }:
stdenv.mkDerivation rec {
pname = "todoist-electron";
version = "1.19";
src = fetchurl {
url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb";
sha256 = "1w0l7k7wmbhwzv71cffsir0q7zg9m0617fmyvd4a01b6flpxrpfx";
};
desktopItem = makeDesktopItem {
name = "Todoist";
exec = "todoist";
desktopName = "Todoist";
categories = "Utility;Productivity";
};
nativeBuildInputs = [ makeWrapper dpkg ];
unpackPhase = ''
mkdir pkg
dpkg-deb -x $src pkg
sourceRoot=pkg
'';
installPhase = let
libPath = lib.makeLibraryPath ([
stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
nss nspr alsaLib libpulseaudio cups expat udev utillinux
] ++ (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver
]));
in ''
mkdir -p "$out/bin"
mv opt "$out/"
# Patch binary
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}:\$ORIGIN" \
$out/opt/Todoist/todoist
# Hacky workaround for RPATH problems
makeWrapper $out/opt/Todoist/todoist $out/bin/todoist \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio udev ]}
# Desktop item
mkdir -p "$out/share"
ln -s "${desktopItem}/share/applications" "$out/share/applications"
'';
meta = with lib; {
homepage = "https://github.com/KryDos/todoist-linux";
description = "The Linux wrapper for Todoist web version";
platforms = [ "x86_64-linux" ];
license = licenses.isc;
maintainers = with maintainers; [ i077 ];
};
}

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -45,11 +45,11 @@ let
flash = stdenv.mkDerivation rec { flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi"; pname = "flashplayer-ppapi";
version = "32.0.0.314"; version = "32.0.0.330";
src = fetchzip { src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "05xcscpzglpfpiiqc3ngs5snxli99irjk18g5vdhw91jk9808gnl"; sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk";
stripRoot = false; stripRoot = false;
}; };

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -16,10 +16,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "73.0"; ffversion = "73.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "2da2jn3gwck6qys3ys146jsjl9fgq10s3ii62y4ssnhl76ryir8f1mv9i1d6hyv8381hplasnxb553d5bgwnq87ymgqabakmr48n2p1"; sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9";
}; };
patches = [ patches = [

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -74,7 +74,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flashplayer"; pname = "flashplayer";
version = "32.0.0.314"; version = "32.0.0.330";
src = fetchurl { src = fetchurl {
url = url =
@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 = sha256 =
if debug then if debug then
if arch == "x86_64" then if arch == "x86_64" then
"076l93wjcy15sic88cyq6msp87gdhcvbk4ym2vbvvjz2bav2z456" "1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b"
else else
"0kxr8d6fh00akqgk3lwv0z6rk7xswislicsbh9b9p33f19mj7c8a" "0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b"
else else
if arch == "x86_64" then if arch == "x86_64" then
"0a3hvp0qmqlann8k875ajf0i70cv0an1a3mr8kbgji46dxqvwjxz" "1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj"
else else
"0jyywas2z7ssgzng82qgnp01gy6nccqavkbx9529m07xrclvqbxn"; "1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -50,7 +50,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "flashplayer-standalone"; pname = "flashplayer-standalone";
version = "32.0.0.314"; version = "32.0.0.330";
src = fetchurl { src = fetchurl {
url = url =
@ -60,9 +60,9 @@ stdenv.mkDerivation {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 = sha256 =
if debug then if debug then
"0zlin94rip13rn58m7v5l6m20ylnw59l77rbg5j5qyxkr53zawdz" "0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84"
else else
"0pfrm02iwa01pqx3adqj0sw27p1ddlz9knjky6x248ak8zywsqr2"; "08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -90,19 +90,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source # Upstream source
version = "9.0.4"; version = "9.0.5";
lang = "en-US"; lang = "en-US";
srcs = { srcs = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "14zlf02i447hcdr4qap8af1k4aziznfp9m2ygqz05zsy8icm1j2k"; sha256 = "1d4c3mrvqd6v086mwn3rnv776y2j3y45agnd0k5njqnmr53ybn2s";
}; };
i686-linux = fetchurl { i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "1bmih91gsh698fp2mbnjcq8vmwhg822wanmn99r0xhkmgpi4zw2s"; sha256 = "040nh79hjkg5afvzshzhp7588dbi1pcpjsyk8phfqaapds74ma8y";
}; };
}; };
in in

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -17,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "vivaldi"; pname = "vivaldi";
version = "2.11.1811.33-1"; version = "2.11.1811.38-1";
src = fetchurl { src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "1z0cscvmhxh1wjs7r0sjdr3f3mcg8i6avpal6spp0ymkxp2rn0h3"; sha256 = "0nz7yhxp7fxv6pj1i2684di1wgk4k78hw4icfjqzjwmvc3i710jw";
}; };
unpackPhase = '' unpackPhase = ''

2
pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.5.6", "version": "1.5.9",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"dependencies": { "dependencies": {

5
pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View File

@ -6,12 +6,12 @@
let let
executableName = "riot-desktop"; executableName = "riot-desktop";
version = "1.5.6"; version = "1.5.9";
riot-web-src = fetchFromGitHub { riot-web-src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "riot-web"; repo = "riot-web";
rev = "v${version}"; rev = "v${version}";
sha256 = "148rg6wc84xy53bj16v5riw78s999ridid59x6v9jas827l0bdpk"; sha256 = "13bskp8nj1h44y7x4dibnfa8sdnzl744x4xckcw5lxnlkccfr69m";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {
@ -29,7 +29,6 @@ in mkYarnPackage rec {
# resources # resources
mkdir -p "$out/share/riot" mkdir -p "$out/share/riot"
ln -s '${riot-web}' "$out/share/riot/webapp" ln -s '${riot-web}' "$out/share/riot/webapp"
cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator"
cp -r './deps/riot-web' "$out/share/riot/electron" cp -r './deps/riot-web' "$out/share/riot/electron"
cp -r './deps/riot-web/img' "$out/share/riot" cp -r './deps/riot-web/img' "$out/share/riot"
rm "$out/share/riot/electron/node_modules" rm "$out/share/riot/electron/node_modules"

23
pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View File

@ -1,27 +1,30 @@
{ lib, stdenv, fetchurl, writeText, conf ? null }: { lib, stdenv, fetchurl, writeText, jq, conf ? {} }:
# Note for maintainers: # Note for maintainers:
# Versions of `riot-web` and `riot-desktop` should be kept in sync. # Versions of `riot-web` and `riot-desktop` should be kept in sync.
stdenv.mkDerivation rec { let
noPhoningHome = {
disable_guests = true; # disable automatic guest account registration at matrix.org
piwik = false; # disable analytics
};
configOverrides = writeText "riot-config-overrides.json" (builtins.toJSON (noPhoningHome // conf));
in stdenv.mkDerivation rec {
pname = "riot-web"; pname = "riot-web";
version = "1.5.8"; version = "1.5.9";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx"; sha256 = "1qibbgjzhiwn1lnfm3pbfn6jahphgyf6625mp4v0ah2is75x16ys";
}; };
installPhase = let installPhase = ''
configFile = if (conf != null)
then writeText "riot-config.json" conf
else "$out/config.sample.json";
in ''
runHook preInstall runHook preInstall
mkdir -p $out/ mkdir -p $out/
cp -R . $out/ cp -R . $out/
ln -s ${configFile} $out/config.json ${jq}/bin/jq -s '.[0] * .[1]' "config.sample.json" "${configOverrides}" > "$out/config.json"
runHook postInstall runHook postInstall
''; '';

4
pkgs/applications/networking/mullvad-vpn/default.nix
View File

@ -40,11 +40,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mullvad-vpn"; pname = "mullvad-vpn";
version = "2019.10"; version = "2020.2";
src = fetchurl { src = fetchurl {
url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq"; sha256 = "4f5970714684a86fba44b742d77f9bbe1147a111330e487d160d9844f34ae3d5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

23
pkgs/applications/office/libreoffice/default.nix
View File

@ -57,23 +57,11 @@ in (stdenv.mkDerivation rec {
# For some reason librdf_redland sometimes refers to rasqal.h instead # For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h # of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"; NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"
+ stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma";
patches = [ patches = [
./xdg-open-brief.patch ./xdg-open-brief.patch
# Poppler-0.82 compatibility
# https://gerrit.libreoffice.org/81545
(fetchpatch {
url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
})
# Poppler-0.83 compatibility
# https://gerrit.libreoffice.org/84384
(fetchpatch {
url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
})
]; ];
tarballPath = "external/tarballs"; tarballPath = "external/tarballs";
@ -235,7 +223,6 @@ in (stdenv.mkDerivation rec {
sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx'
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx"
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx"
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx"
@ -296,7 +283,6 @@ in (stdenv.mkDerivation rec {
"--enable-python=system" "--enable-python=system"
"--enable-dbus" "--enable-dbus"
"--enable-release-build" "--enable-release-build"
(lib.enableFeature kdeIntegration "kde4")
"--enable-epm" "--enable-epm"
"--with-jdk-home=${jdk.home}" "--with-jdk-home=${jdk.home}"
"--with-ant-home=${ant}/lib/ant" "--with-ant-home=${ant}/lib/ant"
@ -310,8 +296,6 @@ in (stdenv.mkDerivation rec {
"--with-system-openldap" "--with-system-openldap"
"--with-system-coinmp" "--with-system-coinmp"
"--with-alloc=system"
# Without these, configure does not finish # Without these, configure does not finish
"--without-junit" "--without-junit"
@ -349,6 +333,7 @@ in (stdenv.mkDerivation rec {
"--without-system-mdds" "--without-system-mdds"
# https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
"--without-system-orcus" "--without-system-orcus"
"--without-system-qrcodegen"
"--without-system-xmlsec" "--without-system-xmlsec"
]; ];
@ -390,4 +375,4 @@ in (stdenv.mkDerivation rec {
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}).overrideAttrs ((importVariant "override.nix") args) }).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; }))

142
pkgs/applications/office/libreoffice/src-fresh/download.nix
View File

@ -1,10 +1,10 @@
[ [
{ {
name = "libabw-0.1.2.tar.xz"; name = "libabw-0.1.3.tar.xz";
url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz";
sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed";
md5 = ""; md5 = "";
md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
} }
{ {
name = "commons-logging-1.2-src.tar.gz"; name = "commons-logging-1.2-src.tar.gz";
@ -147,11 +147,11 @@
md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
} }
{ {
name = "expat-2.2.5.tar.bz2"; name = "expat-2.2.8.tar.bz2";
url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";
sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102";
md5 = ""; md5 = "";
md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2";
} }
{ {
name = "Firebird-3.0.0.32483-0.tar.bz2"; name = "Firebird-3.0.0.32483-0.tar.bz2";
@ -336,11 +336,11 @@
md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz";
} }
{ {
name = "harfbuzz-2.3.1.tar.bz2"; name = "harfbuzz-2.6.0.tar.xz";
url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz";
sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966";
md5 = ""; md5 = "";
md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz";
} }
{ {
name = "hsqldb_1_8_0.zip"; name = "hsqldb_1_8_0.zip";
@ -364,18 +364,18 @@
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
} }
{ {
name = "icu4c-63_1-src.tgz"; name = "icu4c-65_1-src.tgz";
url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; url = "http://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz";
sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; sha256 = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948";
md5 = ""; md5 = "";
md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; md5name = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948-icu4c-65_1-src.tgz";
} }
{ {
name = "icu4c-63_1-data.zip"; name = "icu4c-65_1-data.zip";
url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; url = "http://dev-www.libreoffice.org/src/icu4c-65_1-data.zip";
sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; sha256 = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6";
md5 = ""; md5 = "";
md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; md5name = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6-icu4c-65_1-data.zip";
} }
{ {
name = "flow-engine-0.9.4.zip"; name = "flow-engine-0.9.4.zip";
@ -462,11 +462,11 @@
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
} }
{ {
name = "language-subtag-registry-2019-04-03.tar.bz2"; name = "language-subtag-registry-2019-09-16.tar.bz2";
url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2";
sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a";
md5 = ""; md5 = "";
md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2";
} }
{ {
name = "JLanguageTool-1.7.0.tar.bz2"; name = "JLanguageTool-1.7.0.tar.bz2";
@ -510,6 +510,13 @@
md5 = ""; md5 = "";
md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz";
} }
{
name = "libffi-3.3.tar.gz";
url = "http://dev-www.libreoffice.org/src/libffi-3.3.tar.gz";
sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056";
md5 = "";
md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz";
}
{ {
name = "libgpg-error-1.27.tar.bz2"; name = "libgpg-error-1.27.tar.bz2";
url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
@ -546,18 +553,18 @@
md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz";
} }
{ {
name = "libxml2-2.9.9.tar.gz"; name = "libxml2-2.9.10.tar.gz";
url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";
sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f";
md5 = ""; md5 = "";
md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz";
} }
{ {
name = "libxslt-1.1.33.tar.gz"; name = "libxslt-1.1.34.tar.gz";
url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz";
sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f";
md5 = ""; md5 = "";
md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz";
} }
{ {
name = "lp_solve_5.5.tar.gz"; name = "lp_solve_5.5.tar.gz";
@ -581,11 +588,11 @@
md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
} }
{ {
name = "mdds-1.4.3.tar.bz2"; name = "mdds-1.5.0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2";
sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; sha256 = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d";
md5 = ""; md5 = "";
md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; md5name = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d-mdds-1.5.0.tar.bz2";
} }
{ {
name = "mDNSResponder-878.200.35.tar.gz"; name = "mDNSResponder-878.200.35.tar.gz";
@ -623,11 +630,11 @@
md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
} }
{ {
name = "nss-3.45-with-nspr-4.21.tar.gz"; name = "nss-3.47.1-with-nspr-4.23.tar.gz";
url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz";
sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64";
md5 = ""; md5 = "";
md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz";
} }
{ {
name = "libodfgen-0.1.6.tar.bz2"; name = "libodfgen-0.1.6.tar.bz2";
@ -658,18 +665,18 @@
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
} }
{ {
name = "openssl-1.0.2r.tar.gz"; name = "openssl-1.0.2t.tar.gz";
url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz";
sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc";
md5 = ""; md5 = "";
md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz";
} }
{ {
name = "liborcus-0.14.1.tar.gz"; name = "liborcus-0.15.3.tar.gz";
url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; url = "http://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz";
sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; sha256 = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2";
md5 = ""; md5 = "";
md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; md5name = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2-liborcus-0.15.3.tar.gz";
} }
{ {
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@ -686,11 +693,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
} }
{ {
name = "pdfium-3794.tar.bz2"; name = "pdfium-3963.tar.bz2";
url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; url = "http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2";
sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; sha256 = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895";
md5 = ""; md5 = "";
md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; md5name = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895-pdfium-3963.tar.bz2";
} }
{ {
name = "pixman-0.34.0.tar.gz"; name = "pixman-0.34.0.tar.gz";
@ -707,11 +714,11 @@
md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
} }
{ {
name = "poppler-0.74.0.tar.xz"; name = "poppler-0.82.0.tar.xz";
url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";
sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df";
md5 = ""; md5 = "";
md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz";
} }
{ {
name = "postgresql-9.2.24.tar.bz2"; name = "postgresql-9.2.24.tar.bz2";
@ -721,11 +728,18 @@
md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
} }
{ {
name = "Python-3.5.7.tar.xz"; name = "Python-3.7.6.tar.xz";
url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; url = "http://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz";
sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; sha256 = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f";
md5 = ""; md5 = "";
md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; md5name = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f-Python-3.7.6.tar.xz";
}
{
name = "QR-Code-generator-1.4.0.tar.gz";
url = "http://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz";
sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a";
md5 = "";
md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz";
} }
{ {
name = "libqxp-0.0.2.tar.xz"; name = "libqxp-0.0.2.tar.xz";
@ -805,11 +819,11 @@
md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
} }
{ {
name = "libvisio-0.1.6.tar.xz"; name = "libvisio-0.1.7.tar.xz";
url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz";
sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c";
md5 = ""; md5 = "";
md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz";
} }
{ {
name = "libwpd-0.10.3.tar.xz"; name = "libwpd-0.10.3.tar.xz";

12
pkgs/applications/office/libreoffice/src-fresh/override.nix
View File

@ -1,4 +1,10 @@
{ stdenv, ... }: { stdenv, kdeIntegration, ... }:
attrs: { attrs:
NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; {
postConfigure = attrs.postConfigure + ''
sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx'
'';
configureFlags = attrs.configureFlags ++ [
(stdenv.lib.enableFeature kdeIntegration "kf5")
];
} }

12
pkgs/applications/office/libreoffice/src-fresh/primary.nix
View File

@ -7,9 +7,9 @@ rec {
}; };
major = "6"; major = "6";
minor = "3"; minor = "4";
patch = "0"; patch = "1";
tweak = "4"; tweak = "1";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -17,19 +17,19 @@ rec {
src = fetchurl { src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; sha256 = "03fqpkilz4yi35l447hb9r8gjwj23l61bpdkwg21jm8blm8kkvyj";
}; };
# FIXME rename # FIXME rename
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; sha256 = "1hfllrdyxrg5mgqry3dcrhjbdrd0d27k5mvv4sfj7nwjlmjh8rqq";
}; };
} }

144
pkgs/applications/office/libreoffice/src-still/download.nix
View File

@ -1,10 +1,10 @@
[ [
{ {
name = "libabw-0.1.2.tar.xz"; name = "libabw-0.1.3.tar.xz";
url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz";
sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed";
md5 = ""; md5 = "";
md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
} }
{ {
name = "commons-logging-1.2-src.tar.gz"; name = "commons-logging-1.2-src.tar.gz";
@ -28,11 +28,11 @@
md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
} }
{ {
name = "boost_1_66_0.tar.bz2"; name = "boost_1_69_0.tar.bz2";
url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2";
sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
md5 = ""; md5 = "";
md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2";
} }
{ {
name = "breakpad.zip"; name = "breakpad.zip";
@ -147,11 +147,11 @@
md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
} }
{ {
name = "expat-2.2.5.tar.bz2"; name = "expat-2.2.8.tar.bz2";
url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";
sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102";
md5 = ""; md5 = "";
md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2";
} }
{ {
name = "Firebird-3.0.0.32483-0.tar.bz2"; name = "Firebird-3.0.0.32483-0.tar.bz2";
@ -231,11 +231,11 @@
md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
} }
{ {
name = "source-serif-font-2.007R.tar.gz"; name = "source-serif-pro-3.000R.tar.gz";
url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz";
sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3";
md5 = ""; md5 = "";
md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz";
} }
{ {
name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; name = "EmojiOneColor-SVGinOT-1.3.tar.gz";
@ -308,11 +308,11 @@
md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
} }
{ {
name = "freetype-2.8.1.tar.bz2"; name = "freetype-2.9.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2";
sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d";
md5 = ""; md5 = "";
md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2";
} }
{ {
name = "glm-0.9.4.6-libreoffice.zip"; name = "glm-0.9.4.6-libreoffice.zip";
@ -329,18 +329,18 @@
md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
} }
{ {
name = "graphite2-minimal-1.3.10.tgz"; name = "graphite2-minimal-1.3.13.tgz";
url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz";
sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36";
md5 = ""; md5 = "";
md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz";
} }
{ {
name = "harfbuzz-1.8.4.tar.bz2"; name = "harfbuzz-2.3.1.tar.bz2";
url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2";
sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468";
md5 = ""; md5 = "";
md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2";
} }
{ {
name = "hsqldb_1_8_0.zip"; name = "hsqldb_1_8_0.zip";
@ -462,11 +462,11 @@
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
} }
{ {
name = "language-subtag-registry-2019-04-03.tar.bz2"; name = "language-subtag-registry-2019-09-16.tar.bz2";
url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2";
sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a";
md5 = ""; md5 = "";
md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2";
} }
{ {
name = "JLanguageTool-1.7.0.tar.bz2"; name = "JLanguageTool-1.7.0.tar.bz2";
@ -539,25 +539,25 @@
md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
} }
{ {
name = "xmlsec1-1.2.27.tar.gz"; name = "xmlsec1-1.2.28.tar.gz";
url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz";
sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4";
md5 = ""; md5 = "";
md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz";
} }
{ {
name = "libxml2-2.9.9.tar.gz"; name = "libxml2-2.9.10.tar.gz";
url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";
sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f";
md5 = ""; md5 = "";
md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz";
} }
{ {
name = "libxslt-1.1.33.tar.gz"; name = "libxslt-1.1.34.tar.gz";
url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz";
sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f";
md5 = ""; md5 = "";
md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz";
} }
{ {
name = "lp_solve_5.5.tar.gz"; name = "lp_solve_5.5.tar.gz";
@ -602,11 +602,11 @@
md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
} }
{ {
name = "libmwaw-0.3.14.tar.xz"; name = "libmwaw-0.3.15.tar.xz";
url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz";
sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1";
md5 = ""; md5 = "";
md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz";
} }
{ {
name = "mythes-1.2.4.tar.gz"; name = "mythes-1.2.4.tar.gz";
@ -623,11 +623,11 @@
md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
} }
{ {
name = "nss-3.45-with-nspr-4.21.tar.gz"; name = "nss-3.47.1-with-nspr-4.23.tar.gz";
url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz";
sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64";
md5 = ""; md5 = "";
md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz";
} }
{ {
name = "libodfgen-0.1.6.tar.bz2"; name = "libodfgen-0.1.6.tar.bz2";
@ -658,11 +658,11 @@
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
} }
{ {
name = "openssl-1.0.2r.tar.gz"; name = "openssl-1.0.2t.tar.gz";
url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz";
sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc";
md5 = ""; md5 = "";
md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz";
} }
{ {
name = "liborcus-0.14.1.tar.gz"; name = "liborcus-0.14.1.tar.gz";
@ -686,11 +686,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
} }
{ {
name = "pdfium-3550.tar.bz2"; name = "pdfium-3794.tar.bz2";
url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2";
sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4";
md5 = ""; md5 = "";
md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2";
} }
{ {
name = "pixman-0.34.0.tar.gz"; name = "pixman-0.34.0.tar.gz";
@ -707,11 +707,11 @@
md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
} }
{ {
name = "poppler-0.74.0.tar.xz"; name = "poppler-0.82.0.tar.xz";
url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";
sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df";
md5 = ""; md5 = "";
md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz";
} }
{ {
name = "postgresql-9.2.24.tar.bz2"; name = "postgresql-9.2.24.tar.bz2";
@ -721,11 +721,11 @@
md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
} }
{ {
name = "Python-3.5.7.tar.xz"; name = "Python-3.5.9.tar.xz";
url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz";
sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049";
md5 = ""; md5 = "";
md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz";
} }
{ {
name = "libqxp-0.0.2.tar.xz"; name = "libqxp-0.0.2.tar.xz";
@ -805,11 +805,11 @@
md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
} }
{ {
name = "libvisio-0.1.6.tar.xz"; name = "libvisio-0.1.7.tar.xz";
url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz";
sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c";
md5 = ""; md5 = "";
md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz";
} }
{ {
name = "libwpd-0.10.3.tar.xz"; name = "libwpd-0.10.3.tar.xz";

10
pkgs/applications/office/libreoffice/src-still/override.nix
View File

@ -1,6 +1,12 @@
{ stdenv, ... }: { stdenv, kdeIntegration, ... }:
attrs: attrs:
{ {
configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; postConfigure = attrs.postConfigure + ''
sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx'
'';
configureFlags = stdenv.lib.remove "--without-system-qrcodegen"
(attrs.configureFlags ++ [
(stdenv.lib.enableFeature kdeIntegration "kde5")
]);
meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; };
} }

11
pkgs/applications/office/libreoffice/src-still/primary.nix
View File

@ -7,8 +7,8 @@ rec {
}; };
major = "6"; major = "6";
minor = "2"; minor = "3";
patch = "6"; patch = "5";
tweak = "2"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -17,18 +17,19 @@ rec {
src = fetchurl { src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz";
}; };
# FIXME rename
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6";
}; };
} }

4
pkgs/applications/virtualization/crun/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "crun"; pname = "crun";
version = "0.12.1"; version = "0.12.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0dj6lf5yflbsybv7qkx19xvcfy5pv46k9mys7imr7akr9r1bcl5s"; sha256 = "16hjkkr1fp542ycyp87pj626mzfrza5mcb82hhkp4a8m8bqmpzp4";
fetchSubmodules = true; fetchSubmodules = true;
}; };

7
pkgs/build-support/rust/build-rust-crate/default.nix
View File

@ -62,9 +62,6 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr
extraRustcOpts_ = extraRustcOpts; extraRustcOpts_ = extraRustcOpts;
buildTests_ = buildTests; buildTests_ = buildTests;
# take a list of crates that we depend on and override them to fit our overrides, rustc, release, …
makeDependencies = map (dep: lib.getLib (dep.override { inherit release verbose crateOverrides; }));
# crate2nix has a hack for the old bash based build script that did split # crate2nix has a hack for the old bash based build script that did split
# entries at `,`. No we have to work around that hack. # entries at `,`. No we have to work around that hack.
# https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89 # https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89
@ -93,8 +90,8 @@ stdenv.mkDerivation (rec {
name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}";
depsBuildBuild = [ rust stdenv.cc ]; depsBuildBuild = [ rust stdenv.cc ];
buildInputs = (crate.buildInputs or []) ++ buildInputs_; buildInputs = (crate.buildInputs or []) ++ buildInputs_;
dependencies = makeDependencies dependencies_; dependencies = map lib.getLib dependencies_;
buildDependencies = makeDependencies buildDependencies_; buildDependencies = map lib.getLib buildDependencies_;
completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies); completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies);
completeBuildDeps = lib.unique ( completeBuildDeps = lib.unique (

7
pkgs/build-support/trivial-builders.nix
View File

@ -255,11 +255,14 @@ rec {
}: }:
let let
args = removeAttrs args_ [ "name" "postBuild" ] args = removeAttrs args_ [ "name" "postBuild" ]
// { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults // {
inherit preferLocalBuild allowSubstitutes;
passAsFile = [ "paths" ];
}; # pass the defaults
in runCommand name args in runCommand name args
'' ''
mkdir -p $out mkdir -p $out
for i in $paths; do for i in $(cat $pathsPath); do
${lndir}/bin/lndir -silent $i $out ${lndir}/bin/lndir -silent $i $out
done done
${postBuild} ${postBuild}

46
pkgs/data/fonts/siji/default.nix
View File

@ -1,26 +1,44 @@
{ lib, fetchzip }: { stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }:
let stdenv.mkDerivation rec {
date = "2016-05-13"; name = "siji-${version}";
in fetchzip { version = "2016-05-13";
name = "siji-${date}";
src = fetchzip {
url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip;
sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
};
postFetch = '' nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
unzip -j $downloadedFile
install -D *.pcf -t $out/share/fonts/pcf buildPhase = ''
install -D *.bdf -t $out/share/fonts/bdf # compress pcf fonts
gzip -n -9 pcf/*
# convert bdf fonts to otb
for i in bdf/*; do
name=$(basename $i .bdf)
faketime -f "1970-01-01 00:00:01" \
fonttosfnt -v -o "$name.otb" "$i"
done
''; '';
sha256 = "1ymcbirdbkqaf0xs2y00l0wachb4yxh1fgqm5avqwvccs0lsfj1d"; postInstall = ''
install -m 644 -D pcf/* -t "$out/share/fonts/misc"
install -m 644 -D bdf/* -t "$bdf/share/fonts/misc"
install -m 644 -D *.otb -t "$otb/share/fonts/misc"
mkfontdir "$out/share/fonts/misc"
mkfontdir "$bdf/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
meta = { outputs = [ "out" "bdf" "otb" ];
meta = with stdenv.lib; {
homepage = https://github.com/stark/siji; homepage = https://github.com/stark/siji;
description = "An iconic bitmap font based on Stlarch with additional glyphs"; description = "An iconic bitmap font based on Stlarch with additional glyphs";
license = lib.licenses.gpl2; license = licenses.gpl2;
platforms = lib.platforms.all; platforms = platforms.all;
maintainers = [ lib.maintainers.asymmetric ]; maintainers = [ maintainers.asymmetric ];
}; };
} }

33
pkgs/data/fonts/tamsyn/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }: { stdenv, fetchurl, fontforge, mkfontscale }:
let let
version = "1.11"; version = "1.11";
@ -11,27 +11,32 @@ in stdenv.mkDerivation {
sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp"; sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp";
}; };
nativeBuildInputs = [ mkfontdir mkfontscale ]; nativeBuildInputs = [ fontforge mkfontscale ];
unpackPhase = '' unpackPhase = ''
tar -xzf $src --strip-components=1 tar -xzf $src --strip-components=1
''; '';
installPhase = '' postBuild = ''
# install the pcf fonts (for xorg applications) # convert pcf fonts to otb
fontDir="$out/share/fonts/tamsyn" for i in *.pcf; do
mkdir -p "$fontDir" name=$(basename "$i" .pcf)
mv *.pcf "$fontDir" fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otb\")"
mv *.psf.gz "$fontDir" done
cd "$fontDir" # compress pcf fonts
mkfontdir gzip -n -9 *.pcf
mkfontscale
''; '';
outputHashAlgo = "sha256"; installPhase = ''
outputHashMode = "recursive"; install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc"
outputHash = "13l7ighfmn3kmqmchlksfg8ss22ndjk71rs0f9fn5p5zk7s4dn5x"; install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
install -m 644 -D *.otb -t "$otb/share/fonts/misc"
mkfontdir "$out/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "otb" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A monospace bitmap font aimed at programmers"; description = "A monospace bitmap font aimed at programmers";

35
pkgs/data/fonts/terminus-font/default.nix
View File

@ -1,4 +1,7 @@
{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }: { stdenv, fetchurl, python3
, libfaketime, fonttosfnt
, bdftopcf, mkfontscale
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "terminus-font"; pname = "terminus-font";
@ -9,16 +12,36 @@ stdenv.mkDerivation rec {
sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l"; sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l";
}; };
nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ]; nativeBuildInputs =
[ python3 bdftopcf libfaketime
patchPhase = '' fonttosfnt mkfontscale
substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' ];
'';
enableParallelBuilding = true; enableParallelBuilding = true;
postPatch = ''
substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
'';
postBuild = ''
# convert unicode bdf fonts to otb
for i in *.bdf; do
name=$(basename $i .bdf)
faketime -f "1970-01-01 00:00:01" \
fonttosfnt -v -o "$name.otb" "$i"
done
'';
postInstall = ''
# install otb fonts (for GTK applications)
install -m 644 -D *.otb -t "$otb/share/fonts/misc";
mkfontdir "$otb/share/fonts/misc"
'';
installTargets = [ "install" "fontdir" ]; installTargets = [ "install" "fontdir" ];
outputs = [ "out" "otb" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A clean fixed width font"; description = "A clean fixed width font";
longDescription = '' longDescription = ''

57
pkgs/data/fonts/tewi/default.nix
View File

@ -1,37 +1,52 @@
{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: { stdenv, fetchFromGitHub, python3
, bdftopcf, mkfontscale
, libfaketime, fonttosfnt
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
date = "2015-06-07"; pname = "tewi-font";
name = "tewi-font-${date}"; version = "2.0.2";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/lucy/tewi-font"; owner = "lucy";
rev = "ff930e66ae471da4fdc226ffe65fd1ccd13d4a69"; repo = pname;
sha256 = "0c7k847cp68w20frzsdknpss2cwv3lp970asyybv65jxyl2jz3iq"; rev = version;
sha256 = "1axv9bv10xlcmgfyjh3z5kn5fkg3m6n1kskcs5hvlmyb6m1zk91j";
}; };
nativeBuildInputs = [ bdftopcf mkfontdir mkfontscale ]; nativeBuildInputs =
buildPhase = '' [ python3 bdftopcf mkfontscale
for i in *.bdf; do libfaketime fonttosfnt
bdftopcf -o ''${i/bdf/pcf} $i ];
done
gzip -n *.pcf postPatch = ''
# make gzip deterministic
sed 's/gzip -9/gzip -9 -n/g' -i Makefile
# fix python not found
patchShebangs scripts/merge
'';
postBuild = ''
# convert bdf fonts to otb
for i in *.bdf; do
name=$(basename "$i" .bdf)
faketime -f "1970-01-01 00:00:01" \
fonttosfnt -v -o "$name.otb" "$i"
done
''; '';
installPhase = '' installPhase = ''
fontDir="$out/share/fonts/misc" fontDir="$out/share/fonts/misc"
mkdir -p "$fontDir" install -m 644 -D out/* -t "$fontDir"
mv *.pcf.gz "$fontDir" mkfontdir "$fontDir"
cd "$fontDir" fontDir="$otb/share/fonts/misc"
mkfontdir install -m 644 -D *.otb -t "$fontDir"
mkfontscale mkfontdir "$fontDir"
''; '';
outputHashAlgo = "sha256"; outputs = [ "out" "otb" ];
outputHashMode = "recursive";
outputHash = "14dv3m1svahjyb9c1x1570qrmlnynzg0g36b10bqqs8xvhix34yq";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A nice bitmap font, readable even at small sizes"; description = "A nice bitmap font, readable even at small sizes";

44
pkgs/data/fonts/ucs-fonts/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }: { stdenv, fetchurl, bdftopcf
, libfaketime, fonttosfnt, mkfontscale
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "ucs-fonts"; pname = "ucs-fonts";
@ -21,24 +23,40 @@ stdenv.mkDerivation {
sourceRoot = "."; sourceRoot = ".";
nativeBuildInputs = [ mkfontdir mkfontscale ]; nativeBuildInputs =
[ bdftopcf libfaketime fonttosfnt
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out/share/fonts
cp *.bdf $out/share/fonts
cd $out/share/fonts
mkfontdir
mkfontscale mkfontscale
];
buildPhase = ''
for i in *.bdf; do
name=$(basename "$i" .bdf)
# generate pcf fonts (for X11 applications)
bdftopcf -t "$i" | gzip -n -9 -c > "$name.pcf.gz"
# generate otb fonts (for GTK applications)
faketime -f "1970-01-01 00:00:01" \
fonttosfnt -v -o "$name.otb" "$i"
done
''; '';
outputHashAlgo = "sha256"; installPhase = ''
outputHashMode = "recursive"; install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc"
outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk"; install -m 644 -D *.bdf -t "$bdf/share/fonts/misc"
install -m 644 -D *.otb -t "$otb/share/fonts/misc"
mkfontdir "$out/share/fonts/misc"
mkfontdir "$bdf/share/fonts/misc"
mkfontdir "$otb/share/fonts/misc"
'';
outputs = [ "out" "bdf" "otb" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html";
description = "Unicode bitmap fonts"; description = "Unicode bitmap fonts";
license = licenses.publicDomain;
maintainers = [ maintainers.raskin ]; maintainers = [ maintainers.raskin ];
platforms = platforms.all; platforms = platforms.all;
}; };

31
pkgs/data/fonts/unifont/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, mkfontscale, mkfontdir }: { stdenv, fetchurl, mkfontscale
, libfaketime, fonttosfnt
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unifont"; pname = "unifont";
@ -14,23 +16,32 @@ stdenv.mkDerivation rec {
sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf";
}; };
nativeBuildInputs = [ mkfontscale mkfontdir ]; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
phases = "installPhase"; phases = [ "buildPhase" "installPhase" ];
buildPhase =
''
# convert pcf font to otb
faketime -f "1970-01-01 00:00:01" \
fonttosfnt -g 2 -m 2 -v -o "unifont.otb" "${pcf}"
'';
installPhase = installPhase =
'' ''
mkdir -p $out/share/fonts $out/share/fonts/truetype # install otb fonts
cp -v ${pcf} $out/share/fonts/unifont.pcf.gz install -m 644 -D unifont.otb "$otb/share/fonts/unifont.otb"
cp -v ${ttf} $out/share/fonts/truetype/unifont.ttf mkfontdir "$otb/share/fonts"
cd $out/share/fonts
# install pcf and ttf fonts
install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz
install -m 644 -D ${ttf} $out/share/fonts/truetype/unifont.ttf
cd "$out/share/fonts"
mkfontdir mkfontdir
mkfontscale mkfontscale
''; '';
outputHashAlgo = "sha256"; outputs = [ "out" "otb" ];
outputHashMode = "recursive";
outputHash = "0n3ms2k2mk7j6144l05c45smggwf3j5cwkaxhw93wf9hd1lhpwq1";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Unicode font for Base Multilingual Plane"; description = "Unicode font for Base Multilingual Plane";

45
pkgs/data/fonts/unscii/default.nix
View File

@ -1,32 +1,55 @@
{stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}: { stdenv, fetchurl, perl, bdftopcf
, fontforge, SDL, SDL_image, mkfontscale
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "unscii"; pname = "unscii";
version = "1.1"; version = "1.1";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl { src = fetchurl {
url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz"; url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz";
sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
}; };
nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
SDL SDL_image]; nativeBuildInputs =
[ (perl.withPackages (p: [ p.TextCharWidth ]))
bdftopcf fontforge SDL SDL_image
mkfontscale
];
preConfigure = '' preConfigure = ''
patchShebangs . patchShebangs .
''; '';
installPhase = ''
install -m444 -Dt $out/share/fonts *.hex *.pcf postBuild = ''
install -m444 -Dt $out/share/fonts/truetype *.ttf # compress pcf fonts
install -m444 -Dt $out/share/fonts/opentype *.otf gzip -9 -n *.pcf
install -m444 -Dt $out/share/fonts/svg *.svg
install -m444 -Dt $out/share/fonts/web *.woff
''; '';
installPhase = ''
# install fonts for use in X11 and GTK applications
install -m444 -Dt "$out/share/fonts/misc" *.pcf.gz
install -m444 -Dt "$out/share/fonts/opentype" *.otf
mkfontdir "$out/share/fonts/misc"
mkfontscale "$out/share/fonts/opentype"
# install other formats in $extra
install -m444 -Dt "$extra/share/fonts/truetype" *.ttf
install -m444 -Dt "$extra/share/fonts/svg" *.svg
install -m444 -Dt "$extra/share/fonts/web" *.woff
install -m444 -Dt "$extra/share/fonts/misc" *.hex
mkfontscale "$extra"/share/fonts/*
'';
outputs = [ "out" "extra" ];
meta = { meta = {
inherit version; inherit version;
description = ''Bitmapped character-art-friendly Unicode fonts''; description = ''Bitmapped character-art-friendly Unicode fonts'';
# Basically GPL2+ with font exception — because of the Unifont-augmented # Basically GPL2+ with font exception — because of the Unifont-augmented
# version. The reduced version is public domain. # version. The reduced version is public domain.
license = http://unifoundry.com/LICENSE.txt; license = http://unifoundry.com/LICENSE.txt;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [ stdenv.lib.maintainers.raskin ];
homepage = http://pelulamu.net/unscii/; homepage = http://pelulamu.net/unscii/;
}; };
} }

4
pkgs/desktops/gnome-3/apps/accerciser/default.nix
View File

@ -17,13 +17,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
name = "accerciser-${version}"; name = "accerciser-${version}";
version = "3.34.3"; version = "3.34.4";
format = "other"; format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1ixyxfv2h5921x82d0r39v952ggclnf2xba5li01qmshl6b21kcc"; sha256 = "0f1dixq5hc55dl3y0fr85bkrc2zk08n4dacqcjifij1dys4ks3z1";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

20
pkgs/desktops/mate/atril/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "atril"; pname = "atril";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06hmyw7fwdrdyl3n79b8qxlrwbzf240n82arzmlg62q9zxzdc0is"; sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -25,16 +25,20 @@ stdenv.mkDerivation rec {
mate.caja mate.caja
mate.mate-desktop mate.mate-desktop
hicolor-icon-theme hicolor-icon-theme
texlive.bin.core # for synctex, used by the pdf back-end
]; ];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ];
meta = { enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A simple multi-page document viewer for the MATE desktop"; description = "A simple multi-page document viewer for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
}; };
} }

6
pkgs/desktops/mate/caja-dropbox/default.nix
View File

@ -7,11 +7,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "caja-dropbox"; pname = "caja-dropbox";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5"; sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2";
}; };
patches = [ patches = [
@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ]; configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dropbox extension for Caja file manager"; description = "Dropbox extension for Caja file manager";
homepage = "https://github.com/mate-desktop/caja-dropbox"; homepage = "https://github.com/mate-desktop/caja-dropbox";

12
pkgs/desktops/mate/caja-extensions/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "caja-extensions"; pname = "caja-extensions";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xzhphzvaxbwyyp242pnhl5zjrkiznj90i0xjmy7pvi155pmp16h"; sha256 = "175v5c05nrdliya23rbqma49alldq67dklmvpq18nq71sfry4pp6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -31,9 +31,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Set of extensions for Caja file manager"; description = "Set of extensions for Caja file manager";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

22
pkgs/desktops/mate/caja/caja-extension-dirs.patch
View File

@ -1,11 +1,24 @@
From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 11 Feb 2020 17:49:13 -0300
Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS
CAJA_EXTENSION_DIRS is a list of paths where caja extensions are
looked for. It is needed for distributions like NixOS that do not
install all extensions in the same directory. In NixOS each package is
installed in a self contained directory.
---
libcaja-private/caja-module.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
index 023c22e..414913b 100644 index d54d7cf..9794e56 100644
--- a/libcaja-private/caja-module.c --- a/libcaja-private/caja-module.c
+++ b/libcaja-private/caja-module.c +++ b/libcaja-private/caja-module.c
@@ -258,11 +258,25 @@ caja_module_setup (void) @@ -258,11 +258,25 @@ void
caja_module_setup (void)
{ {
static gboolean initialized = FALSE; static gboolean initialized = FALSE;
GList *res;
+ gchar *caja_extension_dirs; + gchar *caja_extension_dirs;
+ gchar **dir_vector; + gchar **dir_vector;
@ -28,3 +41,6 @@ index 023c22e..414913b 100644
load_module_dir (CAJA_EXTENSIONDIR); load_module_dir (CAJA_EXTENSIONDIR);
eel_debug_call_at_shutdown (free_module_objects); eel_debug_call_at_shutdown (free_module_objects);
--
2.25.0

12
pkgs/desktops/mate/caja/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "caja"; pname = "caja";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1w2liq9h1kr5zyaaq82xz8pic04qi5sra8kaycfg1iddmknkfqn7"; sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -31,9 +31,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-update-mimedb" ]; configureFlags = [ "--disable-update-mimedb" ];
enableParallelBuilding = true;
meta = { meta = {
description = "File manager for the MATE desktop"; description = "File manager for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

12
pkgs/desktops/mate/engrampa/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "engrampa"; pname = "engrampa";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17pn1qgr1a13jxv50qcnzqcw8gr96g7jz2z2y1wbwy7i44bknv6n"; sha256 = "13cak3qgrzqj74x9jq1sf155793v2bqqz4mk4i04g9f9xn3g85fl";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -26,9 +26,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
enableParallelBuilding = true;
meta = { meta = {
description = "Archive Manager for MATE"; description = "Archive Manager for MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

12
pkgs/desktops/mate/eom/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eom"; pname = "eom";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0za1lw4awg1i0ls0r9iw0ail2hqa34y1dx65b50bw9kx9kbfyl9l"; sha256 = "0zzximp2534bky0vac219alafblw6m0lis0gncq92017s6c1mb77";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -30,9 +30,11 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
]; ];
enableParallelBuilding = true;
meta = { meta = {
description = "An image viewing and cataloging program for the MATE desktop"; description = "An image viewing and cataloging program for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

12
pkgs/desktops/mate/libmatekbd/default.nix
View File

@ -1,21 +1,23 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmatekbd"; pname = "libmatekbd";
version = "1.22.0"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8"; sha256 = "1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ gtk3 libxklavier ]; buildInputs = [ gtk3 libxklavier ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Keyboard management library for MATE"; description = "Keyboard management library for MATE";
homepage = https://github.com/mate-desktop/libmatekbd; homepage = "https://github.com/mate-desktop/libmatekbd";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/libmatemixer/default.nix
View File

@ -1,4 +1,4 @@
{ config, stdenv, fetchurl, pkgconfig, intltool, glib { config, stdenv, fetchurl, pkgconfig, gettext, glib
, alsaSupport ? stdenv.isLinux, alsaLib , alsaSupport ? stdenv.isLinux, alsaLib
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
, ossSupport ? false , ossSupport ? false
@ -6,14 +6,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmatemixer"; pname = "libmatemixer";
version = "1.22.0"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9"; sha256 = "08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ glib ] buildInputs = [ glib ]
++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional alsaSupport alsaLib
@ -21,9 +21,11 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional ossSupport "--enable-oss"; configureFlags = stdenv.lib.optional ossSupport "--enable-oss";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Mixer library for MATE"; description = "Mixer library for MATE";
homepage = https://github.com/mate-desktop/libmatemixer; homepage = "https://github.com/mate-desktop/libmatemixer";
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/libmateweather/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmateweather"; pname = "libmateweather";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1y3z82ymc7q6z8ly9f6nys0hbs373fjnvr6j7zwlgf6zc88f71h3"; sha256 = "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ gtk3 libsoup tzdata ]; buildInputs = [ gtk3 libsoup tzdata ];
@ -20,9 +20,11 @@ stdenv.mkDerivation rec {
preFixup = "rm -f $out/share/icons/mate/icon-theme.cache"; preFixup = "rm -f $out/share/icons/mate/icon-theme.cache";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library to access weather information from online services for MATE"; description = "Library to access weather information from online services for MATE";
homepage = https://github.com/mate-desktop/libmateweather; homepage = "https://github.com/mate-desktop/libmateweather";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

13
pkgs/desktops/mate/marco/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marco"; pname = "marco";
version = "1.22.4"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0z8q4nwm43imbnbxz348ylgzfl25sknb19kml57d6z6flxws19k3"; sha256 = "0hcbyv8czymhwz5q9rwig7kkhlhik6y080bls736f3wsbqnnirc2";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -23,11 +23,14 @@ stdenv.mkDerivation rec {
libstartup_notification libstartup_notification
gtk3 gtk3
gnome3.zenity gnome3.zenity
mate-settings-daemon
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE default window manager"; description = "MATE default window manager";
homepage = https://github.com/mate-desktop/marco; homepage = "https://github.com/mate-desktop/marco";
license = [ licenses.gpl2 ]; license = [ licenses.gpl2 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/mate-applets/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-applets"; pname = "mate-applets";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1c32rkkry6kka2arrx5psjj037j79icp5jr1s0qh596dvsgxciqc"; sha256 = "0nm3amb3v458mxv1mbz9y8f4230gldmydmkkm7vqxsrxbccynkxq";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -36,9 +36,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Applets for use with the MATE panel"; description = "Applets for use with the MATE panel";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl2Plus lgpl2Plus ]; license = with licenses; [ gpl2Plus lgpl2Plus ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/mate-backgrounds/default.nix
View File

@ -1,19 +1,21 @@
{ stdenv, fetchurl, intltool }: { stdenv, fetchurl, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-backgrounds"; pname = "mate-backgrounds";
version = "1.22.0"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9"; sha256 = "16rmsy02fyq6mj6xgc5mdyh146z3zmkn7iwsi44s962aqwbpn4i8";
}; };
nativeBuildInputs = [ intltool ]; nativeBuildInputs = [ gettext ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Background images and data for MATE"; description = "Background images and data for MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/mate-calc/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-calc"; pname = "mate-calc";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1as4gshydcf84vynq8ijd9n8pslz5jpw6aj18ri4bdc91a6q3rpg"; sha256 = "0f7hc1gg41kcwcyvsqqg79qylrp0qqymris8qizk2x3cfvvg7261";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -21,9 +21,11 @@ stdenv.mkDerivation rec {
libxml2 libxml2
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Calculator for the MATE desktop"; description = "Calculator for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = [ licenses.gpl2Plus ]; license = [ licenses.gpl2Plus ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

8
pkgs/desktops/mate/mate-common/default.nix
View File

@ -2,16 +2,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-common"; pname = "mate-common";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1xx7qrw8kc6355r1a1nybncf8s2rxjb2nqzw0gv2r5j5sqx8fzgf"; sha256 = "06w25mk2w7rfnkwpnav8pcrvip1zdd0zd1qc6d975ksmg66r1vz7";
}; };
enableParallelBuilding = true;
meta = { meta = {
description = "Common files for development of MATE packages"; description = "Common files for development of MATE packages";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

81
pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch
View File

@ -1,81 +0,0 @@
From 74fb65a2574c93a2b20a51875a5e336f727ff4bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 25 Dec 2019 18:48:38 -0300
Subject: [PATCH] Search system themes in system data dirs
---
capplets/common/gtkrc-utils.c | 20 ++++++++++++--------
capplets/common/mate-theme-info.c | 18 +++++++++++-------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c
index 011c8a1..27e01da 100644
--- a/capplets/common/gtkrc-utils.c
+++ b/capplets/common/gtkrc-utils.c
@@ -60,15 +60,19 @@ gchar* gtkrc_find_named(const gchar* name)
if (!path)
{
- gchar* theme_dir = gtk_rc_get_theme_dir();
- path = g_build_filename(theme_dir, name, subpath, NULL);
- g_free(theme_dir);
+ const gchar * const * dirs = g_get_system_data_dirs();
- if (!g_file_test(path, G_FILE_TEST_EXISTS))
- {
- g_free (path);
- path = NULL;
- }
+ if (dirs != NULL)
+ for (; !path && *dirs != NULL; ++dirs)
+ {
+ path = g_build_filename(*dirs, "themes", name, subpath, NULL);
+
+ if (!g_file_test(path, G_FILE_TEST_EXISTS))
+ {
+ g_free (path);
+ path = NULL;
+ }
+ }
}
return path;
diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c
index 54ae3ae..a738f0b 100644
--- a/capplets/common/mate-theme-info.c
+++ b/capplets/common/mate-theme-info.c
@@ -1763,6 +1763,7 @@ mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2)
void
mate_theme_init ()
{
+ const gchar * const * dirs;
GFile *top_theme_dir;
gchar *top_theme_dir_string;
static gboolean initted = FALSE;
@@ -1783,13 +1784,16 @@ mate_theme_init ()
theme_hash_by_uri = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
theme_hash_by_name = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
- /* Add all the toplevel theme dirs. */
- /* $datadir/themes */
- top_theme_dir_string = gtk_rc_get_theme_dir ();
- top_theme_dir = g_file_new_for_path (top_theme_dir_string);
- g_free (top_theme_dir_string);
- add_top_theme_dir_monitor (top_theme_dir, 1, NULL);
- g_object_unref (top_theme_dir);
+ /* Add all the toplevel theme dirs following the XDG Base Directory Specification */
+ dirs = g_get_system_data_dirs ();
+ if (dirs != NULL)
+ for (; *dirs != NULL; ++dirs) {
+ top_theme_dir_string = g_build_filename (*dirs, "themes", NULL);
+ top_theme_dir = g_file_new_for_path (top_theme_dir_string);
+ g_free (top_theme_dir_string);
+ add_top_theme_dir_monitor (top_theme_dir, 1, NULL);
+ g_object_unref (top_theme_dir);
+ }
/* ~/.themes */
top_theme_dir_string = g_build_filename (g_get_home_dir (), ".themes", NULL);
--
2.24.1

20
pkgs/desktops/mate/mate-control-center/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, { stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib,
libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
desktop-file-utils, dconf, gtk3, mate, hicolor-icon-theme, wrapGAppsHook desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-control-center"; pname = "mate-control-center";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ybdjibi6wgqn3587a66ckxp2qkvl4mcvv2smhflyxksl5djrjgh"; sha256 = "192plsh83m2qz7jgakns2yvhqbj53v7i54iwb0z26i2awy0j9rcd";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
desktop-file-utils desktop-file-utils
wrapGAppsHook wrapGAppsHook
@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
libappindicator-gtk3 libappindicator-gtk3
gtk3 gtk3
dconf dconf
polkit
hicolor-icon-theme hicolor-icon-theme
mate.mate-desktop mate.mate-desktop
mate.libmatekbd mate.libmatekbd
@ -37,13 +38,6 @@ stdenv.mkDerivation rec {
mate.mate-settings-daemon mate.mate-settings-daemon
]; ];
patches = [
# see https://github.com/mate-desktop/mate-control-center/pull/528
./0001-Search-system-themes-in-system-data-dirs.patch
# look up keyboard shortcuts in system data dirs
./mate-control-center.keybindings-dir.patch
];
configureFlags = [ "--disable-update-mimedb" ]; configureFlags = [ "--disable-update-mimedb" ];
preFixup = '' preFixup = ''
@ -57,7 +51,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Utilities to configure the MATE desktop"; description = "Utilities to configure the MATE desktop";
homepage = https://github.com/mate-desktop/mate-control-center; homepage = "https://github.com/mate-desktop/mate-control-center";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

106
pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch
View File

@ -1,106 +0,0 @@
From faeb322b01d3856f3cf163470cc38f4e88a8527c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 28 Apr 2019 21:45:39 -0300
Subject: [PATCH] Use system data dirs to locate key bindings
---
capplets/keybindings/Makefile.am | 3 +-
.../keybindings/mate-keybinding-properties.c | 58 ++++++++++++-------
2 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
index e5efb109..9501dd8f 100644
--- a/capplets/keybindings/Makefile.am
+++ b/capplets/keybindings/Makefile.am
@@ -33,8 +33,7 @@ AM_CPPFLAGS = \
$(MATECC_CAPPLETS_CFLAGS) \
-DMATELOCALEDIR="\"$(datadir)/locale\"" \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \
- -DMATECC_UI_DIR="\"$(uidir)\"" \
- -DMATECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\""
+ -DMATECC_UI_DIR="\"$(uidir)\""
CLEANFILES = \
$(MATECC_CAPPLETS_CLEANFILES) \
$(desktop_DATA) \
diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c
index 4f257333..cf1891d2 100644
--- a/capplets/keybindings/mate-keybinding-properties.c
+++ b/capplets/keybindings/mate-keybinding-properties.c
@@ -1033,39 +1033,57 @@ static void
reload_key_entries (GtkBuilder *builder)
{
gchar **wm_keybindings;
- GDir *dir;
- const char *name;
GList *list, *l;
+ const gchar * const * data_dirs;
+ GHashTable *loaded_files;
+ guint i;
wm_keybindings = wm_common_get_current_keybindings();
clear_old_model (builder);
- dir = g_dir_open (MATECC_KEYBINDINGS_DIR, 0, NULL);
- if (!dir)
- return;
-
- list = NULL;
- for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir))
+ loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+ data_dirs = g_get_system_data_dirs ();
+ for (i = 0; data_dirs[i] != NULL; i++)
{
- if (g_str_has_suffix (name, ".xml"))
+ g_autofree gchar *dir_path = NULL;
+ GDir *dir;
+ const gchar *name;
+
+ dir_path = g_build_filename (data_dirs[i], "mate-control-center", "keybindings", NULL);
+ g_debug ("Keybinding dir: %s", dir_path);
+
+ dir = g_dir_open (dir_path, 0, NULL);
+ if (!dir)
+ continue;
+
+ for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir))
{
- list = g_list_insert_sorted (list, g_strdup (name),
- (GCompareFunc) g_ascii_strcasecmp);
- }
- }
- g_dir_close (dir);
+ if (g_str_has_suffix (name, ".xml") == FALSE)
+ continue;
+
+ if (g_hash_table_lookup (loaded_files, name) != NULL)
+ {
+ g_debug ("Not loading %s, it was already loaded from another directory", name);
+ continue;
+ }
+ g_hash_table_insert (loaded_files, g_strdup (name), g_strdup (dir_path));
+ }
+
+ g_dir_close (dir);
+ }
+ list = g_hash_table_get_keys (loaded_files);
+ list = g_list_sort(list, (GCompareFunc) g_str_equal);
for (l = list; l != NULL; l = l->next)
{
- gchar *path;
-
- path = g_build_filename (MATECC_KEYBINDINGS_DIR, l->data, NULL);
- append_keys_to_tree_from_file (builder, path, wm_keybindings);
- g_free (l->data);
- g_free (path);
+ g_autofree gchar *path = NULL;
+ path = g_build_filename (g_hash_table_lookup (loaded_files, l->data), l->data, NULL);
+ g_debug ("Keybinding file: %s", path);
+ append_keys_to_tree_from_file (builder, path, wm_keybindings);
}
g_list_free (list);
+ g_hash_table_destroy (loaded_files);
/* Load custom shortcuts _after_ system-provided ones,
* since some of the custom shortcuts may also be listed

12
pkgs/desktops/mate/mate-desktop/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-desktop"; pname = "mate-desktop";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18w5r9p3bqpvxqqy2am7z686xf65cz5vhj247kki8s2yvvap6rlh"; sha256 = "0l4bbj6nz315s5ndq5sw1jcgi3s1whk59bj12c4mbpsvmlb33adg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -21,9 +21,11 @@ stdenv.mkDerivation rec {
isocodes isocodes
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library with common API for various MATE modules"; description = "Library with common API for various MATE modules";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

4
pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
View File

@ -25,9 +25,11 @@ stdenv.mkDerivation rec {
done done
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "Faenza icon theme from MATE"; description = "Faenza icon theme from MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

12
pkgs/desktops/mate/mate-icon-theme/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: { stdenv, fetchurl, pkgconfig, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-icon-theme"; pname = "mate-icon-theme";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0r2bk4flb6kjj97badj2lnml4lfwpl2ym5hkf7r6f7cj8g6pzc4r"; sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na";
}; };
nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; nativeBuildInputs = [ pkgconfig gettext iconnamingutils ];
buildInputs = [ librsvg ]; buildInputs = [ librsvg ];
@ -25,9 +25,11 @@ stdenv.mkDerivation rec {
done done
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "Icon themes from MATE"; description = "Icon themes from MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.lgpl3; license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

12
pkgs/desktops/mate/mate-indicator-applet/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-indicator-applet"; pname = "mate-indicator-applet";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05j5s6r4kx1rbz0j7a7xv38d0kbdi1r8iv8b6nx3lkbkdzq1x0w2"; sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -22,8 +22,10 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/mate-desktop/mate-indicator-applet; homepage = "https://github.com/mate-desktop/mate-indicator-applet";
description = "MATE panel indicator applet"; description = "MATE panel indicator applet";
longDescription = '' longDescription = ''
A small applet to display information from various applications A small applet to display information from various applications

12
pkgs/desktops/mate/mate-media/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-media"; pname = "mate-media";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0m8q2rqbxzvh82yj63syd8sbfjrc8y4a8caa42zs66j9x60d1agw"; sha256 = "1d5dx79yfqghjaxrdrdh053nfnvkbx8p3ma7j87s7rsvy5irs963";
}; };
buildInputs = [ buildInputs = [
@ -20,14 +20,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
libtool libtool
wrapGAppsHook wrapGAppsHook
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Media tools for MATE"; description = "Media tools for MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo maintainers.chpatrick ]; maintainers = [ maintainers.romildo maintainers.chpatrick ];

12
pkgs/desktops/mate/mate-menus/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }: { stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-menus"; pname = "mate-menus";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0kh6y76f1rhp3nr22rp93bx77wcgqnygag2ir076cqkppayjc3c0"; sha256 = "1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd";
}; };
nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; nativeBuildInputs = [ pkgconfig gettext gobject-introspection ];
buildInputs = [ glib python3 ]; buildInputs = [ glib python3 ];
@ -18,9 +18,11 @@ stdenv.mkDerivation rec {
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Menu system for MATE"; description = "Menu system for MATE";
homepage = https://github.com/mate-desktop/mate-menus; homepage = "https://github.com/mate-desktop/mate-menus";
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/mate-netbook/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-netbook"; pname = "mate-netbook";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0m38v2276s2d3zs7smxyf70nyl7bcwp5665zgva28lvs8ip3gijx"; sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
mate.mate-panel mate.mate-panel
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE utilities for netbooks"; description = "MATE utilities for netbooks";
longDescription = '' longDescription = ''
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
Installing these utilities is recommended for netbooks and similar Installing these utilities is recommended for netbooks and similar
devices with low resolution displays. devices with low resolution displays.
''; '';
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl3 lgpl2Plus ]; license = with licenses; [ gpl3 lgpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

17
pkgs/desktops/mate/mate-notification-daemon/default.nix
View File

@ -1,18 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libcanberra-gtk3, { stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3,
libnotify, libwnck3, gtk3, wrapGAppsHook }: libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-notification-daemon"; pname = "mate-notification-daemon";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0f8m3m94iqj2x61dzwwvwq2qlsl2ma8pqr6rfns5pzd0nj0waz0m"; sha256 = "0y362b51lb8nq2cw254qc39x8hpficn5rxddzp0fxqxakrh7vcif";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
libxml2 # for xmllint
wrapGAppsHook wrapGAppsHook
]; ];
@ -25,9 +26,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Notification daemon for MATE"; description = "Notification daemon for MATE Desktop";
homepage = https://github.com/mate-desktop/mate-notification-daemon; homepage = "https://github.com/mate-desktop/mate-notification-daemon";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/mate-panel/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-panel"; pname = "mate-panel";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1sm0fniywcxg8rbakhhc37bamwq1x3jqqyaqcvqwxvm6jg1hc97y"; sha256 = "1hrh10pqk8mva1ix2nmsp3cbbn81cgqy0b9lqhsl0b5p0s40i7in";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection
intltool gettext
itstool itstool
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
@ -37,9 +37,11 @@ stdenv.mkDerivation rec {
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The MATE panel"; description = "The MATE panel";
homepage = https://github.com/mate-desktop/mate-panel; homepage = "https://github.com/mate-desktop/mate-panel";
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/mate-polkit/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-polkit"; pname = "mate-polkit";
version = "1.22.0"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0"; sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection
intltool gettext
pkgconfig pkgconfig
]; ];
@ -22,9 +22,11 @@ stdenv.mkDerivation rec {
polkit polkit
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Integrates polkit authentication for MATE desktop"; description = "Integrates polkit authentication for MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = [ licenses.gpl2Plus ]; license = [ licenses.gpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

27
pkgs/desktops/mate/mate-power-manager/default.nix
View File

@ -1,14 +1,21 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-power-manager"; pname = "mate-power-manager";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12pnj7y01k1fhfhswxmf6q9yyb0772am5anm338hzfhjp0lcxlbn"; sha256 = "1h6wm8vna97iayhwqh7rfsc87715np12nxa72w27p4zl54bdkdlg";
}; };
nativeBuildInputs = [
pkgconfig
gettext
libtool
wrapGAppsHook
];
buildInputs = [ buildInputs = [
glib glib
itstool itstool
@ -19,23 +26,19 @@ stdenv.mkDerivation rec {
libnotify libnotify
dbus-glib dbus-glib
upower upower
polkit
mate.mate-panel mate.mate-panel
]; ];
nativeBuildInputs = [
pkgconfig
intltool
libtool
wrapGAppsHook
];
configureFlags = [ "--enable-applets" ]; configureFlags = [ "--enable-applets" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The MATE Power Manager"; description = "The MATE Power Manager";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo maintainers.chpatrick ]; maintainers = with maintainers; [ romildo chpatrick ];
}; };
} }

13
pkgs/desktops/mate/mate-screensaver/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-screensaver"; pname = "mate-screensaver";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1y8828g4bys8y4r5y478z6i7dgdqm2wkymi5fq75vxx4lzq919cb"; sha256 = "0gpw6x9d0b77f14vjl7ghq5dya1mwcnvmgigg00manfwlksr5zby";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
libxml2 # provides xmllint
wrapGAppsHook wrapGAppsHook
]; ];
@ -30,9 +31,11 @@ stdenv.mkDerivation rec {
makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ]; makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Screen saver and locker for the MATE desktop"; description = "Screen saver and locker for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl2Plus lgpl2Plus ]; license = with licenses; [ gpl2Plus lgpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/mate-sensors-applet/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-sensors-applet"; pname = "mate-sensors-applet";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3"; sha256 = "1izjgzj3xb93arim8w891x8as85phdmlhdnr2yc8ixg7xpblsq2s";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -28,8 +28,10 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/mate-desktop/mate-sensors-applet; homepage = "https://github.com/mate-desktop/mate-sensors-applet";
description = "MATE panel applet for hardware sensors"; description = "MATE panel applet for hardware sensors";
license = with licenses; [ gpl2Plus ]; license = with licenses; [ gpl2Plus ];
platforms = platforms.linux; platforms = platforms.linux;

16
pkgs/desktops/mate/mate-session-manager/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd, { stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd,
libSM, libXtst, gtk3, hicolor-icon-theme, mate, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
wrapGAppsHook wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-session-manager"; pname = "mate-session-manager";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ys26af75xl1psck8v32gygxipd8ms1xgpvdhwmnj7bqhabhh249"; sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
xtrans xtrans
wrapGAppsHook wrapGAppsHook
]; ];
@ -27,11 +27,15 @@ stdenv.mkDerivation rec {
gtk3 gtk3
mate.mate-desktop mate.mate-desktop
hicolor-icon-theme hicolor-icon-theme
epoxy
polkit
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE Desktop session manager"; description = "MATE Desktop session manager";
homepage = https://github.com/mate-desktop/mate-session-manager; homepage = "https://github.com/mate-desktop/mate-session-manager";
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

23
pkgs/desktops/mate/mate-settings-daemon/default.nix
View File

@ -1,28 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, { stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier,
libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
wrapGAppsHook, fetchpatch, autoreconfHook }: wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-settings-daemon"; pname = "mate-settings-daemon";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip"; sha256 = "1hc5a36wqpjv9i2lgrn1h12s8y910xab3phx5vzbzq47kj6m3gw9";
}; };
patches = [
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/mate-desktop/mate-settings-daemon/pull/296.patch";
sha256 = "00dfn8h47zw3wr7yya82vvp19wsw51whn8jwgayn4hkjd161s9nm";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook # drop with the above patch gettext
intltool
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
]; ];
@ -45,9 +36,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE settings daemon"; description = "MATE settings daemon";
homepage = https://github.com/mate-desktop/mate-settings-daemon; homepage = "https://github.com/mate-desktop/mate-settings-daemon";
license = with licenses; [ gpl2 lgpl21 ]; license = with licenses; [ gpl2 lgpl21 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

13
pkgs/desktops/mate/mate-system-monitor/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-system-monitor"; pname = "mate-system-monitor";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1d4l5rv01343jf8bk2j5hxvrbp3d705nd4v2pdrjn4h5dw8nxsl1"; sha256 = "1cb36lrsn4fhsryl2kl4yq0qhp1p4r7k21w3fc2ywjga8fdxx6y5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -22,14 +22,17 @@ stdenv.mkDerivation rec {
libgtop libgtop
libwnck3 libwnck3
librsvg librsvg
polkit
systemd systemd
]; ];
configureFlags = [ "--enable-systemd" ]; configureFlags = [ "--enable-systemd" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "System monitor for the MATE desktop"; description = "System monitor for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = [ licenses.gpl2Plus ]; license = [ licenses.gpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

13
pkgs/desktops/mate/mate-terminal/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-terminal"; pname = "mate-terminal";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn"; sha256 = "0nc23nmbkya2fgf7j65z85dcibwi5akkr8nscqrvk039ckirhk97";
}; };
buildInputs = [ buildInputs = [
@ -23,14 +23,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The MATE Terminal Emulator"; description = "The MATE Terminal Emulator";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
}; };
} }

4
pkgs/desktops/mate/mate-themes/default.nix
View File

@ -20,9 +20,11 @@ stdenv.mkDerivation rec {
gtk-update-icon-cache "$out"/share/icons/ContrastHigh gtk-update-icon-cache "$out"/share/icons/ContrastHigh
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "A set of themes from MATE"; description = "A set of themes from MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

17
pkgs/desktops/mate/mate-user-guide/default.nix
View File

@ -1,21 +1,28 @@
{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }: { stdenv, fetchurl, gettext, itstool, libxml2, yelp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-user-guide"; pname = "mate-user-guide";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zv8arsxnbab0qk3ck9i1wp3d4gfclcv6vq6nh5i8zjz6rpp9cjs"; sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f";
}; };
nativeBuildInputs = [ itstool intltool libxml2 ]; nativeBuildInputs = [ itstool gettext libxml2 ];
buildInputs = [ yelp ]; buildInputs = [ yelp ];
postPatch = ''
substituteInPlace mate-user-guide.desktop.in.in \
--replace "Exec=yelp" "Exec=${yelp}/bin/yelp"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE User Guide"; description = "MATE User Guide";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl2Plus fdl12 ]; license = with licenses; [ gpl2Plus fdl12 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/mate-user-share/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-user-share"; pname = "mate-user-share";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k"; sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
libxml2 libxml2
wrapGAppsHook wrapGAppsHook
@ -42,9 +42,11 @@ stdenv.mkDerivation rec {
"--with-cajadir=$(out)/lib/caja/extensions-2.0" "--with-cajadir=$(out)/lib/caja/extensions-2.0"
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "User level public file sharing for the MATE desktop"; description = "User level public file sharing for the MATE desktop";
homepage = https://github.com/mate-desktop/mate-user-share; homepage = "https://github.com/mate-desktop/mate-user-share";
license = with licenses; [ gpl2Plus ]; license = with licenses; [ gpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

15
pkgs/desktops/mate/mate-utils/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-utils"; pname = "mate-utils";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1i6fnm3y1hj8r57x4jpc4ixqs77zln8f7477d0haypflxm3s4kjr"; sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
inkscape inkscape
wrapGAppsHook wrapGAppsHook
@ -22,13 +22,18 @@ stdenv.mkDerivation rec {
libgtop libgtop
libcanberra-gtk3 libcanberra-gtk3
libxml2 libxml2
udisks2
mate.mate-panel mate.mate-panel
hicolor-icon-theme hicolor-icon-theme
]; ];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Utilities for the MATE desktop"; description = "Utilities for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl2Plus lgpl2Plus ]; license = with licenses; [ gpl2Plus lgpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

12
pkgs/desktops/mate/mozo/default.nix
View File

@ -1,26 +1,28 @@
{ stdenv, python3, fetchurl, pkgconfig, intltool, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: { stdenv, python3, fetchurl, pkgconfig, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "mozo"; pname = "mozo";
version = "1.22.2"; version = "1.24.0";
format = "other"; format = "other";
doCheck = false; doCheck = false;
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1lzcwsz940v218frwzhpywp1an9x3cgfvqr7r8dplpdapvd0khrs"; sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3";
}; };
nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig gettext gobject-introspection wrapGAppsHook ];
propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ];
buildInputs = [ gtk3 glib ]; buildInputs = [ gtk3 glib ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE Desktop menu editor"; description = "MATE Desktop menu editor";
homepage = https://github.com/mate-desktop/mozo; homepage = "https://github.com/mate-desktop/mozo";
license = with licenses; [ lgpl2Plus ]; license = with licenses; [ lgpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

13
pkgs/desktops/mate/pluma/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pluma"; pname = "pluma";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1gsj8grdhzb1jvl5zwd8zjc9cj9ys2ndny04gy4bbh80sjaj6xva"; sha256 = "1vmndhlhy3qkf3xs5kkv0xhbv5ar25pqz0kp17hc4qhgjzycfr0r";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
perl
itstool itstool
isocodes isocodes
wrapGAppsHook wrapGAppsHook
@ -27,9 +28,11 @@ stdenv.mkDerivation rec {
mate.mate-desktop mate.mate-desktop
]; ];
enableParallelBuilding = true;
meta = { meta = {
description = "Powerful text editor for the MATE desktop"; description = "Powerful text editor for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

12
pkgs/desktops/mate/python-caja/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, mate, python3Packages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "python-caja"; pname = "python-caja";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07hkvs4a6anrvh28zjsrj8anbcz32p19hslhq66yhcvh0hh4kvqk"; sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
python3Packages.wrapPython python3Packages.wrapPython
]; ];
@ -24,9 +24,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Python binding for Caja components"; description = "Python binding for Caja components";
homepage = https://github.com/mate-desktop/python-caja; homepage = "https://github.com/mate-desktop/python-caja";
license = [ licenses.gpl2Plus ]; license = [ licenses.gpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

2
pkgs/desktops/mate/update.sh
View File

@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
root=../../.. root=../../..
export NIXPKGS_ALLOW_UNFREE=1 export NIXPKGS_ALLOW_UNFREE=1
mate_version=1.22 mate_version=1.24
theme_version=3.22 theme_version=3.22
materepo=https://pub.mate-desktop.org/releases/${mate_version} materepo=https://pub.mate-desktop.org/releases/${mate_version}
themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version} themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version}

4
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -30,7 +30,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-files"; pname = "elementary-files";
version = "4.3.0"; version = "4.4.0";
repoName = "files"; repoName = "files";
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
owner = "elementary"; owner = "elementary";
repo = repoName; repo = repoName;
rev = version; rev = version;
sha256 = "0brckm0vi9lh8l4g3cy37pbyrdh6g0mdsv3cpii069y2drrh8mz5"; sha256 = "1l5ki203agy3wkhnxf89ziy4xfmn7m3q0qz1hyrzy7a7qaslq3bg";
}; };
passthru = { passthru = {

170
pkgs/development/compilers/julia/1.3.nix Normal file
View File

@ -0,0 +1,170 @@
{ stdenv, fetchurl, fetchzip, fetchFromGitHub
# build tools
, gfortran, m4, makeWrapper, patchelf, perl, which, python2
, cmake
# libjulia dependencies
, libunwind, readline, utf8proc, zlib
# standard library dependencies
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
# linear algebra
, openblas, arpack
# Darwin frameworks
, CoreServices, ApplicationServices
}:
with stdenv.lib;
# All dependencies must use the same OpenBLAS.
let
arpack_ = arpack;
in
let
arpack = arpack_.override { inherit openblas; };
in
let
majorVersion = "1";
minorVersion = "3";
maintenanceVersion = "1";
src_sha256 = "0q9a7yc3b235psrwl5ghyxgwly25lf8n818l8h6bkf2ymdbsv5p6";
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
in
stdenv.mkDerivation rec {
pname = "julia";
inherit version;
src = fetchzip {
url = "https://github.com/JuliaLang/julia/releases/download/v${majorVersion}.${minorVersion}.${maintenanceVersion}/julia-${majorVersion}.${minorVersion}.${maintenanceVersion}-full.tar.gz";
sha256 = src_sha256;
};
prePatch = ''
export PATH=$PATH:${cmake}/bin
'';
patches = [
./use-system-utf8proc-julia-1.3.patch
# Julia recompiles a precompiled file if the mtime stored *in* the
# .ji file differs from the mtime of the .ji file. This
# doesn't work in Nix because Nix changes the mtime of files in
# the Nix store to 1. So patch Julia to accept mtimes of 1.
./allow_nix_mtime.patch
];
postPatch = ''
patchShebangs . contrib
for i in backtrace cmdlineargs; do
mv test/$i.jl{,.off}
touch test/$i.jl
done
rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl
rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl
sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl
sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl
'';
buildInputs = [
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
pcre2.dev openblas openlibm openspecfun readline utf8proc
zlib
]
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
;
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
makeFlags =
let
arch = head (splitString "-" stdenv.system);
march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
or (throw "unsupported architecture: ${arch}");
# Julia requires Pentium 4 (SSE2) or better
cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
or (throw "unsupported architecture: ${arch}");
# Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM
# https://github.com/JuliaLang/julia/tree/master/deps/patches
in [
"ARCH=${arch}"
"MARCH=${march}"
"JULIA_CPU_TARGET=${cpuTarget}"
"PREFIX=$(out)"
"prefix=$(out)"
"SHELL=${stdenv.shell}"
"USE_SYSTEM_BLAS=1"
"USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
"LIBBLAS=-lopenblas"
"LIBBLASNAME=libopenblas"
"USE_SYSTEM_LAPACK=1"
"LIBLAPACK=-lopenblas"
"LIBLAPACKNAME=libopenblas"
"USE_SYSTEM_ARPACK=1"
"USE_SYSTEM_FFTW=1"
"USE_SYSTEM_GMP=1"
"USE_SYSTEM_LIBGIT2=1"
"USE_SYSTEM_LIBUNWIND=1"
"USE_SYSTEM_MPFR=1"
"USE_SYSTEM_OPENLIBM=1"
"USE_SYSTEM_OPENSPECFUN=1"
"USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1"
"PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
"PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
"USE_SYSTEM_READLINE=1"
"USE_SYSTEM_UTF8PROC=1"
"USE_SYSTEM_ZLIB=1"
"USE_BINARYBUILDER=0"
];
LD_LIBRARY_PATH = makeLibraryPath [
arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
openspecfun pcre2
];
enableParallelBuilding = true;
doCheck = !stdenv.isDarwin;
checkTarget = "testall";
# Julia's tests require read/write access to $HOME
preCheck = ''
export HOME="$NIX_BUILD_TOP"
'';
preBuild = ''
sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
'';
postInstall = ''
# Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
# as using a wrapper with LD_LIBRARY_PATH causes segmentation
# faults when program returns an error:
# $ julia -e 'throw(Error())'
find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
ln -sv $lib $out/lib/julia/$(basename $lib)
fi
done
'';
passthru = {
inherit majorVersion minorVersion maintenanceVersion;
site = "share/julia/site/v${majorVersion}.${minorVersion}";
};
meta = {
description = "High-level performance-oriented dynamical language for technical computing";
homepage = https://julialang.org/;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.isi686;
};
}

24
pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch Normal file
View File

@ -0,0 +1,24 @@
---
src/flisp/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/flisp/Makefile b/src/flisp/Makefile
index d97075e..6bebca7 100644
--- a/src/flisp/Makefile
+++ b/src/flisp/Makefile
@@ -32,9 +32,9 @@ OBJS := $(SRCS:%.c=$(BUILDDIR)/%.o)
DOBJS := $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj)
LLT_release := $(LLT_BUILDDIR)/libsupport.a
LLT_debug := $(LLT_BUILDDIR)/libsupport-debug.a
-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC)
-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC)
-LIBS :=
+LIBFILES_release := $(LLT_release) $(LIBUV)
+LIBFILES_debug := $(LLT_debug) $(LIBUV)
+LIBS := $(LIBUTF8PROC)
ifneq ($(OS),WINNT)
LIBS += -lpthread
endif
--

8
pkgs/development/compilers/mint/default.nix
View File

@ -1,15 +1,15 @@
{ lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }: { lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }:
crystal.buildCrystalPackage rec { crystal.buildCrystalPackage rec {
version = "0.5.0"; version = "0.7.1";
pname = "mint"; pname = "mint";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mint-lang"; owner = "mint-lang";
repo = "mint"; repo = "mint";
rev = version; rev = version;
sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl"; sha256 = "18cg96kl4dn89bj6fm3080zzyd1r7rsfi17agdjjayd2v9fgs95l";
}; };
buildInputs = [ openssl_1_0_2 ]; buildInputs = [ openssl ];
# Update with # Update with
# nix-shell -p crystal2nix --run crystal2nix # nix-shell -p crystal2nix --run crystal2nix

14
pkgs/development/compilers/mint/shards.nix
View File

@ -8,8 +8,8 @@
ameba = { ameba = {
owner = "veelenga"; owner = "veelenga";
repo = "ameba"; repo = "ameba";
rev = "v0.9.1"; rev = "v0.10.1";
sha256 = "05q2ki9dpg23pllalv5p27f1m287kiicp97ziz0z7vv0vg1r8smj"; sha256 = "0dcw7px7g0c5pxpdlirhirqzhcc7gdwdfiwb9kgm4x1k74ghjgxq";
}; };
baked_file_system = { baked_file_system = {
owner = "schovi"; owner = "schovi";
@ -26,8 +26,8 @@
dotenv = { dotenv = {
owner = "gdotdesign"; owner = "gdotdesign";
repo = "cr-dotenv"; repo = "cr-dotenv";
rev = "v0.2.0"; rev = "v0.3.1";
sha256 = "0zi2y1j2546xjhdzn7icmry0cjv82cx2cqmpgx5ml37c2pnb7kp7"; sha256 = "1xp7c3g8dj1hqk2b885qr4y0s8661gpp9q28lv6rhr0ckllc6zgz";
}; };
exception_page = { exception_page = {
owner = "crystal-loot"; owner = "crystal-loot";
@ -47,6 +47,12 @@
rev = "v0.4.0"; rev = "v0.4.0";
sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k"; sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k";
}; };
markd = {
owner = "icyleaf";
repo = "markd";
rev = "v0.2.0";
sha256 = "0n27fndd77mlkgw1r4pf0sa8fz4gwsh7dpnjck95c0ml91cr8j1a";
};
radix = { radix = {
owner = "luislavena"; owner = "luislavena";
repo = "radix"; repo = "radix";

16
pkgs/development/compilers/openjdk/8.nix
View File

@ -29,49 +29,49 @@ let
jdk8 = fetchurl { jdk8 = fetchurl {
name = "jdk8-${repover}.tar.gz"; name = "jdk8-${repover}.tar.gz";
url = "${baseurl}/archive/${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" sha256 = if stdenv.isAarch64 then "0qpmr267qcxhmw398zbl1axd161yxn4k4hfz1jlxlmdvg70p7h90"
else "1crs4hmzmgm6fkwfq0d3xz9lph0nd33fngrqv2rz1mkkqcrjx18z"; else "1crs4hmzmgm6fkwfq0d3xz9lph0nd33fngrqv2rz1mkkqcrjx18z";
}; };
langtools = fetchurl { langtools = fetchurl {
name = "langtools-${repover}.tar.gz"; name = "langtools-${repover}.tar.gz";
url = "${baseurl}/langtools/archive/${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz";
sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" sha256 = if stdenv.isAarch64 then "1rhhi4kgmxvnyl3ic5p008p1n7zyji5nw99blm1lr5fw7ry7df24"
else "1aaxd1rl7dlk4kxdivvqvripsbn0d5vny0jvjksycsm97vrfiry4"; else "1aaxd1rl7dlk4kxdivvqvripsbn0d5vny0jvjksycsm97vrfiry4";
}; };
hotspot = fetchurl { hotspot = fetchurl {
name = "hotspot-${repover}.tar.gz"; name = "hotspot-${repover}.tar.gz";
url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" sha256 = if stdenv.isAarch64 then "0lphrhjqlavd6qlkh7h4sd2bqf5gd0cchkcnvy87703fbd7gy5ii"
else "18i4if16zikgda9k5bgqyx0p2104db23zlnclq512178z0p9yycb"; else "18i4if16zikgda9k5bgqyx0p2104db23zlnclq512178z0p9yycb";
}; };
corba = fetchurl { corba = fetchurl {
name = "corba-${repover}.tar.gz"; name = "corba-${repover}.tar.gz";
url = "${baseurl}/corba/archive/${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz";
sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" sha256 = if stdenv.isAarch64 then "18h0v566v420d00na6x4jrs41v4aa39byk15fi8k6dcn0dmirhvg"
else "1298k8p2dsj7xc4h2ayk5nl4ssrcgncn06ysyqrmnwrb8gj8s1w4"; else "1298k8p2dsj7xc4h2ayk5nl4ssrcgncn06ysyqrmnwrb8gj8s1w4";
}; };
jdk = fetchurl { jdk = fetchurl {
name = "jdk-${repover}.tar.gz"; name = "jdk-${repover}.tar.gz";
url = "${baseurl}/jdk/archive/${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz";
sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" sha256 = if stdenv.isAarch64 then "0xxy7rkj8ah263nnzkd4mg9dai5qix3l9cyilm47dig5hv7g8aq0"
else "0vqlbks3cy3cnmnrnhbjkqinvp8bcy2h96xvx81cvlza4s2hszvz"; else "0vqlbks3cy3cnmnrnhbjkqinvp8bcy2h96xvx81cvlza4s2hszvz";
}; };
jaxws = fetchurl { jaxws = fetchurl {
name = "jaxws-${repover}.tar.gz"; name = "jaxws-${repover}.tar.gz";
url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" sha256 = if stdenv.isAarch64 then "0ajqm2l9g5w5ag5s4vl4ldpbm99pqa6d342hrzvv7psqn3zf6ar5"
else "1wg9fbiz09arj0llavnzrmbhw8nx0dw8dcjkrzxw78rj1cadflzc"; else "1wg9fbiz09arj0llavnzrmbhw8nx0dw8dcjkrzxw78rj1cadflzc";
}; };
jaxp = fetchurl { jaxp = fetchurl {
name = "jaxp-${repover}.tar.gz"; name = "jaxp-${repover}.tar.gz";
url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" sha256 = if stdenv.isAarch64 then "03zjh6xvza05abxz9d9j2w9xndw9n07f8lrn6dymj7f4imals831"
else "1i5xrk8r8pcgnc68zrgp3hd1a1nzcm99swpmdnlb424qlg5nnrcf"; else "1i5xrk8r8pcgnc68zrgp3hd1a1nzcm99swpmdnlb424qlg5nnrcf";
}; };
nashorn = fetchurl { nashorn = fetchurl {
name = "nashorn-${repover}.tar.gz"; name = "nashorn-${repover}.tar.gz";
url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb" sha256 = if stdenv.isAarch64 then "0n809w264ndxksva9c81x0m1fsyg8c627w571f72xxxl9c1bnrmp"
else "0qlxaz7sriy709vcyzz48s2v4p5h4d31my33whip018c4j5gkfqq"; else "0qlxaz7sriy709vcyzz48s2v4p5h4d31my33whip018c4j5gkfqq";
}; };
openjdk8 = stdenv.mkDerivation { openjdk8 = stdenv.mkDerivation {

6
pkgs/development/idris-modules/tparsec.nix
View File

@ -5,7 +5,7 @@
}: }:
build-idris-package { build-idris-package {
name = "tparsec"; name = "tparsec";
version = "2019-09-19"; version = "2020-02-11";
ipkgName = "TParsec"; ipkgName = "TParsec";
@ -14,8 +14,8 @@ build-idris-package {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gallais"; owner = "gallais";
repo = "idris-tparsec"; repo = "idris-tparsec";
rev = "cbaea6ec7e5b62536666329940f3ffb5b8b59036"; rev = "943c64dfcb4e1582696f68312fad88145dc3a8e4";
sha256 = "0bzdv90a83irn7ca268acl19mjg9vxjmc4saa4naj4hdmg7srb2v"; sha256 = "0pyhkafhx2pwim91ada6qrgacvahl9bpv5m486y8fph4qzf4z6mx";
}; };
meta = { meta = {

4
pkgs/development/libraries/allegro/5.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "allegro"; pname = "allegro";
version = "5.2.5.0"; version = "5.2.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "liballeg"; owner = "liballeg";
repo = "allegro5"; repo = "allegro5";
rev = version; rev = version;
sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp"; sha256 = "1xbhvriyh10ka2j7jgjkpa6mlzp6av909hhr9sk317vjvf0z0mqz";
}; };
buildInputs = [ buildInputs = [

14
pkgs/development/libraries/flatpak/default.nix
View File

@ -55,14 +55,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flatpak"; pname = "flatpak";
version = "1.6.1"; version = "1.6.2";
# TODO: split out lib once we figure out what to do with triggerdir # TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "man" "doc" "installedTests" ]; outputs = [ "out" "dev" "man" "doc" "installedTests" ];
src = fetchurl { src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "1x3zh2xashsq1nh4s85qq45hcnwfbnwzln2wlk10g7149nia6f7w"; sha256 = "02k9p5n60gz2k85n805n9niic4miw0mfh0i7yk1vrc8vaa5h69wd";
}; };
patches = [ patches = [
@ -128,7 +128,6 @@ stdenv.mkDerivation rec {
bzip2 bzip2
dbus dbus
dconf dconf
glib
gpgme gpgme
json-glib json-glib
libarchive libarchive
@ -136,7 +135,6 @@ stdenv.mkDerivation rec {
libseccomp libseccomp
libsoup libsoup
lzma lzma
ostree
polkit polkit
python3 python3
systemd systemd
@ -148,6 +146,12 @@ stdenv.mkDerivation rec {
librsvg # for flatpak-validate-icon librsvg # for flatpak-validate-icon
]; ];
# Required by flatpak.pc
propagatedBuildInputs = [
glib
ostree
];
checkInputs = [ checkInputs = [
valgrind valgrind
]; ];

28
pkgs/development/libraries/jose/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, zlib, jansson, openssl
}:
stdenv.mkDerivation rec {
pname = "jose";
version = "10";
src = fetchFromGitHub {
owner = "latchset";
repo = pname;
rev = "v${version}";
sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ zlib jansson openssl ];
outputs = [ "out" "dev" "man" ];
enableParallelBuilding = true;
meta = {
description = "C-language implementation of Javascript Object Signing and Encryption";
homepage = "https://github.com/latchset/jose";
maintainers = with lib.maintainers; [ fpletz ];
license = lib.licenses.asl20;
};
}

22
pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch → pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
View File

@ -1,8 +1,17 @@
Index: kinit-5.32.0/src/kdeinit/kinit.cpp From 715c5f461b4992dac066601202a673bc551a5e33 Mon Sep 17 00:00:00 2001
=================================================================== From: Thomas Tuegel <ttuegel@mailbox.org>
--- kinit-5.32.0.orig/src/kdeinit/kinit.cpp Date: Sun, 16 Feb 2020 14:23:31 -0600
+++ kinit-5.32.0/src/kdeinit/kinit.cpp Subject: [PATCH 1/4] kinit-libpath
@@ -623,19 +623,15 @@ static pid_t launch(int argc, const char
---
src/kdeinit/kinit.cpp | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
index 8fff17a..0801b75 100644
--- a/src/kdeinit/kinit.cpp
+++ b/src/kdeinit/kinit.cpp
@@ -622,19 +622,15 @@ static pid_t launch(int argc, const char *_name, const char *args,
if (!libpath.isEmpty()) { if (!libpath.isEmpty()) {
if (libpath_relative) { if (libpath_relative) {
@ -31,3 +40,6 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
} }
} else { } else {
l.load(); l.load();
--
2.23.1

25
pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch Normal file
View File

@ -0,0 +1,25 @@
From 129cd0ae1e983adc10dbe84e87bcc6f31cb13db8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 16 Feb 2020 14:23:44 -0600
Subject: [PATCH 2/4] start_kdeinit-path
---
src/start_kdeinit/start_kdeinit_wrapper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/start_kdeinit/start_kdeinit_wrapper.c b/src/start_kdeinit/start_kdeinit_wrapper.c
index 891f50c..ef664ad 100644
--- a/src/start_kdeinit/start_kdeinit_wrapper.c
+++ b/src/start_kdeinit/start_kdeinit_wrapper.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <unistd.h>
-#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
+#define EXECUTE "/run/wrappers/bin/start_kdeinit"
#if KDEINIT_OOM_PROTECT
--
2.23.1

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