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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2020-02-18 16:09:51 +01:00
commit 17331278ee
266 changed files with 5821 additions and 5360 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 = {

2
doc/languages-frameworks/go.xml
View File

@ -42,7 +42,7 @@ pet = buildGoModule rec {
meta = with lib; { meta = with lib; {
description = "Simple command-line snippet manager, written in Go"; description = "Simple command-line snippet manager, written in Go";
homepage = https://github.com/knqyf263/pet; homepage = "https://github.com/knqyf263/pet";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ kalbasit ]; maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;

2
doc/languages-frameworks/idris.section.md
View File

@ -96,7 +96,7 @@ build-idris-package {
meta = { meta = {
description = "Idris YAML lib"; description = "Idris YAML lib";
homepage = https://github.com/Heather/Idris.Yaml; homepage = "https://github.com/Heather/Idris.Yaml";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ lib.maintainers.brainrape ]; maintainers = [ lib.maintainers.brainrape ];
}; };

4
doc/languages-frameworks/ocaml.xml
View File

@ -36,7 +36,7 @@ buildDunePackage rec {
doCheck = true; doCheck = true;
meta = { meta = {
homepage = https://github.com/inhabitedtype/angstrom; homepage = "https://github.com/inhabitedtype/angstrom";
description = "OCaml parser combinators built for speed and memory efficiency"; description = "OCaml parser combinators built for speed and memory efficiency";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
@ -63,7 +63,7 @@ buildDunePackage rec {
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/flowtype/ocaml-wtf8; homepage = "https://github.com/flowtype/ocaml-wtf8";
description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.eqyiel ]; maintainers = [ maintainers.eqyiel ];

6
doc/languages-frameworks/python.section.md
View File

@ -241,7 +241,7 @@ buildPythonPackage rec {
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {
homepage = https://github.com/pytoolz/toolz; homepage = "https://github.com/pytoolz/toolz";
description = "List processing tools and functional utilities"; description = "List processing tools and functional utilities";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ fridh ]; maintainers = with maintainers; [ fridh ];
@ -335,7 +335,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ numpy multipledispatch dateutil ]; propagatedBuildInputs = [ numpy multipledispatch dateutil ];
meta = with lib; { meta = with lib; {
homepage = https://github.com/ContinuumIO/datashape; homepage = "https://github.com/ContinuumIO/datashape";
description = "A data description language"; description = "A data description language";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ fridh ]; maintainers = with maintainers; [ fridh ];
@ -369,7 +369,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Pythonic binding for the libxml2 and libxslt libraries"; description = "Pythonic binding for the libxml2 and libxslt libraries";
homepage = https://lxml.de; homepage = "https://lxml.de";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ sjourdois ]; maintainers = with maintainers; [ sjourdois ];
}; };

2
doc/languages-frameworks/rust.section.md
View File

@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A fast line-oriented regex search tool, similar to ag and ack"; description = "A fast line-oriented regex search tool, similar to ag and ack";
homepage = https://github.com/BurntSushi/ripgrep; homepage = "https://github.com/BurntSushi/ripgrep";
license = licenses.unlicense; license = licenses.unlicense;
maintainers = [ maintainers.tailhook ]; maintainers = [ maintainers.tailhook ];
platforms = platforms.all; platforms = platforms.all;

2
doc/stdenv/meta.xml
View File

@ -11,7 +11,7 @@ meta = with stdenv.lib; {
GNU Hello is a program that prints "Hello, world!" when you run it. GNU Hello is a program that prints "Hello, world!" when you run it.
It is fully customizable. It is fully customizable.
''; '';
homepage = https://www.gnu.org/software/hello/manual/; homepage = "https://www.gnu.org/software/hello/manual/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
platforms = platforms.all; platforms = platforms.all;

7
maintainers/maintainer-list.nix
View File

@ -2257,6 +2257,7 @@
ericdallo = { ericdallo = {
email = "ercdll1337@gmail.com"; email = "ercdll1337@gmail.com";
github = "ericdallo"; github = "ericdallo";
githubId = 7820865;
name = "Eric Dallo"; name = "Eric Dallo";
}; };
ericsagnes = { ericsagnes = {
@ -3002,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";

47
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" ];
serviceConfig = { preStart = ''
ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}"; install -m 600 ${redisConfig} /run/redis/redis.conf
RuntimeDirectory = "redis"; '' + optionalString (cfg.requirePassFile != null) ''
StateDirectory = "redis"; password=$(cat ${escapeShellArg cfg.requirePassFile})
Type = "notify"; echo "requirePass $password" >> /run/redis/redis.conf
User = "redis"; '';
};
serviceConfig = {
ExecStart = "${cfg.package}/bin/redis-server /run/redis/redis.conf";
RuntimeDirectory = "redis";
StateDirectory = "redis";
Type = "notify";
User = "redis";
}; };
};
}; };
} }

8
nixos/modules/services/networking/shorewall.nix
View File

@ -33,7 +33,6 @@ in {
The attribute name defines the name of the config, The attribute name defines the name of the config,
and the attribute value defines the content of the config. and the attribute value defines the content of the config.
''; '';
apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text);
}; };
}; };
}; };
@ -63,12 +62,7 @@ in {
''; '';
}; };
environment = { environment = {
etc = lib.mapAttrsToList etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {text=conf;}) cfg.configs;
(name: file:
{ source = file;
target = "shorewall/${name}";
})
cfg.configs;
systemPackages = [ cfg.package ]; systemPackages = [ cfg.package ];
}; };
}; };

8
nixos/modules/services/networking/shorewall6.nix
View File

@ -33,7 +33,6 @@ in {
The attribute name defines the name of the config, The attribute name defines the name of the config,
and the attribute value defines the content of the config. and the attribute value defines the content of the config.
''; '';
apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text);
}; };
}; };
}; };
@ -63,12 +62,7 @@ in {
''; '';
}; };
environment = { environment = {
etc = lib.mapAttrsToList etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {text=conf;}) cfg.configs;
(name: file:
{ source = file;
target = "shorewall6/${name}";
})
cfg.configs;
systemPackages = [ cfg.package ]; systemPackages = [ cfg.package ];
}; };
}; };

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;

16
nixos/modules/virtualisation/docker-containers.nix
View File

@ -210,7 +210,16 @@ let
wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; wantedBy = [] ++ optional (container.autoStart) "multi-user.target";
after = [ "docker.service" "docker.socket" ] ++ mkAfter; after = [ "docker.service" "docker.socket" ] ++ mkAfter;
requires = after; requires = after;
path = [ pkgs.docker ];
preStart = ''
docker rm -f ${name} || true
${optionalString (container.imageFile != null) ''
docker load -i ${container.imageFile}
''}
'';
postStop = "docker rm -f ${name} || true";
serviceConfig = { serviceConfig = {
ExecStart = concatStringsSep " \\\n " ([ ExecStart = concatStringsSep " \\\n " ([
"${pkgs.docker}/bin/docker run" "${pkgs.docker}/bin/docker run"
@ -229,12 +238,7 @@ let
++ map escapeShellArg container.cmd ++ map escapeShellArg container.cmd
); );
ExecStartPre = ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || docker stop ${name}"'';
["-${pkgs.docker}/bin/docker rm -f ${name}"] ++
(optional (container.imageFile != null) "${pkgs.docker}/bin/docker load -i ${container.imageFile}");
ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${pkgs.docker}/bin/docker stop ${name}"'';
ExecStopPost = "-${pkgs.docker}/bin/docker rm -f ${name}";
### There is no generalized way of supporting `reload` for docker ### There is no generalized way of supporting `reload` for docker
### containers. Some containers may respond well to SIGHUP sent to their ### containers. Some containers may respond well to SIGHUP sent to their

178
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"
];
};
} }

19
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" =
fsType = "glusterfs"; { device = "server1:/gv0";
device = "server1:/gv0"; fsType = "glusterfs";
} ]; };
};
}; };
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";

14
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
}; };

10
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;

19
nixos/tests/postgresql-wal-receiver.nix
View File

@ -6,17 +6,24 @@ with import ../lib/testing.nix { inherit system pkgs; };
with pkgs.lib; with pkgs.lib;
let let
makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: let
postgresqlDataDir = "/var/db/postgresql/test"; postgresqlDataDir = "/var/db/postgresql/test";
replicationUser = "wal_receiver_user"; replicationUser = "wal_receiver_user";
replicationSlot = "wal_receiver_slot"; replicationSlot = "wal_receiver_slot";
replicationConn = "postgresql://${replicationUser}@localhost"; replicationConn = "postgresql://${replicationUser}@localhost";
baseBackupDir = "/tmp/pg_basebackup"; baseBackupDir = "/tmp/pg_basebackup";
walBackupDir = "/tmp/pg_wal"; walBackupDir = "/tmp/pg_wal";
recoveryConf = pkgs.writeText "recovery.conf" '' atLeast12 = versionAtLeast postgresqlPackage.version "12.0";
restoreCommand = ''
restore_command = 'cp ${walBackupDir}/%f %p' restore_command = 'cp ${walBackupDir}/%f %p'
''; '';
makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: makeTest { recoveryFile = if atLeast12
then pkgs.writeTextDir "recovery.signal" ""
else pkgs.writeTextDir "recovery.conf" "${restoreCommand}";
in makeTest {
name = "postgresql-wal-receiver-${subTestName}"; name = "postgresql-wal-receiver-${subTestName}";
meta.maintainers = with maintainers; [ pacien ]; meta.maintainers = with maintainers; [ pacien ];
@ -29,6 +36,9 @@ let
wal_level = archive # alias for replica on pg >= 9.6 wal_level = archive # alias for replica on pg >= 9.6
max_wal_senders = 10 max_wal_senders = 10
max_replication_slots = 10 max_replication_slots = 10
'' + optionalString atLeast12 ''
${restoreCommand}
recovery_end_command = 'touch recovery.done'
''; '';
authentication = '' authentication = ''
host replication ${replicationUser} all trust host replication ${replicationUser} all trust
@ -45,6 +55,9 @@ let
slot = replicationSlot; slot = replicationSlot;
directory = walBackupDir; directory = walBackupDir;
}; };
# This is only to speedup test, it isn't time racing. Service is set to autorestart always,
# default 60sec is fine for real system, but is too much for a test
systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = mkForce 5;
}; };
testScript = '' testScript = ''
@ -70,7 +83,7 @@ let
# prepare WAL and recovery # prepare WAL and recovery
$machine->succeed('chmod a+rX -R ${walBackupDir}'); $machine->succeed('chmod a+rX -R ${walBackupDir}');
$machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too $machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too
$machine->succeed('cp ${recoveryConf} ${postgresqlDataDir}/recovery.conf && chmod 666 ${postgresqlDataDir}/recovery.conf'); $machine->succeed('cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*');
# replay WAL # replay WAL
$machine->systemctl('start postgresql'); $machine->systemctl('start postgresql');

5
pkgs/applications/audio/gnome-podcasts/default.nix
View File

@ -32,10 +32,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0"; sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0";
}; };
# Delete this on next update; see #79975 for details cargoSha256 = "1dlbdxsf9p2jzrsclm43k95y8m3zcd41qd9ajg1ii3fpnahi58kd";
legacyCargoFetcher = true;
cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q";
nativeBuildInputs = [ nativeBuildInputs = [
meson meson

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;

36
pkgs/applications/audio/sonic-visualiser/default.nix
View File

@ -2,21 +2,23 @@
{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, libpulseaudio, qtbase, redland , libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland
, qmake, rubberband, serd, sord, vampSDK, fftwFloat , rubberband, serd, sord, vampSDK, fftwFloat
, capnproto, liboggz, libfishsound, libid3tag, opusfile
, wrapQtAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sonic-visualiser"; pname = "sonic-visualiser";
version = "2.4.1"; version = "4.0.1";
src = fetchurl { src = fetchurl {
url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz"; url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz";
sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6";
}; };
buildInputs = buildInputs =
[ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 librdf rubberband
libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
serd serd
sord sord
@ -26,23 +28,22 @@ stdenv.mkDerivation rec {
libpulseaudio libpulseaudio
libmad libmad
libogg # ? libogg # ?
# fishsound libfishsound
liblo liblo
libX11 libX11
capnproto
liboggz
libid3tag
opusfile
]; ];
nativeBuildInputs = [ pkgconfig qmake ]; nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
configurePhase = '' enableParallelBuilding = true;
for i in sonic-visualiser svapp svcore svgui;
do cd $i && qmake PREFIX=$out && cd ..;
done
'';
installPhase = '' # comment out the tests
mkdir -p $out/{bin,share/sonic-visualiser} preConfigure = ''
cp sonic-visualiser $out/bin/ sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro
cp -r samples $out/share/sonic-visualiser/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -51,6 +52,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ maintainers.goibhniu maintainers.marcweber ]; maintainers = [ maintainers.goibhniu maintainers.marcweber ];
platforms = platforms.linux; platforms = platforms.linux;
broken = true;
}; };
} }

6
pkgs/applications/blockchains/lnd.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "lnd"; pname = "lnd";
version = "0.8.1-beta"; version = "0.9.0-beta";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lightningnetwork"; owner = "lightningnetwork";
repo = "lnd"; repo = "lnd";
rev = "v${version}"; rev = "v${version}";
sha256 = "0f9fx2y66l3wxiax2vl2966avamjarkv3vbn9dy0wbxkwg4pfayb"; sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9";
}; };
modSha256 = "1i6xw2amkg4azvzybcl4pqxif9c0mv8ayrhz9hm8x85bz7i6a787"; modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq";
meta = with lib; { meta = with lib; {
description = "Lightning Network Daemon"; description = "Lightning Network Daemon";

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
]; ];

6
pkgs/applications/editors/vscode/vscode.nix
View File

@ -11,15 +11,15 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = { sha256 = {
x86_64-linux = "1bb7icdjzprrsxllx2q478m1p3qf5sbs3rs3bavvb3hzyyf4bifn"; x86_64-linux = "0c067qp3aa5kqya3y8pzc9cvyzsafizhgjp9dsibnfl08lvz9hbs";
x86_64-darwin = "1hqpfmp5s135kb9777s96sr0zbls002h1980qbgf7r2hmc0mpnx0"; x86_64-darwin = "0vi94nk8p3vp30nx60mwqcmfqbrmrqwvfdjbah0zm480dcjzz7dv";
}.${system}; }.${system};
in in
callPackage ./generic.nix rec { callPackage ./generic.nix rec {
# The update script doesn't correctly change the hash for darwin, so please: # The update script doesn't correctly change the hash for darwin, so please:
# nixpkgs-update: no auto update # nixpkgs-update: no auto update
version = "1.42.0"; version = "1.42.1";
pname = "vscode"; pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders"; executableName = "code" + lib.optionalString isInsiders "-insiders";

6
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = { sha256 = {
x86_64-linux = "0f6ic24w6s9wfirzk5rvysn96gj1naj6b81al9743mllaf32ad5q"; x86_64-linux = "1pac3rv7ps23ymynvy8dwd5k2154aln33ksr75z1d8w859x3f1dy";
x86_64-darwin = "0fgyhb2wxkvrc90zzw5w2k3ggwbinmax286gbff3sjlrzbs5sj64"; x86_64-darwin = "1imzgqynbd65c7gbfp2gb1cxjbazx7afvbdvbqnm5qg7pvq22rni";
}.${system}; }.${system};
sourceRoot = { sourceRoot = {
@ -25,7 +25,7 @@ in
# The update script doesn't correctly change the hash for darwin, so please: # The update script doesn't correctly change the hash for darwin, so please:
# nixpkgs-update: no auto update # nixpkgs-update: no auto update
version = "1.42.0"; version = "1.42.1";
pname = "vscodium"; pname = "vscodium";
executableName = "codium"; executableName = "codium";

4
pkgs/applications/graphics/avocode/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "avocode"; pname = "avocode";
version = "4.2.2"; version = "4.3.0";
src = fetchurl { src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "0f4cmai2d1x7wbqllxp9na6gxgqfxqav8n4g9azyvm6ymd8zjnx8"; sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids";
}; };
libPath = stdenv.lib.makeLibraryPath (with xorg; [ libPath = stdenv.lib.makeLibraryPath (with xorg; [

12
pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
View File

@ -1,12 +0,0 @@
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 99f7dbf..03e953b 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -45,7 +45,6 @@ add_subdirectory( imap )
if (Libkolabxml_FOUND)
add_subdirectory( kolab )
endif()
-add_subdirectory( facebook )
add_subdirectory( maildir )
add_subdirectory( openxchange )

3
pkgs/applications/kde/kdepim-runtime/default.nix
View File

@ -14,7 +14,6 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam; maintainers = kdepimTeam;
}; };
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [ buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
@ -22,6 +21,4 @@ mkDerivation {
kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns
]; ];
# Attempts to build some files before dependencies have been generated
enableParallelBuilding = false;
} }

1
pkgs/applications/kde/kdepim-runtime/series
View File

@ -1 +0,0 @@
00-no-facebook.patch

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

@ -62,10 +62,7 @@ in buildRustPackage rec {
sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg"; sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg";
}; };
# Delete this on next update; see #79975 for details cargoSha256 = "182j8ah67b2gw409vjfml3p41i00zh0klx9m8bwfkm64y2ki2bip";
legacyCargoFetcher = true;
cargoSha256 = "1kc9n10kb4j87x337pzl6wpi0qj5ib2mqmrjag2yld3138dag71n";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake

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 = ''

11
pkgs/applications/misc/doomseeker/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: { stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
stdenv.mkDerivation { mkDerivation {
pname = "doomseeker"; pname = "doomseeker";
version = "2018-03-05"; version = "2018-03-05";
@ -13,13 +13,10 @@ stdenv.mkDerivation {
patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; patches = [ ./fix_paths.patch ./qt_build_fix.patch ];
nativeBuildInputs = [ cmake qttools pkgconfig xxd ];
buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://doomseeker.drdteam.org/; homepage = http://doomseeker.drdteam.org/;

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

24
pkgs/applications/misc/mbutil/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildPythonApplication, fetchFromGitHub, nose }:
buildPythonApplication rec {
pname = "mbutil";
version = "0.3.0";
src = fetchFromGitHub {
owner = "mapbox";
repo = pname;
rev = "v${version}";
sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z";
};
checkInputs = [ nose ];
checkPhase = "nosetests";
meta = with lib; {
description = "An importer and exporter for MBTiles";
homepage = "https://github.com/mapbox/mbutil";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ sikmir ];
};
}

34
pkgs/applications/misc/moolticute/default.nix
View File

@ -1,36 +1,44 @@
{ stdenv, fetchurl { lib, mkDerivation, fetchFromGitHub
, libusb1, pkgconfig, qmake, qtbase, qttools, qtwebsockets , libusb1
, pkg-config
, qmake
, qtbase
, qttools
, qtwebsockets
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "moolticute"; pname = "moolticute";
version = "0.30.8"; version = "0.42.32-testing";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/mooltipass/moolticute/archive/v${version}.tar.gz"; owner = "mooltipass";
sha256 = "1qi18r2v0mpw1y007vjgzhiia89fpgsbg2wirxgngl21yxdns1pf"; repo = pname;
rev = "v${version}";
sha256 = "1kx1p2h65dilj1pbzf36d1mxwym19kvln1sqg8fb7na8q7lk4b05";
}; };
outputs = [ "out" "udev" ];
nativeBuildInputs = [ pkg-config qmake qttools ];
buildInputs = [ libusb1 qtbase qtwebsockets ];
preConfigure = "mkdir -p build && cd build"; preConfigure = "mkdir -p build && cd build";
nativeBuildInputs = [ pkgconfig qmake qttools ];
qmakeFlags = [ "../Moolticute.pro" ]; qmakeFlags = [ "../Moolticute.pro" ];
outputs = [ "out" "udev" ];
preInstall = '' preInstall = ''
mkdir -p $udev/lib/udev/rules.d mkdir -p $udev/lib/udev/rules.d
sed -n '/^ \+cat > "$tmpfile" <<- EOF$/,/^EOF$/p' ../data/moolticute.sh | sed -n '/^ \+cat > "$tmpfile" <<- EOF$/,/^EOF$/p' ../data/moolticute.sh |
sed '1d;$d' > $udev/lib/udev/rules.d/50-mooltipass.rules sed '1d;$d' > $udev/lib/udev/rules.d/50-mooltipass.rules
''; '';
buildInputs = [ libusb1 qtbase qtwebsockets ];
meta = with stdenv.lib; { meta = with lib; {
description = "GUI app and daemon to work with Mooltipass device via USB"; description = "GUI app and daemon to work with Mooltipass device via USB";
longDescription = '' longDescription = ''
To install udev rules, add `services.udev.packages == [ moolticute.udev ]` To install udev rules, add `services.udev.packages == [ moolticute.udev ]`
into `nixos/configuration.nix`. into `nixos/configuration.nix`.
''; '';
homepage = https://github.com/mooltipass/moolticute; homepage = "https://github.com/mooltipass/moolticute";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [ maintainers.kirikaza ]; maintainers = [ maintainers.kirikaza ];
platforms = platforms.linux; platforms = platforms.linux;

5
pkgs/applications/misc/pastel/default.nix
View File

@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5"; sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5";
}; };
# Delete this on next update; see #79975 for details cargoSha256 = "1hkqahsrhmgcpgp0pvfpc0wmwqivnqylsxzjrz63k1s9ssdv9syy";
legacyCargoFetcher = true;
cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security; buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

5
pkgs/applications/misc/rsclock/default.nix
View File

@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
}; };
# Delete this on next update; see #79975 for details cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl";
legacyCargoFetcher = true;
cargoSha256 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple terminal clock written in Rust"; description = "A simple terminal clock written in Rust";

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;

5
pkgs/applications/misc/taizen/default.nix
View File

@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
# Delete this on next update; see #79975 for details cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni";
legacyCargoFetcher = true;
cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg";
meta = with lib; { meta = with lib; {
homepage = https://crates.io/crates/taizen; homepage = https://crates.io/crates/taizen;

5
pkgs/applications/misc/todiff/default.nix
View File

@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm";
}; };
# Delete this on next update; see #79975 for details cargoSha256 = "1vyc230a2b0dry2057mkdkrjb7s9d0p43fnz4q67aqrpyr4jxwx2";
legacyCargoFetcher = true;
cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id";
checkPhase = "cargo test --features=integration_tests"; checkPhase = "cargo test --features=integration_tests";

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 = ''

5
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.17.4"; version = "0.21.11";
goPackagePath = "github.com/gruntwork-io/terragrunt"; goPackagePath = "github.com/gruntwork-io/terragrunt";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = "terragrunt"; repo = "terragrunt";
rev = "v${version}"; rev = "v${version}";
sha256 = "13hlv0ydmv8gpzgg6bfr7rp89xfw1bkgd0j684armw8zq29cmv3a"; sha256 = "1w64skk67i0sxjd2mkyqh3nglc32wc7schk7h8fwszpa1rw4dfcn";
}; };
goDeps = ./deps.nix; goDeps = ./deps.nix;
@ -18,6 +18,7 @@ buildGoPackage rec {
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
preBuild = '' preBuild = ''
find go/src -name vendor | xargs -I % sh -c 'echo Removing %; rm -rf %'
buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
''; '';

412
pkgs/applications/networking/cluster/terragrunt/deps.nix generated
View File

@ -1,129 +1,453 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 # file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[ [
{ {
goPackagePath = "github.com/aws/aws-sdk-go"; goPackagePath = "cloud.google.com/go";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/aws/aws-sdk-go"; url = "https://code.googlesource.com/gocloud";
rev = "25253087ea42da08900c4c1fc34c04bdb4a97d5a"; rev = "28a4bc8c44b3acbcc482cff0cdf7de29a4688b61";
sha256 = "0p6mf53f4l9b26yc4qlm1s7yls73hsw8klyfhmnxhk2mq8k6ix4m"; sha256 = "0j40msxm72m8gs87rpwkk19iagjj387r42xwxszmrna7il8g0sbl";
}; };
} }
{ {
goPackagePath = "github.com/bgentry/go-netrc"; goPackagePath = "github.com/agext/levenshtein";
fetch = {
type = "git";
url = "https://github.com/agext/levenshtein";
rev = "0ded9c86537917af2ff89bc9c78de6bd58477894";
sha256 = "19d7q69yhcg7gl81j038rkbjz8yjb4qwnsqrmxa4zvhgzlc7d130";
};
}
{
goPackagePath = "github.com/apparentlymart/go-cidr";
fetch = {
type = "git";
url = "https://github.com/apparentlymart/go-cidr";
rev = "b1115bf8e14a60131a196f908223e4506b0ddc35";
sha256 = "0r938rb18c9cr2k417cwwd4pfq74aabpjp9pzvk4qkxc5279igl3";
};
}
{
goPackagePath = "github.com/apparentlymart/go-textseg";
fetch = {
type = "git";
url = "https://github.com/apparentlymart/go-textseg";
rev = "fb01f485ebef760e5ee06d55e1b07534dda2d295";
sha256 = "0n9xcyj7p5y8mbqilk9zprfyqvgm2y9f1g440wqw9dnn3s4fi1k4";
};
}
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
rev = "572908275ed4e38fef7ccb7d507f2faacaa7ab36";
sha256 = "07bn3v0c4pd38qdp0a0kgmsvh7q30f14qp7pbbls3jzmvpxh49zs";
};
}
{
goPackagePath = "github.com/bgentry/go-netrc";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/bgentry/go-netrc"; url = "https://github.com/bgentry/go-netrc";
rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480";
sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l";
}; };
} }
{ {
goPackagePath = "github.com/go-errors/errors"; goPackagePath = "github.com/bmatcuk/doublestar";
fetch = {
type = "git";
url = "https://github.com/bmatcuk/doublestar";
rev = "2437321e1473408f122a95f65df3d8841fec4fba";
sha256 = "0z1jg4l746825qs95sffbc69av1yj0l37n8rjmmnwf7hxh5glxzp";
};
}
{
goPackagePath = "github.com/creack/pty";
fetch = {
type = "git";
url = "https://github.com/creack/pty";
rev = "3a6a957789163cacdfe0e291617a1c8e80612c11";
sha256 = "1v52599qq76dwq742mffakzj6mxqqccv2szn3hjicjld56nmd2d3";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/go-errors/errors"; url = "https://github.com/go-errors/errors";
rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; rev = "a6af135bd4e28680facf08a3d206b454abc877a4";
sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
}; };
} }
{ {
goPackagePath = "github.com/hashicorp/go-cleanhttp"; goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30";
sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
};
}
{
goPackagePath = "github.com/google/go-cmp";
fetch = {
type = "git";
url = "https://github.com/google/go-cmp";
rev = "6f77996f0c42f7b84e5a2b252227263f93432e9b";
sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
};
}
{
goPackagePath = "github.com/google/uuid";
fetch = {
type = "git";
url = "https://github.com/google/uuid";
rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4";
sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
};
}
{
goPackagePath = "github.com/googleapis/gax-go";
fetch = {
type = "git";
url = "https://github.com/googleapis/gax-go";
rev = "beaecbbdd8af86aa3acf14180d53828ce69400b2";
sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm";
};
}
{
goPackagePath = "github.com/gruntwork-io/terratest";
fetch = {
type = "git";
url = "https://github.com/gruntwork-io/terratest";
rev = "a02960d4ef0711ae95ae2651271b4e073f88da4e";
sha256 = "0mywsimj8if8j2jbp8sf4igl5lcdlj81hd3lif86fsmyrma090vw";
};
}
{
goPackagePath = "github.com/hashicorp/errwrap";
fetch = {
type = "git";
url = "https://github.com/hashicorp/errwrap";
rev = "8a6fb523712970c966eefc6b39ed2c5e74880354";
sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
};
}
{
goPackagePath = "github.com/hashicorp/go-cleanhttp";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/hashicorp/go-cleanhttp"; url = "https://github.com/hashicorp/go-cleanhttp";
rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; rev = "eda1e5db218aad1db63ca4642c8906b26bcf2744";
sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk";
}; };
} }
{ {
goPackagePath = "github.com/hashicorp/go-getter"; goPackagePath = "github.com/hashicorp/go-getter";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/hashicorp/go-getter"; url = "https://github.com/hashicorp/go-getter";
rev = "64040d90d4ab861e7e833d689dc76a0f176d8dec"; rev = "f9ec369200fd2163b8f452e5e45696d83ae3f4b6";
sha256 = "0g25nx42z6ykd7jqzlrxf161h8lqrpxpddmbspl4w3a84wphhgms"; sha256 = "1h69946nsmpp06iqg85whwvjrfqlk1gf9q7y01f0r3sf0cb28f30";
}; };
} }
{ {
goPackagePath = "github.com/hashicorp/go-version"; goPackagePath = "github.com/hashicorp/go-multierror";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-multierror";
rev = "886a7fbe3eb1c874d46f623bfa70af45f425b3d1";
sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
};
}
{
goPackagePath = "github.com/hashicorp/go-safetemp";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-safetemp";
rev = "c9a55de4fe06c920a71964b53cfe3dd293a3c743";
sha256 = "0gydks8bkq88adlzmv8qj3rvljx15j94c8lyrp88ji2jn6dvv643";
};
}
{
goPackagePath = "github.com/hashicorp/go-uuid";
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-uuid";
rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43";
sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k";
};
}
{
goPackagePath = "github.com/hashicorp/go-version";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/hashicorp/go-version"; url = "https://github.com/hashicorp/go-version";
rev = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"; rev = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd";
sha256 = "056zs67diq3m7skmmq3pnz6wymfcg55dfs5zf86xkfqqpj10kyf7"; sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z";
}; };
} }
{ {
goPackagePath = "github.com/hashicorp/hcl"; goPackagePath = "github.com/hashicorp/golang-lru";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/hashicorp/hcl"; url = "https://github.com/hashicorp/golang-lru";
rev = "f40e974e75af4e271d97ce0fc917af5898ae7bda"; rev = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c";
sha256 = "1w5w3m40xv85gngw8g1kjbcgah1vl4ardbpg2cxgj1svf80zazxx"; sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
}; };
} }
{ {
goPackagePath = "github.com/mattn/go-zglob"; goPackagePath = "github.com/hashicorp/hcl2";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl2";
rev = "318e80eefe28c3aa01b434c61bcf4c83a0cc6b25";
sha256 = "1wlm47qk84ggn6lanafirc49kaq998r1nw2xdcv4ghdxy2ijc0rj";
};
}
{
goPackagePath = "github.com/hashicorp/terraform";
fetch = {
type = "git";
url = "https://github.com/hashicorp/terraform";
rev = "abec0acf40d8e31ac612a244cf3886fb3bcce0bb";
sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka";
};
}
{
goPackagePath = "github.com/jmespath/go-jmespath";
fetch = {
type = "git";
url = "https://github.com/jmespath/go-jmespath";
rev = "c2b33e84";
sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3";
sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
};
}
{
goPackagePath = "github.com/mattn/go-zglob";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/mattn/go-zglob"; url = "https://github.com/mattn/go-zglob";
rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1";
sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz";
}; };
} }
{ {
goPackagePath = "github.com/mitchellh/go-homedir"; goPackagePath = "github.com/mitchellh/go-homedir";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/mitchellh/go-homedir"; url = "https://github.com/mitchellh/go-homedir";
rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; rev = "af06845cf3004701891bf4fdb884bfe4920b3727";
sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
}; };
} }
{ {
goPackagePath = "github.com/mitchellh/go-testing-interface"; goPackagePath = "github.com/mitchellh/go-testing-interface";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/mitchellh/go-testing-interface"; url = "https://github.com/mitchellh/go-testing-interface";
rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28"; rev = "6d0b8010fcc857872e42fc6c931227569016843c";
sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx"; sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw";
}; };
} }
{ {
goPackagePath = "github.com/mitchellh/mapstructure"; goPackagePath = "github.com/mitchellh/go-wordwrap";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-wordwrap";
rev = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c";
sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/mitchellh/mapstructure"; url = "https://github.com/mitchellh/mapstructure";
rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe";
sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
}; };
} }
{ {
goPackagePath = "github.com/stretchr/testify"; goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/stretchr/testify"; url = "https://github.com/stretchr/testify";
rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; rev = "ffdc059bfe9ce6a4e144ba849dbedead332c6053";
sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
}; };
} }
{ {
goPackagePath = "github.com/ulikunitz/xz"; goPackagePath = "github.com/ulikunitz/xz";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/ulikunitz/xz"; url = "https://github.com/ulikunitz/xz";
rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; rev = "6f934d456d51e742b4eeab20d925a827ef22320a";
sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831";
}; };
} }
{ {
goPackagePath = "github.com/urfave/cli"; goPackagePath = "github.com/urfave/cli";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/urfave/cli"; url = "https://github.com/urfave/cli";
rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
}; };
} }
] {
goPackagePath = "github.com/zclconf/go-cty";
fetch = {
type = "git";
url = "https://github.com/zclconf/go-cty";
rev = "6fd39ad70c3a6bbdb1b4e47444e4cce72f901200";
sha256 = "0mb0ws70jg93vlamzhdvyvyfq6x0s0ll5gf44yanb1dhlz6i1f90";
};
}
{
goPackagePath = "github.com/zclconf/go-cty-yaml";
fetch = {
type = "git";
url = "https://github.com/zclconf/go-cty-yaml";
rev = "bc34c981dadb5ed30af852693e3aba8fb6546f42";
sha256 = "0dams5g61n88rk7zq7sy0yap873ksjafhf81hn2fg2dpfjhcd3y2";
};
}
{
goPackagePath = "go.opencensus.io";
fetch = {
type = "git";
url = "https://github.com/census-instrumentation/opencensus-go";
rev = "9c377598961b706d1542bd2d84d538b5094d596e";
sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "5c40567a22f818bd14a1ea7245dad9f8ef0691aa";
sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "461777fb6f67e8cb9d70cda16573678d085a74cf";
sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2";
};
}
{
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33";
sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7";
sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475";
sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
};
}
{
goPackagePath = "google.golang.org/api";
fetch = {
type = "git";
url = "https://code.googlesource.com/google-api-go-client";
rev = "890e5eb51fe205e56dc55eb68d63e82039730816";
sha256 = "05r2wsjnmszsz4y59w8q6qknc7zq1mc56kya61i2133dqxyc55ai";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880";
sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry";
};
}
{
goPackagePath = "google.golang.org/genproto";
fetch = {
type = "git";
url = "https://github.com/google/go-genproto";
rev = "eb0b1bdb6ae60fcfc41b8d907b50dfb346112301";
sha256 = "0g00wfxd4z886bglyszcvfpgzak0476axqyfaqv3va62ndbqpk90";
};
}
{
goPackagePath = "google.golang.org/grpc";
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
rev = "501c41df7f472c740d0674ff27122f3f48c80ce7";
sha256 = "0hla9rjvyi6wjak4cw39ic8jkdcd0lsymhrz9sa52bfybxsczf38";
};
}
]

5
pkgs/applications/networking/instant-messengers/fractal/default.nix
View File

@ -35,10 +35,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r"; sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r";
}; };
# Delete this on next update; see #79975 for details cargoSha256 = "10fgw9m6gdazrca73g43sgvsghhac7xc3bg7hr0vpynzqyfigwa9";
legacyCargoFetcher = true;
cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv";
nativeBuildInputs = [ nativeBuildInputs = [
cargo cargo

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 = [

4
pkgs/applications/networking/nextcloud-client/default.nix
View File

@ -17,13 +17,13 @@
mkDerivation rec { mkDerivation rec {
pname = "nextcloud-client"; pname = "nextcloud-client";
version = "2.6.2"; version = "2.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nextcloud"; owner = "nextcloud";
repo = "desktop"; repo = "desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "1adicl0msjwbvvi0nxqb1zmka51nn2b88plsynrap5fm0xp40j39"; sha256 = "17w1bx305w656jkiv55lwncxwdly8rf2dsisqw3c9bc7vz19l6p8";
}; };
patches = [ patches = [

4
pkgs/applications/office/atlassian-cli/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "atlassian-cli"; pname = "atlassian-cli";
version = "9.1.0"; version = "9.1.1";
src = fetchzip { src = fetchzip {
url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
sha256 = "06431nmz2k1d7vdpnyr88j777sfaa0vrfvxbr9zikn65176mkw7k"; sha256 = "0mdf4ybp0a6c816210g76lx901qwxw727ipyiph5kbdzl4jlrpgm";
extraPostFetch = "chmod go-w $out"; extraPostFetch = "chmod go-w $out";
}; };

4
pkgs/applications/office/homebank/default.nix
View File

@ -2,10 +2,10 @@
, libsoup, gnome3 }: , libsoup, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "homebank-5.3.1"; name = "homebank-5.3.2";
src = fetchurl { src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz"; url = "http://homebank.free.fr/public/${name}.tar.gz";
sha256 = "119lyr8c33n8sa3s4l8s33ajwhyv0qgpmaigkyaqnccbkw1qdhhv"; sha256 = "1fr4060yqlciay98dypvifmfvr8y2kbpj89d86mcvq9gb00vij2b";
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

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";
}; };
} }

6
pkgs/applications/office/qownnotes/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec { mkDerivation rec {
pname = "qownnotes"; pname = "qownnotes";
version = "19.12.15"; version = "20.2.5";
src = fetchurl { src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so: # Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256
sha256 = "11i3cn1j365nwinaksfpi1hn7j6bqgjzhawkl6c294lzahngba9w"; sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5";
}; };
nativeBuildInputs = [ qmake qttools ]; nativeBuildInputs = [ qmake qttools ];

4
pkgs/applications/office/softmaker/softmaker_office.nix
View File

@ -2,13 +2,13 @@
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
pname = "softmaker-office"; pname = "softmaker-office";
version = "972"; version = "974";
edition = "2018"; edition = "2018";
suiteName = "SoftMaker Office"; suiteName = "SoftMaker Office";
src = fetchurl { src = fetchurl {
url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz";
sha256 = "06kgkmqg5269a4vm14i89mw8m1x9yy9ajw0dhfcvjizadyzmlqn1"; sha256 = "0z1g76lhja92s25x6y0h55wmqza2d3pjbshn5b9rn2784gjgj7hn";
}; };
archive = "office${edition}.tar.lzma"; archive = "office${edition}.tar.lzma";

4
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -44,6 +44,10 @@ let
git-fame = callPackage ./git-fame {}; git-fame = callPackage ./git-fame {};
git-filter-repo = callPackage ./git-filter-repo {
pythonPackages = python3Packages;
};
gita = python3Packages.callPackage ./gita {}; gita = python3Packages.callPackage ./gita {};
# The full-featured Git. # The full-featured Git.

27
pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
pname = "git-filter-repo";
version = "2.25.0";
src = fetchurl {
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "1772if8ajaw80dsdw4ic6vjw24dq0b9w87qlkn0iw4b8r9yxp37a";
};
buildInputs = [ pythonPackages.python ];
dontBuild = true;
installPhase = ''
install -Dm755 -t $out/bin git-filter-repo
install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1
'';
meta = with stdenv.lib; {
homepage = "https://github.com/newren/git-filter-repo";
description = "Quickly rewrite git repository history (filter-branch replacement)";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}

17
pkgs/applications/version-management/pijul/default.nix
View File

@ -20,8 +20,18 @@ in rustPlatform.buildRustPackage rec {
sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
}; };
cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v";
# N.B. The cargo depfile checker expects us to have unpacked the src tarball
# into the standard dirname "source".
cargoDepsHook = ''
ln -s ${pname}-${version} source
'';
# TODO: Delete once pijul fixes upstream:
# https://nest.pijul.com/pijul_org/pijul/discussions/447
postPatch = '' postPatch = ''
pushd ../${pname}-${version}-vendor/thrussh/ pushd ../${pname}-${version}-vendor.tar.gz/thrussh/
patch -p1 < ${./thrussh-build-fix.patch} patch -p1 < ${./thrussh-build-fix.patch}
substituteInPlace .cargo-checksum.json --replace \ substituteInPlace .cargo-checksum.json --replace \
9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \
@ -45,11 +55,6 @@ in rustPlatform.buildRustPackage rec {
doCheck = false; doCheck = false;
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A distributed version control system"; description = "A distributed version control system";
homepage = https://pijul.org; homepage = https://pijul.org;

46
pkgs/applications/video/jftui/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, fetchFromGitHub, fetchpatch, clang,
pkg-config, curl, mpv, yajl }:
stdenv.mkDerivation rec {
pname = "jftui";
version = "0.2.2";
src = fetchFromGitHub {
owner = "Aanok";
repo = pname;
rev = "v${version}";
sha256 = "0g93w8ahyh2v0cv2fyj5a7v6qyznavwk0dcxx1qw4kczdgmlxnkx";
};
patches = [
# Remove this patch with next version
(fetchpatch {
name = "curl-capability-check-fix";
url = "https://github.com/Aanok/jftui/commit/d63996b8bc0d2ac4b04c5de4169bc7f8ec9b2a30.patch";
sha256 = "1d595mkzgx3carq2cykxpvmf5klgdlyaq94fk9wj8812yswqlsr7";
})
];
nativeBuildInputs = [
pkg-config
];
buildInputs = [
clang
curl
mpv
yajl
];
installPhase = ''
install -Dm555 build/jftui $out/bin/jftui
'';
meta = with stdenv.lib; {
description = "Jellyfin Terminal User Interface ";
homepage = "https://github.com/Aanok/jftui";
license = licenses.unlicense;
maintainers = [ maintainers.nyanloutre ];
platforms = platforms.linux;
};
}

5
pkgs/applications/virtualization/cntr/default.nix
View File

@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0"; sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0";
}; };
# Delete this on next update; see #79975 for details cargoSha256 = "088drkpkgq8psv5j6igxyhfvvbalzg6nd98r9z0nxkawck5i2clz";
legacyCargoFetcher = true;
cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A container debugging tool based on FUSE"; description = "A container debugging tool based on FUSE";

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}

2
pkgs/data/fonts/iosevka/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
npm run build -- ttf::$pname npm run build -- ttf::$pname >/dev/null
runHook postBuild runHook postBuild
''; '';

48
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}";
url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; src = fetchzip {
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 ];
}; };
} }

4
pkgs/data/fonts/spleen/default.nix
View File

@ -2,7 +2,7 @@
let let
pname = "spleen"; pname = "spleen";
version = "1.6.0"; version = "1.7.0";
in fetchurl { in fetchurl {
name = "${pname}-${version}"; name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@ -19,7 +19,7 @@ in fetchurl {
# create fonts.dir so NixOS xorg module adds to fp # create fonts.dir so NixOS xorg module adds to fp
${mkfontscale}/bin/mkfontdir "$d" ${mkfontscale}/bin/mkfontdir "$d"
''; '';
sha256 = "0x1xiw4gyfkyvwqg0f47rl92zq76d0c6jfncdnq8m2wwpxz9697b"; sha256 = "17dn6spfr8wv63sy009djb4q12q635m13wsyirzn074qabhr9ggg";
meta = with lib; { meta = with lib; {
description = "Monospaced bitmap fonts"; description = "Monospaced bitmap fonts";

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";

42
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
mkfontscale
];
phases = [ "unpackPhase" "installPhase" ]; buildPhase = ''
for i in *.bdf; do
name=$(basename "$i" .bdf)
installPhase = '' # generate pcf fonts (for X11 applications)
mkdir -p $out/share/fonts bdftopcf -t "$i" | gzip -n -9 -c > "$name.pcf.gz"
cp *.bdf $out/share/fonts
cd $out/share/fonts # generate otb fonts (for GTK applications)
mkfontdir faketime -f "1970-01-01 00:00:01" \
mkfontscale 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/;
}; };
} }

6
pkgs/data/themes/pop-gtk/default.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pop-gtk-theme"; pname = "pop-gtk-theme";
version = "2019-12-17"; version = "2020-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pop-os"; owner = "pop-os";
repo = "gtk-theme"; repo = "gtk-theme";
rev = "77601545f049251bce9c63a07f0d9819aa27cb60"; rev = "ed888e9dd5de142cb899e362beedaf694594cc7e";
sha256 = "0bmkcdr1z9m3inrw33zprq2a4jawql4724a84nr89r19xllj2z1s"; sha256 = "0ryr1jx9pzij6pkv7sam07f90w5lbrzx0fj5vdxl94612mh76aad";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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 ];

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