b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Robert Schütz 2019-05-03 16:01:49 +02:00
parent 3567b1390f b1bd1854d0
commit 56b560942c
187 changed files with 2862 additions and 1404 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/CODEOWNERS vendored
View file

@ -47,8 +47,8 @@
/nixos/doc/manual/man-nixos-option.xml @nbp
/nixos/modules/installer/tools/nixos-option.sh @nbp
# NixOS modules
/nixos/modules @Infinisil
# New NixOS modules
/nixos/modules/module-list.nix @Infinisil
# Python-related code and docs
/maintainers/scripts/update-python-libraries @FRidh

15
maintainers/maintainer-list.nix
View file

@ -157,6 +157,11 @@
github = "aespinosa";
name = "Allan Espinosa";
};
aethelz = {
email = "aethelz@protonmail.com";
github = "aethelz";
name = "Eugene";
};
aflatter = {
email = "flatter@fastmail.fm";
github = "aflatter";
@ -930,6 +935,11 @@
github = "chris-martin";
name = "Chris Martin";
};
chrisaw = {
email = "home@chrisaw.com";
github = "cawilliamson";
name = "Christopher A. Williamson";
};
chrisjefferson = {
email = "chris@bubblescope.net";
github = "chrisjefferson";
@ -2663,6 +2673,11 @@
github = "league";
name = "Christopher League";
};
leahneukirchen = {
email = "leah@vuxu.org";
github = "leahneukirchen";
name = "Leah Neukirchen";
};
lebastr = {
email = "lebastr@gmail.com";
github = "lebastr";

11
nixos/doc/manual/release-notes/rl-1909.xml
View file

@ -91,6 +91,17 @@
the module for some time and so was removed as cleanup.
</para>
</listitem>
<listitem>
<para>
The <option>services.emby.enable</option> module has been removed, see
<option>services.jellyfin.enable</option> instead for a free software fork of Emby.
See the Jellyfin documentation:
<link xlink:href="https://jellyfin.readthedocs.io/en/latest/administrator-docs/migrate-from-emby/">
Migrating from Emby to Jellyfin
</link>
</para>
</listitem>
</itemizedlist>
</section>

4
nixos/modules/misc/ids.nix
View file

@ -266,7 +266,7 @@
caddy = 239;
taskd = 240;
factorio = 241;
emby = 242;
# emby = 242; # unusued, removed 2019-05-01
graylog = 243;
sniproxy = 244;
nzbget = 245;
@ -567,7 +567,7 @@
caddy = 239;
taskd = 240;
factorio = 241;
emby = 242;
# emby = 242; # unused, removed 2019-05-01
sniproxy = 244;
nzbget = 245;
mosquitto = 246;

2
nixos/modules/module-list.nix
View file

@ -392,9 +392,9 @@
./services/misc/dysnomia.nix
./services/misc/disnix.nix
./services/misc/docker-registry.nix
./services/misc/emby.nix
./services/misc/errbot.nix
./services/misc/etcd.nix
./services/misc/ethminer.nix
./services/misc/exhibitor.nix
./services/misc/felix.nix
./services/misc/folding-at-home.nix

6
nixos/modules/services/backup/znapzend.nix
View file

@ -382,8 +382,10 @@ in
| xargs -I{} ${pkgs.znapzend}/bin/znapzendzetup delete "{}"
'' + concatStringsSep "\n" (mapAttrsToList (dataset: config: ''
echo Importing znapzend zetup ${config} for dataset ${dataset}
${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config}
'') files);
${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config} &
'') files) + ''
wait
'';
serviceConfig = {
ExecStart = let

33
nixos/modules/services/databases/openldap.nix
View file

@ -18,7 +18,11 @@ let
database ${cfg.database}
suffix ${cfg.suffix}
rootdn ${cfg.rootdn}
rootpw ${cfg.rootpw}
${if (cfg.rootpw != null) then ''
rootpw ${cfg.rootpw}
'' else ''
include ${cfg.rootpwFile}
''}
directory ${cfg.dataDir}
${cfg.extraDatabaseConfig}
'');
@ -106,10 +110,23 @@ in
};
rootpw = mkOption {
type = types.str;
type = types.nullOr types.str;
default = null;
description = ''
Password for the root user.
This setting will be ignored if configDir is set.
Using this option will store the root password in plain text in the
world-readable nix store. To avoid this the <literal>rootpwFile</literal> can be used.
'';
};
rootpwFile = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Password file for the root user.
The file should contain the string <literal>rootpw</literal> followed by the password.
e.g.: <literal>rootpw mysecurepassword</literal>
'';
};
@ -140,9 +157,9 @@ in
include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema
include ${pkgs.openldap.out}/etc/schema/nis.schema
database bdb
suffix dc=example,dc=org
rootdn cn=admin,dc=example,dc=org
database bdb
suffix dc=example,dc=org
rootdn cn=admin,dc=example,dc=org
# NOTE: change after first start
rootpw secret
directory /var/db/openldap
@ -218,6 +235,12 @@ in
###### implementation
config = mkIf cfg.enable {
assertions = [
{
assertion = cfg.rootpwFile != null || cfg.rootpw != null;
message = "Either services.openldap.rootpw or services.openldap.rootpwFile must be set";
}
];
environment.systemPackages = [ openldap ];

76
nixos/modules/services/misc/emby.nix
View file

@ -1,76 +0,0 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.services.emby;
in
{
options = {
services.emby = {
enable = mkEnableOption "Emby Media Server";
user = mkOption {
type = types.str;
default = "emby";
description = "User account under which Emby runs.";
};
group = mkOption {
type = types.str;
default = "emby";
description = "Group under which emby runs.";
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/emby/ProgramData-Server";
description = "Location where Emby stores its data.";
};
};
};
config = mkIf cfg.enable {
systemd.services.emby = {
description = "Emby Media Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
if [ -d ${cfg.dataDir} ]
then
for plugin in ${cfg.dataDir}/plugins/*
do
echo "Correcting permissions of plugin: $plugin"
chmod u+w $plugin
done
else
echo "Creating initial Emby data directory in ${cfg.dataDir}"
mkdir -p ${cfg.dataDir}
chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
fi
'';
serviceConfig = {
Type = "simple";
User = cfg.user;
Group = cfg.group;
PermissionsStartOnly = "true";
ExecStart = "${pkgs.emby}/bin/emby -programdata ${cfg.dataDir}";
Restart = "on-failure";
};
};
users.users = mkIf (cfg.user == "emby") {
emby = {
group = cfg.group;
uid = config.ids.uids.emby;
};
};
users.groups = mkIf (cfg.group == "emby") {
emby = {
gid = config.ids.gids.emby;
};
};
};
}

115
nixos/modules/services/misc/ethminer.nix Normal file
View file

@ -0,0 +1,115 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.ethminer;
poolUrl = escapeShellArg "stratum1+tcp://${cfg.wallet}@${cfg.pool}:${toString cfg.stratumPort}/${cfg.rig}/${cfg.registerMail}";
in
{
###### interface
options = {
services.ethminer = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable ethminer ether mining.";
};
recheckInterval = mkOption {
type = types.int;
default = 2000;
description = "Interval in milliseconds between farm rechecks.";
};
toolkit = mkOption {
type = types.enum [ "cuda" "opencl" ];
default = "cuda";
description = "Cuda or opencl toolkit.";
};
apiPort = mkOption {
type = types.int;
default = -3333;
description = "Ethminer api port. minus sign puts api in read-only mode.";
};
wallet = mkOption {
type = types.str;
example = "0x0123456789abcdef0123456789abcdef01234567";
description = "Ethereum wallet address.";
};
pool = mkOption {
type = types.str;
example = "eth-us-east1.nanopool.org";
description = "Mining pool address.";
};
stratumPort = mkOption {
type = types.port;
default = 9999;
description = "Stratum protocol tcp port.";
};
rig = mkOption {
type = types.str;
default = "mining-rig-name";
description = "Mining rig name.";
};
registerMail = mkOption {
type = types.str;
example = "email%40example.org";
description = "Url encoded email address to register with pool.";
};
maxPower = mkOption {
type = types.int;
default = 115;
description = "Miner max watt usage.";
};
};
};
###### implementation
config = mkIf cfg.enable {
systemd.services.ethminer = {
path = [ pkgs.cudatoolkit ];
description = "ethminer ethereum mining service";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
DynamicUser = true;
ExecStartPost = optional (cfg.toolkit == "cuda") "+${getBin config.boot.kernelPackages.nvidia_x11}/bin/nvidia-smi -pl ${toString cfg.maxPower}";
};
environment = {
LD_LIBRARY_PATH = "${config.boot.kernelPackages.nvidia_x11}/lib";
};
script = ''
${pkgs.ethminer}/bin/.ethminer-wrapped \
--farm-recheck ${toString cfg.recheckInterval} \
--report-hashrate \
--${cfg.toolkit} \
--api-port ${toString cfg.apiPort} \
--pool ${poolUrl}
'';
};
};
}

2
nixos/modules/services/monitoring/grafana-reporter.nix
View file

@ -52,7 +52,7 @@ in {
wantedBy = ["multi-user.target"];
after = ["network.target"];
serviceConfig = let
args = lib.concatSepString " " [
args = lib.concatStringsSep " " [
"-proto ${cfg.grafana.protocol}://"
"-ip ${cfg.grafana.addr}:${toString cfg.grafana.port}"
"-port :${toString cfg.port}"

2
nixos/modules/services/networking/softether.nix
View file

@ -70,6 +70,8 @@ in
systemd.services."softether-init" = {
description = "SoftEther VPN services initial task";
after = [ "keys.target" ];
wants = [ "keys.target" ];
wantedBy = [ "network.target" ];
serviceConfig = {
Type = "oneshot";

4
nixos/modules/services/networking/znc/default.nix
View file

@ -47,11 +47,11 @@ let
# Baz=baz
# Qux=qux
# </Foo>
set = concatMap (subname: [
set = concatMap (subname: optionals (value.${subname} != null) ([
"<${name} ${subname}>"
] ++ map (line: "\t${line}") (toLines value.${subname}) ++ [
"</${name}>"
]) (filter (v: v != null) (attrNames value));
])) (filter (v: v != null) (attrNames value));
}.${builtins.typeOf value};

11
nixos/modules/services/security/tor.nix
View file

@ -81,7 +81,7 @@ let
${optionalString (elem cfg.relay.role ["bridge" "private-bridge"]) ''
BridgeRelay 1
ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed
ServerTransportPlugin ${concatStringsSep "," cfg.relay.bridgeTransports} exec ${obfs4}/bin/obfs4proxy managed
ExtORPort auto
${optionalString (cfg.relay.role == "private-bridge") ''
ExtraInfoStatistics 0
@ -355,7 +355,7 @@ in
<para>
Regular bridge. Works like a regular relay, but
doesn't list you in the public relay directory and
hides your Tor node behind obfsproxy.
hides your Tor node behind obfs4proxy.
</para>
<para>
@ -424,6 +424,13 @@ in
'';
};
bridgeTransports = mkOption {
type = types.listOf types.str;
default = ["obfs4"];
example = ["obfs2" "obfs3" "obfs4" "scramblesuit"];
description = "List of pluggable transports";
};
nickname = mkOption {
type = types.str;
default = "anonymous";

4
nixos/modules/services/web-servers/nginx/default.nix
View file

@ -16,11 +16,11 @@ let
} // (optionalAttrs vhostConfig.enableACME {
sslCertificate = "${acmeDirectory}/${serverName}/fullchain.pem";
sslCertificateKey = "${acmeDirectory}/${serverName}/key.pem";
sslTrustedCertificate = "${acmeDirectory}/${serverName}/full.pem";
sslTrustedCertificate = "${acmeDirectory}/${serverName}/fullchain.pem";
}) // (optionalAttrs (vhostConfig.useACMEHost != null) {
sslCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem";
sslCertificateKey = "${acmeDirectory}/${vhostConfig.useACMEHost}/key.pem";
sslTrustedCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/full.pem";
sslTrustedCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem";
})
) cfg.virtualHosts;
enableIPv6 = config.networking.enableIPv6;

1
nixos/tests/all-tests.nix
View file

@ -116,6 +116,7 @@ in
installer = handleTest ./installer.nix {};
ipv6 = handleTest ./ipv6.nix {};
jackett = handleTest ./jackett.nix {};
jellyfin = handleTest ./jellyfin.nix {};
jenkins = handleTest ./jenkins.nix {};
kafka = handleTest ./kafka.nix {};
kerberos = handleTest ./kerberos/default.nix {};

4
pkgs/applications/altcoins/bitcoin-abc.nix
View file

@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
version = "0.18.2";
version = "0.19.4";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
sha256 = "1ha219xnd61qicf7r3j0wbfrifh7blwp3lyk3ycgdn381q1qln29";
sha256 = "1z4x25ygcw1pqml2ww02vqrvmihlv4f5gnnn1iyfirrjxgpfaxd7";
};
patches = [ ./fix-bitcoin-qt-build.patch ];

4
pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
View file

@ -4,12 +4,12 @@
dnl Output: $1 is set to the path of $2 if found. $2 are searched in order.
AC_DEFUN([BITCOIN_QT_PATH_PROGS],[
BITCOIN_QT_CHECK([
- if test "x$3" != "x"; then
- if test "x$3" != x; then
- AC_PATH_PROGS($1,$2,,$3)
- else
- AC_PATH_PROGS($1,$2)
- fi
+ AC_PATH_PROGS($1,$2)
if test "x$$1" = "x" && test "x$4" != "xyes"; then
if test "x$$1" = x && test "x$4" != xyes; then
BITCOIN_QT_FAIL([$1 not found])
fi

6
pkgs/applications/audio/mixxx/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "mixxx-${version}";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = "release-${version}";
sha256 = "1rp2nyhz2j695k5kk0m94x30akwrlr9jgs0n4pi4snnvjpwmbfp9";
sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r";
};
nativeBuildInputs = [ makeWrapper ];
@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
qtx11extras rubberband scons sqlite taglib upower vampSDK
];
enableParallelBuilding = true;
sconsFlags = [
"build=release"
"qtdir=${qtbase}"

4
pkgs/applications/audio/mopidy/iris.nix
View file

@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.36.0";
version = "3.37.0";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1qxb3rfjxmwihcm0nrarrgp9x7zr3kjipzn5igj0d57gpi2bdwgv";
sha256 = "1fy802jx3817ldrm3g5inrfjbi7s8xcx96pnglbq54nvp41lzyh5";
};
propagatedBuildInputs = [

5
pkgs/applications/audio/pulseeffects/default.nix
View file

@ -47,13 +47,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
version = "4.5.9";
version = "4.6.0";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "19pqi9wix359hdrslzmi9sz0dzz03pdwqvdyzw3i5rdny01skdfw";
sha256 = "1ap07sw4j1a0al2hqh781m8ivlplxlaw515gkf65q100q80kr0zj";
};
nativeBuildInputs = [
@ -107,5 +107,6 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ];
};
}

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
version = "0.5.6";
version = "0.5.7";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
sha256 = "0wlmbb9m7cf3wr7c2h2hji18592x2b119m7mx85wksjs6rjaq2mj";
sha256 = "1g6a5j74p45yisl28bw4fcc9nr6b710ikk459p4mp6djh9gs8v95";
};
buildInputs = [

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
version = "0.5.3";
version = "0.5.4";
name = "qmidinet-${version}";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
sha256 = "0li6iz1anm8pzz7j12yrfyxlyslsfsksmz0kk0iapa4yx3kifn10";
sha256 = "1il4b8v3azb33yg4fy78npi56xlkz4n60f17sgvckyxb2yj57jwq";
};
hardeningDisable = [ "format" ];

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "qsampler-${version}";
version = "0.5.4";
version = "0.5.5";
src = fetchurl {
url = "mirror://sourceforge/qsampler/${name}.tar.gz";
sha256 = "1hk0j63zzdyji5dd89spbyw79i74n28zjryyy0a4gsaq0m7j2dry";
sha256 = "1li2p8zknrdr62wlaassfvgski0rlbr3lvrzywbh32dq8j50w8zf";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];

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

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "qtractor";
version = "0.9.6";
version = "0.9.7";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "06sa4wl8zr0k8dnjiil0gjwnhrkq95h50xv56ih1y8jgyzxchaxp";
sha256 = "0z97c8h0m7070bfq0qsbf8hwzwcqjs7dln7na4mngyhc6vqkg63s";
};
nativeBuildInputs = [

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

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "reaper-${version}";
version = "5.973";
version = "5.974";
src = fetchurl {
url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
sha256 = "02ymi2rn29zrb71krx43nrpfldhkcvwry4gz228apff2hb2lmqdx";
sha256 = "0pmjdh4d1jsplv99nrgjn437bgjp7hqk6fynvqk3lbn1zw3wk0i9";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "samplv1-${version}";
version = "0.9.6";
version = "0.9.7";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
sha256 = "16a5xix9pn0gl3fr6bv6zl1l9vrzgvy1q7xd8yxzfr3vi5s8x4z9";
sha256 = "1vgmcjccpgqqlmmwfg6m91nph81p2xaxydjx82n4l1yrr9lidn9h";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "synthv1-${version}";
version = "0.9.6";
version = "0.9.7";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
sha256 = "1hcngk7mxfrqf8v3r759x3wd0p02nc3q83j8m3k58p408y3mx7nr";
sha256 = "0i70wm430fvksi3g985farrkhgb7mwhi7j06dl66cdj1n12jzzk7";
};
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];

28
pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
View file

@ -17,25 +17,41 @@ let
};
libvterm = libvterm-neovim.overrideAttrs(old: rec {
pname = "libvterm-neovim";
version = "2019-04-27";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
};
});
in stdenv.mkDerivation rec {
name = "emacs-libvterm-${version}";
version = "unstable-2018-11-16";
version = "unstable-2019-04-28";
src = fetchFromGitHub {
owner = "akermu";
repo = "emacs-libvterm";
rev = "8be9316156be75a685c0636258b2fec2daaf5ab5";
sha256 = "059js4aa7xgqcpaicgy4gz683hppa1iyp1r98mnms5hd31a304k8";
rev = "6adcedf3e4aaadeeaff97437044fba17aeb466d4";
sha256 = "1j6qr5bmajig3idhwsaa3zm72w13q9zn77z2dlrhhx3p4bbds3f8";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ emacs libvterm-neovim ];
buildInputs = [ emacs libvterm ];
cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ];
cmakeFlags = [
"-DEMACS_SOURCE=${emacsSources}"
"-DUSE_SYSTEM_LIBVTERM=True"
];
installPhase = ''
install -d $out/share/emacs/site-lisp
install ../*.el $out/share/emacs/site-lisp
install ./*.so $out/share/emacs/site-lisp
install ../*.so $out/share/emacs/site-lisp
'';
}

4
pkgs/applications/editors/quilter/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "quilter";
version = "1.8.1";
version = "1.8.4";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "0i8rvvc5g74bgfjgsmmgpj42xmhjaz14jjzl9s5nzwpy1fn7vv0p";
sha256 = "14qbkkz1l4zj6kwds5d82swnh3ynj6diyvjl0pafgp5i1i27j4rh";
};
nativeBuildInputs = [

6
pkgs/applications/editors/sublime/3/packages.nix
View file

@ -5,10 +5,10 @@ let
in
rec {
sublime3-dev = common {
buildVersion = "3203";
buildVersion = "3208";
dev = true;
x32sha256 = "004hnlm2dvcfagf3bkbfqxlnkgqk46jrm8w9yagpjwkpdy76mgyx";
x64sha256 = "0dp4vi39s2gq5a7snz0byrf44i0csbzwq6hn7i2zqa6rpvfywa1d";
x32sha256 = "09k04fjryc0dc6173i6nwhi5xaan89n4lp0n083crvkqwp0qlf2i";
x64sha256 = "12pn3yfm452m75dlyl0lyf82956j8raz2dglv328m81hbafflrj8";
} {};
sublime3 = common {

4
pkgs/applications/editors/typora/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "typora";
version = "0.9.68";
version = "0.9.70";
src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
sha256 = "09hkmnh9avzb7nc8i67vhbv6nc1v90kk88aq01mpmyibpdqp03zp";
sha256 = "08bgllbvgrpdkk9bryj4s16n274ps4igwrzdvsdbyw8wpp44vcy2";
};
nativeBuildInputs = [

13
pkgs/applications/misc/electron-cash/default.nix
View file

@ -8,13 +8,13 @@ in
python3Packages.buildPythonApplication rec {
pname = "electron-cash";
version = "3.3.6";
version = "4.0.2";
src = fetchurl {
url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
# Verified using official SHA-1 and signature from
# https://github.com/fyookball/keys-n-hashes
sha256 = "ac435f2bf98b9b50c4bdcc9e3fb2ff19d9c66f8cce5df852f3a4727306bb0a84";
sha256 = "6255cd0493442ec57c10ae70ca2e84c6a29497f90a1393e6ac5772afe7572acf";
};
propagatedBuildInputs = with python3Packages; [
@ -48,7 +48,14 @@ python3Packages.buildPythonApplication rec {
--replace "(share_dir" "(\"share\""
'';
doCheck = false;
checkInputs = with python3Packages; [
pytest
];
checkPhase = ''
unset HOME
pytest lib/tests
'';
postInstall = ''
substituteInPlace $out/share/applications/electron-cash.desktop \

16
pkgs/applications/misc/gcalcli/default.nix
View file

@ -5,32 +5,26 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "gcalcli";
version = "4.0.4";
version = "4.1.0";
src = fetchFromGitHub {
owner = "insanum";
repo = pname;
rev = "v${version}";
sha256 = "0bl4cmc24iw12zn5mlj5qn141s2k2mzdixbcb92pfng4w2s4dq66";
sha256 = "06iijpwlvvn8bj81s4znhykilvwvydxjmzd3d4nsa5j2kj3iwshi";
};
postPatch = lib.optionalString stdenv.isLinux ''
substituteInPlace gcalcli/argparsers.py --replace \
"command = 'notify-send -u critical" \
"command = '${libnotify}/bin/notify-send -u critical"
substituteInPlace gcalcli/argparsers.py \
--replace "'notify-send" "'${libnotify}/bin/notify-send"
'';
propagatedBuildInputs = [
dateutil gflags httplib2 parsedatetime six vobject
google_api_python_client oauth2client uritemplate
libnotify
] ++ lib.optional (!isPy3k) futures;
postInstall = lib.optionalString stdenv.isLinux ''
substituteInPlace $out/bin/gcalcli --replace \
"command = 'notify-send -u critical -a gcalcli %s'" \
"command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'"
'';
# There are no tests as of 4.0.0a4
doCheck = false;

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

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
patches = [
./gcc43.patch
./find-config-file-in-system-etc-dir.patch
./gmrun-0.9.2-xdg.patch
];

18
pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch Normal file
View file

@ -0,0 +1,18 @@
diff -ur gmrun-0.9.2-orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc
--- gmrun-0.9.2-orig/src/prefs.cc 2019-05-02 12:56:39.025088361 +0200
+++ gmrun-0.9.2/src/prefs.cc 2019-05-02 13:21:51.179778620 +0200
@@ -31,9 +31,11 @@
Prefs::Prefs()
{
- string file_name = PACKAGE_DATA_DIR"/";
- file_name += GMRUNRC;
- init(file_name);
+ string file_name = "/etc/" GMRUNRC;
+ if (!init(file_name)) {
+ file_name = PACKAGE_DATA_DIR "/" GMRUNRC;;
+ init(file_name);
+ }
file_name = getenv("HOME");
if (!file_name.empty()) {

4
pkgs/applications/misc/masterpdfeditor/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:
let
version = "5.3.22";
version = "5.4.10";
in stdenv.mkDerivation {
name = "masterpdfeditor-${version}";
src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
sha256 = "0cnw01g3j5l07f2lng604mx8qqm61i5sflryj1vya2gkjmrphkan";
sha256 = "1902ahb2g9xanrip1n0ihr31az8sv9fsvzddnzf70kbwlfclnqf7";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

4
pkgs/applications/misc/mediainfo-gui/default.nix
View file

@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
version = "18.12";
version = "19.04";
name = "mediainfo-gui-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d";
sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

4
pkgs/applications/misc/translate-shell/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "translate-shell";
version = "0.9.6.9";
version = "0.9.6.10";
src = fetchFromGitHub {
owner = "soimort";
repo = "translate-shell";
rev = "v${version}";
sha256 = "1xyf0vdxmbgqcgsr1gvgwh1q4fh080h68radkim6pfcwzffliszm";
sha256 = "1dmh3flldfhnqfay3a6c5hanqcjwrmbly1bq8mlk022qfi1fv33y";
};
buildInputs = [ makeWrapper ];

8
pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
View file

@ -34,7 +34,7 @@
, rsync
# Pluggable transports
, obfsproxy
, obfs4
# Customization
, extraPrefs ? ""
@ -171,9 +171,9 @@ stdenv.mkDerivation rec {
EOF
# Configure pluggable transports
cat >>$TBDATA_PATH/torrc-defaults <<EOF
ClientTransportPlugin obfs2,obfs3 exec ${obfsproxy}/bin/obfsproxy managed
EOF
substituteInPlace $TBDATA_PATH/torrc-defaults \
--replace "./TorBrowser/Tor/PluggableTransports/obfs4proxy" \
"${obfs4}/bin/obfs4proxy"
# Hard-code path to TBB fonts; xref: FONTCONFIG_FILE in the wrapper below
sed $bundleData/$bundlePlatform/Data/fontconfig/fonts.conf \

68
pkgs/applications/networking/dropbox/cli.nix
View file

@ -1,4 +1,15 @@
{ stdenv, pkgconfig, fetchurl, python3, dropbox }:
{ stdenv
, substituteAll
, pkgconfig
, fetchurl
, python3
, dropbox
, gtk3
, gnome3
, gdk_pixbuf
, gobject-introspection
}:
let
version = "2019.02.14";
dropboxd = "${dropbox}/bin/dropbox";
@ -6,35 +17,52 @@ in
stdenv.mkDerivation {
name = "dropbox-cli-${version}";
outputs = [ "out" "nautilusExtension" ];
src = fetchurl {
url = "https://linux.dropboxstatic.com/packages/nautilus-dropbox-${version}.tar.bz2";
sha256 = "09yg7q45sycl88l3wq0byz4a9k6sxx3m0r3szinvisfay9wlj35f";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ python3 ];
strictDeps = true;
phases = "unpackPhase installPhase";
patches = [
(substituteAll {
src = ./fix-cli-paths.patch;
inherit dropboxd;
})
];
installPhase = ''
mkdir -p "$out/bin/" "$out/share/applications"
cp data/dropbox.desktop "$out/share/applications"
cp -a data/icons "$out/share/icons"
find "$out/share/icons" -type f \! -name '*.png' -delete
substitute "dropbox.in" "$out/bin/dropbox" \
--replace '@PACKAGE_VERSION@' ${version} \
--replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \
--replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \
--replace '@IMAGEDATA64@' '"too-lazy-to-fix"'
sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox
chmod +x "$out/bin/"*
patchShebangs "$out/bin"
'';
nativeBuildInputs = [
pkgconfig
gobject-introspection
gdk_pixbuf
# only for build, the install command also wants to use GTK through introspection
# but we are using Nix for installation so we will not need that.
(python3.withPackages (ps: with ps; [
docutils
pygobject3
]))
];
buildInputs = [
python3
gtk3
gnome3.nautilus
];
configureFlags = [
"--with-nautilus-extension-dir=${placeholder ''nautilusExtension''}/lib/nautilus/extensions-3.0"
];
makeFlags = [
"EMBLEM_DIR=${placeholder ''nautilusExtension''}/share/nautilus-dropbox/emblems"
];
meta = {
homepage = http://dropbox.com;
homepage = https://www.dropbox.com;
description = "Command line client for the dropbox daemon";
license = stdenv.lib.licenses.gpl3;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
# NOTE: Dropbox itself only works on linux, so this is ok.
platforms = stdenv.lib.platforms.linux;

11
pkgs/applications/networking/dropbox/fix-cli-paths.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/dropbox.in
+++ b/dropbox.in
@@ -71,7 +71,7 @@
PARENT_DIR = os.path.expanduser("~")
DROPBOX_DIST_PATH = "%s/.dropbox-dist" % PARENT_DIR
-DROPBOXD_PATH = os.path.join(DROPBOX_DIST_PATH, "dropboxd")
+DROPBOXD_PATH = "@dropboxd@"
DESKTOP_FILE = "@DESKTOP_FILE_DIR@/dropbox.desktop"
enc = locale.getpreferredencoding()

9
pkgs/applications/networking/instant-messengers/mikutter/Gemfile
View file

@ -7,17 +7,20 @@ def source(url)
source 'https://rubygems.org'
ruby '>= 2.3.0'
group :default do
gem 'oauth', '>= 0.5.1'
gem 'json_pure', '~> 1.8'
gem 'addressable', '~> 2.3'
gem 'addressable', '>= 2.5.2', '< 2.6'
gem 'diva', '>= 0.3.2', '< 2.0'
gem 'memoist', '>= 0.16', '< 0.17'
gem 'ruby-hmac', '~> 0.4'
gem 'typed-array', '~> 0.1'
gem 'delayer', '~> 0.0'
gem 'pluggaloid', '>= 1.1.1', '< 2.0'
gem 'delayer-deferred', '>= 1.0.4', '< 1.1'
gem 'twitter-text', '>= 1.14.6'
gem 'delayer-deferred', '>= 2.0', '< 3.0'
gem 'twitter-text', '>= 2.1.0'
end
group :test do

102
pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock
View file

@ -3,75 +3,78 @@ GEM
specs:
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
atk (3.1.9)
glib2 (= 3.1.9)
cairo (1.15.10)
atk (3.3.2)
glib2 (= 3.3.2)
cairo (1.16.4)
native-package-installer (>= 1.0.3)
pkg-config (>= 1.2.2)
cairo-gobject (3.1.9)
cairo
glib2 (= 3.1.9)
cairo-gobject (3.3.2)
cairo (>= 1.16.2)
glib2 (= 3.3.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
delayer (0.0.2)
delayer-deferred (1.0.4)
delayer-deferred (2.0.0)
delayer (>= 0.0.2, < 0.1)
gdk_pixbuf2 (3.1.9)
gio2 (= 3.1.9)
gettext (3.0.9)
diva (0.3.2)
addressable (>= 2.5, < 2.6)
gdk_pixbuf2 (3.3.2)
gio2 (= 3.3.2)
gettext (3.2.9)
locale (>= 2.0.5)
text
gio2 (3.1.9)
glib2 (= 3.1.9)
gobject-introspection (= 3.1.9)
glib2 (3.1.9)
text (>= 1.3.0)
gio2 (3.3.2)
gobject-introspection (= 3.3.2)
glib2 (3.3.2)
native-package-installer (>= 1.0.3)
pkg-config (>= 1.2.2)
gobject-introspection (3.1.9)
glib2 (= 3.1.9)
gtk2 (3.1.9)
atk (= 3.1.9)
gdk_pixbuf2 (= 3.1.9)
pango (= 3.1.9)
hashdiff (0.3.7)
gobject-introspection (3.3.2)
glib2 (= 3.3.2)
gtk2 (3.3.2)
atk (= 3.3.2)
gdk_pixbuf2 (= 3.3.2)
pango (= 3.3.2)
hashdiff (0.3.9)
httpclient (2.8.3)
idn-ruby (0.1.0)
instance_storage (1.0.0)
irb (1.0.0)
json_pure (1.8.6)
locale (2.1.2)
memoist (0.16.0)
metaclass (0.0.4)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
mocha (0.14.0)
metaclass (~> 0.0.1)
moneta (1.0.0)
native-package-installer (1.0.4)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
oauth (0.5.3)
pango (3.1.9)
cairo (>= 1.14.0)
cairo-gobject (= 3.1.9)
gobject-introspection (= 3.1.9)
pkg-config (1.2.8)
pluggaloid (1.1.1)
moneta (1.1.1)
native-package-installer (1.0.7)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
oauth (0.5.4)
pango (3.3.2)
cairo-gobject (= 3.3.2)
gobject-introspection (= 3.3.2)
pkg-config (1.3.7)
pluggaloid (1.1.2)
delayer
instance_storage (>= 1.0.0, < 2.0.0)
power_assert (1.1.1)
public_suffix (3.0.0)
power_assert (1.1.4)
public_suffix (3.0.3)
rake (10.5.0)
ruby-hmac (0.4.0)
ruby-prof (0.16.2)
safe_yaml (1.0.4)
test-unit (3.2.6)
ruby-prof (0.17.0)
safe_yaml (1.0.5)
test-unit (3.3.2)
power_assert
text (1.3.1)
totoridipjp (0.1.0)
twitter-text (1.14.7)
twitter-text (3.0.0)
idn-ruby
unf (~> 0.1.0)
typed-array (0.1.2)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unf_ext (0.0.7.6)
watch (0.1.0)
webmock (1.24.6)
addressable (>= 2.3.6)
@ -82,12 +85,14 @@ PLATFORMS
ruby
DEPENDENCIES
addressable (~> 2.3)
addressable (>= 2.5.2, < 2.6)
delayer (~> 0.0)
delayer-deferred (>= 1.0.4, < 1.1)
gettext (~> 3.0.1)
gtk2 (= 3.1.9)
delayer-deferred (>= 2.0, < 3.0)
diva (>= 0.3.2, < 2.0)
gettext (>= 3.2.9, < 3.3)
gtk2 (= 3.3.2)
httpclient
irb (>= 1.0.0, < 1.1)
json_pure (~> 1.8)
memoist (>= 0.16, < 0.17)
mocha (~> 0.14)
@ -100,10 +105,13 @@ DEPENDENCIES
ruby-prof
test-unit (~> 3.0)
totoridipjp
twitter-text (>= 1.14.6)
twitter-text (>= 2.1.0)
typed-array (~> 0.1)
watch (~> 0.1)
webmock (~> 1.17)
RUBY VERSION
ruby 2.5.5p157
BUNDLED WITH
1.14.6
1.17.2

2
pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile
View file

@ -1,3 +1,3 @@
source 'https://rubygems.org'
gem 'gtk2', '3.1.9'
gem 'gtk2', '3.3.2'

3
pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile
View file

@ -1,5 +1,6 @@
source 'https://rubygems.org'
group :default do
gem 'gettext', '~> 3.0.1'
gem 'gettext', '>= 3.2.9', '< 3.3'
gem 'irb', '>= 1.0.0', '< 1.1'
end

24
pkgs/applications/networking/instant-messengers/mikutter/default.nix
View file

@ -1,15 +1,29 @@
{ stdenv, fetchurl
, bundlerEnv, ruby
, alsaUtils, libnotify, which, wrapGAppsHook, gtk2
, alsaUtils, libnotify, which, wrapGAppsHook, gtk2, atk, gobject-introspection
}:
# how to update:
# find latest version at: http://mikutter.hachune.net/download#download
# run these commands:
#
# wget http://mikutter.hachune.net/bin/mikutter.3.8.7.tar.gz
# tar xvf mikutter.3.8.7.tar.gz
# cd mikutter
# find . -not -name Gemfile -exec rm {} \;
# find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \;
# cd ..
# mv mikutter/* .
# rm mikutter.3.8.7.tar.gz
# rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix'
stdenv.mkDerivation rec {
name = "mikutter-${version}";
version = "3.5.13";
version = "3.8.7";
src = fetchurl {
url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz";
sha256 = "2e01cd6cfe0caad663a381e5263f6d8030f0fb7cd8d4f858d320166516c7c320";
sha256 = "1griypcd1xgyfd9wc3ls32grpw4ig0xxdiygpdinzr3bigfmd7iv";
};
env = bundlerEnv {
@ -19,7 +33,7 @@ stdenv.mkDerivation rec {
inherit ruby;
};
buildInputs = [ alsaUtils libnotify which gtk2 ruby ];
buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ];
nativeBuildInputs = [ wrapGAppsHook ];
postUnpack = ''
@ -41,6 +55,7 @@ stdenv.mkDerivation rec {
--prefix GEM_HOME : "${env}/${env.ruby.gemPath}"
--set DISABLE_BUNDLER_SETUP 1
)
# --prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules"
mkdir -p $out/share/mikutter $out/share/applications
ln -sv $out/core/skin $out/share/mikutter/skin
@ -54,7 +69,6 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
broken = true;
description = "An extensible Twitter client";
homepage = https://mikutter.hachune.net;
platforms = ruby.meta.platforms;

229
pkgs/applications/networking/instant-messengers/mikutter/gemset.nix
View file

@ -1,6 +1,8 @@
{
addressable = {
dependencies = ["public_suffix"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
@ -10,33 +12,41 @@
};
atk = {
dependencies = ["glib2"];
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18l99gv6828rn59q8k6blxg146b025fj44klrcisffw6h9s9qqxm";
sha256 = "17c5ixwyg16lbbjix2prk7fa6lm0vkxvc1z6m6inc6jgkb1x0700";
type = "gem";
};
version = "3.1.9";
version = "3.3.2";
};
cairo = {
dependencies = ["native-package-installer" "pkg-config"];
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f0n057cj6cjz7f38pwnflrkbwkl8pm3g9ssa51flyxr7lcpcw7c";
sha256 = "0yvv2lcbsybzbw1nrmfivmln23da4rndrs3av6ymjh0x3ww5h7p8";
type = "gem";
};
version = "1.15.10";
version = "1.16.4";
};
cairo-gobject = {
dependencies = ["cairo" "glib2"];
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qnsd9203qc6hl2i4hfzngr8v06rfk4vxfn6sbr8b4c1q4n0lq26";
sha256 = "12q441a5vnfvbcnli4fpq2svb75vq1wvs2rlgsp6fv38fh6fgsfz";
type = "gem";
};
version = "3.1.9";
version = "3.3.2";
};
crack = {
dependencies = ["safe_yaml"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
@ -45,6 +55,8 @@
version = "0.4.3";
};
delayer = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "156vy4x1d2jgafkjaafzfz7g8ghl4p5zgbl859b8slp4wdxy3v1r";
@ -54,76 +66,105 @@
};
delayer-deferred = {
dependencies = ["delayer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rp2hpik8gs1kzwwq831jwj1iv5bhfwd3dmm9nvizy3nqpz1gvvb";
sha256 = "0zvqphyzngj5wghgbb2nd1qj2qvj2plsz9vx8hz24c7bfq55n4xz";
type = "gem";
};
version = "1.0.4";
version = "2.0.0";
};
diva = {
dependencies = ["addressable"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rp125gdlq7jqq7x8la52pdpimhx5wr66frcgf6z4jm927rjw84d";
type = "gem";
};
version = "0.3.2";
};
gdk_pixbuf2 = {
dependencies = ["gio2"];
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x7vna77qw26479dydzfs1sq7xmq31xfly2pn5fvh35wg0q4y07d";
sha256 = "071z8a8khs5qb43ri5hbvaijwbx43mick7cjfmhn6javifkzijk7";
type = "gem";
};
version = "3.1.9";
version = "3.3.2";
};
gettext = {
dependencies = ["locale" "text"];
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14vw306p46w2kyad3kp9vq56zw3ch6px30wkhl5x0qkx8d3ya3ir";
sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr";
type = "gem";
};
version = "3.0.9";
version = "3.2.9";
};
gio2 = {
dependencies = ["glib2" "gobject-introspection"];
dependencies = ["gobject-introspection"];
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dxyaxp32m19mynw20x39vkb50wa4jcxczwmbkq7pcg55j76wwhm";
sha256 = "1f131yd9zzfsjn8i4k8xkl7xm3c5f9sm7irvwxnqqh635qccfz8n";
type = "gem";
};
version = "3.1.9";
version = "3.3.2";
};
glib2 = {
dependencies = ["native-package-installer" "pkg-config"];
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y1ws895345a88wikqil1x87cpd7plmwfi635piam7il6vsb4h73";
sha256 = "13r1i8gkgxj0fjz7bdnqqrsvszl7dffbf85ghx2f8p7zrcbzlk3p";
type = "gem";
};
version = "3.1.9";
version = "3.3.2";
};
gobject-introspection = {
dependencies = ["glib2"];
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04gla6z9y8g0d69wlwl0wr7pwyzqg132pfs1n9fq6fgkjb6l7sm3";
sha256 = "15njcm0yg4qpwkhyx6gf2nxvjl6fxm9jffan8zrl2xyh68yr4jf7";
type = "gem";
};
version = "3.1.9";
version = "3.3.2";
};
gtk2 = {
dependencies = ["atk" "gdk_pixbuf2" "pango"];
groups = ["plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mshgsw2x0w5wfcp17qnsja50aafbjxy2g42kvk5sr19l0chkkkq";
sha256 = "1a4lj6anmvr82cwrg8swzglz90jss995zr7bvsiwr876qqdwv7qs";
type = "gem";
};
version = "3.1.9";
version = "3.3.2";
};
hashdiff = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x";
type = "gem";
};
version = "0.3.7";
version = "0.3.9";
};
httpclient = {
groups = ["plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
@ -131,7 +172,19 @@
};
version = "2.8.3";
};
idn-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr";
type = "gem";
};
version = "0.1.0";
};
instance_storage = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08nf5fhq9dckq9lmaklxydq0hrlfi7phk66gr3bggxg45zd687pl";
@ -139,7 +192,19 @@
};
version = "1.0.0";
};
irb = {
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "181d88hns00fpw8szg8hbchflwq69wp3y5zvd3dyqjzbq91v1dcr";
type = "gem";
};
version = "1.0.0";
};
json_pure = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vllrpm2hpsy5w1r7000mna2mhd7yfrmd8hi713lk0n9mv27bmam";
@ -148,6 +213,8 @@
version = "1.8.6";
};
locale = {
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
@ -156,6 +223,8 @@
version = "2.1.2";
};
memoist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
@ -164,6 +233,8 @@
version = "0.16.0";
};
metaclass = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5";
@ -172,15 +243,19 @@
version = "0.0.4";
};
mini_portile2 = {
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
version = "2.3.0";
version = "2.4.0";
};
mocha = {
dependencies = ["metaclass"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0id1x7g46fzy8f4jna20ys329ydaj3sad75qs9db2a6nd7f0zc2b";
@ -189,81 +264,101 @@
version = "0.14.0";
};
moneta = {
groups = ["plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pgwn6xnlh7vviy511mfgkv2j3sfihn5ic2zabmyrs2nh6kfa912";
sha256 = "1mbs9w3c13phza8008mwlx8s991fzigml7pncq94i1c2flz9vw95";
type = "gem";
};
version = "1.0.0";
version = "1.1.1";
};
native-package-installer = {
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0svj2sg7y7izl90qrvzd2fcb1rkq8bv3bd6lr9sh1ml18v3w882a";
sha256 = "03qrzhk807f98bdwy6c37acksyb5fnairdz4jpl7y3fifh7k7yfn";
type = "gem";
};
version = "1.0.4";
version = "1.0.7";
};
nokogiri = {
dependencies = ["mini_portile2"];
groups = ["plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
type = "gem";
};
version = "1.8.1";
version = "1.10.3";
};
oauth = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a5cfg9pm3mxsmlk1slj652vza8nha2lpbpbmf3rrk0lh6zi4d0b";
sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
type = "gem";
};
version = "0.5.3";
version = "0.5.4";
};
pango = {
dependencies = ["cairo" "cairo-gobject" "gobject-introspection"];
dependencies = ["cairo-gobject" "gobject-introspection"];
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0swld0s01djjlqrari0ib75703mb7qr4ydn00cqfhdr7xim66hjk";
sha256 = "0lbhjsd6y42iw572xcynd6gcapczjki41h932s90rkh6022pbm9p";
type = "gem";
};
version = "3.1.9";
version = "3.3.2";
};
pkg-config = {
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "056qb6cwbw2l9riq376wazx4kwd67cdilyclpa6j38mfsswpmzws";
sha256 = "1s56ym0chq3fycl29vqabcalqdcf7y2f25pmihjwqgbmrmzdyvr1";
type = "gem";
};
version = "1.2.8";
version = "1.3.7";
};
pluggaloid = {
dependencies = ["delayer" "instance_storage"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p9s1bzw02jzjlpjpxsbfsy1cyfbqs10iqvhxqh4xgyh72nry9zr";
sha256 = "0fkm6y7aq132icmmv4k8mqw08fxqil8k52l8li642jyi79hvzrqh";
type = "gem";
};
version = "1.1.1";
version = "1.1.2";
};
power_assert = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h0s1clasynlbk3782801c61yx24pdv959fpw53g5yl8gxqj34iz";
sha256 = "072y5ixw59ad47hkfj6nl2i4zcyad8snfxfsyyrgjkiqnvqwvbvq";
type = "gem";
};
version = "1.1.1";
version = "1.1.4";
};
public_suffix = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
version = "3.0.0";
version = "3.0.3";
};
rake = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
@ -272,6 +367,8 @@
version = "10.5.0";
};
ruby-hmac = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954";
@ -280,31 +377,39 @@
version = "0.4.0";
};
ruby-prof = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag";
sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c";
type = "gem";
};
version = "0.16.2";
version = "0.17.0";
};
safe_yaml = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
type = "gem";
};
version = "1.0.4";
version = "1.0.5";
};
test-unit = {
dependencies = ["power_assert"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gl5b2d6bysnm0a1zx54qn6iwd67f6gsjy0c7zb68ag0453rqcnv";
sha256 = "0hf47w70ajvwdchx0psq3dir26hh902x9sz0iwbxqj8z9w1kc6sd";
type = "gem";
};
version = "3.2.6";
version = "3.3.2";
};
text = {
groups = ["default" "plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg";
@ -313,6 +418,8 @@
version = "1.3.1";
};
totoridipjp = {
groups = ["plugin"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ci9hbwc6xf4x0lkm6px4jgbmi37n8plsjhbf2ir5vka9f29lck";
@ -321,15 +428,19 @@
version = "0.1.0";
};
twitter-text = {
dependencies = ["unf"];
dependencies = ["idn-ruby" "unf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
sha256 = "1ibk4bl9hrq0phlg7zplkilsqgniji6yvid1a7k09rs0ai422jax";
type = "gem";
};
version = "1.14.7";
version = "3.0.0";
};
typed-array = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qlv2rnkin9rwkgjx3k5qvc17m0m7jf5cdirw3wxbjnw5kga27w9";
@ -339,6 +450,8 @@
};
unf = {
dependencies = ["unf_ext"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
@ -347,14 +460,18 @@
version = "0.1.4";
};
unf_ext = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
type = "gem";
};
version = "0.0.7.4";
version = "0.0.7.6";
};
watch = {
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02g4g6ynnldyjjzrh19r584gj4z6ksff7h0ajz5jdwhpp5y7cghx";
@ -364,6 +481,8 @@
};
webmock = {
dependencies = ["addressable" "crack" "hashdiff"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03vlr6axajz6c7xmlk0w1kvkxc92f8y2zp27wq1z6yk916ry25n5";

18
pkgs/applications/networking/instant-messengers/mikutter/shell.nix
View file

@ -1,18 +0,0 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.stdenv.mkDerivation {
name = "mikutter-shell";
buildInputs = with pkgs; [
bundix
bundler
];
shellHook = ''
export MIKUTTER_CONFROOT="/homeless-shelter"
truncate --size 0 Gemfile.lock
bundle lock
bundle package --path=vendor/bundle --no-install
rm -rf vendor .bundle
bundix -d
'';
}

51
pkgs/applications/networking/instant-messengers/rambox/pro.nix Normal file
View file

@ -0,0 +1,51 @@
{ autoPatchelfHook, electron, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }:
stdenv.mkDerivation rec {
pname = "rambox-pro";
version = "1.1.2";
dontBuild = true;
dontStrip = true;
buildInputs = [ nss xorg.libxkbfile ];
nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ];
src = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
sha256 = "0rrfpl371hp278b02b9b6745ax29yrdfmxrmkxv6d158jzlv0dlr";
};
postPatch = ''
substituteInPlace resources/app.asar.unpacked/node_modules/ad-block/vendor/depot_tools/create-chromium-git-src \
--replace "/usr/bin/env -S bash -e" "${stdenv.shell}"
substituteInPlace resources/app.asar.unpacked/node_modules/ad-block/node_modules/bloom-filter-cpp/vendor/depot_tools/create-chromium-git-src \
--replace "/usr/bin/env -S bash -e" "${stdenv.shell}"
'';
installPhase = ''
mkdir -p $out/bin $out/opt/RamboxPro $out/share/applications
asar e resources/app.asar $out/opt/RamboxPro/resources/app.asar.unpacked
ln -s ${desktopItem}/share/applications/* $out/share/applications
'';
postFixup = ''
makeWrapper ${electron}/lib/electron/.electron-wrapped $out/bin/ramboxpro \
--add-flags "$out/opt/RamboxPro/resources/app.asar.unpacked --without-update" \
--prefix PATH : ${xdg_utils}/bin
'';
desktopItem = makeDesktopItem {
name = "rambox-pro";
exec = "ramboxpro";
type = "Application";
desktopName = "Rambox Pro";
};
meta = with stdenv.lib; {
description = "Messaging and emailing app that combines common web applications into one";
homepage = https://rambox.pro;
license = licenses.unfree;
maintainers = with maintainers; [ chrisaw ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

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

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

7
pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file

@ -1,15 +1,18 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }:
# Note for maintainers:
# Versions of `riot-web` and `riot-desktop` should be kept in sync.
with (import ./yarn2nix.nix { inherit pkgs; });
let
executableName = "riot-desktop";
version = "1.0.7";
version = "1.0.8";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "1sq6vnyas2ab3phaiyby4fkpp0nwvl67xwxnr2pzfm0dkjxl9r58";
sha256 = "1krp608wxff1siih8zknc425n0qb6qjzf854fnp7qyjp1cnfc9sb";
};
in mkYarnPackage rec {

9
pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file

@ -1,13 +1,16 @@
{ lib, stdenv, fetchurl, writeText, conf ? null }:
# Note for maintainers:
# Versions of `riot-web` and `riot-desktop` should be kept in sync.
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
version = "1.0.7";
version = "1.0.8";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1zg9hwvbanmv2yymjcxjzk2bwvv8707i30vrs0gr213iz6i4abg5";
sha256 = "010m8b4lfnfi70d4v205wk3i4xhnsz7zkrdqrvw3si14xqy6192r";
};
installPhase = ''
@ -19,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A glossy Matrix collaboration client for the web";
homepage = http://riot.im/;
maintainers = with stdenv.lib.maintainers; [ bachp ];
maintainers = with stdenv.lib.maintainers; [ bachp pacien ];
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all;
hydraPlatforms = [];

25
pkgs/applications/networking/testssl/default.nix
View file

@ -1,17 +1,15 @@
{ stdenv, fetchFromGitHub, makeWrapper, lib
, dnsutils, coreutils, openssl, nettools, utillinux, procps }:
let
version = "2.9.5-7";
in stdenv.mkDerivation rec {
name = "testssl.sh-${version}";
stdenv.mkDerivation rec {
pname = "testssl.sh";
version = "3.0rc5";
src = fetchFromGitHub {
owner = "drwetter";
repo = "testssl.sh";
rev = "v${version}";
sha256 = "02xp0yi53xf6jw6v633zs2ws2iyyvq3mlkimg0cv3zvj7nw9x5wr";
repo = pname;
rev = version;
sha256 = "14b9n0h4f2dsa292wi9gnan5ncgqblis6wyh5978lhjzi1d7gyds";
};
nativeBuildInputs = [ makeWrapper ];
@ -27,16 +25,15 @@ in stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace testssl.sh \
--replace /bin/pwd pwd \
--replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\"
--replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" \
--replace PROG_NAME=\"\$\(basename\ \"\$0\"\)\" PROG_NAME=\"testssl.sh\"
'';
installPhase = ''
install -Dt $out/bin testssl.sh
wrapProgram $out/bin/testssl.sh \
--prefix PATH ':' ${lib.makeBinPath buildInputs}
install -D testssl.sh $out/bin/testssl.sh
cp -r etc $out
wrapProgram $out/bin/testssl.sh --prefix PATH ':' ${lib.makeBinPath buildInputs}
'';
meta = with stdenv.lib; {

4
pkgs/applications/networking/vnstat/default.nix
View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "vnstat-${version}";
version = "2.1";
version = "2.2";
src = fetchurl {
sha256 = "0yk0x6bg9f36dsslhayyyi8fg04yvzjzqkjmlrcsrv6nnggchb6i";
sha256 = "0b7020rlc568pz6vkiy28kl8493z88wzrn18wv9b0iq2bv1pn2n6";
url = "https://humdi.net/vnstat/${name}.tar.gz";
};

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

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

4
pkgs/applications/science/biology/picard-tools/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "picard-tools-${version}";
version = "2.19.0";
version = "2.19.2";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "0l2riidd9p84axj8h7fnrbwgpcpizj74i9mnm3pcqm9vlzvw6zzr";
sha256 = "0dfap1whga03r0fh3adi684dyp9agfdi96hb2aqskgr9jp0z69rb";
};
nativeBuildInputs = [ makeWrapper ];

15
pkgs/applications/science/electronics/kicad/default.nix
View file

@ -28,11 +28,11 @@ let
in stdenv.mkDerivation rec {
name = "kicad-${version}";
series = "5.0";
version = "5.0.2";
version = "5.1.2";
src = fetchurl {
url = "https://launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz";
sha256 = "10605rr10x0353n6yk2z095ydnkd1i6j1ncbq64pfxdn5vkhcd1g";
sha256 = "12kp82ms2dwqkhilmh3mbhg5rsj5ykk99pnkhp4sx89nni86qdw4";
};
postPatch = ''
@ -47,6 +47,7 @@ in stdenv.mkDerivation rec {
# nix installs wxPython headers in wxPython package, not in wxwidget
# as assumed. We explicitely set the header location.
"-DCMAKE_CXX_FLAGS=-I${pythonPackages.wxPython}/include/wx-3.0"
"-DwxPYTHON_INCLUDE_DIRS=${pythonPackages.wxPython}/include/wx-3.0"
] ++ optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON";
@ -72,22 +73,22 @@ in stdenv.mkDerivation rec {
dontWrapGApps = true;
passthru = {
i18n = mkLib version "i18n" "1hkc240gymhmyv6r858mq5d2slz0vjqc47ah8wn82vvmb83fpnjy" {
i18n = mkLib version "i18n" "08a8lpz2j7bhwn155s0ii538qlynnnvq6fmdw1dxjfgmfy7y3r66" {
buildInputs = [
gettext
];
meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3
};
symbols = mkLib version "symbols" "1rjh2pjcrc3bhcgyyskj5pssm7vffrjk0ymwr70fb7sjpmk96yjk" {
symbols = mkLib version "symbols" "0l5r53wcv0518x2kl0fh1zi0d50cckc7z1739fp9z3k5a4ddk824" {
meta.license = licenses.cc-by-sa-40;
};
footprints = mkLib version "footprints" "19khqyrbrqsdzxvm1b1vxfscxhss705fqky0ilrbvnbvf27fnx8w" {
footprints = mkLib version "footprints" "0q7y7m10pav6917ri37pzjvyh71c8lf4lh9ch258pdpl3w481zk6" {
meta.license = licenses.cc-by-sa-40;
};
templates = mkLib version "templates" "0rlzq1n09n0sf2kj5c9bvbnkvs6cpycjxmxwcswql0fbpcp0sql7" {
templates = mkLib version "templates" "1nva4ckq0l2lrah0l05355cawlwd7qfxcagcv32m8hcrn781455q" {
meta.license = licenses.cc-by-sa-40;
};
packages3d = mkLib version "packages3d" "135jyrljgknnv2y35skhnwcxg16yxxkfbcx07nad3vr4r76zk3am" {
packages3d = mkLib version "packages3d" "0xla9k1rnrs00fink90y9qz766iks5lyqwnf1h2i508djqhqm5zi" {
hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store
meta.license = licenses.cc-by-sa-40;
};

2
pkgs/applications/version-management/git-and-tools/default.nix
View file

@ -38,7 +38,7 @@ let
git-fame = callPackage ./git-fame {};
gita = callPackage ./gita {};
gita = python3Packages.callPackage ./gita {};
# The full-featured Git.
gitFull = gitBase.override {

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

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "ghq-${version}";
version = "0.8.0";
version = "0.10.2";
goPackagePath = "github.com/motemen/ghq";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "motemen";
repo = "ghq";
rev = "v${version}";
sha256 = "1gdi0sbmq9kfi8hzd0dpgmhbmcf8q93jy3x08dd8smayrhbbwmld";
sha256 = "1i7zmgv7760nrw8sayag90b8vvmbsiifgiqki5s3gs3ldnvlki5w";
};
goDeps = ./deps.nix;

174
pkgs/applications/version-management/git-and-tools/ghq/deps.nix generated
View file

@ -1,20 +1,75 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/blang/semver";
fetch = {
type = "git";
url = "https://github.com/blang/semver";
rev = "v3.5.1";
sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
};
}
{
goPackagePath = "github.com/daviddengcn/go-colortext";
fetch = {
type = "git";
url = "https://github.com/daviddengcn/go-colortext";
rev = "805cee6e0d43c72ba1d4e3275965ff41e0da068a";
sha256 = "0z0ggqnprqchnd8zyrz99w53kr4sgv372lyx12z5nsh9q342pmyf";
rev = "186a3d44e920";
sha256 = "18piv4zzcb8abbc7fllz9p6rd4zhsy1gc6iygym381caggmmgxgk";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://github.com/mitchellh/go-homedir";
rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
url = "https://github.com/fsnotify/fsnotify";
rev = "v1.4.7";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "v1.2.0";
sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
};
}
{
goPackagePath = "github.com/golangplus/bytes";
fetch = {
type = "git";
url = "https://github.com/golangplus/bytes";
rev = "45c989fe5450";
sha256 = "1fpwg1idakpbvkmk8j8yyhv9g7mhr9c922kvff6kj4br4k05zyzr";
};
}
{
goPackagePath = "github.com/golangplus/fmt";
fetch = {
type = "git";
url = "https://github.com/golangplus/fmt";
rev = "2a5d6d7d2995";
sha256 = "1242q05qnawhv0klzy1pbq63q8jxkms5hc7421992hzq2m40k5yn";
};
}
{
goPackagePath = "github.com/golangplus/testing";
fetch = {
type = "git";
url = "https://github.com/golangplus/testing";
rev = "af21d9c3145e";
sha256 = "1g83sjvcavqbh92vyirc48mrqd18yfci08zya0hrgk840cr94czc";
};
}
{
goPackagePath = "github.com/hpcloud/tail";
fetch = {
type = "git";
url = "https://github.com/hpcloud/tail";
rev = "v1.0.0";
sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
};
}
{
@ -22,8 +77,26 @@
fetch = {
type = "git";
url = "https://github.com/motemen/go-colorine";
rev = "49ff36b8fa42db28092361cd20dcefd0b03b1472";
sha256 = "1rfi5gggf2sxb52whgxfl37p22r2xp27rndixbiicw6swllmml9l";
rev = "45d19169413a";
sha256 = "1mdy6q0926s1frj027nlzlvm2qssmkpjis7ic3l2smajkzh07118";
};
}
{
goPackagePath = "github.com/onsi/ginkgo";
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
rev = "v1.6.0";
sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
};
}
{
goPackagePath = "github.com/onsi/gomega";
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
rev = "v1.5.0";
sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9";
};
}
{
@ -31,8 +104,89 @@
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "f017f86fccc5a039a98f23311f34fdf78b014f78";
sha256 = "1biq4wl4z8l0ycinb39mfavnk13d0qnqqdplqybl7klxmk67cvhv";
rev = "v1.20.0";
sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "c2843e01d9a2";
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "4829fb13d2c6";
sha256 = "05nwpw41d7xsdln5rj381n8j9dsbq5ng1wp52bxslqc4x0l5s9fj";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "1d60e4601c6f";
sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "d0b11bdaac8a";
sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "v0.3.0";
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
};
}
{
goPackagePath = "gopkg.in/check.v1";
fetch = {
type = "git";
url = "https://gopkg.in/check.v1";
rev = "20d25e280405";
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
};
}
{
goPackagePath = "gopkg.in/fsnotify.v1";
fetch = {
type = "git";
url = "https://gopkg.in/fsnotify.v1";
rev = "v1.4.7";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "gopkg.in/tomb.v1";
fetch = {
type = "git";
url = "https://gopkg.in/tomb.v1";
rev = "dd632973f1e7";
sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.1";
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
};
}
]

16
pkgs/applications/version-management/git-and-tools/gita/default.nix
View file

@ -1,15 +1,19 @@
{ lib, python3Packages }:
{ lib
, buildPythonApplication
, fetchPypi
, pyyaml
}:
python3Packages.buildPythonApplication rec {
version = "0.8.2";
buildPythonApplication rec {
version = "0.9.2";
pname = "gita";
src = python3Packages.fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "16jpnl323x86dkrnh4acyvi9jknhgi3r0ccv63rkjcmd0srkaxkk";
sha256 = "1aycqq4crsa57ghpv7xc497rf4y8x43fcfd0v9prd2kn6h1793r0";
};
propagatedBuildInputs = with python3Packages; [
propagatedBuildInputs = [
pyyaml
];

4
pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, python3Packages }:
with python3Packages; buildPythonApplication rec {
pname = "pre-commit";
version = "1.15.1";
version = "1.15.2";
src = fetchPypi {
inherit version;
pname = "pre_commit";
sha256 = "1c4a6g3x44xkr75196m2qhb7fbm0lv40yv312g4hkl00mq713abm";
sha256 = "1if44rfzmrw9m2k47kiplccby1lfdrlq82jlz4p91wwqc1vs4xi5";
};
propagatedBuildInputs = [

24
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,29 +1,29 @@
{
"ce": {
"version": "11.9.8",
"repo_hash": "10xlabp7ziw1vpyy9dvhaiwf5l340d3yzvlh2aq6ly3xlqr5ip07",
"deb_hash": "0apw0w5grhpfxwl76w7as5xb6injr7ka8wwk2azllamrxrnn30dv",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.8-ce.0_amd64.deb/download.deb",
"version": "11.9.11",
"repo_hash": "08f824y6zla4076axdjwcn59hnybps2zvqjhrznfwnhwmak7zqr6",
"deb_hash": "17cp3vr8pq0l7pgrcmwrmlsygk7ggdvjhh71vjcdlmngaffmv5hm",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.11-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ce",
"rev": "v11.9.8",
"rev": "v11.9.11",
"passthru": {
"GITALY_SERVER_VERSION": "1.27.1",
"GITALY_SERVER_VERSION": "1.27.2",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.3"
}
},
"ee": {
"version": "11.9.8",
"repo_hash": "0h6lpaiwsvyn5cdga08zbgr6cwp3k6xi5jpb7n37hc6y4c7b36ry",
"deb_hash": "1bsy8qrr2sjvavzv4nslx14x4cx5xjx55d2v7zz6fvjzmgb98hgv",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.8-ee.0_amd64.deb/download.deb",
"version": "11.9.11",
"repo_hash": "0nsp3lxxh8gmkafa5a5jxi78n9w8v7gij4l4lka2d1wzfkhgzjph",
"deb_hash": "1qr8zbwlj99gqxj0cziy5z9hnaxb5lilgf46k4przkd2lhg5s0c0",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.11-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ee",
"rev": "v11.9.8-ee",
"rev": "v11.9.11-ee",
"passthru": {
"GITALY_SERVER_VERSION": "1.27.1",
"GITALY_SERVER_VERSION": "1.27.2",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.3"

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
version = "1.27.1";
version = "1.27.2";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "0sr1jjw1rvyxrv6vaqvl138m0x2xgjksjdy92ajslrjxrnjlrjvp";
sha256 = "03v8c9ask1f2bk4z51scpm6zh815hcxi5crly5zn7932i2nfvva0";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";

2
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
View file

@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '5.0.7.1'
gem 'rails', '5.0.7.2'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Improves copy-on-write performance for MRI

70
pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
View file

@ -4,41 +4,41 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
actioncable (5.0.7.1)
actionpack (= 5.0.7.1)
actioncable (5.0.7.2)
actionpack (= 5.0.7.2)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.7.1)
actionpack (= 5.0.7.1)
actionview (= 5.0.7.1)
activejob (= 5.0.7.1)
actionmailer (5.0.7.2)
actionpack (= 5.0.7.2)
actionview (= 5.0.7.2)
activejob (= 5.0.7.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.0.7.1)
actionview (= 5.0.7.1)
activesupport (= 5.0.7.1)
actionpack (5.0.7.2)
actionview (= 5.0.7.2)
activesupport (= 5.0.7.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.7.1)
activesupport (= 5.0.7.1)
actionview (5.0.7.2)
activesupport (= 5.0.7.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.7.1)
activesupport (= 5.0.7.1)
activejob (5.0.7.2)
activesupport (= 5.0.7.2)
globalid (>= 0.3.6)
activemodel (5.0.7.1)
activesupport (= 5.0.7.1)
activerecord (5.0.7.1)
activemodel (= 5.0.7.1)
activesupport (= 5.0.7.1)
activemodel (5.0.7.2)
activesupport (= 5.0.7.2)
activerecord (5.0.7.2)
activemodel (= 5.0.7.2)
activesupport (= 5.0.7.2)
arel (~> 7.0)
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
activesupport (5.0.7.1)
activesupport (5.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@ -296,7 +296,7 @@ GEM
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.2.0)
actionpack (>= 3.0)
@ -386,7 +386,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.2.0)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
@ -637,17 +637,17 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.7.1)
actioncable (= 5.0.7.1)
actionmailer (= 5.0.7.1)
actionpack (= 5.0.7.1)
actionview (= 5.0.7.1)
activejob (= 5.0.7.1)
activemodel (= 5.0.7.1)
activerecord (= 5.0.7.1)
activesupport (= 5.0.7.1)
rails (5.0.7.2)
actioncable (= 5.0.7.2)
actionmailer (= 5.0.7.2)
actionpack (= 5.0.7.2)
actionview (= 5.0.7.2)
activejob (= 5.0.7.2)
activemodel (= 5.0.7.2)
activerecord (= 5.0.7.2)
activesupport (= 5.0.7.2)
bundler (>= 1.3.0)
railties (= 5.0.7.1)
railties (= 5.0.7.2)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@ -663,9 +663,9 @@ GEM
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.0.7.1)
actionpack (= 5.0.7.1)
activesupport (= 5.0.7.1)
railties (5.0.7.2)
actionpack (= 5.0.7.2)
activesupport (= 5.0.7.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@ -1111,7 +1111,7 @@ DEPENDENCIES
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
rails (= 5.0.7.1)
rails (= 5.0.7.2)
rails-controller-testing
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)

72
pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
View file

@ -17,66 +17,80 @@
};
actioncable = {
dependencies = ["actionpack" "nio4r" "websocket-driver"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb";
sha256 = "14qy7aygsr35lhcrw2y0c1jxmkfjlcz10p7qcf9jxzhcfmk5rr3y";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm";
sha256 = "17whd0cjkb038g14pmkmakp89085j5950jdmfa5hmzqf1djnvc8r";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw";
sha256 = "1wyyj014n0gza5m2gpg9ab9av4yr6psvym047nrn1iz84v6fmkfb";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1";
sha256 = "0w96iqknr5jz7gzlcyixq1lvhbzbqijj4iq22pbfzscppbz1anvi";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
activejob = {
dependencies = ["activesupport" "globalid"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv";
sha256 = "1281zl53a5dpl33vxswrg2jxv7kpcyl7mg5mckn4hcksna60356l";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
activemodel = {
dependencies = ["activesupport"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c";
sha256 = "0xphpzx3ippi8f2h27v2g3n82i39xwx2gq9yamhby9s2a9hh8shl";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c";
sha256 = "1jy2amhn2xsd9hy546mw27agh8493nqlgbmzqhlppx7p3nwikw63";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
activerecord_sane_schema_dumper = {
dependencies = ["rails"];
@ -89,12 +103,14 @@
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb";
sha256 = "1bcbr490ryw6295p0ja7xigcw0ivkdys90x3qbsbs8c4n1zwcp7p";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
@ -1163,12 +1179,14 @@
};
globalid = {
dependencies = ["activesupport"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
type = "gem";
};
version = "0.4.1";
version = "0.4.2";
};
gon = {
dependencies = ["actionpack" "multi_json" "request_store"];
@ -1444,12 +1462,14 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr";
sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
version = "1.2.0";
version = "1.6.0";
};
icalendar = {
source = {
@ -2423,12 +2443,14 @@
};
rails = {
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w";
sha256 = "0amqbd8kl6vmilfhlkf2w0l33x688jssjbra7s717kjqzb4fmqiw";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@ -2477,12 +2499,14 @@
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr";
sha256 = "064w0n33l0wik5i00b4ry7iqv1nb3xhdpjvm55ycx2abpqnlrhjd";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
rainbow = {
source = {

2
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
View file

@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '5.0.7.1'
gem 'rails', '5.0.7.2'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Improves copy-on-write performance for MRI

70
pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
View file

@ -4,41 +4,41 @@ GEM
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
actioncable (5.0.7.1)
actionpack (= 5.0.7.1)
actioncable (5.0.7.2)
actionpack (= 5.0.7.2)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.7.1)
actionpack (= 5.0.7.1)
actionview (= 5.0.7.1)
activejob (= 5.0.7.1)
actionmailer (5.0.7.2)
actionpack (= 5.0.7.2)
actionview (= 5.0.7.2)
activejob (= 5.0.7.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.0.7.1)
actionview (= 5.0.7.1)
activesupport (= 5.0.7.1)
actionpack (5.0.7.2)
actionview (= 5.0.7.2)
activesupport (= 5.0.7.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.7.1)
activesupport (= 5.0.7.1)
actionview (5.0.7.2)
activesupport (= 5.0.7.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.7.1)
activesupport (= 5.0.7.1)
activejob (5.0.7.2)
activesupport (= 5.0.7.2)
globalid (>= 0.3.6)
activemodel (5.0.7.1)
activesupport (= 5.0.7.1)
activerecord (5.0.7.1)
activemodel (= 5.0.7.1)
activesupport (= 5.0.7.1)
activemodel (5.0.7.2)
activesupport (= 5.0.7.2)
activerecord (5.0.7.2)
activemodel (= 5.0.7.2)
activesupport (= 5.0.7.2)
arel (~> 7.0)
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
activesupport (5.0.7.1)
activesupport (5.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@ -321,7 +321,7 @@ GEM
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.2.0)
actionpack (>= 3.0)
@ -413,7 +413,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.2.0)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
@ -667,17 +667,17 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.7.1)
actioncable (= 5.0.7.1)
actionmailer (= 5.0.7.1)
actionpack (= 5.0.7.1)
actionview (= 5.0.7.1)
activejob (= 5.0.7.1)
activemodel (= 5.0.7.1)
activerecord (= 5.0.7.1)
activesupport (= 5.0.7.1)
rails (5.0.7.2)
actioncable (= 5.0.7.2)
actionmailer (= 5.0.7.2)
actionpack (= 5.0.7.2)
actionview (= 5.0.7.2)
activejob (= 5.0.7.2)
activemodel (= 5.0.7.2)
activerecord (= 5.0.7.2)
activesupport (= 5.0.7.2)
bundler (>= 1.3.0)
railties (= 5.0.7.1)
railties (= 5.0.7.2)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@ -693,9 +693,9 @@ GEM
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.0.7.1)
actionpack (= 5.0.7.1)
activesupport (= 5.0.7.1)
railties (5.0.7.2)
actionpack (= 5.0.7.2)
activesupport (= 5.0.7.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@ -1150,7 +1150,7 @@ DEPENDENCIES
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
rails (= 5.0.7.1)
rails (= 5.0.7.2)
rails-controller-testing
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)

72
pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
View file

@ -17,66 +17,80 @@
};
actioncable = {
dependencies = ["actionpack" "nio4r" "websocket-driver"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1443cal16yzc94hfxcx9ljagdbs5xs54bmr55wzmg84wx28bgvrb";
sha256 = "14qy7aygsr35lhcrw2y0c1jxmkfjlcz10p7qcf9jxzhcfmk5rr3y";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "077g5yg8l10rcs8r63pmmikakma1nr2bvxa1ifly1vbry8lajmhm";
sha256 = "17whd0cjkb038g14pmkmakp89085j5950jdmfa5hmzqf1djnvc8r";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zn3gw1naz1l6kcb4h5all24kisdv8fk733vm1niiaq2zmwbvlrw";
sha256 = "1wyyj014n0gza5m2gpg9ab9av4yr6psvym047nrn1iz84v6fmkfb";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "053z1r9lbyqb7a8mvi7ppwgphqg1pn9ynhklwxavq65cym8qn9a1";
sha256 = "0w96iqknr5jz7gzlcyixq1lvhbzbqijj4iq22pbfzscppbz1anvi";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
activejob = {
dependencies = ["activesupport" "globalid"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w9rspq9y5a99kyljzam7k0cpvkxpzhfmlvs1j6a4flxn14qy7lv";
sha256 = "1281zl53a5dpl33vxswrg2jxv7kpcyl7mg5mckn4hcksna60356l";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
activemodel = {
dependencies = ["activesupport"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1i808lgn542x0lyk2dlnziiqcf1nmxhxqf6125dq6brr08yxgr0c";
sha256 = "0xphpzx3ippi8f2h27v2g3n82i39xwx2gq9yamhby9s2a9hh8shl";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qva7vdv9arliza0155k0xh5w1q6rzdajj3rmj7hv0f86ybd674c";
sha256 = "1jy2amhn2xsd9hy546mw27agh8493nqlgbmzqhlppx7p3nwikw63";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
activerecord_sane_schema_dumper = {
dependencies = ["rails"];
@ -89,12 +103,14 @@
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02dnmcmkvzijbzm5nlmrd55s5586b78s087kvpvkada3791b9agb";
sha256 = "1bcbr490ryw6295p0ja7xigcw0ivkdys90x3qbsbs8c4n1zwcp7p";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
acts-as-taggable-on = {
dependencies = ["activerecord"];
@ -1259,12 +1275,14 @@
};
globalid = {
dependencies = ["activesupport"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
type = "gem";
};
version = "0.4.1";
version = "0.4.2";
};
gon = {
dependencies = ["actionpack" "multi_json" "request_store"];
@ -1549,12 +1567,14 @@
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr";
sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
version = "1.2.0";
version = "1.6.0";
};
icalendar = {
source = {
@ -2552,12 +2572,14 @@
};
rails = {
dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0blacnfcn2944cml69wji2ywp9c13qjiciavnfsa9vpimk8ixq9w";
sha256 = "0amqbd8kl6vmilfhlkf2w0l33x688jssjbra7s717kjqzb4fmqiw";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"];
@ -2606,12 +2628,14 @@
};
railties = {
dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
groups = ["default" "development" "mysql" "postgres" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cfh2ijfalxj8hhf0rfw8bqhazsq6km7barsxczsvyl2a9islanr";
sha256 = "064w0n33l0wik5i00b4ry7iqv1nb3xhdpjvm55ycx2abpqnlrhjd";
type = "gem";
};
version = "5.0.7.1";
version = "5.0.7.2";
};
rainbow = {
source = {

6
pkgs/applications/version-management/tortoisehg/default.nix
View file

@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
name = "tortoisehg-${version}";
version = "4.9";
version = "4.9.1";
src = fetchurl {
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
sha256 = "01na1ymdlh9nd121gmq3vkssr183sd2fcwjfdnq5n5fpys6bazjc";
sha256 = "0c5gp5wyaiyh8w2zzy1q0f2qv8aa3219shb6swpsdzqr2j9gkk4b";
};
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
@ -30,7 +30,7 @@ python2Packages.buildPythonApplication rec {
meta = {
description = "Qt based graphical tool for working with Mercurial";
homepage = http://tortoisehg.bitbucket.org/;
homepage = https://tortoisehg.bitbucket.io/;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ danbst ];

2
pkgs/common-updater/scripts/update-source-version
View file

@ -97,7 +97,7 @@ if [ -z "$oldUrl" ]; then
fi
drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"')
oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).${versionKey}" | tr -d '"')
oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"')
if [ -z "$drvName" -o -z "$oldVersion" ]; then
die "Couldn't evaluate name and version from '$attr.name'!"

8
pkgs/data/fonts/twemoji-color-font/default.nix
View file

@ -1,12 +1,13 @@
{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
stdenv.mkDerivation rec {
name = "twemoji-color-font-${meta.version}";
pname = "twemoji-color-font";
version = "12.0.1";
src = fetchFromGitHub {
owner = "eosrei";
repo = "twemoji-color-font";
rev = "v${meta.version}";
sha256 = "07yawvbdkk15d7ac9dj7drs1rqln9sba1fd6jx885ms7ww2sfm7r";
rev = "v${version}";
sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2";
};
nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
@ -21,7 +22,6 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
version = "11.2.0";
description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
longDescription = ''
A color and B&W emoji SVGinOT font built from the Twitter Emoji for

4
pkgs/data/misc/hackage/default.nix
View file

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/179aac2faddbba8921029ca9851ad97bcaa79991.tar.gz";
sha256 = "17cbapnvpasdpza2r1y7lf4y4b31k094jqsnx89dn8zwp8n862lv";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f0c3944190bf34286e4e80620fede11dd688f68.tar.gz";
sha256 = "1i4k4wjm6w8hgwia1axwdr3ij0ckxh3ikc1f0nlk8sb0j3yrmxa6";
}

8
pkgs/misc/themes/tetra/default.nix → pkgs/data/themes/tetra/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, gtk3, sassc }:
stdenv.mkDerivation rec {
name = "tetra-gtk-theme-${version}";
version = "201903";
pname = "tetra-gtk-theme";
version = "201905";
src = fetchFromGitHub {
owner = "hrdwrrsk";
repo = "tetra-gtk-theme";
repo = pname;
rev = version;
sha256 = "0ycxvz16gg8rjlg71dzbfnqlh0y62v35j8dvgs8rckfb48xm0xvs";
sha256 = "1j2w8na564f5yjm5am7843hq5qk28h1rq8rcbak4xsygdc3lbsfi";
};
preBuild = ''

39
pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch Normal file
View file

@ -0,0 +1,39 @@
From c48867b73485b34b95f14e9b9bbb54507fc77648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 19 Apr 2019 18:21:49 -0300
Subject: [PATCH] Use an environment variable for the plugins directory
---
frame/controller/dockpluginscontroller.cpp | 2 +-
plugins/tray/system-trays/systemtrayscontroller.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp
index 32a5885..efd53c8 100644
--- a/frame/controller/dockpluginscontroller.cpp
+++ b/frame/controller/dockpluginscontroller.cpp
@@ -126,7 +126,7 @@ void DockPluginsController::startLoader()
{
QString pluginsDir("../plugins");
if (!QDir(pluginsDir).exists()) {
- pluginsDir = "/usr/lib/dde-dock/plugins";
+ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins");
}
qDebug() << "using dock plugins dir:" << pluginsDir;
diff --git a/plugins/tray/system-trays/systemtrayscontroller.cpp b/plugins/tray/system-trays/systemtrayscontroller.cpp
index 0c8ca88..7c47d25 100644
--- a/plugins/tray/system-trays/systemtrayscontroller.cpp
+++ b/plugins/tray/system-trays/systemtrayscontroller.cpp
@@ -159,7 +159,7 @@ void SystemTraysController::startLoader()
{
QString pluginsDir("../plugins/system-trays");
if (!QDir(pluginsDir).exists()) {
- pluginsDir = "/usr/lib/dde-dock/plugins/system-trays";
+ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins") + "/system-trays";
}
qDebug() << "using system tray plugins dir:" << pluginsDir;
--
2.21.0

87
pkgs/desktops/deepin/dde-dock/default.nix Normal file
View file

@ -0,0 +1,87 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
qtsvg, libsForQt5, polkit, gsettings-qt, dtkcore, dtkwidget,
dde-qt-dbus-factory, dde-network-utils, dde-daemon,
deepin-desktop-schemas, xorg, glib, wrapGAppsHook, deepin,
plugins ? [], symlinkJoin, makeWrapper }:
let
unwrapped = stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-dock";
version = "4.9.9";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0vscm808q63bbl84q9l3vhhd8mw86wfjdh55rvyj42qpa5q4mvlz";
};
nativeBuildInputs = [
cmake
pkgconfig
qttools
wrapGAppsHook
deepin.setupHook
];
buildInputs = [
dde-daemon
dde-network-utils
dde-qt-dbus-factory
deepin-desktop-schemas
dtkcore
dtkwidget
glib.bin
gsettings-qt
libsForQt5.libdbusmenu
polkit
qtsvg
qtx11extras
xorg.libXdmcp
xorg.libXtst
xorg.libpthreadstubs
];
patches = [
./dde-dock.plugins-dir.patch
];
postPatch = ''
searchHardCodedPaths
patchShebangs translate_generation.sh
fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt
fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake
fixPath $out /usr dde-dock.pc
fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service
fixPath $out /usr/share/dbus-1 CMakeLists.txt
fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp
fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp
fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp
substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out
substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out
'';
cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ];
postFixup = ''
searchHardCodedPaths $out
'';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {
description = "Dock for Deepin Desktop Environment";
homepage = https://github.com/linuxdeepin/dde-dock;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
};
in if plugins == [] then unwrapped
else import ./wrapper.nix {
inherit makeWrapper symlinkJoin plugins;
dde-dock = unwrapped;
}

21
pkgs/desktops/deepin/dde-dock/wrapper.nix Normal file
View file

@ -0,0 +1,21 @@
{ makeWrapper, symlinkJoin, dde-dock, plugins }:
symlinkJoin {
name = "dde-dock-with-plugins-${dde-dock.version}";
paths = [ dde-dock ] ++ plugins;
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/dde-dock \
--set DDE_DOCK_PLUGINS_DIR "$out/lib/dde-dock/plugins"
rm $out/share/dbus-1/services/com.deepin.dde.Dock.service
substitute ${dde-dock}/share/dbus-1/services/com.deepin.dde.Dock.service $out/share/dbus-1/services/com.deepin.dde.Dock.service \
--replace ${dde-dock} $out
'';
inherit (dde-dock) meta;
}

3
pkgs/desktops/deepin/default.nix
View file

@ -10,8 +10,9 @@ let
dde-api = callPackage ./dde-api { };
dde-calendar = callPackage ./dde-calendar { };
dde-daemon = callPackage ./dde-daemon { };
dde-polkit-agent = callPackage ./dde-polkit-agent { };
dde-dock = callPackage ./dde-dock { };
dde-network-utils = callPackage ./dde-network-utils { };
dde-polkit-agent = callPackage ./dde-polkit-agent { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };

4
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gnome-shell-gsconnect-${version}";
version = "21";
version = "23";
src = fetchFromGitHub {
owner = "andyholmes";
repo = "gnome-shell-extension-gsconnect";
rev = "v${version}";
sha256 = "0ikkb2rly3h4qglswn15vs8f2kl727gpri5c9x3jiy27ylag7yav";
sha256 = "011asrhkly9zhvnng2mh9v06yw39fx244pmqz5yk9rd9m4c32xid";
};
patches = [

14
pkgs/desktops/mate/mate-control-center/default.nix
View file

@ -37,8 +37,22 @@ stdenv.mkDerivation rec {
mate.mate-settings-daemon
];
patches = [
# look up keyboard shortcuts in system data dirs
./mate-control-center.keybindings-dir.patch
];
configureFlags = [ "--disable-update-mimedb" ];
preFixup = ''
gappsWrapperArgs+=(
# WM keyboard shortcuts
--prefix XDG_DATA_DIRS : "${mate.marco}/share"
)
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Utilities to configure the MATE desktop";
homepage = https://github.com/mate-desktop/mate-control-center;

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

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

4
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
version = "2.1.7";
version = "2.1.8";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1icz1is576d2w5a6wc06bnkg2vbsj5g6mz0b6ikzyjddr6j743ql";
sha256 = "1xpgkvcv3bylpaj7c80727vr55vilkgjvnlbw7d5pr56v6mv7n9j";
};
passthru = {

4
pkgs/desktops/pantheon/desktop/wingpanel/default.nix
View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel";
version = "2.2.3";
version = "2.2.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1kd1w3mxysg33niryrz5yp6fdayzjpg73ihvq7dlasj8ls5d0qyj";
sha256 = "17xl4l0znr91aj6kb9p0rswyii4gy8k16r9fvj7d96dd5szdp4mc";
};
passthru = {

4
pkgs/development/compilers/mint/default.nix
View file

@ -33,13 +33,13 @@ let
};
in
stdenv.mkDerivation rec {
version = "0.3.1";
version = "0.5.0";
name = "mint-${version}";
src = fetchFromGitHub {
owner = "mint-lang";
repo = "mint";
rev = version;
sha256 = "1f49ax045zdjj0ypc2j4ms9gx80rl63qcsfzm3r0k0lcavfp57zr";
sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl";
};
nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ];

26
pkgs/development/compilers/mint/shards.nix
View file

@ -8,8 +8,8 @@
ameba = {
owner = "veelenga";
repo = "ameba";
rev = "v0.8.0";
sha256 = "0i9vc5xy05kzxgjid2rnvc7ksvxm9gba25qqi6939q2m1s07qjka";
rev = "v0.9.1";
sha256 = "05q2ki9dpg23pllalv5p27f1m287kiicp97ziz0z7vv0vg1r8smj";
};
baked_file_system = {
owner = "schovi";
@ -23,23 +23,23 @@
rev = "51962dc36f9bbb1b926d557f7cb8993a6c73cc63";
sha256 = "1nwnsxm8srfw8jg0yfi2v19x6j3dadx62hq0xpxra40qcqz9dbnp";
};
duktape = {
owner = "jessedoyle";
repo = "duktape.cr";
rev = "v0.14.1";
sha256 = "0fkay3qspzych050xl8xjkrphmxpzaj0dcf9jl22xwz8cx1l89f1";
dotenv = {
owner = "gdotdesign";
repo = "cr-dotenv";
rev = "v0.2.0";
sha256 = "0zi2y1j2546xjhdzn7icmry0cjv82cx2cqmpgx5ml37c2pnb7kp7";
};
exception_page = {
owner = "crystal-loot";
repo = "exception_page";
rev = "v0.1.1";
sha256 = "0pimjm64p21cjhp0jhcgdmbgisx7amk8hhbkcprkbr44bj6rv9ay";
rev = "v0.1.2";
sha256 = "0j5ishhyriq9p339yaawrmawl9wgmp1paniq30a8d6a0568h3avq";
};
kemal = {
owner = "kemalcr";
repo = "kemal";
rev = "v0.24.0";
sha256 = "0sg7gy1lbhid9y9wh77m9sd00jygk92njm4mpb7w1fq8bjnm738k";
rev = "v0.25.1";
sha256 = "1334i905xj6vlmp8acyybwwlaxsgmf90b59da7brzpnf28wci782";
};
kilt = {
owner = "jeromegn";
@ -50,8 +50,8 @@
radix = {
owner = "luislavena";
repo = "radix";
rev = "v0.3.8";
sha256 = "1kn2xxj8a8j6f6g1dr0s9mkrj1xqnpzw9wnbq24mbv8ach9a1hva";
rev = "v0.3.9";
sha256 = "19pksfr7ddc31hvikb433jg0zav1ar93k6zmsgaf3vsrjnvia3ix";
};
string_inflection = {
owner = "mosop";

6
pkgs/development/compilers/osl/default.nix
View file

@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}";
version = "1.10.2";
version = "1.10.4";
src = fetchFromGitHub {
owner = "imageworks";
repo = "OpenShadingLanguage";
rev = "Release-1.10.2";
sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7";
rev = "Release-1.10.4";
sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g";
};
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];

44
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -871,38 +871,17 @@ self: super: {
# https://github.com/takano-akio/filelock/issues/5
filelock = dontCheck super.filelock;
# fix GHC 8.6 builds by using irrefutable patterns. jailbreak is also
# required due to a constraint failure for base-compat.
cryptol = doJailbreak (overrideCabal super.cryptol (drv: {
# the last patch fixes ghc 8.6 builds; the other two (small) patches fix a
# few bugs between them, but are also hard dependencies
patches = drv.patches or [] ++ [
(pkgs.fetchpatch {
url = https://github.com/GaloisInc/cryptol/commit/634c5a03e757663bf86d1ffad1ce2c6086d4483f.patch;
sha256 = "16dvfihsl2c4jnyfndgrjarkm3z5pyn7rzg2svnidx0qipwrxzm7";
})
(pkgs.fetchpatch {
url = https://github.com/GaloisInc/cryptol/commit/515642328aff6d958ff1b534b9effdd726901b60.patch;
sha256 = "1fml71b720igyh8s7mj1z1c2bbv1vk490iy7blvxp625nymzjij6";
})
(pkgs.fetchpatch {
url = https://github.com/GaloisInc/cryptol/commit/a8eab11b319f6434f9b01b26d419b8305ff30bc2.patch;
sha256 = "1bbznp3kbj8l83q979gf4gr2khwbyqi85ykwsf2jnkhzda6pr0n8";
})
];
# Wrap the generated binaries to include their run-time dependencies in
# $PATH. Also, cryptol needs a version of sbl that's newer than what we have
# in LTS-13.x.
cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: {
buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ];
# make sure the binaries always start up. previously this was in
# all-packages.nix but it's almost certainly better to do it here (e.g. a
# haskell deps may use cryptol in the test suite or something, etc)
postInstall = drv.postInstall or "" + ''
for b in $out/bin/cryptol $out/bin/cryptol-html; do
wrapProgram $b --prefix 'PATH' ':' "${pkgs.lib.getBin pkgs.z3}/bin"
done
'';
}));
});
# Tests try to invoke external process and process == 1.4
grakn = dontCheck (doJailbreak super.grakn);
@ -1223,15 +1202,10 @@ self: super: {
sha256 = "1qwy8bj6vywhp0075dza8j90zrzsm3144qz3c703s9c4n6pg3gw4";
});
# These patches contain fixes for 8.6 that should be safe for
# earlier versions, but we need the relaxed version bounds in GHC
# 8.4 builds. beam needs to release a round of updates that relax
# bounds and include the 8.6 fixes:
# https://github.com/tathougies/beam/issues/315
beam-core = appendPatch super.beam-core ./patches/beam-core-fix-ghc-8.6.x-build.patch;
beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch;
beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch;
beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch;
# Requires pg_ctl command during tests
beam-postgres = overrideCabal super.beam-postgres (drv: {
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
});
# https://github.com/sighingnow/computations/pull/1
primesieve = appendPatch super.primesieve (pkgs.fetchpatch {

7
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file

@ -3014,12 +3014,7 @@ broken-packages:
- bdcs
- bdcs-api
- beam
- beam-core
- beam-migrate
- beam-mysql
- beam-newtype-field
- beam-postgres
- beam-sqlite
- beam-th
- beamable
- beautifHOL
@ -8049,6 +8044,7 @@ broken-packages:
- reflex-backend-wai
- reflex-basic-host
- reflex-dom-core
- reflex-dom-svg
- reflex-gloss
- reflex-gloss-scene
- reflex-orphans
@ -9947,6 +9943,7 @@ broken-packages:
- yesod-markdown
- yesod-paginate
- yesod-pagination
- yesod-paginator
- yesod-paypal-rest
- yesod-platform
- yesod-pnotify

679
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

72
pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch
View file

@ -1,72 +0,0 @@
diff --git a/beam-core/Database/Beam/Backend/SQL.hs b/beam-core/Database/Beam/Backend/SQL.hs
index e2cd37d0..6f9db126 100644
--- a/Database/Beam/Backend/SQL.hs
+++ b/Database/Beam/Backend/SQL.hs
@@ -10,6 +10,7 @@
import Database.Beam.Backend.Types
import Control.Monad.IO.Class
+import Control.Monad.Fail (MonadFail)
-- * MonadBeam class
@@ -29,7 +30,7 @@
-- strategies. More complicated strategies (for example, Postgres's @COPY@)
-- are supported in individual backends. See the documentation of those
-- backends for more details.
-class (BeamBackend be, Monad m, MonadIO m, Sql92SanityCheck syntax) =>
+class (BeamBackend be, Monad m, MonadIO m, MonadFail m, Sql92SanityCheck syntax) =>
MonadBeam syntax be handle m | m -> syntax be handle where
{-# MINIMAL withDatabaseDebug, runReturningMany #-}
diff --git a/Database/Beam/Backend/SQL/Builder.hs b/Database/Beam/Backend/SQL/Builder.hs
index 9e734036..e9849912 100644
--- a/Database/Beam/Backend/SQL/Builder.hs
+++ b/Database/Beam/Backend/SQL/Builder.hs
@@ -33,6 +33,7 @@
import Data.Hashable
import Data.Int
import Data.String
+import qualified Control.Monad.Fail as Fail
#if !MIN_VERSION_base(4, 11, 0)
import Data.Semigroup
#endif
@@ -507,8 +508,10 @@
type BackendFromField SqlSyntaxBackend = Trivial
newtype SqlSyntaxM a = SqlSyntaxM (IO a)
- deriving (Applicative, Functor, Monad, MonadIO)
+ deriving (Applicative, Functor, Monad, MonadIO, Fail.MonadFail)
instance MonadBeam SqlSyntaxBuilder SqlSyntaxBackend SqlSyntaxBackend SqlSyntaxM where
- withDatabaseDebug _ _ _ = fail "absurd"
- runReturningMany _ _ = fail "absurd"
+ withDatabaseDebug _ _ _ = Fail.fail "absurd"
+ runReturningMany _ _ = Fail.fail "absurd"
+
+
diff --git a/Database/Beam/Schema/Lenses.hs b/Database/Beam/Schema/Lenses.hs
index b21dddb6..5df0654c 100644
--- a/Database/Beam/Schema/Lenses.hs
+++ b/Database/Beam/Schema/Lenses.hs
@@ -1,4 +1,5 @@
{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE UndecidableInstances #-}
module Database.Beam.Schema.Lenses
( tableLenses
, TableLens(..)
diff --git a/beam-core.cabal b/beam-core.cabal
index 4bf4ffd9..251d4d85 100644
--- a/beam-core.cabal
+++ b/beam-core.cabal
@@ -64,8 +64,8 @@
time >=1.6 && <1.10,
hashable >=1.1 && <1.3,
network-uri >=2.6 && <2.7,
- containers >=0.5 && <0.6,
- vector-sized >=0.5 && <1.1,
+ containers >=0.5 && <0.7,
+ vector-sized >=0.5 && <1.3,
tagged >=0.8 && <0.9
Default-language: Haskell2010
default-extensions: ScopedTypeVariables, OverloadedStrings, GADTs, RecursiveDo, FlexibleInstances, FlexibleContexts, TypeFamilies,

29
pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch
View file

@ -1,29 +0,0 @@
diff --git a/Database/Beam/Migrate/Generics/Types.hs b/Database/Beam/Migrate/Generics/Types.hs
index 553e208b..0cf9b2c8 100644
--- a/Database/Beam/Migrate/Generics/Types.hs
+++ b/Database/Beam/Migrate/Generics/Types.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE UndecidableInstances #-}
+
module Database.Beam.Migrate.Generics.Types where
import Database.Beam.Migrate.Types
diff --git a/beam-migrate.cabal b/beam-migrate.cabal
index f53b280d..9cf3722c 100644
--- a/beam-migrate.cabal
+++ b/beam-migrate.cabal
@@ -69,13 +69,12 @@ library
mtl >=2.2 && <2.3,
scientific >=0.3 && <0.4,
vector >=0.11 && <0.13,
- containers >=0.5 && <0.6,
unordered-containers >=0.2 && <0.3,
hashable >=1.2 && <1.3,
parallel >=3.2 && <3.3,
deepseq >=1.4 && <1.5,
ghc-prim >=0.5 && <0.6,
- containers >=0.5 && <0.6,
+ containers >=0.5 && <0.7,
haskell-src-exts >=1.18 && <1.21,
pretty >=1.1 && <1.2,
dependent-map >=0.2 && <0.3,

45
pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch
View file

@ -1,45 +0,0 @@
diff --git a/Database/Beam/Postgres/Connection.hs b/Database/Beam/Postgres/Connection.hs
index 433f55b9..5836c53d 100644
--- a/Database/Beam/Postgres/Connection.hs
+++ b/Database/Beam/Postgres/Connection.hs
@@ -52,6 +52,8 @@ import qualified Database.PostgreSQL.Simple.Types as Pg (Null(..), Query(..))
import Control.Monad.Reader
import Control.Monad.State
+import Control.Monad.Fail (MonadFail)
+import qualified Control.Monad.Fail as Fail
import Data.ByteString (ByteString)
import Data.ByteString.Builder (toLazyByteString, byteString)
@@ -302,6 +304,9 @@ deriving instance Functor PgF
newtype Pg a = Pg { runPg :: F PgF a }
deriving (Monad, Applicative, Functor, MonadFree PgF)
+instance MonadFail Pg where
+ fail e = fail $ "Internal Error with: " <> show e
+
instance MonadIO Pg where
liftIO x = liftF (PgLiftIO x id)
diff --git a/beam-postgres.cabal b/beam-postgres.cabal
index e14b84f5..d29a5b67 100644
--- a/beam-postgres.cabal
+++ b/beam-postgres.cabal
@@ -31,7 +31,7 @@ library
beam-migrate >=0.3 && <0.4,
postgresql-libpq >=0.8 && <0.10,
- postgresql-simple >=0.5 && <0.6,
+ postgresql-simple >=0.5 && <0.7,
text >=1.0 && <1.3,
bytestring >=0.10 && <0.11,
@@ -38,7 +38,7 @@ library
hashable >=1.1 && <1.3,
lifted-base >=0.2 && <0.3,
- free >=4.12 && <5.1,
+ free >=4.12 && <5.2,
time >=1.6 && <1.10,
monad-control >=1.0 && <1.1,
mtl >=2.1 && <2.3,

21
pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch
View file

@ -1,21 +0,0 @@
diff --git a/Database/Beam/Sqlite/Connection.hs b/Database/Beam/Sqlite/Connection.hs
index f034b272..4e459ea3 100644
--- a/Database/Beam/Sqlite/Connection.hs
+++ b/Database/Beam/Sqlite/Connection.hs
@@ -37,6 +37,7 @@ import Database.SQLite.Simple.Types (Null)
import Control.Exception (bracket_, onException, mask)
import Control.Monad (forM_, replicateM_)
+import Control.Monad.Fail (MonadFail)
import Control.Monad.Free.Church
import Control.Monad.IO.Class (MonadIO(..))
import Control.Monad.Identity (Identity)
@@ -143,7 +144,7 @@ newtype SqliteM a
{ runSqliteM :: ReaderT (String -> IO (), Connection) IO a
-- ^ Run an IO action with access to a SQLite connection and a debug logging
-- function, called or each query submitted on the connection.
- } deriving (Monad, Functor, Applicative, MonadIO)
+ } deriving (Monad, Functor, Applicative, MonadIO, MonadFail)
newtype BeamSqliteParams = BeamSqliteParams [SQLData]
instance ToRow BeamSqliteParams where

16
pkgs/development/interpreters/hy/default.nix
View file

@ -1,18 +1,28 @@
{ stdenv, fetchurl, pythonPackages }:
{ stdenv, fetchurl, fetchpatch, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "hy-${version}";
version = "0.15.0";
version = "0.16.0";
src = fetchurl {
url = "mirror://pypi/h/hy/${name}.tar.gz";
sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1";
sha256 = "00lq38ppikrpyw38fn5iy9iwrsamsv22507cp146dsjbzkwjpzrd";
};
patches = [
(fetchpatch {
name = "bytecode-error-handling.patch";
url = "https://github.com/hylang/hy/commit/57326785b97b7b0a89f6258fe3d04dccdc06cfc0.patch";
sha256 = "1lxxs7mxbh0kaaa25b1pbqs9d8asyjnlf2n86qg8hzsv32jfcq92";
excludes = [ "AUTHORS" "NEWS.rst" ];
})
];
propagatedBuildInputs = with pythonPackages; [
appdirs
astor
clint
fastentrypoints
funcparserlib
rply
];

2
pkgs/development/interpreters/wasmtime/default.nix
View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
cargoSha256 = "17k8n5xar4pvvi4prhm6c51vlim9xqwkkhysbnss299mm3fyh36h";
cargoSha256 = "0xy8vazb4nc4q1098ws92j1yfwp9w7q30z0yk2gindkn898603bc";
cargoPatches = [ ./cargo-lock.patch ];

58
pkgs/development/libraries/ethash/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ stdenv, fetchFromGitHub, cmake, boost, cryptopp, opencl-headers, opencl-info,
openmpi, ocl-icd, mesa, gbenchmark, gtest }:
stdenv.mkDerivation rec {
pname = "ethash";
version = "0.4.2";
src =
fetchFromGitHub {
owner = "chfast";
repo = "ethash";
rev = "v${version}";
sha256 = "0qiixvxbpl2gz7jh1qs8lmyk7wzv6ffnl7kckqgrpgm547nnn8zy";
};
nativeBuildInputs = [
cmake
];
buildInputs = [
boost
cryptopp
opencl-headers
opencl-info
openmpi
ocl-icd
mesa
];
checkInputs = [
gbenchmark
gtest
];
#preConfigure = ''
# sed -i 's/GTest::main//' test/unittests/CMakeLists.txt
# cat test/unittests/CMakeLists.txt
# ln -sfv ${gtest.src}/googletest gtest
#'';
# NOTE: disabling tests due to gtest issue
cmakeFlags = [
"-DHUNTER_ENABLED=OFF"
"-DETHASH_BUILD_TESTS=OFF"
#"-Dbenchmark_DIR=${gbenchmark}/lib/cmake/benchmark"
#"-DGTest_DIR=${gtest.dev}/lib/cmake/GTest"
#"-DGTest_DIR=${gtest.src}/googletest"
#"-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"
];
meta = with stdenv.lib; {
description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto";
homepage = https://github.com/ethereum/ethash;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ nand0p ];
license = licenses.asl20;
};
}

12
pkgs/development/libraries/jsoncpp/default.nix
View file

@ -1,10 +1,7 @@
{ stdenv
, fetchFromGitHub
, cmake
, python
}:
{ stdenv , fetchFromGitHub , cmake , python }:
stdenv.mkDerivation rec {
name = "jsoncpp-${version}";
pname = "jsoncpp";
version = "1.8.4";
src = fetchFromGitHub {
@ -36,13 +33,14 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=OFF"
"-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
];
meta = with stdenv.lib; {
inherit version;
homepage = https://github.com/open-source-parsers/jsoncpp;
description = "A C++ library for interacting with JSON.";
maintainers = with maintainers; [ ttuegel cpages ];
maintainers = with maintainers; [ ttuegel cpages nand0p ];
license = licenses.mit;
platforms = platforms.all;
};

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "liblinear-${version}";
version = "2.21";
version = "2.30";
src = fetchurl {
url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz";
sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs";
sha256 = "1b66jpg9fdwsq7r52fccr8z7nqcivrin5d8zg2f134ygqqwp0748";
};
buildPhase = ''

13
pkgs/development/libraries/liburing/default.nix
View file

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "liburing-${version}";
version = "1.0.0pre821_${builtins.substring 0 7 src.rev}";
version = "1.0.0pre92_${builtins.substring 0 7 src.rev}";
src = fetchgit {
url = "http://git.kernel.dk/liburing";
rev = "39e0ebd4fc66046bf733a47aaa899a556093ebc6";
sha256 = "00c72fizxmwxd2jzmlzi4l82cw7h75lfpkkwzwcjpw9zdg9w0ci7";
rev = "7b989f34191302011b5b49bf5b26b36862d54056";
sha256 = "12kfqvwzxksmsm8667a1g4vxr6xsaq63cz9wrfhwq6hrsv3ynydc";
};
enableParallelBuilding = true;
@ -19,13 +19,12 @@ stdenv.mkDerivation rec {
[ "prefix=$(out)"
"includedir=$(dev)/include"
"libdir=$(lib)/lib"
"mandir=$(man)/share/man"
];
# Copy the examples into $out and man pages into $man. This should be handled
# by the build system in the future and submitted upstream.
# Copy the examples into $out.
postInstall = ''
mkdir -p $out/bin $man/share/man/man2/
cp -R ./man/* $man/share/man/man2
mkdir -p $out/bin
cp ./examples/io_uring-cp examples/io_uring-test $out/bin
'';

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