Merge branch 'master' into staging
This commit is contained in:
Nikolay Amiantov
commit
a984be41ab
@ -671,6 +671,7 @@
|
||||
stumoss = "Stuart Moss <samoss@gmail.com>";
|
||||
SuprDewd = "Bjarki Ágúst Guðmundsson <suprdewd@gmail.com>";
|
||||
suvash = "Suvash Thapaliya <suvash+nixpkgs@gmail.com>";
|
||||
svsdep = "Vasyl Solovei <svsdep@gmail.com>";
|
||||
swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>";
|
||||
swflint = "Samuel W. Flint <swflint@flintfam.org>";
|
||||
swistak35 = "Rafał Łasocha <me@swistak35.com>";
|
||||
@ -713,6 +714,7 @@
|
||||
treemo = "Matthieu Chevrier <matthieu.chevrier@treemo.fr>";
|
||||
trevorj = "Trevor Joynson <nix@trevor.joynson.io>";
|
||||
trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
|
||||
troydm = "Dmitry Geurkov <d.geurkov@gmail.com>";
|
||||
tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>";
|
||||
ttuegel = "Thomas Tuegel <ttuegel@mailbox.org>";
|
||||
tv = "Tomislav Viljetić <tv@shackspace.de>";
|
||||
|
||||
@ -209,6 +209,11 @@ following incompatible changes:</para>
|
||||
For <literal>stateVersion = "17.09"</literal> or lower the old behavior is preserved.
|
||||
</para>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>sound.enable</literal> now defaults to false.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>matrix-synapse</literal> uses postgresql by default instead of sqlite.
|
||||
|
||||
@ -37,8 +37,9 @@ in {
|
||||
hardware.firmware = with pkgs; [
|
||||
firmwareLinuxNonfree
|
||||
intel2200BGFirmware
|
||||
rtl8723bs-firmware
|
||||
rtl8192su-firmware
|
||||
] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
|
||||
rtl8723bs-firmware
|
||||
];
|
||||
})
|
||||
(mkIf cfg.enableAllFirmware {
|
||||
|
||||
@ -603,6 +603,10 @@ $bootLoaderConfig
|
||||
# Enable CUPS to print documents.
|
||||
# services.printing.enable = true;
|
||||
|
||||
# Enable sound.
|
||||
# sound.enable = true;
|
||||
# hardware.pulseaudio.enable = true;
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
# services.xserver.enable = true;
|
||||
# services.xserver.layout = "us";
|
||||
|
||||
@ -65,8 +65,8 @@ in
|
||||
# This is set here rather than up there so that changing it would
|
||||
# not rebuild the manual
|
||||
system.nixos.label = mkDefault (maybeEnv "NIXOS_LABEL"
|
||||
(concatStringsSep "-" (sort (x: y: x < y) cfg.tags)
|
||||
+ "-" + maybeEnv "NIXOS_LABEL_VERSION" cfg.version));
|
||||
(concatStringsSep "-" ((sort (x: y: x < y) cfg.tags)
|
||||
++ [ (maybeEnv "NIXOS_LABEL_VERSION" cfg.version) ])));
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -93,7 +93,7 @@ in
|
||||
default = {};
|
||||
example = literalExample
|
||||
''
|
||||
{ firefox.enableGeckoMediaPlayer = true; }
|
||||
{ allowBroken = true; allowUnfree = true; }
|
||||
'';
|
||||
type = configType;
|
||||
description = ''
|
||||
|
||||
@ -18,5 +18,6 @@ with lib;
|
||||
"opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json";
|
||||
"opt/chrome/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json";
|
||||
};
|
||||
nixpkgs.config.firefox.enableBrowserpass = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -52,8 +52,7 @@ in
|
||||
description = "Chromium default search provider url.";
|
||||
default = null;
|
||||
example =
|
||||
"https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:
|
||||
↪searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}";
|
||||
"https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}";
|
||||
};
|
||||
|
||||
defaultSearchProviderSuggestURL = mkOption {
|
||||
|
||||
@ -21,7 +21,7 @@ in
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
defaultText = "!versionAtLeast system.stateVersion \"18.03\"";
|
||||
description = ''
|
||||
Whether to enable ALSA sound.
|
||||
'';
|
||||
@ -78,7 +78,11 @@ in
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.sound.enable {
|
||||
config = mkMerge [
|
||||
({
|
||||
sound.enable = mkDefault (!versionAtLeast config.system.stateVersion "18.03");
|
||||
})
|
||||
(mkIf config.sound.enable {
|
||||
|
||||
environment.systemPackages = [ alsaUtils ];
|
||||
|
||||
@ -124,6 +128,6 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
};
|
||||
})];
|
||||
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ with lib;
|
||||
example = "2G";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Maximum amount of that the crashplan engine should use.
|
||||
Maximum amount of ram that the crashplan engine should use.
|
||||
'';
|
||||
};
|
||||
openPorts = mkOption {
|
||||
@ -52,28 +52,13 @@ with lib;
|
||||
after = [ "network.target" "local-fs.target" ];
|
||||
|
||||
preStart = ''
|
||||
ensureDir() {
|
||||
dir=$1
|
||||
mode=$2
|
||||
|
||||
if ! test -e $dir; then
|
||||
${pkgs.coreutils}/bin/mkdir -m $mode -p $dir
|
||||
elif [ "$(${pkgs.coreutils}/bin/stat -c %a $dir)" != "$mode" ]; then
|
||||
${pkgs.coreutils}/bin/chmod $mode $dir
|
||||
fi
|
||||
}
|
||||
|
||||
ensureDir ${crashplansb.vardir} 755
|
||||
ensureDir ${crashplansb.vardir}/conf 700
|
||||
ensureDir ${crashplansb.manifestdir} 700
|
||||
ensureDir ${crashplansb.vardir}/cache 700
|
||||
ensureDir ${crashplansb.vardir}/backupArchives 700
|
||||
ensureDir ${crashplansb.vardir}/log 777
|
||||
install -d -m 755 ${crashplansb.vardir}
|
||||
install -d -m 700 ${crashplansb.vardir}/conf
|
||||
install -d -m 700 ${crashplansb.manifestdir}
|
||||
install -d -m 700 ${crashplansb.vardir}/cache
|
||||
install -d -m 700 ${crashplansb.vardir}/backupArchives
|
||||
install -d -m 777 ${crashplansb.vardir}/log
|
||||
cp -avn ${crashplansb}/conf.template/* ${crashplansb.vardir}/conf
|
||||
#for x in bin install.vars lang lib libc42archive64.so libc42core.so libjniwrap64.so libjtux64.so libleveldb64.so libnetty-tcnative.so share upgrade; do
|
||||
# rm -f ${crashplansb.vardir}/$x;
|
||||
# ln -sf ${crashplansb}/$x ${crashplansb.vardir}/$x;
|
||||
#done
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
||||
@ -122,7 +122,7 @@ in
|
||||
extraPlugins = mkOption {
|
||||
type = types.listOf types.path;
|
||||
default = [];
|
||||
example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]";
|
||||
example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]";
|
||||
description = ''
|
||||
When this list contains elements a new store path is created.
|
||||
PostgreSQL and the elements are symlinked into it. Then pg_config,
|
||||
|
||||
@ -53,6 +53,12 @@ in
|
||||
description = "Whether to enable the ACPI daemon.";
|
||||
};
|
||||
|
||||
logEvents = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Log all event activity.";
|
||||
};
|
||||
|
||||
handlers = mkOption {
|
||||
type = types.attrsOf (types.submodule {
|
||||
options = {
|
||||
@ -142,7 +148,7 @@ in
|
||||
ConditionPathExists = [ "/proc/acpi" ];
|
||||
};
|
||||
|
||||
script = "acpid --confdir ${acpiConfDir}";
|
||||
script = "acpid ${optionalString config.services.acpid.logEvents "--logevents"} --confdir ${acpiConfDir}";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
@ -5,6 +5,8 @@ with lib;
|
||||
let
|
||||
cfg = config.services.softether;
|
||||
|
||||
package = cfg.package.override { dataDir = cfg.dataDir; };
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
@ -49,7 +51,7 @@ in
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.string;
|
||||
default = "${cfg.package.dataDir}";
|
||||
default = "/var/lib/softether";
|
||||
description = ''
|
||||
Data directory for SoftEther VPN.
|
||||
'';
|
||||
@ -64,11 +66,8 @@ in
|
||||
config = mkIf cfg.enable (
|
||||
|
||||
mkMerge [{
|
||||
environment.systemPackages = [
|
||||
(pkgs.lib.overrideDerivation cfg.package (attrs: {
|
||||
dataDir = cfg.dataDir;
|
||||
}))
|
||||
];
|
||||
environment.systemPackages = [ package ];
|
||||
|
||||
systemd.services."softether-init" = {
|
||||
description = "SoftEther VPN services initial task";
|
||||
wantedBy = [ "network.target" ];
|
||||
@ -80,11 +79,11 @@ in
|
||||
for d in vpnserver vpnbridge vpnclient vpncmd; do
|
||||
if ! test -e ${cfg.dataDir}/$d; then
|
||||
${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
|
||||
install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
|
||||
install -m0600 ${package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
|
||||
fi
|
||||
done
|
||||
rm -rf ${cfg.dataDir}/vpncmd/vpncmd
|
||||
ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
|
||||
ln -s ${package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -97,12 +96,12 @@ in
|
||||
wantedBy = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = "${cfg.package}/bin/vpnserver start";
|
||||
ExecStop = "${cfg.package}/bin/vpnserver stop";
|
||||
ExecStart = "${package}/bin/vpnserver start";
|
||||
ExecStop = "${package}/bin/vpnserver stop";
|
||||
};
|
||||
preStart = ''
|
||||
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
|
||||
ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
|
||||
ln -s ${package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
|
||||
'';
|
||||
postStop = ''
|
||||
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
|
||||
@ -118,12 +117,12 @@ in
|
||||
wantedBy = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = "${cfg.package}/bin/vpnbridge start";
|
||||
ExecStop = "${cfg.package}/bin/vpnbridge stop";
|
||||
ExecStart = "${package}/bin/vpnbridge start";
|
||||
ExecStop = "${package}/bin/vpnbridge stop";
|
||||
};
|
||||
preStart = ''
|
||||
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
|
||||
ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
|
||||
ln -s ${package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
|
||||
'';
|
||||
postStop = ''
|
||||
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
|
||||
@ -139,12 +138,12 @@ in
|
||||
wantedBy = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
ExecStart = "${cfg.package}/bin/vpnclient start";
|
||||
ExecStop = "${cfg.package}/bin/vpnclient stop";
|
||||
ExecStart = "${package}/bin/vpnclient start";
|
||||
ExecStop = "${package}/bin/vpnclient stop";
|
||||
};
|
||||
preStart = ''
|
||||
rm -rf ${cfg.dataDir}/vpnclient/vpnclient
|
||||
ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
|
||||
ln -s ${package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
|
||||
'';
|
||||
postStart = ''
|
||||
sleep 1
|
||||
|
||||
@ -69,7 +69,7 @@ in
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig =
|
||||
{ ExecStart = "${pkg}/bin/tox-bootstrapd ${cfgFile}";
|
||||
{ ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}";
|
||||
Type = "forking";
|
||||
inherit PIDFile;
|
||||
User = "tox-bootstrapd";
|
||||
|
||||
@ -26,9 +26,9 @@ in
|
||||
};
|
||||
|
||||
locker = mkOption {
|
||||
default = "xlock"; # default according to `man xautolock`
|
||||
example = "i3lock -i /path/to/img";
|
||||
type = types.string;
|
||||
default = "${pkgs.xlockmore}/bin/xlock"; # default according to `man xautolock`
|
||||
example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img";
|
||||
type = types.str;
|
||||
|
||||
description = ''
|
||||
The script to use when automatically locking the computer.
|
||||
@ -37,8 +37,8 @@ in
|
||||
|
||||
nowlocker = mkOption {
|
||||
default = null;
|
||||
example = "i3lock -i /path/to/img";
|
||||
type = types.nullOr types.string;
|
||||
example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img";
|
||||
type = types.nullOr types.str;
|
||||
|
||||
description = ''
|
||||
The script to use when manually locking the computer with <command>xautolock -locknow</command>.
|
||||
@ -56,10 +56,8 @@ in
|
||||
|
||||
notifier = mkOption {
|
||||
default = null;
|
||||
example = literalExample ''
|
||||
"${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""
|
||||
'';
|
||||
type = types.nullOr types.string;
|
||||
example = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\"";
|
||||
type = types.nullOr types.str;
|
||||
|
||||
description = ''
|
||||
Notification script to be used to warn about the pending autolock.
|
||||
@ -68,8 +66,8 @@ in
|
||||
|
||||
killer = mkOption {
|
||||
default = null; # default according to `man xautolock` is none
|
||||
example = "systemctl suspend";
|
||||
type = types.nullOr types.string;
|
||||
example = "${pkgs.systemd}/bin/systemctl suspend";
|
||||
type = types.nullOr types.str;
|
||||
|
||||
description = ''
|
||||
The script to use when nothing has happend for as long as <option>killtime</option>
|
||||
@ -131,6 +129,12 @@ in
|
||||
assertion = cfg.killer != null -> cfg.killtime >= 10;
|
||||
message = "killtime has to be at least 10 minutes according to `man xautolock`";
|
||||
}
|
||||
];
|
||||
] ++ (lib.flip map [ "locker" "notifier" "nowlocker" "killer" ]
|
||||
(option:
|
||||
{
|
||||
assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/";
|
||||
message = "Please specify a canonical path for `services.xserver.xautolock.${option}`";
|
||||
})
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@ -339,6 +339,7 @@ in rec {
|
||||
tests.pumpio = callTest tests/pump.io.nix {};
|
||||
# tests.quagga = callTest tests/quagga.nix {};
|
||||
tests.quake3 = callTest tests/quake3.nix {};
|
||||
tests.rabbitmq = callTest tests/rabbitmq.nix {};
|
||||
tests.radicale = callTest tests/radicale.nix {};
|
||||
tests.rspamd = callSubTests tests/rspamd.nix {};
|
||||
tests.runInMachine = callTest tests/run-in-machine.nix {};
|
||||
|
||||
@ -9,6 +9,7 @@ import ./make-test.nix ({ pkgs, ... }: {
|
||||
kver = config.boot.kernelPackages.kernel.modDirVersion;
|
||||
ksrc = "${kdev}/lib/modules/${kver}/build";
|
||||
hardeningDisable = [ "pic" ];
|
||||
nativeBuildInputs = kdev.moduleBuildDependencies;
|
||||
} ''
|
||||
echo "obj-m += $name.o" > Makefile
|
||||
echo "$source" > "$name.c"
|
||||
|
||||
@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
||||
services.postgresql = let mypg = pkgs.postgresql100; in {
|
||||
enable = true;
|
||||
package = mypg;
|
||||
extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ];
|
||||
extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -12,6 +12,17 @@ buildGoPackage rec {
|
||||
# Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
# Only install binaries in $out, source is not interesting and takes ~50M
|
||||
outputs = [ "out" ];
|
||||
preFixup = ''
|
||||
export bin="''${out}"
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out
|
||||
dir="$NIX_BUILD_TOP/go/bin"
|
||||
[ -e "$dir" ] && cp -r $dir $out
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = "go-ethereum";
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
maxRam ? "1024m" }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.6.0";
|
||||
rev = "1506661200660_4347";
|
||||
version = "6.7.0";
|
||||
rev = "1512021600670_4503";
|
||||
pname = "CrashPlanSmb";
|
||||
name = "${pname}_${version}_${rev}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
|
||||
sha256 = "1zzx60fpmi2nlzpq80x4hfgspsrgd7ycfcvc6w391wxr0qzf2i9k";
|
||||
sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "atom-${version}";
|
||||
version = "1.23.3";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
|
||||
sha256 = "0vq0pics8ajjqwqlk396dxl10k80059f9bik0j4wj2cals42bifc";
|
||||
sha256 = "1yvwz4lkf7ya775h3fvrg1wkdc30321j666vfjlmax5mbcjrxkzf";
|
||||
name = "${name}.deb";
|
||||
};
|
||||
|
||||
|
||||
@ -400,10 +400,10 @@
|
||||
}) {};
|
||||
company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
|
||||
pname = "company";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.4.tar";
|
||||
sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay";
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.5.tar";
|
||||
sha256 = "1x9c5dw884rv0lvl24ggzdxp2k484w543azdiw55bw01635pg531";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -713,10 +713,10 @@
|
||||
ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
|
||||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.4.2.tar";
|
||||
sha256 = "1j9hgxa6csj3iz5vrl22xvhl9lxhig0n1cixgzhs1sb3z3nn2li6";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.4.3.tar";
|
||||
sha256 = "1xq0nhhgzgzrvxbb0lgpz71rfd0dcjakh87wg8wi3cpiw9w7zx41";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs seq ];
|
||||
meta = {
|
||||
@ -1637,10 +1637,10 @@
|
||||
}) {};
|
||||
paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild {
|
||||
pname = "paced";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/paced-1.1.2.tar";
|
||||
sha256 = "1hxbzlzmlndj2gs9n741whi7rj6vbcnxdn89lg2l0997pqmsx58y";
|
||||
url = "https://elpa.gnu.org/packages/paced-1.1.3.tar";
|
||||
sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl";
|
||||
};
|
||||
packageRequires = [ async emacs ];
|
||||
meta = {
|
||||
@ -1704,10 +1704,10 @@
|
||||
python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "python";
|
||||
version = "0.25.2";
|
||||
version = "0.26";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/python-0.25.2.el";
|
||||
sha256 = "1ac2ipyg49sb0lz3n0ykj2s6592abd38l5d1cpbmv73j13l8zq5i";
|
||||
url = "https://elpa.gnu.org/packages/python-0.26.el";
|
||||
sha256 = "197sq42xd4ryqq2zy1802pns6wf6n4vzx90yxgn1zzqpwffpv317";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -125,27 +125,6 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ac-anaconda";
|
||||
version = "0.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "proofit404";
|
||||
repo = "ac-anaconda";
|
||||
rev = "d0dec5c026235f65f9fd6594540df8886ed1b6a8";
|
||||
sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda";
|
||||
sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
|
||||
name = "ac-anaconda";
|
||||
};
|
||||
packageRequires = [ anaconda-mode auto-complete dash ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/ac-anaconda";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ac-cake";
|
||||
@ -2023,15 +2002,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "aurora-config-mode";
|
||||
version = "0.0.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdd";
|
||||
repo = "aurora-config-mode.el";
|
||||
rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
|
||||
sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode";
|
||||
sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
|
||||
name = "aurora-config-mode";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/aurora-config-mode";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
|
||||
melpaBuild {
|
||||
pname = "auth-password-store";
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DamienCassou";
|
||||
repo = "auth-password-store";
|
||||
rev = "5ca6a838489c1175de3df7af025751559eb13cb3";
|
||||
sha256 = "10y6grxwp8sw24fv8i9f50lc83qcdxnkw2bm1v983fw6di4i3a8w";
|
||||
rev = "6af0458a6b586cc5004fa652f23615433304924d";
|
||||
sha256 = "150cx8ida9bl0g84iq051rziy64ic2pxz6hn0blsys1qcp9lf8wa";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
|
||||
@ -3775,12 +3775,12 @@
|
||||
caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "caml";
|
||||
version = "4.6.1pre2";
|
||||
version = "4.6.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml";
|
||||
repo = "ocaml";
|
||||
rev = "b057bd0758f63f41fd8853ee025c58368e33ed21";
|
||||
sha256 = "1s066clvar4ws0mingh68jrj87dak52grs8mnd2ibcf1kf21w08q";
|
||||
rev = "81dc8e8fcf923baa5e5208f9bc4228930c7c3d56";
|
||||
sha256 = "0pn25c3v8xnihnyzk1w297ci5ca05hcdv46m21522sgpcinbvkc7";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
|
||||
@ -3838,12 +3838,12 @@
|
||||
cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
|
||||
melpaBuild {
|
||||
pname = "cask";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cask";
|
||||
repo = "cask";
|
||||
rev = "afdd191b97e76c8393f656336699419a2b39ca1a";
|
||||
sha256 = "10qiapg6kp890q8n2pamvnnpxwcgcldw20mp23pmwzh9nsvqrpbs";
|
||||
rev = "ccfe38ae133cc843865f87607d3f4f3960b76870";
|
||||
sha256 = "1bv0lganh5xhjp2r84js596p1sqndvxnhn3q6l7m7lcdxrjckcy8";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
|
||||
@ -4772,12 +4772,12 @@
|
||||
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "cmake-mode";
|
||||
version = "3.10.2";
|
||||
version = "3.11.0pre1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kitware";
|
||||
repo = "CMake";
|
||||
rev = "c1e087a9d3af74299d7681c9f9de59e5977a1539";
|
||||
sha256 = "08qw6kq3l7dv37s5mppqxb6ys22h733k0qh2llzk2430wv5y9crk";
|
||||
rev = "02edf08be2b9476f442b702c6c00447912425cc2";
|
||||
sha256 = "1ppq3g1525izfl4d8779rj6lq8jkgqh50wnbyb0cmj6bp7b7c9sz";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
|
||||
@ -5087,12 +5087,12 @@
|
||||
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "company";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "company-mode";
|
||||
repo = "company-mode";
|
||||
rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56";
|
||||
sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa";
|
||||
rev = "7cc0901489dff3d73ddc845ae060f938ecb85615";
|
||||
sha256 = "1kqj0nvnp8k7kg9fskl9g6z4pn1ik2a3lnvs01r1cxi1b5ixqjmk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
|
||||
@ -5399,22 +5399,22 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
|
||||
company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "company-lsp";
|
||||
version = "1.0.0";
|
||||
version = "2.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tigersoldier";
|
||||
repo = "company-lsp";
|
||||
rev = "86fda23d29b732ba3987bf20901034da1515b077";
|
||||
sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y";
|
||||
rev = "4512d062c38922d8b8cf402ca6043c246e915694";
|
||||
sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
|
||||
sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
|
||||
name = "company-lsp";
|
||||
};
|
||||
packageRequires = [ company emacs lsp-mode s ];
|
||||
packageRequires = [ company dash emacs lsp-mode s ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/company-lsp";
|
||||
license = lib.licenses.free;
|
||||
@ -6059,12 +6059,12 @@
|
||||
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "counsel-etags";
|
||||
version = "1.3.9";
|
||||
version = "1.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redguardtoo";
|
||||
repo = "counsel-etags";
|
||||
rev = "2219bf8d9a4584abc905c7470455777553496056";
|
||||
sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3";
|
||||
rev = "80038731a5be72310ae499173ee793f36ac148b1";
|
||||
sha256 = "0psvdrxwlzhl8hxzvvdjc25xmk4v5v7ili5d0r78lrsq0k17nrg8";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
|
||||
@ -6728,22 +6728,22 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
|
||||
dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "dart-mode";
|
||||
version = "0.15";
|
||||
version = "1.0.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nex3";
|
||||
repo = "dart-mode";
|
||||
rev = "e6635b390235cf16a8081763768cf925ca2d9133";
|
||||
sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx";
|
||||
rev = "f3a7c7b71fb12d02fa02700bc10426cb10010d01";
|
||||
sha256 = "1g0c37qfqki7v1a5rxf6sy7k07i529rw3f1wmjl7g1zhd9bwsml2";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
|
||||
sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
|
||||
name = "dart-mode";
|
||||
};
|
||||
packageRequires = [ cl-lib dash flycheck ];
|
||||
packageRequires = [ cl-lib dash emacs flycheck s ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/dart-mode";
|
||||
license = lib.licenses.free;
|
||||
@ -7571,12 +7571,12 @@
|
||||
direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
|
||||
melpaBuild {
|
||||
pname = "direnv";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbolster";
|
||||
repo = "emacs-direnv";
|
||||
rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa";
|
||||
sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867";
|
||||
rev = "5b55dac12467689083ff995777f54a304ff47be1";
|
||||
sha256 = "0sjrnab8rx1bpnxim268b8jfpyh8h0iy3j38925r0jqjgjb19ksn";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
|
||||
@ -7914,12 +7914,12 @@
|
||||
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "doom-themes";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hlissner";
|
||||
repo = "emacs-doom-themes";
|
||||
rev = "bc747b3b65baf737f99dc4ccf68558581958bbba";
|
||||
sha256 = "0j5aywwh8cw0bb55frrpmyfmbzg6d6jv29ys61p1xf49gvki870m";
|
||||
rev = "98120f9b362b53983e932f126cf92848297b745a";
|
||||
sha256 = "03pnnbqa09iqyypgbgwlkxr6w1j46rla6pivbq7fy366yk2x03x0";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
|
||||
@ -8522,12 +8522,12 @@
|
||||
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
|
||||
melpaBuild {
|
||||
pname = "ebib";
|
||||
version = "2.11.6";
|
||||
version = "2.11.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "joostkremers";
|
||||
repo = "ebib";
|
||||
rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6";
|
||||
sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20";
|
||||
rev = "fb43f9354f9f9c4c65091ae15732b1d941475186";
|
||||
sha256 = "16l6l2qpkq10wkd95vbch2f7qcsb0jw4rjdf0gck2q8si8i2xi9h";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
|
||||
@ -9160,12 +9160,12 @@
|
||||
elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
|
||||
melpaBuild {
|
||||
pname = "elbank";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NicolasPetton";
|
||||
repo = "Elbank";
|
||||
rev = "245cbc218e94793909ecede2e0d360c7d86f3122";
|
||||
sha256 = "1qcxh8v5dj2wcxxs3qcdny00p906nj33wsxyswwa4jbhh2vfxz12";
|
||||
rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5";
|
||||
sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank";
|
||||
@ -9304,6 +9304,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "elisp-lint";
|
||||
version = "0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gonewest818";
|
||||
repo = "elisp-lint";
|
||||
rev = "9d894e99377859171ee54cb7d2b2e7f2cc7c267c";
|
||||
sha256 = "11pvqskjhxxsyxmy8wllqwa0qg0j9280h0m5rzjghgsdcnlisyvq";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint";
|
||||
sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63";
|
||||
name = "elisp-lint";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/elisp-lint";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "elisp-refs";
|
||||
@ -10465,12 +10486,12 @@
|
||||
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "erlang";
|
||||
version = "20.2.2";
|
||||
version = "20.2.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "erlang";
|
||||
repo = "otp";
|
||||
rev = "194513197e19cd592f3f5c2231510542f5193fe4";
|
||||
sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6";
|
||||
rev = "13c6a4bf01d39a5002e09ef1f82619cde9f2c90c";
|
||||
sha256 = "1j8fqzaw36j8naafrrq1s329jlvlb06ra1f03hl76xr0bbxm44ks";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
|
||||
@ -11679,6 +11700,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "evil-swap-keys";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbolster";
|
||||
repo = "evil-swap-keys";
|
||||
rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a";
|
||||
sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys";
|
||||
sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6";
|
||||
name = "evil-swap-keys";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/evil-swap-keys";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "evil-test-helpers";
|
||||
@ -12415,12 +12457,12 @@
|
||||
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "find-file-in-project";
|
||||
version = "5.4.7";
|
||||
version = "5.5.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "technomancy";
|
||||
repo = "find-file-in-project";
|
||||
rev = "7be14de3c737e70606d208d8d443b89e58cd646d";
|
||||
sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr";
|
||||
rev = "ad7d8e3e72ca5044602af060ab2a39c8bbaa0c7b";
|
||||
sha256 = "04p9fv4rv5m9ll6dfbffq46wl3inzayjnrfr3v0wdnppyvpl411c";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
|
||||
@ -12734,6 +12776,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flower = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "flower";
|
||||
version = "0.3.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PositiveTechnologies";
|
||||
repo = "flower";
|
||||
rev = "2c89a7b0bc9d7b2e95d98e159a059d41ae43933f";
|
||||
sha256 = "1ilj0wa53qs8863d7ri9k8m57jd4n2zm3ijs3s2i7fn8a3svmmhy";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower";
|
||||
sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd";
|
||||
name = "flower";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/flower";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "flx";
|
||||
@ -14246,6 +14309,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "fortune-cookie";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andschwa";
|
||||
repo = "fortune-cookie";
|
||||
rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6";
|
||||
sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie";
|
||||
sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
|
||||
name = "fortune-cookie";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/fortune-cookie";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "fountain-mode";
|
||||
@ -14467,12 +14551,12 @@
|
||||
futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "futhark-mode";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "HIPERFIT";
|
||||
repo = "futhark";
|
||||
rev = "81b858a79b29622a1db732f97225cad705c4acf5";
|
||||
sha256 = "04zxal7j58whcy384sscwc7npcqdjlq01jjjn0i35pf2v7r045xy";
|
||||
rev = "631c493b97b3e2f928892fb25fa29daca4927f83";
|
||||
sha256 = "1a6qr5r62q84m1jcs1xj36p7jr9c042gh38lb7cmfcxf2x693h68";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
|
||||
@ -14874,8 +14958,8 @@
|
||||
sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
|
||||
sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub";
|
||||
sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps";
|
||||
name = "ghub";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
@ -16536,12 +16620,12 @@
|
||||
green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "green-is-the-new-black-theme";
|
||||
version = "0.0.3";
|
||||
version = "0.0.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fredcamps";
|
||||
repo = "green-is-the-new-black-emacs";
|
||||
rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122";
|
||||
sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka";
|
||||
rev = "374d14b99f4959fa039c0e1ce8e0e7991b726d98";
|
||||
sha256 = "135w5vwbk2468b82v6icc8nh50d9flpi7zd63xch8vpvsri0vpw0";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
|
||||
@ -17541,12 +17625,12 @@
|
||||
helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-company";
|
||||
version = "0.2.0";
|
||||
version = "0.2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sodel-the-Vociferous";
|
||||
repo = "helm-company";
|
||||
rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048";
|
||||
sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90";
|
||||
rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d";
|
||||
sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
|
||||
@ -18654,12 +18738,12 @@
|
||||
helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-swoop";
|
||||
version = "1.7.2";
|
||||
version = "1.7.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShingoFukuyama";
|
||||
repo = "helm-swoop";
|
||||
rev = "6d3fdcfb6dea06242efc8ff4cafff9917e558bfc";
|
||||
sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72";
|
||||
rev = "c66336b8245ddc51c4206f19c119f1081920985c";
|
||||
sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop";
|
||||
@ -20334,12 +20418,12 @@
|
||||
indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
|
||||
melpaBuild {
|
||||
pname = "indium";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NicolasPetton";
|
||||
repo = "Indium";
|
||||
rev = "c15f5a2b4a48fd53b446e0fa291bdb8323b80c27";
|
||||
sha256 = "07fzsjmbbq4nx2w23pbb0z88iqmclm156yd87nxsdivndmzvsgw2";
|
||||
rev = "5ece767ea30a350dcdb1a4defaca174e85efedc5";
|
||||
sha256 = "1djkzjxv7idqg5pmbqf60lmvibp3ccvgdkdwb48wzn2yvnqr2vw6";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
|
||||
@ -21843,12 +21927,12 @@
|
||||
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "kaolin-themes";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ogdenwebb";
|
||||
repo = "emacs-kaolin-themes";
|
||||
rev = "d730208cff185ee86a81f8a5a6feadfea78ab9cc";
|
||||
sha256 = "0xfb8zi6jvwdivklc3lk5dzf8nnx05pm4fip44s4al6ajns8hgya";
|
||||
rev = "8a229fcd1d73876920a063f0eba906a5080275a7";
|
||||
sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
|
||||
@ -22575,6 +22659,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "line-up-words";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "janestreet";
|
||||
repo = "line-up-words";
|
||||
rev = "54d2c51c1c3da7e06be47b829bf465bf467ab53f";
|
||||
sha256 = "0qda9i5yjjf2x5cpg6nxkzqwa8fzzjxk0yyc4295kbawwd83vglr";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words";
|
||||
sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79";
|
||||
name = "line-up-words";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/line-up-words";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "lingr";
|
||||
@ -23025,12 +23130,12 @@
|
||||
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "logview";
|
||||
version = "0.8.2";
|
||||
version = "0.9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "doublep";
|
||||
repo = "logview";
|
||||
rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f";
|
||||
sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63";
|
||||
rev = "9ec279d933923dab2d8d1f140adc43073dab6433";
|
||||
sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
|
||||
@ -23214,12 +23319,12 @@
|
||||
magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "magic-filetype";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-php";
|
||||
repo = "magic-filetype.el";
|
||||
rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd";
|
||||
sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh";
|
||||
rev = "019494add5ff02dd36cb3f500142fc51125522cc";
|
||||
sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype";
|
||||
@ -24068,12 +24173,12 @@
|
||||
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
|
||||
melpaBuild {
|
||||
pname = "meghanada";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopemope";
|
||||
repo = "meghanada-emacs";
|
||||
rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde";
|
||||
sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q";
|
||||
rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0";
|
||||
sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
|
||||
@ -25620,12 +25725,12 @@
|
||||
nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "nix-buffer";
|
||||
version = "3.0.1";
|
||||
version = "3.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "shlevy";
|
||||
repo = "nix-buffer";
|
||||
rev = "749f48b510d0fd47dac67850f4089119fbff142a";
|
||||
sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25";
|
||||
rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099";
|
||||
sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
|
||||
@ -27076,12 +27181,12 @@
|
||||
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "org-mime";
|
||||
version = "0.0.9";
|
||||
version = "0.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "org-mime";
|
||||
repo = "org-mime";
|
||||
rev = "62791db188fa6a9a6b4e53c5c29fb4fa46582b98";
|
||||
sha256 = "1l1fyyyyyi8nj4vpkyhpvz1yyqa2vn7042kp9443kqcswdfc9660";
|
||||
rev = "0752659f7a19cead182584fabc9544464f69b83e";
|
||||
sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
|
||||
@ -27398,6 +27503,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "org-rich-yank";
|
||||
version = "0.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "unhammer";
|
||||
repo = "org-rich-yank";
|
||||
rev = "ffa90b29604e27a60ad341c06d0e43769af19715";
|
||||
sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank";
|
||||
sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y";
|
||||
name = "org-rich-yank";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/org-rich-yank";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "org-static-blog";
|
||||
@ -27671,22 +27797,22 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-wild-notifier = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
|
||||
org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "org-wild-notifier";
|
||||
version = "0.2.2";
|
||||
version = "0.2.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akhramov";
|
||||
repo = "org-wild-notifier.el";
|
||||
rev = "28f6af12a9efbcab53e310363c451f53ce8ea3f2";
|
||||
sha256 = "00v4f26np4i947xgqr03wylz4ichc168znlwxn4l6np1s85i3mzb";
|
||||
rev = "5da63fc00db20b60eb46a241cc8308547d85b3ad";
|
||||
sha256 = "1269az078d6d0x7ims2qa6wdv8ql2hn70fwigfqw116v9602ywjr";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier";
|
||||
sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp";
|
||||
name = "org-wild-notifier";
|
||||
};
|
||||
packageRequires = [ alert dash org ];
|
||||
packageRequires = [ alert dash emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/org-wild-notifier";
|
||||
license = lib.licenses.free;
|
||||
@ -27788,12 +27914,12 @@
|
||||
orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
|
||||
melpaBuild {
|
||||
pname = "orgit";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magit";
|
||||
repo = "orgit";
|
||||
rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663";
|
||||
sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf";
|
||||
rev = "976f3c7d25ad92c57341b52dad9af89b49c37f0c";
|
||||
sha256 = "0m8mghh0iydbvlsrg0zd2xajfhdxgxk79dm4gwircrh6zv8194ax";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
|
||||
@ -28250,12 +28376,12 @@
|
||||
package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "package-build";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "melpa";
|
||||
repo = "package-build";
|
||||
rev = "940c991ccd0dab53bd7c120601b3db35669c5e73";
|
||||
sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp";
|
||||
rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00";
|
||||
sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
|
||||
@ -30979,6 +31105,34 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }:
|
||||
melpaBuild {
|
||||
pname = "python-pytest";
|
||||
version = "0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbolster";
|
||||
repo = "emacs-python-pytest";
|
||||
rev = "440f65ff4859fe45ae411dead032d74a2eb1d035";
|
||||
sha256 = "1di8jdvaknr4vx2a68hr4pb040lbfjw2ckzfgmzv527ln5ndww6b";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest";
|
||||
sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4";
|
||||
name = "python-pytest";
|
||||
};
|
||||
packageRequires = [
|
||||
dash
|
||||
dash-functional
|
||||
emacs
|
||||
magit-popup
|
||||
projectile
|
||||
s
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/python-pytest";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
|
||||
melpaBuild {
|
||||
pname = "python-x";
|
||||
@ -32059,12 +32213,12 @@
|
||||
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "rg";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dajva";
|
||||
repo = "rg.el";
|
||||
rev = "68984092d0e0725057e7b67ba32016903170f189";
|
||||
sha256 = "0qd3qh640339n1dn1isk23xhnkj0pds08yzfak4ijxyzlgl63bdq";
|
||||
rev = "562ac6fd6291f828ee6116db62982c77ddd52956";
|
||||
sha256 = "0r5pqjmjwn5qpm8kns1730a6cq3bqxjp8ha63w0n1hnrd4gb24sw";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
|
||||
@ -32350,6 +32504,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rubik = callPackage ({ calc, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "rubik";
|
||||
version = "1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kurvivor19";
|
||||
repo = "rubik-mode";
|
||||
rev = "7ec955639865ca8e99a941843e19b12be5015a47";
|
||||
sha256 = "0fdjg6gpg45m5myq517vkprmvh50xw10dqa8vwr9hfz2z8dy18ja";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik";
|
||||
sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267";
|
||||
name = "rubik";
|
||||
};
|
||||
packageRequires = [ calc cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/rubik";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "rubocop";
|
||||
@ -34973,6 +35148,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "stgit";
|
||||
version = "0.18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ctmarinas";
|
||||
repo = "stgit";
|
||||
rev = "3df606d14f6673fede6cdf5fad921a664c03e108";
|
||||
sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit";
|
||||
sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g";
|
||||
name = "stgit";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/stgit";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "string-edit";
|
||||
@ -35161,6 +35357,48 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "sudden-death";
|
||||
version = "0.2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yewton";
|
||||
repo = "sudden-death.el";
|
||||
rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb";
|
||||
sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death";
|
||||
sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
|
||||
name = "sudden-death";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/sudden-death";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "sudo-edit";
|
||||
version = "0.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nflath";
|
||||
repo = "sudo-edit";
|
||||
rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b";
|
||||
sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
|
||||
sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4";
|
||||
name = "sudo-edit";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/sudo-edit";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "suggest";
|
||||
@ -35311,12 +35549,12 @@
|
||||
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
|
||||
melpaBuild {
|
||||
pname = "swift-mode";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisbarrett";
|
||||
repo = "swift-mode";
|
||||
rev = "7739e4954cc614ecd6b37e935f82ad057e256d56";
|
||||
sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8";
|
||||
rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29";
|
||||
sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
|
||||
@ -36548,12 +36786,12 @@
|
||||
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }:
|
||||
melpaBuild {
|
||||
pname = "treemacs";
|
||||
version = "1.18";
|
||||
version = "1.18.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexander-Miller";
|
||||
repo = "treemacs";
|
||||
rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475";
|
||||
sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52";
|
||||
rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
|
||||
sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs";
|
||||
@ -36569,12 +36807,12 @@
|
||||
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
|
||||
melpaBuild {
|
||||
pname = "treemacs-evil";
|
||||
version = "1.18";
|
||||
version = "1.18.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexander-Miller";
|
||||
repo = "treemacs";
|
||||
rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475";
|
||||
sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52";
|
||||
rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
|
||||
sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil";
|
||||
@ -36590,12 +36828,12 @@
|
||||
treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
|
||||
melpaBuild {
|
||||
pname = "treemacs-projectile";
|
||||
version = "1.18";
|
||||
version = "1.18.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexander-Miller";
|
||||
repo = "treemacs";
|
||||
rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475";
|
||||
sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52";
|
||||
rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35";
|
||||
sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile";
|
||||
@ -36776,22 +37014,22 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "turing-machine";
|
||||
version = "0.1.4";
|
||||
version = "0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "therockmandolinist";
|
||||
repo = "turing-machine";
|
||||
rev = "41bfe79ecf8a44dcbaf308c33cbdf324f7c806ae";
|
||||
sha256 = "04j4nw526mxlm4fd2a28p0pa2ss4b4vznjvpk0f0wlf61ymvy884";
|
||||
rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047";
|
||||
sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
|
||||
sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
|
||||
name = "turing-machine";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/turing-machine";
|
||||
license = lib.licenses.free;
|
||||
@ -39687,4 +39925,4 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ callPackage }: {
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20180212";
|
||||
version = "20180219";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20180212.tar";
|
||||
sha256 = "09wgmiavby009mkc5v2d0znrrs40fnmhzq252hni4zjy8kbgwfzk";
|
||||
url = "https://orgmode.org/elpa/org-20180219.tar";
|
||||
sha256 = "0yqyvkcal74jmpj6zl7xkcn85hdw2qpqjisb4dbdsr4312g45f3d";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -14,10 +14,10 @@
|
||||
}) {};
|
||||
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
version = "20180212";
|
||||
version = "20180219";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20180212.tar";
|
||||
sha256 = "0wy9j2iagjzzjkqfsz1askxg4jmaxc0p0f42jbzx2ja7h4qkm9nj";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20180219.tar";
|
||||
sha256 = "1y7c2prbxpka0j32jam4fbfpslsh9h5049xbxfqymih456j8q7s2";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
@ -247,25 +247,25 @@ in
|
||||
|
||||
datagrip = buildDataGrip rec {
|
||||
name = "datagrip-${version}";
|
||||
version = "2017.2.3"; /* updated by script */
|
||||
version = "2017.3.5"; /* updated by script */
|
||||
description = "Your Swiss Army Knife for Databases and SQL";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
|
||||
sha256 = "0yp5h8ps5hfi07gsz14pp61skibfx48klg8qmc4f6q6xzcfdqxsf"; /* updated by script */
|
||||
sha256 = "1hfy0mxdsvydjjklh8fwdz6f6qxajhngmcmyyzw0gdfhw6ldrv9c"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-datagrip";
|
||||
update-channel = "datagrip_2017_2";
|
||||
update-channel = "datagrip_2017_3";
|
||||
};
|
||||
|
||||
goland = buildGoland rec {
|
||||
name = "goland-${version}";
|
||||
version = "2017.3.1"; /* updated by script */
|
||||
version = "2017.3.2"; /* updated by script */
|
||||
description = "Up and Coming Go IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
||||
sha256 = "0cfjfv01ra67sr8n8ijqwd9zm2yzb1nm447kf0mr5cynr124ch0z"; /* updated by script */
|
||||
sha256 = "0bhvj1xqlpy58yq2s5nrhhaw53i913zpr135b1f6r5s22nvkigvm"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-goland";
|
||||
update-channel = "goland_release";
|
||||
@ -338,15 +338,15 @@ in
|
||||
|
||||
rider = buildRider rec {
|
||||
name = "rider-${version}";
|
||||
version = "2017.2.1"; /* updated by script */
|
||||
version = "2017.3.1"; /* updated by script */
|
||||
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz";
|
||||
sha256 = "1zviknxamp1y7lrlg5qfj3ijp96z0dqvcr42ca0fbx1xb887wzww"; /* updated by script */
|
||||
sha256 = "0k9yc00lmk826pylfs9jyxqnlczk9vhq7bs61b8nyfam1dqbgikv"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rider";
|
||||
update-channel = "rider_2017_2";
|
||||
update-channel = "rider_2017_3";
|
||||
};
|
||||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
|
||||
@ -25,7 +25,7 @@ let
|
||||
name = "neovim-ruby-env";
|
||||
gemdir = ./ruby_provider;
|
||||
postBuild = ''
|
||||
ln -s ${ruby}/bin/* $out/bin
|
||||
ln -sf ${ruby}/bin/* $out/bin
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, python3, python3Packages, zbar }:
|
||||
{ stdenv, fetchurl, python3, python3Packages, zbar, fetchpatch }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "electrum-${version}";
|
||||
@ -9,6 +9,15 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "01dnqiazjl2avrmdiq68absjvcfv24446y759z2s9dwk8ywzjkrg";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Trezor compat patch should be included in electrum > 3.0.6
|
||||
(fetchpatch {
|
||||
name = "trezor-compat.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/spesmilo/electrum/pull/3621.patch";
|
||||
sha256 = "1bk1r2ikhnvw1fpfh71y4za2lnskcbkv50k8ynjxi5slx2wrfpl0";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
dnspython
|
||||
ecdsa
|
||||
|
||||
@ -2,23 +2,23 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "hugo-${version}";
|
||||
version = "0.32.2";
|
||||
version = "0.36.1";
|
||||
|
||||
goPackagePath = "github.com/gohugoio/hugo";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "v${version}";
|
||||
sha256 = "0k62sg9rvr4aqzh1r60m456cw8mj6kxjpri2nnj4c2dxmvll8qhr";
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "v${version}";
|
||||
sha256 = "179lzkd6f81rssgcwlngx2mhr9nvbj0rsh6yjbf1fsrpxfzr2q9z";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A fast and modern static website engine.";
|
||||
homepage = https://gohugo.io;
|
||||
maintainers = with stdenv.lib.maintainers; [ schneefux ];
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ schneefux ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,8 +32,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/alecthomas/chroma";
|
||||
rev = "c9f612c1940a4951cd2b55811744632a7b3b3bb2";
|
||||
sha256 = "0s1mzb175s96adxfx5vhyazpzfq9j4dzx4sr4n8gj7r8afkqys8h";
|
||||
rev = "df4ec264daccb2ecb17bde9134830100701199c5";
|
||||
sha256 = "1snw7byfkfvvw0579jc0yxk79j1v1rb0jdcvivfsalh064zmjdvd";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -59,8 +59,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cpuguy83/go-md2man";
|
||||
rev = "8d868be6e9bf9d5350910bab97a050e49887600f";
|
||||
sha256 = "0vy096wzkq1z59in1if486k0adaj1idvma0ax9z1igh9qpq53vd9";
|
||||
rev = "48d8747a2ca13185e7cc8efe6e9fc196a83f71a5";
|
||||
sha256 = "01hpll16rvxhnvv35vs3z8p51x54c5jyl1gjdm0g7kwfwp2chvjx";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -72,15 +72,6 @@
|
||||
sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/dchest/cssmin";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/dchest/cssmin";
|
||||
rev = "fb8d9b44afdc258bfff6052d3667521babcb2239";
|
||||
sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/disintegration/imaging";
|
||||
fetch = {
|
||||
@ -113,8 +104,26 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fsnotify/fsnotify";
|
||||
rev = "4da3e2cfbabc9f751898f250b49f2439785783a1";
|
||||
sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3";
|
||||
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
|
||||
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gobuffalo/envy";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gobuffalo/envy";
|
||||
rev = "50fabbbaf1e65fc9b739f37a00590c396485d84d";
|
||||
sha256 = "0js2hggb1gybk28pk3hcsb1m6rswfdzvvr194z4my4za09ly5jax";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gobwas/glob";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gobwas/glob";
|
||||
rev = "19c076cdf202b3d1c0489bdfa2f2f289f634474b";
|
||||
sha256 = "0176psz3m0pks0ka6pb62g7ccq5izzj0i7c0j20lb7dp3kawphxs";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -122,8 +131,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/websocket";
|
||||
rev = "d965e9adc66deebadcc7d0c6c7598e2a4baa7838";
|
||||
sha256 = "0ka8pvby06farlji7pixlrk3zb962qp5xarvy2vxnfrdzlarv7xb";
|
||||
rev = "f37d1588608ec036fa9b0b7b8afbde47dc06aea9";
|
||||
sha256 = "1y0z7k4yi8aaw6yjm8s92hvbkyc51b5azpiywminjj1a84czvzvq";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -131,8 +140,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/go-immutable-radix";
|
||||
rev = "8aac2701530899b64bdea735a1de8da899815220";
|
||||
sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6";
|
||||
rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf";
|
||||
sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -140,8 +149,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/golang-lru";
|
||||
rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
|
||||
sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
|
||||
rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3";
|
||||
sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -163,12 +172,12 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kardianos/osext";
|
||||
goPackagePath = "github.com/joho/godotenv";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kardianos/osext";
|
||||
rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
|
||||
sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
|
||||
url = "https://github.com/joho/godotenv";
|
||||
rev = "6bb08516677f8c8274c557fc801bee9ab564ab2c";
|
||||
sha256 = "0jqczq5x5zwgs29vrmq87335c99gi5jrvxkwcpidz98yqg95db4f";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -185,8 +194,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/magiconair/properties";
|
||||
rev = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934";
|
||||
sha256 = "0cnvcd4q88nvxk3q9617dcis2kng2xxsx3iivi5xs8azk290lpyy";
|
||||
rev = "2c9e9502788518c97fe44e8955cd069417ee89df";
|
||||
sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -194,8 +203,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/markbates/inflect";
|
||||
rev = "a12c3aec81a6a938bf584a4bac567afed9256586";
|
||||
sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd";
|
||||
rev = "80fa1ea41b0dc859816314ab0b85f07a6bc57923";
|
||||
sha256 = "0fmpfcz8g0qsb6h94yqpcms2bdb68qac706b54x0k1crfzl1d1mj";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -216,13 +225,31 @@
|
||||
sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/go-homedir";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/go-homedir";
|
||||
rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
|
||||
sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/mapstructure";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/mapstructure";
|
||||
rev = "06020f85339e21b2478f756a78e295255ffa4d6a";
|
||||
sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9";
|
||||
rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
|
||||
sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/muesli/smartcrop";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/muesli/smartcrop";
|
||||
rev = "c2a0373a193bac1daf8b6691e2ece069c5d7ac7f";
|
||||
sha256 = "1jv68g9wddm2a1kf838anjnr4w17k7sqzz01h4z2lfashw3nanar";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -230,8 +257,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/nicksnyder/go-i18n";
|
||||
rev = "aa0ce51472e0a9982717fd19cf02cb08b1e433aa";
|
||||
sha256 = "0355fxpd69wnw56m6dak8k7rlw3q36bql8algg3jkjnxjpgfii4p";
|
||||
rev = "ec04da47793482067e2e376d810e1622277368e4";
|
||||
sha256 = "1c7ip5jidvssr8d4dbx9nchf99m13wblgaz630f7wm73y99dc3lr";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -239,8 +266,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/olekukonko/tablewriter";
|
||||
rev = "65fec0d89a572b4367094e2058d3ebe667de3b60";
|
||||
sha256 = "116waspmr33dqq3zxj2msnqp2f5v2b6ihk3rxqj7gz25rmcxh5wp";
|
||||
rev = "b8a9be070da40449e501c3c4730a889e42d87a9e";
|
||||
sha256 = "1z9frlk9avqhzjv6zz2rg7mvdhzcr9acdgagblijwwkx01f02hw7";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -248,8 +275,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pelletier/go-toml";
|
||||
rev = "0131db6d737cfbbfb678f8b7d92e55e27ce46224";
|
||||
sha256 = "10sz1bh45346wdv8i3nffdmpfh8fb6xd0b3r474cs2mk961pw73v";
|
||||
rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8";
|
||||
sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -257,8 +284,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/russross/blackfriday";
|
||||
rev = "6d1ef893fcb01b4f50cb6e57ed7df3e2e627b6b2";
|
||||
sha256 = "13p2xq5624b9j2f6j6j76j1h4l2lvmh7w6vcv2f5xsvzjy779r27";
|
||||
rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
|
||||
sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -275,8 +302,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/afero";
|
||||
rev = "57afd63c68602b63ed976de00dd066ccb3c319db";
|
||||
sha256 = "0jf9v16m7k46j3mgw469yilhs5p3i32qvzi5954cqyigs6zzqbnk";
|
||||
rev = "bbf41cb36dffe15dff5bf7e18c447801e7ffe163";
|
||||
sha256 = "19jgsm6y1yp99h0fr77rhamdsn34r8545if7y9q377l3phrz2s0l";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -284,8 +311,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cast";
|
||||
rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4";
|
||||
sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050";
|
||||
rev = "8965335b8c7107321228e3e3702cab9832751bac";
|
||||
sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -293,8 +320,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cobra";
|
||||
rev = "ccaecb155a2177302cb56cae929251a256d0f646";
|
||||
sha256 = "1zm89akryx6x0vzvn50736z732gdm3jsx5898annr0zr1cfpf443";
|
||||
rev = "be77323fc05148ef091e83b3866c0d47c8e74a8b";
|
||||
sha256 = "0kl0psbdg8cyznwvq13sva6r4ggmhwzfxdjmkl2vqhy83xq3a6yn";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -311,8 +338,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/jwalterweatherman";
|
||||
rev = "12bd96e66386c1960ab0f74ced1362f66f552f7b";
|
||||
sha256 = "1abvqd1dl3m7mxv44wvl0vwd50l6qpndzrxk28vyb77x41rc8b2g";
|
||||
rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
|
||||
sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -329,8 +356,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/pflag";
|
||||
rev = "4c012f6dcd9546820e378d0bdda4d8fc772cdfea";
|
||||
sha256 = "0plmm67lkm25ir0lczwh7hmanyilrs1vxmbp8a0dyr282ji1dqm5";
|
||||
rev = "ee5fd03fd6acfd43e44aea0b4135958546ed8e73";
|
||||
sha256 = "1fgb1ph3vrqcpdvypp3c1fwj15r587l9yvv5wqcq08shln5rbsnk";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -365,8 +392,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "d866cfc389cec985d6fda2859936a575a55a3ab6";
|
||||
sha256 = "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03";
|
||||
rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb";
|
||||
sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -383,8 +410,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "83801418e1b59fb1880e363299581ee543af32ca";
|
||||
sha256 = "0ilykaanvnzb27d42kmbr4i37hcn7hgqbx98z945gy63aa8dskji";
|
||||
rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd";
|
||||
sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -392,8 +419,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3";
|
||||
sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w";
|
||||
rev = "9e2b64d659da1afe07ce1c9c1dfefc09d188f21e";
|
||||
sha256 = "00ichxdybvs76gj805j828qxg7x4h4v64pq1s56ydaw07ja6lmry";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -401,8 +428,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5";
|
||||
sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831";
|
||||
rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4";
|
||||
sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
{ stdenv, buildEnv, fetchurl, mono, unzip }:
|
||||
|
||||
let
|
||||
version = "1.6.4";
|
||||
drv = stdenv.mkDerivation {
|
||||
name = "keefox-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi";
|
||||
sha256 = "0nj4l9ssyfwbl1pxgxvd2h9q0mqhx7i0yzm4a2xjqlqwam534d1w";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Keepass plugin for keefox Firefox add-on";
|
||||
homepage = http://keefox.org;
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.mjanczyk ];
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
pluginFilename = "KeePassRPC.plgx";
|
||||
|
||||
unpackCmd = "unzip $src deps/$pluginFilename ";
|
||||
sourceRoot = "deps";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/dotnet/keepass/
|
||||
cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename
|
||||
'';
|
||||
};
|
||||
in
|
||||
# Mono is required to compile plugin at runtime, after loading.
|
||||
buildEnv { name = drv.name; paths = [ mono drv ]; }
|
||||
@ -0,0 +1,35 @@
|
||||
{ stdenv, buildEnv, fetchurl, mono }:
|
||||
|
||||
let
|
||||
version = "1.7.3.1";
|
||||
drv = stdenv.mkDerivation {
|
||||
name = "keepassrpc-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
|
||||
sha256 = "1y9b35qg27caj3pbaqqzrqpk61hbbd8617ziwdc9vl799i786m9k";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords";
|
||||
homepage = https://github.com/kee-org/keepassrpc;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ mjanczyk svsdep ];
|
||||
};
|
||||
|
||||
pluginFilename = "KeePassRPC.plgx";
|
||||
|
||||
unpackCmd = ''
|
||||
mkdir deps/
|
||||
cp -p $src deps/$pluginFilename
|
||||
'';
|
||||
sourceRoot = "deps";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/dotnet/keepass/
|
||||
cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename
|
||||
'';
|
||||
};
|
||||
in
|
||||
# Mono is required to compile plugin at runtime, after loading.
|
||||
buildEnv { name = drv.name; paths = [ mono drv ]; }
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, gtk2, plugins ? [] }:
|
||||
{ stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem,
|
||||
unzip, icoutils, gtk2, xorg, xdotool, xsel, plugins ? [] }:
|
||||
|
||||
# KeePass looks for plugins in under directory in which KeePass.exe is
|
||||
# located. It follows symlinks where looking for that directory, so
|
||||
@ -19,6 +20,15 @@ with builtins; buildDotnetPackage rec {
|
||||
|
||||
buildInputs = [ unzip makeWrapper icoutils ];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
xsel = "${xsel}/bin/xsel";
|
||||
xprop = "${xorg.xprop}/bin/xprop";
|
||||
xdotool = "${xdotool}/bin/xdotool";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
rm -rvf Build/*
|
||||
find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
|
||||
|
||||
87
pkgs/applications/misc/keepass/fix-paths.patch
Normal file
87
pkgs/applications/misc/keepass/fix-paths.patch
Normal file
@ -0,0 +1,87 @@
|
||||
diff --git a/KeePass/Native/NativeMethods.Unix.cs b/KeePass/Native/NativeMethods.Unix.cs
|
||||
index 7495a1c..4ef4727 100644
|
||||
--- a/KeePass/Native/NativeMethods.Unix.cs
|
||||
+++ b/KeePass/Native/NativeMethods.Unix.cs
|
||||
@@ -128,7 +128,7 @@ namespace KeePass.Native
|
||||
try
|
||||
{
|
||||
Application.DoEvents(); // E.g. for clipboard updates
|
||||
- string strOutput = NativeLib.RunConsoleApp("xdotool", strParams);
|
||||
+ string strOutput = NativeLib.RunConsoleApp("@xdotool@", strParams);
|
||||
Application.DoEvents(); // E.g. for clipboard updates
|
||||
return (strOutput ?? string.Empty);
|
||||
}
|
||||
diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs
|
||||
index e93a22a..3fd9a2b 100644
|
||||
--- a/KeePass/Util/ClipboardUtil.Unix.cs
|
||||
+++ b/KeePass/Util/ClipboardUtil.Unix.cs
|
||||
@@ -62,7 +62,7 @@ namespace KeePass.Util
|
||||
// "-out -selection clipboard");
|
||||
// if(str != null) return str;
|
||||
|
||||
- string str = NativeLib.RunConsoleApp("xsel",
|
||||
+ string str = NativeLib.RunConsoleApp("@xsel@",
|
||||
"--output --clipboard", null, XSelFlags);
|
||||
if(str != null) return str;
|
||||
|
||||
@@ -83,10 +83,10 @@ namespace KeePass.Util
|
||||
if(string.IsNullOrEmpty(str))
|
||||
{
|
||||
// xsel with an empty input can hang, thus use --clear
|
||||
- if(NativeLib.RunConsoleApp("xsel", "--clear --primary",
|
||||
+ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary",
|
||||
null, XSelFlags) != null)
|
||||
{
|
||||
- NativeLib.RunConsoleApp("xsel", "--clear --clipboard",
|
||||
+ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard",
|
||||
null, XSelFlags);
|
||||
return;
|
||||
}
|
||||
@@ -97,10 +97,10 @@ namespace KeePass.Util
|
||||
}
|
||||
|
||||
// xsel does not support --primary and --clipboard together
|
||||
- if(NativeLib.RunConsoleApp("xsel", "--input --primary",
|
||||
+ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary",
|
||||
str, XSelFlags) != null)
|
||||
{
|
||||
- NativeLib.RunConsoleApp("xsel", "--input --clipboard",
|
||||
+ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard",
|
||||
str, XSelFlags);
|
||||
return;
|
||||
}
|
||||
diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs
|
||||
index ddd8f57..150eb82 100644
|
||||
--- a/KeePassLib/Native/ClipboardU.cs
|
||||
+++ b/KeePassLib/Native/ClipboardU.cs
|
||||
@@ -27,7 +27,7 @@ namespace KeePassLib.Native
|
||||
{
|
||||
internal static class ClipboardU
|
||||
{
|
||||
- private const string XSel = "xsel";
|
||||
+ private const string XSel = "@xsel@";
|
||||
private const string XSelV = "--version";
|
||||
private const string XSelR = "--output --clipboard";
|
||||
private const string XSelC = "--clear --clipboard";
|
||||
diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs
|
||||
index 0da7019..f6a1022 100644
|
||||
--- a/KeePassLib/Utility/MonoWorkarounds.cs
|
||||
+++ b/KeePassLib/Utility/MonoWorkarounds.cs
|
||||
@@ -41,7 +41,7 @@ namespace KeePassLib.Utility
|
||||
{
|
||||
public static class MonoWorkarounds
|
||||
{
|
||||
- private const string AppXDoTool = "xdotool";
|
||||
+ private const string AppXDoTool = "@xdotool@";
|
||||
|
||||
private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>();
|
||||
private static Thread g_thFixClip = null;
|
||||
@@ -303,7 +303,7 @@ namespace KeePassLib.Utility
|
||||
// }
|
||||
// else { Debug.Assert(false); }
|
||||
|
||||
- string strWmClass = (NativeLib.RunConsoleApp("xprop",
|
||||
+ string strWmClass = (NativeLib.RunConsoleApp("@xprop@",
|
||||
"-id " + strHandle + " WM_CLASS") ?? string.Empty);
|
||||
|
||||
if(strWmClass.IndexOf("\"" + PwDefs.ResClass + "\"",
|
||||
37
pkgs/applications/misc/nixnote2/default.nix
Normal file
37
pkgs/applications/misc/nixnote2/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}:
|
||||
|
||||
mkDerivation rec {
|
||||
name = "nixnote2-${version}";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baumgarr";
|
||||
repo = "nixnote2";
|
||||
rev = "v${version}";
|
||||
sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
|
||||
};
|
||||
|
||||
buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
postPatch = ''
|
||||
# Fix location of poppler-qt5.h
|
||||
for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do
|
||||
substituteInPlace $f \
|
||||
--replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>'
|
||||
done
|
||||
|
||||
substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy'
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An unofficial client of Evernote";
|
||||
homepage = http://www.nixnote.org/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ htr ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,29 @@
|
||||
{ stdenv, lib, go_1_8, fetchzip, git }:
|
||||
{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }:
|
||||
|
||||
# When perkeep is updated all deps in the let block should be removed
|
||||
let
|
||||
gopherjs = fetchFromGitHub {
|
||||
owner = "gopherjs";
|
||||
repo = "gopherjs";
|
||||
# Rev matching https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45
|
||||
rev = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7";
|
||||
sha256 = "0kniz8dg5bymb03qriizza1h3gpymf97vsgq9vd222282pdj0vyc";
|
||||
};
|
||||
|
||||
gotool = fetchFromGitHub {
|
||||
owner = "kisielk";
|
||||
repo = "gotool";
|
||||
rev = "80517062f582ea3340cd4baf70e86d539ae7d84d";
|
||||
sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
|
||||
};
|
||||
|
||||
gcimporter15 = fetchgit {
|
||||
url = "https://go.googlesource.com/tools";
|
||||
rev = "f8f2f88271bf2c23f28a09d288d26507a9503c97";
|
||||
sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "perkeep-${version}";
|
||||
version = "20170505";
|
||||
@ -9,7 +33,24 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa";
|
||||
};
|
||||
|
||||
buildInputs = [ git go_1_8 ];
|
||||
# When perkeep is updated postPatch should be removed
|
||||
postPatch = ''
|
||||
rm -r ./vendor/github.com/gopherjs/gopherjs/
|
||||
cp -a ${gopherjs} ./vendor/github.com/gopherjs/gopherjs
|
||||
mkdir -p ./vendor/github.com/kisielk/
|
||||
cp -a ${gotool} ./vendor/github.com/kisielk/gotool
|
||||
mkdir -p ./vendor/golang.org/x/tools/go
|
||||
cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15
|
||||
|
||||
substituteInPlace vendor/github.com/gopherjs/gopherjs/build/build.go \
|
||||
--replace '"github.com/fsnotify/fsnotify"' 'fsnotify "camlistore.org/pkg/misc/fakefsnotify"'
|
||||
|
||||
substituteInPlace ./make.go \
|
||||
--replace "goVersionMinor = '8'" "goVersionMinor = '9'" \
|
||||
--replace "gopherJSGoMinor = '8'" "gopherJSGoMinor = '9'"
|
||||
'';
|
||||
|
||||
buildInputs = [ git go ];
|
||||
|
||||
goPackagePath = "";
|
||||
buildPhase = ''
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
|
||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||
# source of the latter disappears much faster.
|
||||
version = "8.13.0.2";
|
||||
version = "8.16.0.4";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
alsaLib
|
||||
@ -57,7 +57,7 @@ let
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
|
||||
sha256 = "15p1v6y8fwx9qj3ag645bvrcw7c1j20v63iy75s4xwsv1siz8cf9";
|
||||
sha256 = "1qc5qd07r768q9wkr2fq1q731hslh21i8rs41jb6pbn3ai65mxf5";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.system}";
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nextcloud-client-${version}";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/nextcloud/client_theming.git";
|
||||
rev = "1ee750d1aeaaefc899629e85c311594603e9ac1b";
|
||||
sha256 = "0dxyng8a7cg78z8yngiqypsb44lf5c6vkabvkfch0cl0cqmarc1a";
|
||||
rev = "ab40efe1e1475efddd636c09251d8917627261da";
|
||||
sha256 = "19a1kqydgx47sa1a917j46zlbc5g9nynsanasyad9c8sqi0qvyip";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
chronic (0.10.2)
|
||||
sequel (4.0.0)
|
||||
sqlite3 (1.3.11)
|
||||
timetrap (1.10.0)
|
||||
sequel (4.43.0)
|
||||
sqlite3 (1.3.13)
|
||||
timetrap (1.15.1)
|
||||
chronic (~> 0.10.2)
|
||||
sequel (~> 4.0.0)
|
||||
sequel (~> 4.43.0)
|
||||
sqlite3 (~> 1.3.3)
|
||||
|
||||
PLATFORMS
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
{ stdenv, lib, bundlerEnv, ruby }:
|
||||
|
||||
bundlerEnv {
|
||||
name = "timetrap-1.10.0";
|
||||
bundlerEnv rec {
|
||||
name = "timetrap-${version}";
|
||||
|
||||
version = (import gemset).timetrap.version;
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
gemset = ./gemset.nix;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A simple command line time tracker written in ruby";
|
||||
homepage = https://github.com/samg/timetrap;
|
||||
license = lib.licenses.mit;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jerith666 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,25 +10,26 @@
|
||||
sequel = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17kqm0vd15p9qxbgcysvmg6a046fd7zvxl3xzpsh00pg6v454svm";
|
||||
sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.0.0";
|
||||
version = "4.43.0";
|
||||
};
|
||||
sqlite3 = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny";
|
||||
sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.11";
|
||||
version = "1.3.13";
|
||||
};
|
||||
timetrap = {
|
||||
dependencies = ["chronic" "sequel" "sqlite3"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rdaa27zvdgmbsbwa59g3dvfwb95nz7x1wycmviby94j5lywyzfc";
|
||||
sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.15.1";
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
let
|
||||
# if you bump version, update pkgs.tortoisehg too or ping maintainer
|
||||
version = "4.3.2";
|
||||
version = "4.5";
|
||||
name = "mercurial-${version}";
|
||||
inherit (python2Packages) docutils hg-git dulwich python;
|
||||
in python2Packages.buildPythonApplication {
|
||||
@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/${name}.tar.gz";
|
||||
sha256 = "0j6djq584rcj9ghz59ddqzrfq49lykg3wqwap5fnzp9apa4gcnqg";
|
||||
sha256 = "0rgjy42zdlbzgp4qq49amzplfcvycyijf4kdhc5wk3fqz7cki4sd";
|
||||
};
|
||||
|
||||
inherit python; # pass it so that the same version can be used in hg2git
|
||||
|
||||
23
pkgs/applications/version-management/sit/default.nix
Normal file
23
pkgs/applications/version-management/sit/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchFromGitHub, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "sit-${version}";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sit-it";
|
||||
repo = "sit";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fvxv9x971s5qvhw6gpbw9ggsxynkwfy1fn5rln50gn9yrjf7612";
|
||||
};
|
||||
|
||||
cargoSha256 = "1y8a8a9jn9f374sy5fs1snmpiqyckqc0aw7idwnpfr912c1zzrxw";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "SCM-agnostic, file-based, offline-first, immutable issue tracker";
|
||||
homepage = http://sit-it.org/;
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ dywedir ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "tortoisehg-${version}";
|
||||
version = "4.3.1";
|
||||
version = "4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
|
||||
sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n";
|
||||
sha256 = "11m2hir2y1hblg9sqmansv16rcp560j2d3nhqzfhkim46a59fxvk";
|
||||
};
|
||||
|
||||
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
|
||||
|
||||
propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = false; # tests fail with "thg: cannot connect to X server"
|
||||
dontStrip = true;
|
||||
buildPhase = "";
|
||||
installPhase = ''
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, python2Packages, intltool, file
|
||||
, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf
|
||||
, wrapGAppsHook, gtkvnc, vte, avahi, dconf
|
||||
, gobjectIntrospection, libvirt-glib, system-libvirt
|
||||
, gsettings_desktop_schemas, glib, libosinfo, gnome3
|
||||
, gsettings_desktop_schemas, glib, libosinfo, gnome3, gtk3
|
||||
, spiceSupport ? true, spice_gtk ? null
|
||||
}:
|
||||
|
||||
@ -9,12 +9,12 @@ with stdenv.lib;
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "virt-manager-${version}";
|
||||
version = "1.4.3";
|
||||
version = "1.5.0";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
|
||||
sha256 = "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj";
|
||||
sha256 = "d43a7b99d40acdcb8e9455e7874beee132cfcfce9eed0d6252e8f254a82cadc6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -23,15 +23,13 @@ python2Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi
|
||||
gsettings_desktop_schemas libosinfo
|
||||
[ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi
|
||||
gsettings_desktop_schemas libosinfo gtk3
|
||||
] ++ optional spiceSupport spice_gtk;
|
||||
|
||||
propagatedBuildInputs = with python2Packages;
|
||||
[ eventlet greenlet gflags netaddr carrot routes PasteDeploy
|
||||
m2crypto ipy twisted distutils_extra simplejson
|
||||
cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python
|
||||
pygobject3 ipaddr mox libvirt libxml2 requests
|
||||
[
|
||||
pygobject3 ipaddr libvirt libxml2 requests
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
@ -63,6 +61,8 @@ python2Packages.buildPythonApplication rec {
|
||||
manages Xen and LXC (linux containers).
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
# exclude Darwin since libvirt-glib currently doesn't build there
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ qknight offline fpletz ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
|
||||
, qtbase, qtmultimedia, qtsvg
|
||||
, qtbase, qtmultimedia, qtsvg, qttools
|
||||
, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
name = "virt-manager-qt-${version}";
|
||||
version = "0.48.79";
|
||||
version = "0.52.80";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1ash";
|
||||
repo = "qt-virt-manager";
|
||||
rev = "${version}";
|
||||
sha256 = "1mzncca9blc742vb77gyfza0sd1rby3qy5yl4x19nkllid92jn6k";
|
||||
sha256 = "131rs6c90vdf1j40qj7k6s939y8la9ma0q3labxb7ac3r8hvhn6a";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
@ -24,7 +24,7 @@ mkDerivation rec {
|
||||
libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkgconfig qttools ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -21,6 +21,8 @@ stdenv.mkDerivation {
|
||||
|
||||
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
|
||||
|
||||
${cargoUpdateHook}
|
||||
|
||||
cargo vendor
|
||||
|
||||
cp -ar vendor $out
|
||||
|
||||
@ -1,21 +1,15 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mime-types-${version}";
|
||||
let
|
||||
version = "9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2";
|
||||
sha256 = "0pib8v0f5xwwm3xj2ygdi2dlxxvbq6p95l3fah5f66qj9xrqlqxl";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 -t $out/etc mime.types
|
||||
runHook postInstall
|
||||
in fetchzip rec {
|
||||
name = "mime-types-${version}";
|
||||
url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2";
|
||||
postFetch = ''
|
||||
mkdir -p $out/etc
|
||||
tar xjvf $downloadedFile --directory=$out/etc --strip-components=1
|
||||
'';
|
||||
sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A database of common mappings of file extensions to MIME types";
|
||||
|
||||
35
pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
Normal file
35
pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-shell-extension-no-title-bar-${version}";
|
||||
version = "8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "franglais125";
|
||||
repo = "no-title-bar";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n3ayf7k2icy913sjl1d6iwm21i8fivv0f7wj7gck8q7q2j7i3bz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib gettext
|
||||
];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
xprop = "${xorg.xprop}/bin/xprop";
|
||||
xwininfo = "${xorg.xwininfo}/bin/xwininfo";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Integrates maximized windows with the top panel";
|
||||
homepage = https://github.com/franglais125/no-title-bar;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ jonafato svsdep ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
--- a/decoration.js
|
||||
+++ b/decoration.js
|
||||
@@ -181,7 +181,7 @@
|
||||
let act = win.get_compositor_private();
|
||||
let xwindow = act && act['x-window'];
|
||||
if (xwindow) {
|
||||
- let xwininfo = GLib.spawn_command_line_sync('xwininfo -children -id 0x%x'.format(xwindow));
|
||||
+ let xwininfo = GLib.spawn_command_line_sync('@xwininfo@ -children -id 0x%x'.format(xwindow));
|
||||
if (xwininfo[0]) {
|
||||
let str = xwininfo[1].toString();
|
||||
|
||||
@@ -207,7 +207,7 @@
|
||||
// Try enumerating all available windows and match the title. Note that this
|
||||
// may be necessary if the title contains special characters and `x-window`
|
||||
// is not available.
|
||||
- let result = GLib.spawn_command_line_sync('xprop -root _NET_CLIENT_LIST');
|
||||
+ let result = GLib.spawn_command_line_sync('@xprop@ -root _NET_CLIENT_LIST');
|
||||
if (result[0]) {
|
||||
let str = result[1].toString();
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
|
||||
// For each window ID, check if the title matches the desired title.
|
||||
for (var i = 0; i < windowList.length; ++i) {
|
||||
- let cmd = 'xprop -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE';
|
||||
+ let cmd = '@xprop@ -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE';
|
||||
let result = GLib.spawn_command_line_sync(cmd);
|
||||
|
||||
if (result[0]) {
|
||||
@@ -258,7 +258,7 @@
|
||||
}
|
||||
|
||||
let id = this._guessWindowXID(win);
|
||||
- let cmd = 'xprop -id ' + id;
|
||||
+ let cmd = '@xprop@ -id ' + id;
|
||||
|
||||
let xprops = GLib.spawn_command_line_sync(cmd);
|
||||
if (!xprops[0]) {
|
||||
@@ -277,7 +277,7 @@
|
||||
m = str.match(/^_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED(\(CARDINAL\))? = ([0-9]+)$/m);
|
||||
if (m) {
|
||||
let state = !!parseInt(m[2]);
|
||||
- cmd = ['xprop', '-id', id,
|
||||
+ cmd = ['@xprop@', '-id', id,
|
||||
'-f', '_NO_TITLE_BAR_ORIGINAL_STATE', '32c',
|
||||
'-set', '_NO_TITLE_BAR_ORIGINAL_STATE',
|
||||
(state ? '0x1' : '0x0')];
|
||||
@@ -358,7 +358,7 @@
|
||||
let winXID = this._guessWindowXID(win);
|
||||
if (winXID == null)
|
||||
return;
|
||||
- let cmd = ['xprop', '-id', winXID,
|
||||
+ let cmd = ['@xprop@', '-id', winXID,
|
||||
'-f', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', '32c',
|
||||
'-set', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED',
|
||||
(hide ? '0x1' : '0x0')];
|
||||
@ -1,28 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-shell-extension-pixel-saver-${version}";
|
||||
version = "1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deadalnix";
|
||||
repo = "pixel-saver";
|
||||
rev = version;
|
||||
sha256 = "040ayzhpv9jq49vp32w85wvjs57047faa7872qm4brii450iy7v4";
|
||||
};
|
||||
|
||||
uuid = "pixel-saver@deadalnix.me";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/gnome-shell/extensions
|
||||
cp -r ${uuid} $out/share/gnome-shell/extensions
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonafato ];
|
||||
platforms = platforms.linux;
|
||||
homepage = https://github.com/deadalnix/pixel-saver;
|
||||
};
|
||||
}
|
||||
@ -135,6 +135,8 @@ let
|
||||
powerdevil = callPackage ./powerdevil.nix {};
|
||||
sddm-kcm = callPackage ./sddm-kcm.nix {};
|
||||
systemsettings = callPackage ./systemsettings.nix {};
|
||||
user-manager = callPackage ./user-manager.nix {};
|
||||
xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {};
|
||||
};
|
||||
in
|
||||
lib.makeScope libsForQt5.newScope packages
|
||||
|
||||
13
pkgs/desktops/plasma-5/user-manager.nix
Normal file
13
pkgs/desktops/plasma-5/user-manager.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{
|
||||
mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, khtml,
|
||||
ki18n, kiconthemes, kio, kwindowsystem, libpwquality
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "user-manager";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
kcmutils kconfig khtml ki18n kiconthemes kio kwindowsystem
|
||||
libpwquality
|
||||
];
|
||||
}
|
||||
13
pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
Normal file
13
pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{
|
||||
mkDerivation,
|
||||
extra-cmake-modules, gettext, kdoctools, python,
|
||||
kcoreaddons, knotifications
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "xdg-desktop-portal-kde";
|
||||
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
|
||||
buildInputs = [
|
||||
kcoreaddons knotifications
|
||||
];
|
||||
}
|
||||
@ -143,6 +143,9 @@ let version = "7.3.0";
|
||||
"--disable-shared"
|
||||
"--disable-libatomic" # libatomic requires libc
|
||||
"--disable-decimal-float" # libdecnumber requires libc
|
||||
# maybe only needed on musl, PATH_MAX
|
||||
# https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62
|
||||
"--disable-libmpx"
|
||||
] else [
|
||||
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
|
||||
else "--with-headers=${getDev libcCross}/include")
|
||||
@ -166,6 +169,8 @@ let version = "7.3.0";
|
||||
# In uclibc cases, libgomp needs an additional '-ldl'
|
||||
# and as I don't know how to pass it, I disable libgomp.
|
||||
"--disable-libgomp"
|
||||
# musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
|
||||
"--disable-libmpx"
|
||||
] ++ [
|
||||
"--enable-threads=posix"
|
||||
"--enable-nls"
|
||||
@ -268,7 +273,7 @@ stdenv.mkDerivation ({
|
||||
-e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
|
||||
done
|
||||
''
|
||||
+ stdenv.lib.optionalString (hostPlatform.libc == "musl")
|
||||
+ stdenv.lib.optionalString (targetPlatform.libc == "musl")
|
||||
''
|
||||
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
|
||||
''
|
||||
|
||||
@ -25,13 +25,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "go-${version}";
|
||||
version = "1.8.7";
|
||||
version = "1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "go";
|
||||
rev = "go${version}";
|
||||
sha256 = "06v83fb75079dy2dc1927sr9bwvcpkkzl9d4wcw10scj70vj4a0x";
|
||||
sha256 = "1dzs1mz3zxgg1qyi2lrlxdz1lsvazxvmj9cb69pgqnwjlh3jpw0l";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
@ -73,6 +73,10 @@ stdenv.mkDerivation rec {
|
||||
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
|
||||
# Remove the timezone naming test
|
||||
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
|
||||
# Remove disable setgid test
|
||||
sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
|
||||
# Remove cert tests that conflict with NixOS's cert resolution
|
||||
sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
|
||||
|
||||
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
|
||||
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
|
||||
@ -93,9 +97,10 @@ stdenv.mkDerivation rec {
|
||||
sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
|
||||
|
||||
sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
|
||||
sed -i '/TestRead0/areturn' src/os/os_test.go
|
||||
sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
|
||||
sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go
|
||||
sed -i '/TestCurrent/areturn' src/os/user/user_test.go
|
||||
sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
|
||||
sed -i '/TestRead0/areturn' src/os/os_test.go
|
||||
sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
|
||||
|
||||
sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
|
||||
@ -104,19 +109,18 @@ stdenv.mkDerivation rec {
|
||||
sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
|
||||
|
||||
sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
|
||||
sed -i 's/unrecognized/unknown/' src/cmd/go/build.go
|
||||
|
||||
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
|
||||
|
||||
sed -i '1 a\exit 0' misc/cgo/errors/test.bash
|
||||
'';
|
||||
|
||||
patches =
|
||||
[ ./remove-tools-1.8.patch
|
||||
./ssl-cert-file.patch
|
||||
./creds-test.patch
|
||||
./remove-test-pie-1.8.patch
|
||||
];
|
||||
patches = [
|
||||
./remove-tools-1.9.patch
|
||||
./ssl-cert-file-1.9.patch
|
||||
./remove-test-pie.patch
|
||||
./creds-test.patch
|
||||
./go-1.9-skip-flaky-19608.patch
|
||||
./go-1.9-skip-flaky-20072.patch
|
||||
];
|
||||
|
||||
postPatch = optionalString stdenv.isDarwin ''
|
||||
echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
|
||||
@ -134,7 +138,6 @@ stdenv.mkDerivation rec {
|
||||
GO386 = 387; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
|
||||
|
||||
# Hopefully avoids test timeouts on Hydra
|
||||
GO_TEST_TIMEOUT_SCALE = 3;
|
||||
|
||||
@ -172,11 +175,11 @@ stdenv.mkDerivation rec {
|
||||
disallowedReferences = [ go_bootstrap ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
branch = "1.8";
|
||||
branch = "1.9";
|
||||
homepage = http://golang.org/;
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ cstrahan wkennington ];
|
||||
maintainers = with maintainers; [ cstrahan orivej velovix mic92 ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -1,168 +0,0 @@
|
||||
{ stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand
|
||||
, perl, which, pkgconfig, patch, fetchpatch
|
||||
, pcre
|
||||
, Security, Foundation, bash }:
|
||||
|
||||
let
|
||||
goBootstrap = runCommand "go-bootstrap" {} ''
|
||||
mkdir $out
|
||||
cp -rf ${go_bootstrap}/* $out/
|
||||
chmod -R u+w $out
|
||||
find $out -name "*.c" -delete
|
||||
cp -rf $out/bin/* $out/share/go/bin/
|
||||
'';
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "go-${version}";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/golang/go/archive/go${version}.tar.gz";
|
||||
sha256 = "1212pijypippg3sq9c9645kskq4ib73y1f8cv0ka6n279smk0mq9";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
nativeBuildInputs = [ perl which pkgconfig patch ];
|
||||
buildInputs = [ pcre ];
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security Foundation
|
||||
];
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
# I'm not sure what go wants from its 'src', but the go installation manual
|
||||
# describes an installation keeping the src.
|
||||
preUnpack = ''
|
||||
topdir=$PWD
|
||||
mkdir -p $out/share
|
||||
cd $out/share
|
||||
'';
|
||||
|
||||
prePatch = ''
|
||||
# Ensure that the source directory is named go
|
||||
cd ..
|
||||
if [ ! -d go ]; then
|
||||
mv * go
|
||||
fi
|
||||
|
||||
cd go
|
||||
patchShebangs ./ # replace /bin/bash
|
||||
|
||||
# This script produces another script at run time,
|
||||
# and thus it is not corrected by patchShebangs.
|
||||
substituteInPlace misc/cgo/testcarchive/test.bash \
|
||||
--replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
|
||||
|
||||
# Disabling the 'os/http/net' tests (they want files not available in
|
||||
# chroot builds)
|
||||
rm src/net/{listen,parse}_test.go
|
||||
rm src/syscall/exec_linux_test.go
|
||||
# !!! substituteInPlace does not seems to be effective.
|
||||
# The os test wants to read files in an existing path. Just don't let it be /usr/bin.
|
||||
sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
|
||||
sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
|
||||
# Disable the unix socket test
|
||||
sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
|
||||
# Disable the hostname test
|
||||
sed -i '/TestHostname/areturn' src/os/os_test.go
|
||||
# ParseInLocation fails the test
|
||||
sed -i '/TestParseInSydney/areturn' src/time/format_test.go
|
||||
# Remove the api check as it never worked
|
||||
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
|
||||
# Remove the coverage test as we have removed this utility
|
||||
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
|
||||
# Remove the timezone naming test
|
||||
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
|
||||
|
||||
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
|
||||
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/race.bash --replace \
|
||||
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
|
||||
sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
|
||||
sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
|
||||
sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
|
||||
sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go
|
||||
sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
|
||||
sed -i '/TestRead0/areturn' src/os/os_test.go
|
||||
sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
|
||||
rm src/crypto/x509/root_darwin_test.go src/crypto/x509/verify_test.go
|
||||
|
||||
sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
|
||||
sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
|
||||
|
||||
sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
|
||||
|
||||
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
|
||||
|
||||
sed -i '1 a\exit 0' misc/cgo/errors/test.bash
|
||||
|
||||
mkdir $topdir/dirtyhacks
|
||||
cat <<EOF > $topdir/dirtyhacks/clang
|
||||
#!${bash}/bin/bash
|
||||
$(type -P clang) "\$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
|
||||
exit $?
|
||||
EOF
|
||||
chmod +x $topdir/dirtyhacks/clang
|
||||
PATH=$topdir/dirtyhacks:$PATH
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./remove-tools-1.5.patch
|
||||
./creds-test.patch
|
||||
./fix-systime-1.6.patch
|
||||
|
||||
# This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
|
||||
# actually works on old versions too.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
|
||||
sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
|
||||
})
|
||||
];
|
||||
|
||||
GOOS = if stdenv.isDarwin then "darwin" else "linux";
|
||||
GOARCH = if stdenv.isDarwin then "amd64"
|
||||
else if stdenv.system == "i686-linux" then "386"
|
||||
else if stdenv.system == "x86_64-linux" then "amd64"
|
||||
else if stdenv.isArm then "arm"
|
||||
else if stdenv.isAarch64 then "arm64"
|
||||
else throw "Unsupported system";
|
||||
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
|
||||
GO386 = 387; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
|
||||
|
||||
# The go build actually checks for CC=*/clang and does something different, so we don't
|
||||
# just want the generic `cc` here.
|
||||
CC = if stdenv.isDarwin then "clang" else "cc";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
export GOROOT="$(pwd)/"
|
||||
export GOBIN="$out/bin"
|
||||
export PATH="$GOBIN:$PATH"
|
||||
cd ./src
|
||||
echo Building
|
||||
./all.bash
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
rm -r $out/share/go/pkg/bootstrap
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
disallowedReferences = [ go_bootstrap ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
branch = "1.6";
|
||||
homepage = http://golang.org/;
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ cstrahan wkennington ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -1,168 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
|
||||
, perl, which, pkgconfig, patch, fetchpatch
|
||||
, pcre, cacert
|
||||
, Security, Foundation, bash }:
|
||||
|
||||
let
|
||||
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
|
||||
clangHack = writeScriptBin "clang" ''
|
||||
#!${stdenv.shell}
|
||||
exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
|
||||
'';
|
||||
|
||||
goBootstrap = runCommand "go-bootstrap" {} ''
|
||||
mkdir $out
|
||||
cp -rf ${go_bootstrap}/* $out/
|
||||
chmod -R u+w $out
|
||||
find $out -name "*.c" -delete
|
||||
cp -rf $out/bin/* $out/share/go/bin/
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "go-${version}";
|
||||
version = "1.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "go";
|
||||
rev = "go${version}";
|
||||
sha256 = "1gacjwbs1qbx8x84746qdxx2xwylirvd31ybgagfglfsl77vi4m2";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
nativeBuildInputs = [ perl which pkgconfig patch ];
|
||||
buildInputs = [ cacert pcre ];
|
||||
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs ./ # replace /bin/bash
|
||||
|
||||
# This source produces shell script at run time,
|
||||
# and thus it is not corrected by patchShebangs.
|
||||
substituteInPlace misc/cgo/testcarchive/carchive_test.go \
|
||||
--replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
|
||||
|
||||
# Disabling the 'os/http/net' tests (they want files not available in
|
||||
# chroot builds)
|
||||
rm src/net/{listen,parse}_test.go
|
||||
rm src/syscall/exec_linux_test.go
|
||||
# !!! substituteInPlace does not seems to be effective.
|
||||
# The os test wants to read files in an existing path. Just don't let it be /usr/bin.
|
||||
sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
|
||||
sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
|
||||
# Disable the unix socket test
|
||||
sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
|
||||
# Disable the hostname test
|
||||
sed -i '/TestHostname/areturn' src/os/os_test.go
|
||||
# ParseInLocation fails the test
|
||||
sed -i '/TestParseInSydney/areturn' src/time/format_test.go
|
||||
# Remove the api check as it never worked
|
||||
sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
|
||||
# Remove the coverage test as we have removed this utility
|
||||
sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
|
||||
# Remove the timezone naming test
|
||||
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
|
||||
|
||||
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
|
||||
sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
|
||||
|
||||
# Disable cgo lookup tests not works, they depend on resolver
|
||||
rm src/net/cgo_unix_test.go
|
||||
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/race.bash --replace \
|
||||
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
|
||||
sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
|
||||
sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
|
||||
sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
|
||||
|
||||
sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
|
||||
sed -i '/TestRead0/areturn' src/os/os_test.go
|
||||
sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
|
||||
sed -i '/TestCurrent/areturn' src/os/user/user_test.go
|
||||
sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
|
||||
|
||||
sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
|
||||
sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
|
||||
|
||||
sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
|
||||
|
||||
sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
|
||||
sed -i 's/unrecognized/unknown/' src/cmd/go/build.go
|
||||
|
||||
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
|
||||
|
||||
sed -i '1 a\exit 0' misc/cgo/errors/test.bash
|
||||
'';
|
||||
|
||||
patches =
|
||||
[ ./remove-tools-1.7.patch
|
||||
./ssl-cert-file.patch
|
||||
./creds-test.patch
|
||||
|
||||
# This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
|
||||
# actually works on old versions too.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
|
||||
sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
|
||||
})
|
||||
];
|
||||
|
||||
GOOS = if stdenv.isDarwin then "darwin" else "linux";
|
||||
GOARCH = if stdenv.isDarwin then "amd64"
|
||||
else if stdenv.system == "i686-linux" then "386"
|
||||
else if stdenv.system == "x86_64-linux" then "amd64"
|
||||
else if stdenv.isArm then "arm"
|
||||
else if stdenv.isAarch64 then "arm64"
|
||||
else throw "Unsupported system";
|
||||
GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
|
||||
GO386 = 387; # from Arch: don't assume sse2 on i686
|
||||
CGO_ENABLED = 1;
|
||||
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
|
||||
|
||||
# The go build actually checks for CC=*/clang and does something different, so we don't
|
||||
# just want the generic `cc` here.
|
||||
CC = if stdenv.isDarwin then "clang" else "cc";
|
||||
|
||||
configurePhase = ''
|
||||
mkdir -p $out/share/go/bin
|
||||
export GOROOT=$out/share/go
|
||||
export GOBIN=$GOROOT/bin
|
||||
export PATH=$GOBIN:$PATH
|
||||
'';
|
||||
|
||||
postConfigure = optionalString stdenv.isDarwin ''
|
||||
export PATH=${clangHack}/bin:$PATH
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
cp -r . $GOROOT
|
||||
( cd $GOROOT/src && ./all.bash )
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
rm -r $out/share/go/pkg/bootstrap
|
||||
ln -s $out/share/go/bin $out/bin
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
disallowedReferences = [ go_bootstrap ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
branch = "1.7";
|
||||
homepage = http://golang.org/;
|
||||
description = "The Go Programming language";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ cstrahan wkennington ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
|
||||
patches =
|
||||
[ ./remove-tools-1.9.patch
|
||||
./ssl-cert-file-1.9.patch
|
||||
./creds-test.patch
|
||||
./creds-test-1.9.patch
|
||||
./remove-test-pie-1.9.patch
|
||||
./go-1.9-skip-flaky-19608.patch
|
||||
./go-1.9-skip-flaky-20072.patch
|
||||
|
||||
14
pkgs/development/compilers/go/creds-test-1.9.patch
Normal file
14
pkgs/development/compilers/go/creds-test-1.9.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go
|
||||
--- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100
|
||||
@@ -62,8 +62,8 @@
|
||||
if sys, ok := err.(*os.SyscallError); ok {
|
||||
err = sys.Err
|
||||
}
|
||||
- if err != syscall.EPERM {
|
||||
- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
|
||||
+ if err != syscall.EPERM && err != syscall.EINVAL {
|
||||
+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,14 +1,13 @@
|
||||
diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go
|
||||
--- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100
|
||||
@@ -62,8 +62,8 @@
|
||||
if sys, ok := err.(*os.SyscallError); ok {
|
||||
err = sys.Err
|
||||
--- source.org/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ source/src/syscall/creds_test.go 2018-02-22 10:43:47.223615358 +0000
|
||||
@@ -76,8 +76,8 @@
|
||||
if sys, ok := err.(*os.SyscallError); ok {
|
||||
err = sys.Err
|
||||
}
|
||||
- if err != syscall.EPERM {
|
||||
- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
|
||||
+ if err != syscall.EPERM && err != syscall.EINVAL {
|
||||
+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
|
||||
}
|
||||
}
|
||||
- if err != syscall.EPERM {
|
||||
- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
|
||||
+ if err != syscall.EPERM && err != syscall.EINVAL {
|
||||
+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
diff --git a/src/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s
|
||||
index e09b906ba5..fa8ff2f65c 100644
|
||||
--- a/src/runtime/sys_darwin_amd64.s
|
||||
+++ b/src/runtime/sys_darwin_amd64.s
|
||||
@@ -157,6 +157,7 @@ systime:
|
||||
// Fall back to system call (usually first call in this thread).
|
||||
MOVQ SP, DI
|
||||
MOVQ $0, SI
|
||||
+ MOVQ $0, DX // required as of Sierra; Issue 16570
|
||||
MOVL $(0x2000000+116), AX
|
||||
SYSCALL
|
||||
CMPQ AX, $0
|
||||
diff --git a/src/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go
|
||||
index 70b53b87f4..79083117b6 100644
|
||||
--- a/src/syscall/syscall_darwin_amd64.go
|
||||
+++ b/src/syscall/syscall_darwin_amd64.go
|
||||
@@ -26,14 +26,21 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
|
||||
}
|
||||
|
||||
//sysnb gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
|
||||
-func Gettimeofday(tv *Timeval) (err error) {
|
||||
- // The tv passed to gettimeofday must be non-nil
|
||||
- // but is otherwise unused. The answers come back
|
||||
- // in the two registers.
|
||||
+func Gettimeofday(tv *Timeval) error {
|
||||
+ // The tv passed to gettimeofday must be non-nil.
|
||||
+ // Before macOS Sierra (10.12), tv was otherwise unused and
|
||||
+ // the answers came back in the two registers.
|
||||
+ // As of Sierra, gettimeofday return zeros and populates
|
||||
+ // tv itself.
|
||||
sec, usec, err := gettimeofday(tv)
|
||||
- tv.Sec = sec
|
||||
- tv.Usec = usec
|
||||
- return err
|
||||
+ if err != nil {
|
||||
+ return err
|
||||
+ }
|
||||
+ if sec != 0 || usec != 0 {
|
||||
+ tv.Sec = sec
|
||||
+ tv.Usec = usec
|
||||
+ }
|
||||
+ return nil
|
||||
}
|
||||
|
||||
func SetKevent(k *Kevent_t, fd, mode, flags int) {
|
||||
@ -1,194 +0,0 @@
|
||||
https://github.com/golang/go/issues/13114
|
||||
https://gnats.netbsd.org/50777
|
||||
|
||||
--- a/src/cmd/6l/asm.c 2015-09-23 06:20:05.000000000 +0200
|
||||
+++ b/src/cmd/6l/asm.c 2016-03-10 21:00:29.032083210 +0100
|
||||
@@ -118,6 +118,8 @@
|
||||
return;
|
||||
|
||||
case 256 + R_X86_64_GOTPCREL:
|
||||
+ case 256 + R_X86_64_GOTPCRELX:
|
||||
+ case 256 + R_X86_64_REX_GOTPCRELX:
|
||||
if(targ->type != SDYNIMPORT) {
|
||||
// have symbol
|
||||
if(r->off >= 2 && s->p[r->off-2] == 0x8b) {
|
||||
--- a/src/cmd/8l/asm.c 2015-09-23 06:20:05.000000000 +0200
|
||||
+++ b/src/cmd/8l/asm.c 2016-03-10 21:02:16.702064080 +0100
|
||||
@@ -115,6 +115,7 @@
|
||||
return;
|
||||
|
||||
case 256 + R_386_GOT32:
|
||||
+ case 256 + R_386_GOT32X:
|
||||
if(targ->type != SDYNIMPORT) {
|
||||
// have symbol
|
||||
if(r->off >= 2 && s->p[r->off-2] == 0x8b) {
|
||||
--- a/src/cmd/ld/elf.h 2015-09-23 06:20:05.000000000 +0200
|
||||
+++ b/src/cmd/ld/elf.h 2016-03-10 21:00:29.033083211 +0100
|
||||
@@ -478,32 +478,47 @@
|
||||
* Relocation types.
|
||||
*/
|
||||
|
||||
-#define R_X86_64_NONE 0 /* No relocation. */
|
||||
-#define R_X86_64_64 1 /* Add 64 bit symbol value. */
|
||||
-#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */
|
||||
-#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */
|
||||
-#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */
|
||||
-#define R_X86_64_COPY 5 /* Copy data from shared object. */
|
||||
-#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */
|
||||
-#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */
|
||||
-#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */
|
||||
-#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */
|
||||
-#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */
|
||||
-#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */
|
||||
-#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */
|
||||
-#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */
|
||||
-#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */
|
||||
-#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */
|
||||
-#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */
|
||||
-#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */
|
||||
-#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */
|
||||
-#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */
|
||||
-#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */
|
||||
-#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */
|
||||
-#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */
|
||||
-#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */
|
||||
-
|
||||
-#define R_X86_64_COUNT 24 /* Count of defined relocation types. */
|
||||
+#define R_X86_64_NONE 0
|
||||
+#define R_X86_64_64 1
|
||||
+#define R_X86_64_PC32 2
|
||||
+#define R_X86_64_GOT32 3
|
||||
+#define R_X86_64_PLT32 4
|
||||
+#define R_X86_64_COPY 5
|
||||
+#define R_X86_64_GLOB_DAT 6
|
||||
+#define R_X86_64_JMP_SLOT 7
|
||||
+#define R_X86_64_RELATIVE 8
|
||||
+#define R_X86_64_GOTPCREL 9
|
||||
+#define R_X86_64_32 10
|
||||
+#define R_X86_64_32S 11
|
||||
+#define R_X86_64_16 12
|
||||
+#define R_X86_64_PC16 13
|
||||
+#define R_X86_64_8 14
|
||||
+#define R_X86_64_PC8 15
|
||||
+#define R_X86_64_DTPMOD64 16
|
||||
+#define R_X86_64_DTPOFF64 17
|
||||
+#define R_X86_64_TPOFF64 18
|
||||
+#define R_X86_64_TLSGD 19
|
||||
+#define R_X86_64_TLSLD 20
|
||||
+#define R_X86_64_DTPOFF32 21
|
||||
+#define R_X86_64_GOTTPOFF 22
|
||||
+#define R_X86_64_TPOFF32 23
|
||||
+#define R_X86_64_PC64 24
|
||||
+#define R_X86_64_GOTOFF64 25
|
||||
+#define R_X86_64_GOTPC32 26
|
||||
+#define R_X86_64_GOT64 27
|
||||
+#define R_X86_64_GOTPCREL64 28
|
||||
+#define R_X86_64_GOTPC64 29
|
||||
+#define R_X86_64_GOTPLT64 30
|
||||
+#define R_X86_64_PLTOFF64 31
|
||||
+#define R_X86_64_SIZE32 32
|
||||
+#define R_X86_64_SIZE64 33
|
||||
+#define R_X86_64_GOTPC32_TLSDEC 34
|
||||
+#define R_X86_64_TLSDESC_CALL 35
|
||||
+#define R_X86_64_TLSDESC 36
|
||||
+#define R_X86_64_IRELATIVE 37
|
||||
+#define R_X86_64_PC32_BND 40
|
||||
+#define R_X86_64_GOTPCRELX 41
|
||||
+#define R_X86_64_REX_GOTPCRELX 42
|
||||
|
||||
|
||||
#define R_ALPHA_NONE 0 /* No reloc */
|
||||
@@ -581,39 +596,42 @@
|
||||
#define R_ARM_COUNT 38 /* Count of defined relocation types. */
|
||||
|
||||
|
||||
-#define R_386_NONE 0 /* No relocation. */
|
||||
-#define R_386_32 1 /* Add symbol value. */
|
||||
-#define R_386_PC32 2 /* Add PC-relative symbol value. */
|
||||
-#define R_386_GOT32 3 /* Add PC-relative GOT offset. */
|
||||
-#define R_386_PLT32 4 /* Add PC-relative PLT offset. */
|
||||
-#define R_386_COPY 5 /* Copy data from shared object. */
|
||||
-#define R_386_GLOB_DAT 6 /* Set GOT entry to data address. */
|
||||
-#define R_386_JMP_SLOT 7 /* Set GOT entry to code address. */
|
||||
-#define R_386_RELATIVE 8 /* Add load address of shared object. */
|
||||
-#define R_386_GOTOFF 9 /* Add GOT-relative symbol address. */
|
||||
-#define R_386_GOTPC 10 /* Add PC-relative GOT table address. */
|
||||
-#define R_386_TLS_TPOFF 14 /* Negative offset in static TLS block */
|
||||
-#define R_386_TLS_IE 15 /* Absolute address of GOT for -ve static TLS */
|
||||
-#define R_386_TLS_GOTIE 16 /* GOT entry for negative static TLS block */
|
||||
-#define R_386_TLS_LE 17 /* Negative offset relative to static TLS */
|
||||
-#define R_386_TLS_GD 18 /* 32 bit offset to GOT (index,off) pair */
|
||||
-#define R_386_TLS_LDM 19 /* 32 bit offset to GOT (index,zero) pair */
|
||||
-#define R_386_TLS_GD_32 24 /* 32 bit offset to GOT (index,off) pair */
|
||||
-#define R_386_TLS_GD_PUSH 25 /* pushl instruction for Sun ABI GD sequence */
|
||||
-#define R_386_TLS_GD_CALL 26 /* call instruction for Sun ABI GD sequence */
|
||||
-#define R_386_TLS_GD_POP 27 /* popl instruction for Sun ABI GD sequence */
|
||||
-#define R_386_TLS_LDM_32 28 /* 32 bit offset to GOT (index,zero) pair */
|
||||
-#define R_386_TLS_LDM_PUSH 29 /* pushl instruction for Sun ABI LD sequence */
|
||||
-#define R_386_TLS_LDM_CALL 30 /* call instruction for Sun ABI LD sequence */
|
||||
-#define R_386_TLS_LDM_POP 31 /* popl instruction for Sun ABI LD sequence */
|
||||
-#define R_386_TLS_LDO_32 32 /* 32 bit offset from start of TLS block */
|
||||
-#define R_386_TLS_IE_32 33 /* 32 bit offset to GOT static TLS offset entry */
|
||||
-#define R_386_TLS_LE_32 34 /* 32 bit offset within static TLS block */
|
||||
-#define R_386_TLS_DTPMOD32 35 /* GOT entry containing TLS index */
|
||||
-#define R_386_TLS_DTPOFF32 36 /* GOT entry containing TLS offset */
|
||||
-#define R_386_TLS_TPOFF32 37 /* GOT entry of -ve static TLS offset */
|
||||
-
|
||||
-#define R_386_COUNT 38 /* Count of defined relocation types. */
|
||||
+#define R_386_NONE 0
|
||||
+#define R_386_32 1
|
||||
+#define R_386_PC32 2
|
||||
+#define R_386_GOT32 3
|
||||
+#define R_386_PLT32 4
|
||||
+#define R_386_COPY 5
|
||||
+#define R_386_GLOB_DAT 6
|
||||
+#define R_386_JMP_SLOT 7
|
||||
+#define R_386_RELATIVE 8
|
||||
+#define R_386_GOTOFF 9
|
||||
+#define R_386_GOTPC 10
|
||||
+#define R_386_TLS_TPOFF 14
|
||||
+#define R_386_TLS_IE 15
|
||||
+#define R_386_TLS_GOTIE 16
|
||||
+#define R_386_TLS_LE 17
|
||||
+#define R_386_TLS_GD 18
|
||||
+#define R_386_TLS_LDM 19
|
||||
+#define R_386_TLS_GD_32 24
|
||||
+#define R_386_TLS_GD_PUSH 25
|
||||
+#define R_386_TLS_GD_CALL 26
|
||||
+#define R_386_TLS_GD_POP 27
|
||||
+#define R_386_TLS_LDM_32 28
|
||||
+#define R_386_TLS_LDM_PUSH 29
|
||||
+#define R_386_TLS_LDM_CALL 30
|
||||
+#define R_386_TLS_LDM_POP 31
|
||||
+#define R_386_TLS_LDO_32 32
|
||||
+#define R_386_TLS_IE_32 33
|
||||
+#define R_386_TLS_LE_32 34
|
||||
+#define R_386_TLS_DTPMOD32 35
|
||||
+#define R_386_TLS_DTPOFF32 36
|
||||
+#define R_386_TLS_TPOFF32 37
|
||||
+#define R_386_TLS_GOTDESC 39
|
||||
+#define R_386_TLS_DESC_CALL 40
|
||||
+#define R_386_TLS_DESC 41
|
||||
+#define R_386_IRELATIVE 42
|
||||
+#define R_386_GOT32X 43
|
||||
|
||||
#define R_PPC_NONE 0 /* No relocation. */
|
||||
#define R_PPC_ADDR32 1
|
||||
--- a/src/cmd/ld/ldelf.c 2015-09-23 06:20:05.000000000 +0200
|
||||
+++ b/src/cmd/ld/ldelf.c 2016-03-10 21:00:29.033083211 +0100
|
||||
@@ -888,12 +888,15 @@
|
||||
case R('6', R_X86_64_PC32):
|
||||
case R('6', R_X86_64_PLT32):
|
||||
case R('6', R_X86_64_GOTPCREL):
|
||||
+ case R('6', R_X86_64_GOTPCRELX):
|
||||
+ case R('6', R_X86_64_REX_GOTPCRELX):
|
||||
case R('8', R_386_32):
|
||||
case R('8', R_386_PC32):
|
||||
case R('8', R_386_GOT32):
|
||||
case R('8', R_386_PLT32):
|
||||
case R('8', R_386_GOTOFF):
|
||||
case R('8', R_386_GOTPC):
|
||||
+ case R('8', R_386_GOT32X):
|
||||
*siz = 4;
|
||||
break;
|
||||
case R('6', R_X86_64_64):
|
||||
@ -1,23 +0,0 @@
|
||||
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
|
||||
index c51dcea..8fbec5e 100644
|
||||
--- a/src/cmd/dist/test.go
|
||||
+++ b/src/cmd/dist/test.go
|
||||
@@ -461,17 +461,5 @@ func (t *tester) registerTests() {
|
||||
})
|
||||
}
|
||||
|
||||
- // Test internal linking of PIE binaries where it is supported.
|
||||
- if t.goos == "linux" && t.goarch == "amd64" {
|
||||
- t.tests = append(t.tests, distTest{
|
||||
- name: "pie_internal",
|
||||
- heading: "internal linking of -buildmode=pie",
|
||||
- fn: func(dt *distTest) error {
|
||||
- t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag(""))
|
||||
- return nil
|
||||
- },
|
||||
- })
|
||||
- }
|
||||
-
|
||||
// sync tests
|
||||
t.tests = append(t.tests, distTest{
|
||||
name: "sync_cpu",
|
||||
24
pkgs/development/compilers/go/remove-test-pie.patch
Normal file
24
pkgs/development/compilers/go/remove-test-pie.patch
Normal file
@ -0,0 +1,24 @@
|
||||
--- source.org/src/cmd/dist/test.go 2018-02-22 10:40:40.089632339 +0000
|
||||
+++ source/src/cmd/dist/test.go 2018-02-22 10:56:53.075193788 +0000
|
||||
@@ -526,21 +526,6 @@
|
||||
})
|
||||
}
|
||||
|
||||
- // Test internal linking of PIE binaries where it is supported.
|
||||
- if goos == "linux" && goarch == "amd64" && !isAlpineLinux() {
|
||||
- // Issue 18243: We don't have a way to set the default
|
||||
- // dynamic linker used in internal linking mode. So
|
||||
- // this test is skipped on Alpine.
|
||||
- t.tests = append(t.tests, distTest{
|
||||
- name: "pie_internal",
|
||||
- heading: "internal linking of -buildmode=pie",
|
||||
- fn: func(dt *distTest) error {
|
||||
- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60))
|
||||
- return nil
|
||||
- },
|
||||
- })
|
||||
- }
|
||||
-
|
||||
// sync tests
|
||||
t.tests = append(t.tests, distTest{
|
||||
name: "sync_cpu",
|
||||
@ -1,48 +0,0 @@
|
||||
diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
|
||||
index 61e3d8d..b8422ad 100644
|
||||
--- a/src/cmd/go/pkg.go
|
||||
+++ b/src/cmd/go/pkg.go
|
||||
@@ -678,7 +678,7 @@ var goTools = map[string]targetDir{
|
||||
"cmd/trace": toTool,
|
||||
"cmd/vet": toTool,
|
||||
"cmd/yacc": toTool,
|
||||
- "golang.org/x/tools/cmd/godoc": toBin,
|
||||
+ "nixos.org/x/tools/cmd/godoc": toBin,
|
||||
"code.google.com/p/go.tools/cmd/cover": stalePath,
|
||||
"code.google.com/p/go.tools/cmd/godoc": stalePath,
|
||||
"code.google.com/p/go.tools/cmd/vet": stalePath,
|
||||
diff --git a/src/go/build/build.go b/src/go/build/build.go
|
||||
index 496fe11..8c81dbd 100644
|
||||
--- a/src/go/build/build.go
|
||||
+++ b/src/go/build/build.go
|
||||
@@ -1388,7 +1388,7 @@ func init() {
|
||||
}
|
||||
|
||||
// ToolDir is the directory containing build tools.
|
||||
-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
|
||||
+var ToolDir = runtime.GOTOOLDIR()
|
||||
|
||||
// IsLocalImport reports whether the import path is
|
||||
// a local import path, like ".", "..", "./foo", or "../foo".
|
||||
diff --git a/src/runtime/extern.go b/src/runtime/extern.go
|
||||
index d346362..fb22b6e 100644
|
||||
--- a/src/runtime/extern.go
|
||||
+++ b/src/runtime/extern.go
|
||||
@@ -194,6 +194,17 @@ func GOROOT() string {
|
||||
return defaultGoroot
|
||||
}
|
||||
|
||||
+// GOTOOLDIR returns the root of the Go tree.
|
||||
+// It uses the GOTOOLDIR environment variable, if set,
|
||||
+// or else the root used during the Go build.
|
||||
+func GOTOOLDIR() string {
|
||||
+ s := gogetenv("GOTOOLDIR")
|
||||
+ if s != "" {
|
||||
+ return s
|
||||
+ }
|
||||
+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
|
||||
+}
|
||||
+
|
||||
// Version returns the Go tree's version string.
|
||||
// It is either the commit hash and date at the time of the build or,
|
||||
// when possible, a release tag like "go1.3".
|
||||
@ -1,35 +0,0 @@
|
||||
diff --git a/src/go/build/build.go b/src/go/build/build.go
|
||||
index 9706b8b..f250751 100644
|
||||
--- a/src/go/build/build.go
|
||||
+++ b/src/go/build/build.go
|
||||
@@ -1513,7 +1513,7 @@ func init() {
|
||||
}
|
||||
|
||||
// ToolDir is the directory containing build tools.
|
||||
-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
|
||||
+var ToolDir = runtime.GOTOOLDIR()
|
||||
|
||||
// IsLocalImport reports whether the import path is
|
||||
// a local import path, like ".", "..", "./foo", or "../foo".
|
||||
diff --git a/src/runtime/extern.go b/src/runtime/extern.go
|
||||
index 441dcd9..a50277e 100644
|
||||
--- a/src/runtime/extern.go
|
||||
+++ b/src/runtime/extern.go
|
||||
@@ -230,6 +230,17 @@ func GOROOT() string {
|
||||
return sys.DefaultGoroot
|
||||
}
|
||||
|
||||
+// GOTOOLDIR returns the root of the Go tree.
|
||||
+// It uses the GOTOOLDIR environment variable, if set,
|
||||
+// or else the root used during the Go build.
|
||||
+func GOTOOLDIR() string {
|
||||
+ s := gogetenv("GOTOOLDIR")
|
||||
+ if s != "" {
|
||||
+ return s
|
||||
+ }
|
||||
+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
|
||||
+}
|
||||
+
|
||||
// Version returns the Go tree's version string.
|
||||
// It is either the commit hash and date at the time of the build or,
|
||||
// when possible, a release tag like "go1.3".
|
||||
@ -1,35 +0,0 @@
|
||||
diff --git a/src/go/build/build.go b/src/go/build/build.go
|
||||
index 9706b8b..f250751 100644
|
||||
--- a/src/go/build/build.go
|
||||
+++ b/src/go/build/build.go
|
||||
@@ -1513,7 +1513,7 @@ func init() {
|
||||
}
|
||||
|
||||
// ToolDir is the directory containing build tools.
|
||||
-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
|
||||
+var ToolDir = runtime.GOTOOLDIR()
|
||||
|
||||
// IsLocalImport reports whether the import path is
|
||||
// a local import path, like ".", "..", "./foo", or "../foo".
|
||||
diff --git a/src/runtime/extern.go b/src/runtime/extern.go
|
||||
index 441dcd9..a50277e 100644
|
||||
--- a/src/runtime/extern.go
|
||||
+++ b/src/runtime/extern.go
|
||||
@@ -230,6 +230,17 @@ func GOROOT() string {
|
||||
return sys.DefaultGoroot
|
||||
}
|
||||
|
||||
+// GOTOOLDIR returns the root of the Go tree.
|
||||
+// It uses the GOTOOLDIR environment variable, if set,
|
||||
+// or else the root used during the Go build.
|
||||
+func GOTOOLDIR() string {
|
||||
+ s := gogetenv("GOTOOLDIR")
|
||||
+ if s != "" {
|
||||
+ return s
|
||||
+ }
|
||||
+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
|
||||
+}
|
||||
+
|
||||
// Version returns the Go tree's version string.
|
||||
// It is either the commit hash and date at the time of the build or,
|
||||
// when possible, a release tag like "go1.3".
|
||||
@ -1,80 +0,0 @@
|
||||
diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
|
||||
index a4b33c7..9700b75 100644
|
||||
--- a/src/crypto/x509/root_cgo_darwin.go
|
||||
+++ b/src/crypto/x509/root_cgo_darwin.go
|
||||
@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) {
|
||||
import "C"
|
||||
import (
|
||||
"errors"
|
||||
+ "io/ioutil"
|
||||
+ "os"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
func loadSystemRoots() (*CertPool, error) {
|
||||
roots := NewCertPool()
|
||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
||||
+ data, err := ioutil.ReadFile(file)
|
||||
+ if err == nil {
|
||||
+ roots.AppendCertsFromPEM(data)
|
||||
+ return roots, nil
|
||||
+ }
|
||||
+ }
|
||||
|
||||
var data C.CFDataRef = nil
|
||||
err := C.FetchPEMRoots(&data)
|
||||
diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
|
||||
index 66cdb5e..bb28036 100644
|
||||
--- a/src/crypto/x509/root_darwin.go
|
||||
+++ b/src/crypto/x509/root_darwin.go
|
||||
@@ -61,17 +61,25 @@ func execSecurityRoots() (*CertPool, error) {
|
||||
println(fmt.Sprintf("crypto/x509: %d certs have a trust policy", len(hasPolicy)))
|
||||
}
|
||||
|
||||
- cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
|
||||
- data, err := cmd.Output()
|
||||
- if err != nil {
|
||||
- return nil, err
|
||||
- }
|
||||
-
|
||||
var (
|
||||
mu sync.Mutex
|
||||
roots = NewCertPool()
|
||||
numVerified int // number of execs of 'security verify-cert', for debug stats
|
||||
)
|
||||
|
||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
||||
+ data, err := ioutil.ReadFile(file)
|
||||
+ if err == nil {
|
||||
+ roots.AppendCertsFromPEM(data)
|
||||
+ return roots, nil
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
|
||||
+ data, err := cmd.Output()
|
||||
+ if err != nil {
|
||||
+ return nil, err
|
||||
+ }
|
||||
+
|
||||
blockCh := make(chan *pem.Block)
|
||||
var wg sync.WaitGroup
|
||||
diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
|
||||
index 7bcb3d6..3986e1a 100644
|
||||
--- a/src/crypto/x509/root_unix.go
|
||||
+++ b/src/crypto/x509/root_unix.go
|
||||
@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
|
||||
|
||||
func loadSystemRoots() (*CertPool, error) {
|
||||
roots := NewCertPool()
|
||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
||||
+ data, err := ioutil.ReadFile(file)
|
||||
+ if err == nil {
|
||||
+ roots.AppendCertsFromPEM(data)
|
||||
+ return roots, nil
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
var firstErr error
|
||||
for _, file := range certFiles {
|
||||
data, err := ioutil.ReadFile(file)
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go
|
||||
index 0b14725..a7608ce 100644
|
||||
--- a/src/cmd/go/build.go
|
||||
+++ b/src/cmd/go/build.go
|
||||
@@ -2310,6 +2310,7 @@ func (gcToolchain) ld(b *builder, root *action, out string, allactions []*action
|
||||
}
|
||||
}
|
||||
var ldflags []string
|
||||
+ ldflags = append(ldflags, "-s")
|
||||
if buildContext.InstallSuffix != "" {
|
||||
ldflags = append(ldflags, "-installsuffix", buildContext.InstallSuffix)
|
||||
}
|
||||
@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
passthru.rustc = rustc;
|
||||
|
||||
# changes hash of vendor directory otherwise on aarch64
|
||||
dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then "1" else null;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
|
||||
|
||||
@ -833,7 +833,7 @@ self: super: {
|
||||
rev = "8b79823c32e234c161baec67fdf7907952ca62b8";
|
||||
sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz";
|
||||
};
|
||||
}).override { language-c = self.language-c_0_7_0; };
|
||||
}).override { language-c = self.language-c_0_7_2; };
|
||||
|
||||
# Needs pginit to function and pgrep to verify.
|
||||
tmp-postgres = overrideCabal super.tmp-postgres (drv: {
|
||||
|
||||
@ -42,47 +42,6 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Use more recent doctest version to fix build errors.
|
||||
doctest = self.doctest_0_14_0;
|
||||
doctest_0_14_0 = dontCheck super.doctest_0_14_0; # https://github.com/sol/doctest/issues/189
|
||||
QuickCheck = self.QuickCheck_2_11_3; # needed by doctest-0.14.0
|
||||
|
||||
# https://github.com/tmhedberg/here/pull/22
|
||||
here = doJailbreak super.here;
|
||||
|
||||
# https://github.com/pcapriotti/optparse-applicative/issues/288
|
||||
optparse-applicative = dontCheck super.optparse-applicative;
|
||||
|
||||
# https://github.com/haskell/test-framework/issues/35
|
||||
test-framework-quickcheck2 = doJailbreak super.test-framework-quickcheck2;
|
||||
|
||||
# GHC 8.4.x needs newer versions than LTS-10.x offers by default.
|
||||
## haddock: panic! (the 'impossible' happened)
|
||||
## (GHC version 8.4.20180122 for x86_64-unknown-linux):
|
||||
## extractDecl
|
||||
## Ambiguous decl for Arg in class:
|
||||
## class Example e where
|
||||
## type Arg e :: *
|
||||
## {-# MINIMAL evaluateExample #-}
|
||||
## evaluateExample ::
|
||||
## e
|
||||
## -> Params
|
||||
## -> ActionWith Arg e -> IO () -> ProgressCallback -> IO Result
|
||||
## Matches:
|
||||
## []
|
||||
## Call stack:
|
||||
## CallStack (from HasCallStack):
|
||||
## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable
|
||||
## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create
|
||||
## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug
|
||||
hspec = dontHaddock (dontCheck super.hspec_2_4_8); # test suite causes an infinite loop
|
||||
|
||||
## Setup: Encountered missing dependencies:
|
||||
## QuickCheck >=2.3 && <2.10
|
||||
## builder for ‘/nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv’ failed with exit code 1
|
||||
## error: build of ‘/nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv’ failed
|
||||
test-framework = dontCheck self.test-framework_0_8_2_0;
|
||||
|
||||
# Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1:
|
||||
# Distribution/Simple/CCompiler.hs:64:10: error:
|
||||
# • No instance for (Semigroup CDialect)
|
||||
@ -96,34 +55,48 @@ self: super: {
|
||||
## Shadowed:
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
##
|
||||
## • Could not deduce (Semigroup (Dict a))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## from the context: a
|
||||
constraints = super.constraints_0_10;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
##
|
||||
## Issue: https://github.com/sol/doctest/issues/189
|
||||
doctest = overrideCabal super.doctest_0_14_0 (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
##
|
||||
## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory))
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## • Could not deduce (Semigroup (IterT m a))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## from the context: (Monad m, Monoid a)
|
||||
free = super.free_5;
|
||||
|
||||
funcmp = overrideCabal super.funcmp_1_9 (drv: {
|
||||
## Needs bump to a versioned attribute
|
||||
##
|
||||
## Needed for (<>) in prelude
|
||||
## Needs bump to a versioned attribute
|
||||
## Needed for (<>) in prelude
|
||||
funcmp = super.funcmp_1_9;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
hspec = overrideCabal super.hspec_2_4_8 (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=3 && <4.11
|
||||
jailbreak = true;
|
||||
## hspec-core ==2.4.4, hspec-discover ==2.4.4
|
||||
##
|
||||
## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
|
||||
## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
|
||||
## infinite recursion encountered, at undefined position
|
||||
## test suite causes an infinite loop
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: {
|
||||
## Needs bump to a versioned attribute
|
||||
## Setup: Encountered missing dependencies:
|
||||
## QuickCheck >=2.5.1 && <2.11
|
||||
##
|
||||
## • No instance for (Semigroup Summary)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid Summary’
|
||||
## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
|
||||
## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
|
||||
## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11:
|
||||
@ -134,43 +107,49 @@ self: super: {
|
||||
});
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
##
|
||||
## breaks hspec:
|
||||
## Setup: Encountered missing dependencies:
|
||||
## hspec-discover ==2.4.7
|
||||
hspec-discover = super.hspec-discover_2_4_8;
|
||||
|
||||
lens = overrideCabal super.lens_4_16 (drv: {
|
||||
## Needs bump to a versioned attribute
|
||||
##
|
||||
## • Could not deduce (Apply f)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## from the context: (Contravariant f, Applicative f)
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
## /run/current-system/sw/bin/nix-shell: failed to build all dependencies
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
semigroupoids = overrideCabal super.semigroupoids_5_2_2 (drv: {
|
||||
## Needs bump to a versioned attribute
|
||||
##
|
||||
## • Variable not in scope: mappend :: Seq a -> Seq a -> Seq a
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
## /run/current-system/sw/bin/nix-shell: failed to build all dependencies
|
||||
doCheck = false;
|
||||
});
|
||||
## Needs bump to a versioned attribute
|
||||
## Ambiguous occurrence ‘<>’
|
||||
## It could refer to either ‘Prelude.<>’,
|
||||
## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24
|
||||
language-c = super.language-c_0_7_2;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## Setup: Encountered missing dependencies:
|
||||
## free ==4.*, template-haskell >=2.4 && <2.13
|
||||
lens = super.lens_4_16;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
QuickCheck = super.QuickCheck_2_11_3;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## Setup: Encountered missing dependencies:
|
||||
## doctest >=0.11.1 && <0.14
|
||||
semigroupoids = super.semigroupoids_5_2_2;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
##
|
||||
## • No instance for (Semigroup Builder)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid Builder’
|
||||
stringbuilder = super.stringbuilder_0_5_1;
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
##
|
||||
## Issue: https://github.com/haskell/test-framework/issues/35
|
||||
test-framework = overrideCabal super.test-framework_0_8_2_0 (drv: {
|
||||
## • No instance for (Semigroup (TestOptions' Maybe))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid (TestOptions' Maybe)’
|
||||
##
|
||||
## Setup: Encountered missing dependencies:
|
||||
## QuickCheck >=2.3 && <2.10
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
## Needs bump to a versioned attribute
|
||||
## Module ‘Data.Semigroup’ does not export ‘Monoid(..)’
|
||||
## |
|
||||
## 80 | import Data.Semigroup (Semigroup(..), Monoid(..))
|
||||
@ -179,9 +158,8 @@ self: super: {
|
||||
|
||||
## On Hackage:
|
||||
|
||||
## On Hackage, awaiting for import
|
||||
tasty = overrideCabal super.tasty (drv: {
|
||||
## On Hackage, awaiting for import
|
||||
##
|
||||
## • No instance for (Semigroup OptionSet)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid OptionSet’
|
||||
@ -192,9 +170,8 @@ self: super: {
|
||||
|
||||
## Upstreamed
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
haskell-gi = overrideCabal super.haskell-gi (drv: {
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
##
|
||||
## Setup: Encountered missing dependencies:
|
||||
## haskell-gi-base ==0.20.*
|
||||
src = pkgs.fetchFromGitHub {
|
||||
@ -203,18 +180,13 @@ self: super: {
|
||||
rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6";
|
||||
sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr";
|
||||
};
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
## /run/current-system/sw/bin/nix-shell: failed to build all dependencies
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
haskell-gi-base = overrideCabal super.haskell-gi-base (drv: {
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
##
|
||||
## Setup: Encountered missing dependencies:
|
||||
## haskell-gi-base ==0.21.*
|
||||
## cannot build derivation ‘/nix/store/b3d6yr1rzk4hpzg87yk4n5i4321i824f-gi-cairo-1.0.14.drv’: 1 dependencies couldn't be built
|
||||
## cannot build derivation ‘/nix/store/qvnrni6j2sz8z26kmjz1hgxfxvggkvjl-gi-cairo-1.0.14.drv’: 1 dependencies couldn't be built
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "haskell-gi";
|
||||
repo = "haskell-gi";
|
||||
@ -224,9 +196,8 @@ self: super: {
|
||||
prePatch = "cd base; ";
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
haskell-src-exts = overrideCabal super.haskell-src-exts (drv: {
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
##
|
||||
## • Could not deduce (Semigroup (ParseResult m))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## from the context: Monoid m
|
||||
@ -238,9 +209,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: {
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
##
|
||||
## Setup: Encountered missing dependencies:
|
||||
## aeson >=0.9 && <0.12,
|
||||
## base >=4.7 && <4.10,
|
||||
@ -255,9 +225,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
lambdacube-ir = overrideCabal super.lambdacube-ir (drv: {
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
##
|
||||
## Setup: Encountered missing dependencies:
|
||||
## aeson >=0.9 && <0.12, base >=4.8 && <4.10, vector ==0.11.*
|
||||
src = pkgs.fetchFromGitHub {
|
||||
@ -269,9 +238,8 @@ self: super: {
|
||||
prePatch = "cd lambdacube-ir.haskell; ";
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
simple-reflect = overrideCabal super.simple-reflect (drv: {
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
##
|
||||
## • No instance for (Semigroup Expr)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid Expr’
|
||||
@ -283,9 +251,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
singletons = overrideCabal super.singletons (drv: {
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
##
|
||||
## Setup: Encountered missing dependencies:
|
||||
## th-desugar ==1.7.*
|
||||
src = pkgs.fetchFromGitHub {
|
||||
@ -296,9 +263,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
th-desugar = overrideCabal super.th-desugar (drv: {
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
##
|
||||
## • Could not deduce (MonadIO (DsM q))
|
||||
## arising from the 'deriving' clause of a data type declaration
|
||||
## from the context: Quasi q
|
||||
@ -310,9 +276,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
websockets = overrideCabal super.websockets (drv: {
|
||||
## Upstreamed, awaiting a Hackage release
|
||||
##
|
||||
## • No instance for (Semigroup SizeLimit)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid SizeLimit’
|
||||
@ -327,9 +292,8 @@ self: super: {
|
||||
|
||||
## Unmerged
|
||||
|
||||
## Unmerged. PR: https://github.com/lpsmith/blaze-builder/pull/10
|
||||
blaze-builder = overrideCabal super.blaze-builder (drv: {
|
||||
## Unmerged. PR: https://github.com/lpsmith/blaze-builder/pull/10
|
||||
##
|
||||
## • No instance for (Semigroup Poke)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid Poke’
|
||||
@ -341,9 +305,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3
|
||||
bytestring-trie = overrideCabal super.bytestring-trie (drv: {
|
||||
## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3
|
||||
##
|
||||
## • Could not deduce (Semigroup (Trie a))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## from the context: Monoid a
|
||||
@ -364,9 +327,8 @@ self: super: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-or ];
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233
|
||||
gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: {
|
||||
## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233
|
||||
##
|
||||
## Setup: Encountered missing dependencies:
|
||||
## Cabal >=1.24.0.0 && <2.1
|
||||
src = pkgs.fetchFromGitHub {
|
||||
@ -378,9 +340,8 @@ self: super: {
|
||||
prePatch = "cd tools; ";
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46
|
||||
hashtables = overrideCabal super.hashtables (drv: {
|
||||
## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46
|
||||
##
|
||||
## • No instance for (Semigroup Slot)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid Slot’
|
||||
@ -392,41 +353,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
language-c = overrideCabal super.language-c (drv: {
|
||||
## Unmerged. PR: https://github.com/visq/language-c/pull/45
|
||||
##
|
||||
## Ambiguous occurrence ‘<>’
|
||||
## It could refer to either ‘Prelude.<>’,
|
||||
## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "deepfire";
|
||||
repo = "language-c";
|
||||
rev = "03b120c64c12946d134017f4922b55c6ab4f52f8";
|
||||
sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r";
|
||||
};
|
||||
## /bin/sh: cabal: command not found
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
language-c_0_7_0 = overrideCabal super.language-c_0_7_0 (drv: {
|
||||
## Unmerged. PR: https://github.com/visq/language-c/pull/45
|
||||
##
|
||||
## Ambiguous occurrence ‘<>’
|
||||
## It could refer to either ‘Prelude.<>’,
|
||||
## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "deepfire";
|
||||
repo = "language-c";
|
||||
rev = "03b120c64c12946d134017f4922b55c6ab4f52f8";
|
||||
sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r";
|
||||
};
|
||||
## /bin/sh: cabal: command not found
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3
|
||||
monadplus = overrideCabal super.monadplus (drv: {
|
||||
## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3
|
||||
##
|
||||
## • No instance for (Semigroup (Partial a b))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid (Partial a b)’
|
||||
@ -438,9 +366,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/reflex-frp/reflex/pull/158
|
||||
reflex = overrideCabal super.reflex (drv: {
|
||||
## Unmerged. PR: https://github.com/reflex-frp/reflex/pull/158
|
||||
##
|
||||
## • Could not deduce (Semigroup (Event t a))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## from the context: (Semigroup a, Reflex t)
|
||||
@ -466,9 +393,8 @@ self: super: {
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-default self.haskell-src-exts self.lens self.monad-control self.prim-uniq self.reflection self.split self.template-haskell self.unbounded-delays ];
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13
|
||||
regex-tdfa = overrideCabal super.regex-tdfa (drv: {
|
||||
## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13
|
||||
##
|
||||
## • No instance for (Semigroup (CharMap a))
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid (CharMap a)’
|
||||
@ -480,9 +406,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/vincenthz/hs-securemem/pull/12
|
||||
securemem = overrideCabal super.securemem (drv: {
|
||||
## Unmerged. PR: https://github.com/vincenthz/hs-securemem/pull/12
|
||||
##
|
||||
## • No instance for (Semigroup SecureMem)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid SecureMem’
|
||||
@ -494,9 +419,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/bos/text-format/pull/21
|
||||
text-format = overrideCabal super.text-format (drv: {
|
||||
## Unmerged. PR: https://github.com/bos/text-format/pull/21
|
||||
##
|
||||
## • No instance for (Semigroup Format)
|
||||
## arising from the superclasses of an instance declaration
|
||||
## • In the instance declaration for ‘Monoid Format’
|
||||
@ -508,9 +432,8 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17
|
||||
wl-pprint-text = overrideCabal super.wl-pprint-text (drv: {
|
||||
## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17
|
||||
##
|
||||
## Ambiguous occurrence ‘<>’
|
||||
## It could refer to either ‘PP.<>’,
|
||||
## imported from ‘Prelude.Compat’ at Text/PrettyPrint/Leijen/Text/Monadic.hs:73:1-36
|
||||
@ -549,13 +472,6 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
bytes = overrideCabal super.bytes (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
## /run/current-system/sw/bin/nix-shell: failed to build all dependencies
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
cabal-doctest = overrideCabal super.cabal-doctest (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## Cabal >=1.10 && <2.1, base >=4.3 && <4.11
|
||||
@ -564,26 +480,17 @@ self: super: {
|
||||
|
||||
ChasingBottoms = overrideCabal super.ChasingBottoms (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.2 && <4.11
|
||||
## QuickCheck >=2.3 && <2.11, base >=4.2 && <4.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
comonad = overrideCabal super.comonad (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
## /run/current-system/sw/bin/nix-shell: failed to build all dependencies
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
deepseq-generics = overrideCabal super.deepseq-generics (drv: {
|
||||
## https://github.com/haskell-hvr/deepseq-generics/pull/4
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
distributive = overrideCabal super.distributive (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
## /run/current-system/sw/bin/nix-shell: failed to build all dependencies
|
||||
doctest_0_14_0 = overrideCabal super.doctest_0_14_0 (drv: {
|
||||
## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory))
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
@ -611,6 +518,13 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
here = overrideCabal super.here (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
## https://github.com/tmhedberg/here/pull/22
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
integer-logarithms = overrideCabal super.integer-logarithms (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.3 && <4.11
|
||||
@ -641,10 +555,9 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
linear = overrideCabal super.linear (drv: {
|
||||
megaparsec = overrideCabal super.megaparsec (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
## /run/current-system/sw/bin/nix-shell: failed to build all dependencies
|
||||
## QuickCheck >=2.7 && <2.11
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
@ -654,6 +567,13 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
## Issue: https://github.com/pcapriotti/optparse-applicative/issues/288
|
||||
optparse-applicative = overrideCabal super.optparse-applicative (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## QuickCheck >=2.8 && <2.11
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
quickcheck-instances = overrideCabal super.quickcheck-instances (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
@ -666,6 +586,12 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
scientific = overrideCabal super.scientific (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## QuickCheck >=2.5 && <2.11
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
@ -678,6 +604,13 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
## Issue: https://github.com/haskell/test-framework/issues/35
|
||||
test-framework-quickcheck2 = overrideCabal super.test-framework-quickcheck2 (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## QuickCheck >=2.4 && <2.11
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
text-lens = overrideCabal super.text-lens (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.9.0.0 && <4.10,
|
||||
@ -699,13 +632,6 @@ self: super: {
|
||||
jailbreak = true;
|
||||
});
|
||||
|
||||
trifecta = overrideCabal super.trifecta (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## ghc >=7.0 && <8.4
|
||||
## /run/current-system/sw/bin/nix-shell: failed to build all dependencies
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
unliftio-core = overrideCabal super.unliftio-core (drv: {
|
||||
## Setup: Encountered missing dependencies:
|
||||
## base >=4.5 && <4.11
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, libpng, libtool, mpfr, openssl, pango, poppler
|
||||
, readline, sqlite
|
||||
, disableDocs ? false
|
||||
, CoreFoundation
|
||||
}:
|
||||
|
||||
let
|
||||
@ -47,9 +48,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
FONTCONFIG_FILE = fontsConf;
|
||||
LD_LIBRARY_PATH = libPath;
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
|
||||
NIX_LDFLAGS = stdenv.lib.concatStringsSep " " [
|
||||
(stdenv.lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
|
||||
(stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
|
||||
];
|
||||
|
||||
buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ];
|
||||
buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ];
|
||||
|
||||
preConfigure = ''
|
||||
unset AR
|
||||
|
||||
@ -14,6 +14,6 @@ racket.overrideAttrs (oldAttrs: rec {
|
||||
as well as libraries that live in collections. In particular, raco
|
||||
and the pkg library are still bundled.
|
||||
'';
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,37 +1,55 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, intltool
|
||||
, xmlto, docbook_xsl, docbook_xml_dtd_45
|
||||
, glib, xapian, libxml2, libyaml, gobjectIntrospection
|
||||
{ stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext
|
||||
, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
|
||||
, libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection
|
||||
, pcre, itstool
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "appstream-${version}";
|
||||
version = "0.10.6";
|
||||
version = "0.11.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ximion";
|
||||
repo = "appstream";
|
||||
rev = "APPSTREAM_0_10_6";
|
||||
sha256 = "1fg7zxx2qhkyj7fmcpwbf80b72d16kyi8dadi111kf00sgzfbiyy";
|
||||
owner = "ximion";
|
||||
repo = "appstream";
|
||||
rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# drop this in version 0.11.9 and above
|
||||
(fetchpatch {
|
||||
name = "define-location-and-soname.patch";
|
||||
url = "https://github.com/ximion/appstream/commit/3e58f9c9.patch";
|
||||
sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake pkgconfig gettext intltool
|
||||
xmlto docbook_xsl docbook_xml_dtd_45
|
||||
meson ninja pkgconfig gettext
|
||||
libxslt xmlto docbook_xsl docbook_xml_dtd_45
|
||||
gobjectIntrospection itstool
|
||||
];
|
||||
|
||||
buildInputs = [ pcre glib xapian libxml2 libyaml ];
|
||||
buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ];
|
||||
|
||||
cmakeFlags = ''
|
||||
-DSTEMMING=off
|
||||
'';
|
||||
prePatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace /usr/include ${libstemmer}/include
|
||||
|
||||
substituteInPlace data/meson.build \
|
||||
--replace /etc $out/etc
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Dapidocs=false"
|
||||
"-Ddocs=false"
|
||||
"-Dgir=false"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Software metadata handling library";
|
||||
homepage = https://www.freedesktop.org/wiki/Distributions/AppStream/;
|
||||
longDescription =
|
||||
''
|
||||
longDescription = ''
|
||||
AppStream is a cross-distro effort for building Software-Center applications
|
||||
and enhancing metadata provided by software components. It provides
|
||||
specifications for meta-information which is shipped by upstream projects and
|
||||
|
||||
25
pkgs/development/libraries/appstream/qt.nix
Normal file
25
pkgs/development/libraries/appstream/qt.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, appstream, qtbase, qttools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "appstream-qt-${version}";
|
||||
inherit (appstream) version src patches prePatch;
|
||||
|
||||
buildInputs = appstream.buildInputs ++ [ appstream qtbase ];
|
||||
|
||||
nativeBuildInputs = appstream.nativeBuildInputs ++ [ qttools ];
|
||||
|
||||
mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/{bin,etc,include/appstream,lib/pkgconfig,lib/libappstream.so*,share}
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
patchelf --add-needed ${appstream}/lib/libappstream.so.4 \
|
||||
$out/lib/libAppStreamQt.so
|
||||
'';
|
||||
|
||||
meta = appstream.meta // {
|
||||
description = "Software metadata handling library - Qt";
|
||||
};
|
||||
}
|
||||
@ -1,18 +1,26 @@
|
||||
# To use this package with a CMake and pkg-config build:
|
||||
# pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp)
|
||||
# add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc)
|
||||
{ stdenv, fetchFromGitHub, cmake, gtest }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "easyloggingpp-${version}";
|
||||
version = "9.95.0";
|
||||
version = "9.96.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "muflihun";
|
||||
repo = "easyloggingpp";
|
||||
rev = "v${version}";
|
||||
sha256 = "0gzmznw6ffag9x55lixxffy6x7mvb7691x0md4q9rbh88zkws7kq";
|
||||
sha256 = "134arh13rksfsxa80h6xw104458ihzp1mpblz5sprx5gxkq7yqfv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [cmake];
|
||||
buildInputs = [gtest];
|
||||
cmakeFlags = [ "-Dtest=ON" "-Dbuild_static_lib=ON"];
|
||||
cmakeFlags = [ "-Dtest=ON" ];
|
||||
NIX_CFLAGS_COMPILE = "-std=c++11" +
|
||||
stdenv.lib.optionalString stdenv.isLinux " -pthread";
|
||||
postInstall = ''
|
||||
mkdir -p $out/include
|
||||
cp ../src/easylogging++.cc $out/include
|
||||
'';
|
||||
meta = {
|
||||
description = "C++ logging library";
|
||||
homepage = https://muflihun.github.io/easyloggingpp/;
|
||||
|
||||
@ -17,7 +17,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
postPatch = ''
|
||||
postConfigure = ''
|
||||
find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \;
|
||||
'';
|
||||
|
||||
|
||||
4
pkgs/development/libraries/icu/60.nix
Normal file
4
pkgs/development/libraries/icu/60.nix
Normal file
@ -0,0 +1,4 @@
|
||||
import ./base.nix {
|
||||
version = "60.2";
|
||||
sha256 = "065l3n0q9wqaw8dz20x82srshhm6i987fr9ync5xf9mr6n7ylwzh";
|
||||
}
|
||||
@ -9,16 +9,16 @@ assert javaSupport -> jdk != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libguestfs-${version}";
|
||||
version = "1.36.3";
|
||||
version = "1.38.0";
|
||||
|
||||
appliance = fetchurl {
|
||||
url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz";
|
||||
sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125";
|
||||
url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz";
|
||||
sha256 = "05481qxgidakga871yb5rgpyci2jaxmplmkh6y79anfh5m19nzhy";
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://libguestfs.org/download/1.36-stable/libguestfs-${version}.tar.gz";
|
||||
sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m";
|
||||
url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
|
||||
sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
# some scripts hardcore /usr/bin/env which is not available in the build env
|
||||
patchShebangs .
|
||||
'';
|
||||
configureFlags = [ "--disable-appliance" "--disable-daemon" ]
|
||||
configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ]
|
||||
++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ];
|
||||
patches = [ ./libguestfs-syms.patch ];
|
||||
NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libsodium libmsgpack ncurses
|
||||
libsodium libmsgpack ncurses libconfig
|
||||
] ++ stdenv.lib.optionals (!stdenv.isArm) [
|
||||
libopus
|
||||
libvpx
|
||||
|
||||
@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
# Remove this mirror on next upgrade, it's only needed because upstream took ncurses-6.0-20171125.tgz down!
|
||||
"http://bld1.alpinelinux.org/distfiles/v3.5/ncurses-${version}.tgz"
|
||||
|
||||
"ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz"
|
||||
];
|
||||
|
||||
102
pkgs/development/libraries/postgis/2.3.nix
Normal file
102
pkgs/development/libraries/postgis/2.3.nix
Normal file
@ -0,0 +1,102 @@
|
||||
{ fetchurl
|
||||
, stdenv
|
||||
, perl
|
||||
, libxml2
|
||||
, postgresql
|
||||
, geos
|
||||
, proj
|
||||
, flex
|
||||
, gdal
|
||||
, json_c
|
||||
, pkgconfig
|
||||
, file
|
||||
}:
|
||||
|
||||
/*
|
||||
|
||||
### NixOS - usage:
|
||||
==================
|
||||
|
||||
services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ];
|
||||
|
||||
|
||||
### important Postgis implementation details:
|
||||
=============================================
|
||||
|
||||
Postgis provides a shared library implementing many operations. They are
|
||||
exposed to the Postgres SQL interpreter by special SQL queries eg:
|
||||
|
||||
CREATE FUNCTION [...]
|
||||
AS '[..]liblwgeom', 'lwhistogram2d_in' LANGUAGE 'C' IMMUTABLE STRICT; -- WITH (isstrict);
|
||||
|
||||
where liblwgeom is the shared library.
|
||||
Postgis < 1.5 used absolute paths, in NixOS $libdir is always used.
|
||||
|
||||
Thus if you want to use postgresql dumps which were created by non NixOS
|
||||
systems you have to adopt the library path.
|
||||
|
||||
|
||||
### TODO:
|
||||
=========
|
||||
the bin commands to have gtk gui:
|
||||
*/
|
||||
|
||||
|
||||
let
|
||||
version = "2.3.1";
|
||||
sha256 = "0xd21h2k6x3i1b3z6pgm3pmkfpxm6irxd5wbx68acjndjgd6p3ac";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "postgis-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
# don't pass these vars to the builder
|
||||
removeAttrs = ["sql_comments" "sql_srcs"];
|
||||
|
||||
# create aliases for all commands adding version information
|
||||
postInstall = ''
|
||||
sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done )
|
||||
|
||||
for prog in $out/bin/*; do # */
|
||||
ln -s $prog $prog-${version}
|
||||
done
|
||||
|
||||
cp -r doc $out
|
||||
'';
|
||||
|
||||
buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ];
|
||||
|
||||
sql_comments = "postgis_comments.sql";
|
||||
|
||||
sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"];
|
||||
|
||||
# postgis config directory assumes /include /lib from the same root for json-c library
|
||||
NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib";
|
||||
|
||||
dontDisableStatic = true;
|
||||
preConfigure = ''
|
||||
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
|
||||
configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
|
||||
makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin"
|
||||
'';
|
||||
postConfigure = ''
|
||||
sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;
|
||||
s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/loader/Makefile";
|
||||
sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/scripts/python/Makefile";
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Geographic Objects for PostgreSQL";
|
||||
homepage = http://postgis.refractions.net;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,23 @@
|
||||
args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, proj, flex, gdal, json_c, pkgconfig, file, ...}:
|
||||
{ fetchurl
|
||||
, stdenv
|
||||
, perl
|
||||
, libxml2
|
||||
, postgresql
|
||||
, geos
|
||||
, proj
|
||||
, flex
|
||||
, gdal
|
||||
, json_c
|
||||
, pkgconfig
|
||||
, file
|
||||
}:
|
||||
|
||||
/*
|
||||
|
||||
### NixOS - usage:
|
||||
==================
|
||||
|
||||
services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_3_1 ];
|
||||
services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ];
|
||||
|
||||
|
||||
### important Postgis implementation details:
|
||||
@ -31,108 +43,60 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p
|
||||
|
||||
|
||||
let
|
||||
pgDerivationBase = composableDerivation.composableDerivation {} ( fix :
|
||||
version = "2.4.0";
|
||||
sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "postgis-${version}";
|
||||
|
||||
let version = fix.fixed.version; in {
|
||||
src = fetchurl {
|
||||
url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
name = "postgis-${version}";
|
||||
# don't pass these vars to the builder
|
||||
removeAttrs = ["sql_comments" "sql_srcs"];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://postgis.refractions.net/download/postgis-${fix.fixed.version}.tar.gz";
|
||||
inherit (fix.fixed) sha256;
|
||||
};
|
||||
# create aliases for all commands adding version information
|
||||
postInstall = ''
|
||||
sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done )
|
||||
|
||||
# don't pass these vars to the builder
|
||||
removeAttrs = ["hash" "sql_comments" "sql_srcs"];
|
||||
for prog in $out/bin/*; do # */
|
||||
ln -s $prog $prog-${version}
|
||||
done
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin"
|
||||
makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin"
|
||||
'';
|
||||
cp -r doc $out
|
||||
'';
|
||||
|
||||
# create aliases for all commands adding version information
|
||||
postInstall = ''
|
||||
buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ];
|
||||
|
||||
sql_srcs=$(for sql in ${builtins.toString fix.fixed.sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done )
|
||||
sql_comments = "postgis_comments.sql";
|
||||
|
||||
for prog in $out/bin/*; do # */
|
||||
ln -s $prog $prog-${version}
|
||||
done
|
||||
sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"];
|
||||
|
||||
cp -r doc $out
|
||||
'';
|
||||
|
||||
buildInputs = [libxml2 postgresql geos proj perl];
|
||||
|
||||
sql_comments = "postgis_comments.sql";
|
||||
|
||||
meta = {
|
||||
description = "Geographic Objects for PostgreSQL";
|
||||
homepage = http://postgis.refractions.net;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [stdenv.lib.maintainers.marcweber];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
});
|
||||
|
||||
pgDerivationBaseNewer = pgDerivationBase.merge (fix: {
|
||||
src = fetchurl {
|
||||
url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString fix.fixed.version}.tar.gz";
|
||||
inherit (fix.fixed) sha256;
|
||||
};
|
||||
});
|
||||
|
||||
in rec {
|
||||
|
||||
v_2_3_1 = pgDerivationBaseNewer.merge ( fix : {
|
||||
version = "2.3.1";
|
||||
sha256 = "0xd21h2k6x3i1b3z6pgm3pmkfpxm6irxd5wbx68acjndjgd6p3ac";
|
||||
sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"];
|
||||
builtInputs = [gdal json_c pkgconfig];
|
||||
|
||||
# postgis config directory assumes /include /lib from the same root for json-c library
|
||||
NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib";
|
||||
|
||||
dontDisableStatic = true;
|
||||
preConfigure = ''
|
||||
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
|
||||
configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
|
||||
'';
|
||||
postConfigure = ''
|
||||
sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;
|
||||
s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/loader/Makefile";
|
||||
sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/scripts/python/Makefile";
|
||||
'';
|
||||
});
|
||||
|
||||
v_2_4_0 = pgDerivationBaseNewer.merge ( fix : {
|
||||
version = "2.4.0";
|
||||
sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29";
|
||||
sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"];
|
||||
builtInputs = [gdal json_c pkgconfig];
|
||||
|
||||
# postgis config directory assumes /include /lib from the same root for json-c library
|
||||
NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib";
|
||||
|
||||
dontDisableStatic = true;
|
||||
preConfigure = ''
|
||||
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
|
||||
configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
|
||||
'';
|
||||
postConfigure = ''
|
||||
sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;
|
||||
s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/loader/Makefile";
|
||||
sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/scripts/python/Makefile";
|
||||
'';
|
||||
});
|
||||
# postgis config directory assumes /include /lib from the same root for json-c library
|
||||
NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib";
|
||||
|
||||
dontDisableStatic = true;
|
||||
preConfigure = ''
|
||||
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
|
||||
configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
|
||||
makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin"
|
||||
'';
|
||||
postConfigure = ''
|
||||
sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;
|
||||
s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/loader/Makefile";
|
||||
sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g
|
||||
" \
|
||||
"raster/scripts/python/Makefile";
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Geographic Objects for PostgreSQL";
|
||||
homepage = http://postgis.refractions.net;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ stdenv.mkDerivation {
|
||||
createFindlibDestdir = true;
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile.in --replace 'MACHDEPCC=gcc' 'MACHDEPCC=$(CC)'
|
||||
export FORCE_PERL_PREFIX=1
|
||||
'';
|
||||
prefixKey = "-prefix=";
|
||||
|
||||
@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
|
||||
# Fix build for recent ncurses versions
|
||||
NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
24
pkgs/development/python-modules/dmenu/default.nix
Normal file
24
pkgs/development/python-modules/dmenu/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ buildPythonPackage, lib, fetchPypi, dmenu }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dmenu-python";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "dmenu";
|
||||
sha256 = "06v2fq0ciallbib7sbk4kncj0n3gdqp1kz8n5k2669x49wyh34wm";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dmenu ];
|
||||
|
||||
# No tests existing
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A Python wrapper for dmenu";
|
||||
homepage = http://dmenu.readthedocs.io;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.nico202 ];
|
||||
};
|
||||
}
|
||||
@ -1,12 +1,16 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k, contextlib2, blinker }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
|
||||
, contextlib2, blinker
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "raven";
|
||||
version = "6.5.0";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "84da75114739191bdf2388f296ffd6177e83567a7fbaf2701e034ad6026e4f3b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "raven-python";
|
||||
rev = version;
|
||||
sha256 = "184wpr0zdcm260pxqll9kpmp2ywisn75k8pdm8gc6xmk740in1hj";
|
||||
};
|
||||
|
||||
# way too many dependencies to run tests
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, protobuf, hidapi, ecdsa, mnemonic
|
||||
, requests
|
||||
{ lib, fetchPypi, buildPythonPackage,
|
||||
protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -12,9 +12,7 @@ buildPythonPackage rec {
|
||||
sha256 = "2dd01e11d669cb8f5e40fcf1748bcabc41fb5f41edb010fc807dc3088f9bd7de";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ protobuf hidapi requests mnemonic ];
|
||||
|
||||
buildInputs = [ ecdsa ];
|
||||
propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 ];
|
||||
|
||||
# There are no actual tests: "ImportError: No module named tests"
|
||||
doCheck = false;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
|
||||
|
||||
let
|
||||
version = "1.7.11";
|
||||
version = "1.8.2";
|
||||
name = "electron-${version}";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.system}";
|
||||
@ -10,8 +10,8 @@ let
|
||||
description = "Cross platform desktop application shell";
|
||||
homepage = https://github.com/electron/electron;
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.travisbhartwell ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" ];
|
||||
maintainers = with maintainers; [ travisbhartwell manveru ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ];
|
||||
};
|
||||
|
||||
linux = {
|
||||
@ -20,15 +20,19 @@ let
|
||||
src = {
|
||||
i686-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
|
||||
sha256 = "0mxrayczs6fc2a53fzfbgs88l71wm7hadq9ir510kicakblmdbyx";
|
||||
sha256 = "12q5h6gh9zzhndg6yfka821rblq3l80d2qzqrq4nbq6rlsshjp9d";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
|
||||
sha256 = "0v22xhzbq9lcbc83laqs45pbx8gzv648qfkj01pxfsmv3lb4myrl";
|
||||
sha256 = "07ggq9wgfz3z5z0lwzzgs6im0qs83pz0pcfwr0r42zgmwg7j78b8";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
|
||||
sha256 = "02n2y69zwzacigqp6f4vg47cmjzf8gvbbispmzkg3pnzk4qc9473";
|
||||
sha256 = "1b0p5x9zigyd6d8gz2hxc4scllrpnbx1dzzwlsvw6ilqbj1ypc7i";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
|
||||
sha256 = "0k4np2d4y15x1qfay8y9m8v9y223vdpbq5fdxa3ywbbyf8j361zd";
|
||||
};
|
||||
}.${stdenv.system} or throwSystem;
|
||||
|
||||
@ -56,7 +60,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
|
||||
sha256 = "19kfb09ap780ayk7miqfr6gmba9rd10f9q9aphj35yk7cl22znbr";
|
||||
sha256 = "0pq587vr1i87jdwcpbf6n136i9dp6i39dp5s95kihnm9qglxr42b";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "lint-${version}";
|
||||
version = "20160428-${stdenv.lib.strings.substring 0 7 rev}";
|
||||
rev = "c7bacac2b21ca01afa1dee0acf64df3ce047c28f";
|
||||
version = "20180208-${stdenv.lib.strings.substring 0 7 rev}";
|
||||
rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d";
|
||||
|
||||
goPackagePath = "github.com/golang/lint";
|
||||
excludedPackages = "testdata";
|
||||
@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/golang/lint";
|
||||
sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg";
|
||||
sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/tools";
|
||||
rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
|
||||
sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
|
||||
rev = "66487607e2081c7c2af2281c62c14ee000d5024b";
|
||||
sha256 = "03wiraqkms4jb5gi7vmp52mpmp4av08yw4gr2nk31c2rnhyd3jv4";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "leaps-${version}";
|
||||
version = "0.5.1";
|
||||
version = "0.9.0";
|
||||
|
||||
goPackagePath = "github.com/jeffail/leaps";
|
||||
goPackagePath = "github.com/Jeffail/leaps";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffail";
|
||||
owner = "Jeffail";
|
||||
repo = "leaps";
|
||||
sha256 = "0w63y777h5qc8fwnkrbawn3an9px0l1zz3649x0n8lhk125fvchj";
|
||||
sha256 = "1bzas7ixyfsfh81lnvplhx59yghkmnmy5p7jv9rnwp219dwbylpz";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -1,94 +1,185 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/amir/raidman";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/amir/raidman";
|
||||
rev = "91c20f3f475cab75bb40ad7951d9bbdde357ade7";
|
||||
sha256 = "0pkqy5hzjkk04wj1ljq8jsyla358ilxi4lkmvkk73b3dh2wcqvpp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/elazarl/go-bindata-assetfs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/elazarl/go-bindata-assetfs";
|
||||
rev = "57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2";
|
||||
sha256 = "1za29pa15y2xsa1lza97jlkax9qj93ks4a2j58xzmay6rczfkb9i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/garyburd/redigo";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/garyburd/redigo";
|
||||
rev = "8873b2f1995f59d4bcdd2b0dc9858e2cb9bf0c13";
|
||||
sha256 = "1lzhb99pcwwf5ddcs0bw00fwf9m1d0k7b92fqz2a01jlij4pm5l2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/go-sql-driver/mysql";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-sql-driver/mysql";
|
||||
rev = "7ebe0a500653eeb1859664bed5e48dec1e164e73";
|
||||
sha256 = "1gyan3lyn2j00di9haq7zm3zcwckn922iigx3fvml6s2bsp6ljas";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "bf531ff1a004f24ee53329dfd5ce0b41bfdc17df";
|
||||
sha256 = "10lnvmq28jp2wk1xc32mdk4745lal2bmdvbjirckb9wlv07zzzf0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jeffail/gabs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jeffail/gabs";
|
||||
rev = "ee1575a53249b51d636e62464ca43a13030afdb5";
|
||||
sha256 = "0svv57193n8m86r7v7n0y9lny0p6nzr7xvz98va87h00mg146351";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jeffail/util";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jeffail/util";
|
||||
rev = "48ada8ff9fcae546b5986f066720daa9033ad523";
|
||||
sha256 = "0k8zz7gdv4hb691fdyb5mhlixppcq8x4ny84fanflypnv258a3i0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/lib/pq";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/lib/pq";
|
||||
rev = "3cd0097429be7d611bb644ef85b42bfb102ceea4";
|
||||
sha256 = "1q7qfzyfgjk6rvid548r43fi4jhvsh4dhfvfjbp2pz4xqsvpsm7a";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/satori/go.uuid";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/satori/go.uuid";
|
||||
rev = "f9ab0dce87d815821e221626b772e3475a0d2749";
|
||||
sha256 = "0z18j6zxq9kw4lgcpmhh3k7jrb9gy1lx252xz5qhs4ywi9w77xwi";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf";
|
||||
sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
# file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep)
|
||||
[
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/Azure/go-autorest";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Azure/go-autorest";
|
||||
rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722";
|
||||
sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/Jeffail/gabs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Jeffail/gabs";
|
||||
rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c";
|
||||
sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/amir/raidman";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/amir/raidman";
|
||||
rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b";
|
||||
sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/azure/azure-sdk-for-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/azure/azure-sdk-for-go";
|
||||
rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f";
|
||||
sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/cenkalti/backoff";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cenkalti/backoff";
|
||||
rev = "61153c768f31ee5f130071d08fc82b85208528de";
|
||||
sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/dgrijalva/jwt-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/dgrijalva/jwt-go";
|
||||
rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29";
|
||||
sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/elazarl/go-bindata-assetfs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/elazarl/go-bindata-assetfs";
|
||||
rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43";
|
||||
sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/garyburd/redigo";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/garyburd/redigo";
|
||||
rev = "d1ed5c67e5794de818ea85e6b522fda02623a484";
|
||||
sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/go-sql-driver/mysql";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-sql-driver/mysql";
|
||||
rev = "a0583e0143b1624142adab07e0e97fe106d99561";
|
||||
sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "925541529c1fa6821df4e44ce2723319eb2be768";
|
||||
sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/websocket";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/websocket";
|
||||
rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
|
||||
sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/kardianos/osext";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kardianos/osext";
|
||||
rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
|
||||
sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/lib/pq";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/lib/pq";
|
||||
rev = "88edab0803230a3898347e77b474f8c1820a1f20";
|
||||
sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/marstr/guid";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/marstr/guid";
|
||||
rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca";
|
||||
sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/satori/go.uuid";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/satori/go.uuid";
|
||||
rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
|
||||
sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb";
|
||||
sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "gopkg.in/alexcesaro/statsd.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/alexcesaro/statsd.v2";
|
||||
rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90";
|
||||
sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4";
|
||||
sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
|
||||
};
|
||||
}
|
||||
|
||||
]
|
||||
@ -1,10 +1,13 @@
|
||||
{ stdenv, fetchzip, ocaml, opam }:
|
||||
{ stdenv, fetchFromGitHub, ocaml, opam }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "jbuilder-1.0+beta14";
|
||||
src = fetchzip {
|
||||
url = http://github.com/janestreet/jbuilder/archive/1.0+beta14.tar.gz;
|
||||
sha256 = "0vq4chqp7bm3rd5n6ry1j1ia6xqlz463059ljd1jmawa4dcyilvl";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jbuilder-${version}";
|
||||
version = "1.0+beta18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml";
|
||||
repo = "dune";
|
||||
rev = "${version}";
|
||||
sha256 = "1xw4i5qd2ndnddzb8b14fb52qxnjpr3lr9wx3mprv4f294kdg0l6";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml ];
|
||||
|
||||
@ -14,6 +14,9 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
# Fix build for recent ncurses versions
|
||||
NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ];
|
||||
|
||||
meta = {
|
||||
homepage = http://rogue.rogueforge.net/rogue-5-4/;
|
||||
description = "The final version of the original Rogue game developed for the UNIX operating system";
|
||||
|
||||
@ -58,8 +58,8 @@ in rec {
|
||||
|
||||
winetricks = fetchFromGitHub rec {
|
||||
# https://github.com/Winetricks/winetricks/releases
|
||||
version = "20171222";
|
||||
sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9";
|
||||
version = "20180217";
|
||||
sha256 = "0k3vlsqjbzys5dfbxwgw76al8gh44jsjqkc06va103frkrgjxvc5";
|
||||
owner = "Winetricks";
|
||||
repo = "winetricks";
|
||||
rev = version;
|
||||
|
||||
@ -33,14 +33,14 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "busybox-1.28.0";
|
||||
name = "busybox-1.28.1";
|
||||
|
||||
# Note to whoever is updating busybox: please verify that:
|
||||
# nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
|
||||
# still builds after the update.
|
||||
src = fetchurl {
|
||||
url = "http://busybox.net/downloads/${name}.tar.bz2";
|
||||
sha256 = "1701carjf02y7r3djm1yvyd5kzrcxm4szinp7agfv7fmvfvm6ib0";
|
||||
sha256 = "0bk52cxxlya5hg9va87snr9caz9ppdrpdyjwrnbwamhi64y1vzlq";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
{ stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig
|
||||
, dbus, glib, systemd }:
|
||||
, dbus, glib, linuxHeaders, systemd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dbus-broker-${version}";
|
||||
version = "9";
|
||||
version = "11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bus1";
|
||||
repo = "dbus-broker";
|
||||
rev = "v${version}";
|
||||
sha256 = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab";
|
||||
sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ docutils meson ninja pkgconfig ];
|
||||
|
||||
buildInputs = [ dbus glib systemd ];
|
||||
buildInputs = [ dbus glib linuxHeaders systemd ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 ../README $out/share/doc/dbus-broker/README
|
||||
|
||||
sed -i $out/lib/systemd/{system,user}/dbus-broker.service \
|
||||
-e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,'
|
||||
'';
|
||||
|
||||
checkPhase = "ninja test";
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user