mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
Merge branch 'master' into staging
Haskell rebuild. Hydra: ?compare=1430378
This commit is contained in:
Vladimír Čunát
commit
2fb4606f38
|
|
@ -1,8 +1,8 @@
|
|||
{ lib }:
|
||||
let
|
||||
inherit (lib) lists;
|
||||
parse = import ./parse.nix { inherit lib; };
|
||||
inherit (import ./inspect.nix { inherit lib; }) predicates;
|
||||
inherit (lib.systems) parse;
|
||||
inherit (lib.systems.inspect) predicates;
|
||||
inherit (lib.attrsets) matchAttrs;
|
||||
|
||||
all = [
|
||||
|
|
|
|||
|
|
@ -4,6 +4,16 @@
|
|||
# http://llvm.org/docs/doxygen/html/Triple_8cpp_source.html especially
|
||||
# Triple::normalize. Parsing should essentially act as a more conservative
|
||||
# version of that last function.
|
||||
#
|
||||
# Most of the types below come in "open" and "closed" pairs. The open ones
|
||||
# specify what information we need to know about systems in general, and the
|
||||
# closed ones are sub-types representing the whitelist of systems we support in
|
||||
# practice.
|
||||
#
|
||||
# Code in the remainder of nixpkgs shouldn't rely on the closed ones in
|
||||
# e.g. exhaustive cases. Its more a sanity check to make sure nobody defines
|
||||
# systems that overlap with existing ones and won't notice something amiss.
|
||||
#
|
||||
{ lib }:
|
||||
with lib.lists;
|
||||
with lib.types;
|
||||
|
|
@ -11,29 +21,52 @@ with lib.attrsets;
|
|||
with (import ./inspect.nix { inherit lib; }).predicates;
|
||||
|
||||
let
|
||||
setTypesAssert = type: pred:
|
||||
inherit (lib.options) mergeOneOption;
|
||||
|
||||
setTypes = type:
|
||||
mapAttrs (name: value:
|
||||
assert pred value;
|
||||
setType type ({ inherit name; } // value));
|
||||
setTypes = type: setTypesAssert type (_: true);
|
||||
assert type.check value;
|
||||
setType type.name ({ inherit name; } // value));
|
||||
|
||||
in
|
||||
|
||||
rec {
|
||||
|
||||
isSignificantByte = isType "significant-byte";
|
||||
significantBytes = setTypes "significant-byte" {
|
||||
################################################################################
|
||||
|
||||
types.openSignifiantByte = mkOptionType {
|
||||
name = "significant-byte";
|
||||
description = "Endianness";
|
||||
merge = mergeOneOption;
|
||||
};
|
||||
|
||||
types.significantByte = enum (attrValues significantBytes);
|
||||
|
||||
significantBytes = setTypes types.openSignifiantByte {
|
||||
bigEndian = {};
|
||||
littleEndian = {};
|
||||
};
|
||||
|
||||
isCpuType = isType "cpu-type";
|
||||
cpuTypes = with significantBytes; setTypesAssert "cpu-type"
|
||||
(x: elem x.bits [8 16 32 64 128]
|
||||
&& (if 8 < x.bits
|
||||
then isSignificantByte x.significantByte
|
||||
else !(x ? significantByte)))
|
||||
{
|
||||
################################################################################
|
||||
|
||||
# Reasonable power of 2
|
||||
types.bitWidth = enum [ 8 16 32 64 128 ];
|
||||
|
||||
################################################################################
|
||||
|
||||
types.openCpuType = mkOptionType {
|
||||
name = "cpu-type";
|
||||
description = "instruction set architecture name and information";
|
||||
merge = mergeOneOption;
|
||||
check = x: types.bitWidth.check x.bits
|
||||
&& (if 8 < x.bits
|
||||
then types.significantByte.check x.significantByte
|
||||
else !(x ? significantByte));
|
||||
};
|
||||
|
||||
types.cpuType = enum (attrValues cpuTypes);
|
||||
|
||||
cpuTypes = with significantBytes; setTypes types.openCpuType {
|
||||
arm = { bits = 32; significantByte = littleEndian; family = "arm"; };
|
||||
armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; };
|
||||
armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; };
|
||||
|
|
@ -50,16 +83,34 @@ rec {
|
|||
wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
|
||||
};
|
||||
|
||||
isVendor = isType "vendor";
|
||||
vendors = setTypes "vendor" {
|
||||
################################################################################
|
||||
|
||||
types.openVendor = mkOptionType {
|
||||
name = "vendor";
|
||||
description = "vendor for the platform";
|
||||
merge = mergeOneOption;
|
||||
};
|
||||
|
||||
types.vendor = enum (attrValues vendors);
|
||||
|
||||
vendors = setTypes types.openVendor {
|
||||
apple = {};
|
||||
pc = {};
|
||||
|
||||
unknown = {};
|
||||
};
|
||||
|
||||
isExecFormat = isType "exec-format";
|
||||
execFormats = setTypes "exec-format" {
|
||||
################################################################################
|
||||
|
||||
types.openExecFormat = mkOptionType {
|
||||
name = "exec-format";
|
||||
description = "executable container used by the kernel";
|
||||
merge = mergeOneOption;
|
||||
};
|
||||
|
||||
types.execFormat = enum (attrValues execFormats);
|
||||
|
||||
execFormats = setTypes types.openExecFormat {
|
||||
aout = {}; # a.out
|
||||
elf = {};
|
||||
macho = {};
|
||||
|
|
@ -68,15 +119,33 @@ rec {
|
|||
unknown = {};
|
||||
};
|
||||
|
||||
isKernelFamily = isType "kernel-family";
|
||||
kernelFamilies = setTypes "kernel-family" {
|
||||
################################################################################
|
||||
|
||||
types.openKernelFamily = mkOptionType {
|
||||
name = "exec-format";
|
||||
description = "executable container used by the kernel";
|
||||
merge = mergeOneOption;
|
||||
};
|
||||
|
||||
types.kernelFamily = enum (attrValues kernelFamilies);
|
||||
|
||||
kernelFamilies = setTypes types.openKernelFamily {
|
||||
bsd = {};
|
||||
};
|
||||
|
||||
isKernel = x: isType "kernel" x;
|
||||
kernels = with execFormats; with kernelFamilies; setTypesAssert "kernel"
|
||||
(x: isExecFormat x.execFormat && all isKernelFamily (attrValues x.families))
|
||||
{
|
||||
################################################################################
|
||||
|
||||
types.openKernel = mkOptionType {
|
||||
name = "kernel";
|
||||
description = "kernel name and information";
|
||||
merge = mergeOneOption;
|
||||
check = x: types.execFormat.check x.execFormat
|
||||
&& all types.kernelFamily.check (attrValues x.families);
|
||||
};
|
||||
|
||||
types.kernel = enum (attrValues kernels);
|
||||
|
||||
kernels = with execFormats; with kernelFamilies; setTypes types.openKernel {
|
||||
darwin = { execFormat = macho; families = { }; };
|
||||
freebsd = { execFormat = elf; families = { inherit bsd; }; };
|
||||
hurd = { execFormat = elf; families = { }; };
|
||||
|
|
@ -93,8 +162,17 @@ rec {
|
|||
win32 = kernels.windows;
|
||||
};
|
||||
|
||||
isAbi = isType "abi";
|
||||
abis = setTypes "abi" {
|
||||
################################################################################
|
||||
|
||||
types.openAbi = mkOptionType {
|
||||
name = "abi";
|
||||
description = "binary interface for compiled code and syscalls";
|
||||
merge = mergeOneOption;
|
||||
};
|
||||
|
||||
types.abi = enum (attrValues abis);
|
||||
|
||||
abis = setTypes types.openAbi {
|
||||
cygnus = {};
|
||||
gnu = {};
|
||||
msvc = {};
|
||||
|
|
@ -106,12 +184,24 @@ rec {
|
|||
unknown = {};
|
||||
};
|
||||
|
||||
################################################################################
|
||||
|
||||
types.system = mkOptionType {
|
||||
name = "system";
|
||||
description = "fully parsed representation of llvm- or nix-style platform tuple";
|
||||
merge = mergeOneOption;
|
||||
check = { cpu, vendor, kernel, abi }:
|
||||
types.cpuType.check cpu
|
||||
&& types.vendor.check vendor
|
||||
&& types.kernel.check kernel
|
||||
&& types.abi.check abi;
|
||||
};
|
||||
|
||||
isSystem = isType "system";
|
||||
mkSystem = { cpu, vendor, kernel, abi }:
|
||||
assert isCpuType cpu && isVendor vendor && isKernel kernel && isAbi abi;
|
||||
setType "system" {
|
||||
inherit cpu vendor kernel abi;
|
||||
};
|
||||
|
||||
mkSystem = components:
|
||||
assert types.system.check components;
|
||||
setType "system" components;
|
||||
|
||||
mkSkeletonFromList = l: {
|
||||
"2" = # We only do 2-part hacks for things Nix already supports
|
||||
|
|
@ -174,4 +264,6 @@ rec {
|
|||
optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}";
|
||||
in "${cpu.name}-${vendor.name}-${kernel.name}${optAbi}";
|
||||
|
||||
################################################################################
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
let pkgs = import ../.. { inherit system config; }; in
|
||||
|
||||
with pkgs.lib;
|
||||
with import ../lib/qemu-flags.nix;
|
||||
with import ../lib/qemu-flags.nix { inherit pkgs; };
|
||||
|
||||
rec {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
# QEMU flags shared between various Nix expressions.
|
||||
{ pkgs }:
|
||||
|
||||
{
|
||||
|
||||
|
|
@ -7,4 +8,14 @@
|
|||
"-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}"
|
||||
];
|
||||
|
||||
qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"
|
||||
else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0"
|
||||
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";
|
||||
|
||||
qemuBinary = qemuPkg: {
|
||||
"i686-linux" = "${qemuPkg}/bin/qemu-kvm";
|
||||
"x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
|
||||
"armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
|
||||
"aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
|
||||
}.${pkgs.stdenv.system} or (throw "Unknown QEMU binary for '${pkgs.stdenv.system}'");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -425,6 +425,7 @@
|
|||
./services/network-filesystems/yandex-disk.nix
|
||||
./services/network-filesystems/xtreemfs.nix
|
||||
./services/networking/amuled.nix
|
||||
./services/networking/aria2.nix
|
||||
./services/networking/asterisk.nix
|
||||
./services/networking/atftpd.nix
|
||||
./services/networking/avahi-daemon.nix
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
|
||||
nix = cfg.package.out;
|
||||
|
||||
isNix112 = versionAtLeast (getVersion nix) "1.12pre";
|
||||
isNix20 = versionAtLeast (getVersion nix) "2.0pre";
|
||||
|
||||
makeNixBuildUser = nr:
|
||||
{ name = "nixbld${toString nr}";
|
||||
|
|
@ -26,32 +26,40 @@ let
|
|||
|
||||
nixConf =
|
||||
let
|
||||
# If we're using sandbox for builds, then provide /bin/sh in
|
||||
# the sandbox as a bind-mount to bash. This means we also need to
|
||||
# include the entire closure of bash.
|
||||
# In Nix < 2.0, If we're using sandbox for builds, then provide
|
||||
# /bin/sh in the sandbox as a bind-mount to bash. This means we
|
||||
# also need to include the entire closure of bash. Nix >= 2.0
|
||||
# provides a /bin/sh by default.
|
||||
sh = pkgs.stdenv.shell;
|
||||
binshDeps = pkgs.writeReferencesToFile sh;
|
||||
in
|
||||
pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
|
||||
extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
|
||||
pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; inherit binshDeps; } ''
|
||||
${optionalString (!isNix20) ''
|
||||
extraPaths=$(for i in $(cat binshDeps); do if test -d $i; then echo $i; fi; done)
|
||||
''}
|
||||
cat > $out <<END
|
||||
# WARNING: this file is generated from the nix.* options in
|
||||
# your NixOS configuration, typically
|
||||
# /etc/nixos/configuration.nix. Do not edit it!
|
||||
build-users-group = nixbld
|
||||
build-max-jobs = ${toString (cfg.maxJobs)}
|
||||
build-cores = ${toString (cfg.buildCores)}
|
||||
build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox}
|
||||
build-sandbox-paths = ${toString cfg.sandboxPaths} /bin/sh=${sh} $(echo $extraPaths)
|
||||
binary-caches = ${toString cfg.binaryCaches}
|
||||
trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
|
||||
binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys}
|
||||
${if isNix20 then "max-jobs" else "build-max-jobs"} = ${toString (cfg.maxJobs)}
|
||||
${if isNix20 then "cores" else "build-cores"} = ${toString (cfg.buildCores)}
|
||||
${if isNix20 then "sandbox" else "build-use-sandbox"} = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox}
|
||||
${if isNix20 then "extra-sandbox-paths" else "build-sandbox-paths"} = ${toString cfg.sandboxPaths} ${optionalString (!isNix20) "/bin/sh=${sh} $(echo $extraPaths)"}
|
||||
${if isNix20 then "substituters" else "binary-caches"} = ${toString cfg.binaryCaches}
|
||||
${if isNix20 then "trusted-substituters" else "trusted-binary-caches"} = ${toString cfg.trustedBinaryCaches}
|
||||
${if isNix20 then "trusted-public-keys" else "binary-cache-public-keys"} = ${toString cfg.binaryCachePublicKeys}
|
||||
auto-optimise-store = ${boolToString cfg.autoOptimiseStore}
|
||||
${optionalString cfg.requireSignedBinaryCaches ''
|
||||
signed-binary-caches = *
|
||||
${if isNix20 then ''
|
||||
require-sigs = ${if cfg.requireSignedBinaryCaches then "true" else "false"}
|
||||
'' else ''
|
||||
signed-binary-caches = ${if cfg.requireSignedBinaryCaches then "*" else ""}
|
||||
''}
|
||||
trusted-users = ${toString cfg.trustedUsers}
|
||||
allowed-users = ${toString cfg.allowedUsers}
|
||||
${optionalString (isNix20 && !cfg.distributedBuilds) ''
|
||||
builders =
|
||||
''}
|
||||
$extraOptions
|
||||
END
|
||||
'';
|
||||
|
|
@ -377,8 +385,9 @@ in
|
|||
systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
|
||||
|
||||
systemd.services.nix-daemon =
|
||||
{ path = [ nix pkgs.openssl.bin pkgs.utillinux config.programs.ssh.package ]
|
||||
++ optionals cfg.distributedBuilds [ pkgs.gzip ];
|
||||
{ path = [ nix pkgs.utillinux ]
|
||||
++ optionals cfg.distributedBuilds [ config.programs.ssh.package pkgs.gzip ]
|
||||
++ optionals (!isNix20) [ pkgs.openssl.bin ];
|
||||
|
||||
environment = cfg.envVars
|
||||
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }
|
||||
|
|
@ -396,10 +405,9 @@ in
|
|||
};
|
||||
|
||||
nix.envVars =
|
||||
{ NIX_CONF_DIR = "/etc/nix";
|
||||
}
|
||||
optionalAttrs (!isNix20) {
|
||||
NIX_CONF_DIR = "/etc/nix";
|
||||
|
||||
// optionalAttrs (!isNix112) {
|
||||
# Enable the copy-from-other-stores substituter, which allows
|
||||
# builds to be sped up by copying build results from remote
|
||||
# Nix stores. To do this, mount the remote file system on a
|
||||
|
|
@ -407,12 +415,8 @@ in
|
|||
NIX_OTHER_STORES = "/run/nix/remote-stores/*/nix";
|
||||
}
|
||||
|
||||
// optionalAttrs cfg.distributedBuilds {
|
||||
NIX_BUILD_HOOK =
|
||||
if isNix112 then
|
||||
"${nix}/libexec/nix/build-remote"
|
||||
else
|
||||
"${nix}/libexec/nix/build-remote.pl";
|
||||
// optionalAttrs (cfg.distributedBuilds && !isNix20) {
|
||||
NIX_BUILD_HOOK = "${nix}/libexec/nix/build-remote.pl";
|
||||
};
|
||||
|
||||
# Set up the environment variables for running Nix.
|
||||
|
|
@ -420,7 +424,7 @@ in
|
|||
{ NIX_PATH = concatStringsSep ":" cfg.nixPath;
|
||||
};
|
||||
|
||||
environment.extraInit =
|
||||
environment.extraInit = optionalString (!isNix20)
|
||||
''
|
||||
# Set up secure multi-user builds: non-root users build through the
|
||||
# Nix daemon.
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ let
|
|||
settingsDir = "${homeDir}";
|
||||
sessionFile = "${homeDir}/aria2.session";
|
||||
downloadDir = "${homeDir}/Downloads";
|
||||
|
||||
|
||||
rangesToStringList = map (x: builtins.toString x.from +"-"+ builtins.toString x.to);
|
||||
|
||||
|
||||
settingsFile = pkgs.writeText "aria2.conf"
|
||||
''
|
||||
dir=${cfg.downloadDir}
|
||||
|
|
@ -110,12 +110,12 @@ in
|
|||
mkdir -m 0770 -p "${homeDir}"
|
||||
chown aria2:aria2 "${homeDir}"
|
||||
if [[ ! -d "${config.services.aria2.downloadDir}" ]]
|
||||
then
|
||||
then
|
||||
mkdir -m 0770 -p "${config.services.aria2.downloadDir}"
|
||||
chown aria2:aria2 "${config.services.aria2.downloadDir}"
|
||||
fi
|
||||
if [[ ! -e "${sessionFile}" ]]
|
||||
then
|
||||
then
|
||||
touch "${sessionFile}"
|
||||
chown aria2:aria2 "${sessionFile}"
|
||||
fi
|
||||
|
|
@ -132,4 +132,4 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,10 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
with import ../../lib/qemu-flags.nix { inherit pkgs; };
|
||||
|
||||
let
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
# FIXME: figure out a common place for this instead of copy pasting
|
||||
serialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"
|
||||
else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0"
|
||||
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";
|
||||
in
|
||||
|
||||
{
|
||||
|
|
@ -28,8 +25,8 @@ in
|
|||
|
||||
systemd.services.backdoor =
|
||||
{ wantedBy = [ "multi-user.target" ];
|
||||
requires = [ "dev-hvc0.device" "dev-${serialDevice}.device" ];
|
||||
after = [ "dev-hvc0.device" "dev-${serialDevice}.device" ];
|
||||
requires = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ];
|
||||
after = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ];
|
||||
script =
|
||||
''
|
||||
export USER=root
|
||||
|
|
@ -46,7 +43,7 @@ in
|
|||
|
||||
cd /tmp
|
||||
exec < /dev/hvc0 > /dev/hvc0
|
||||
while ! exec 2> /dev/${serialDevice}; do sleep 0.1; done
|
||||
while ! exec 2> /dev/${qemuSerialDevice}; do sleep 0.1; done
|
||||
echo "connecting to host..." >&2
|
||||
stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
|
||||
echo
|
||||
|
|
@ -55,10 +52,10 @@ in
|
|||
serviceConfig.KillSignal = "SIGHUP";
|
||||
};
|
||||
|
||||
# Prevent agetty from being instantiated on ${serialDevice}, since it
|
||||
# interferes with the backdoor (writes to ${serialDevice} will randomly fail
|
||||
# Prevent agetty from being instantiated on the serial device, since it
|
||||
# interferes with the backdoor (writes to it will randomly fail
|
||||
# with EIO). Likewise for hvc0.
|
||||
systemd.services."serial-getty@${serialDevice}".enable = false;
|
||||
systemd.services."serial-getty@${qemuSerialDevice}".enable = false;
|
||||
systemd.services."serial-getty@hvc0".enable = false;
|
||||
|
||||
boot.initrd.preDeviceCommands =
|
||||
|
|
@ -94,7 +91,7 @@ in
|
|||
# Panic if an error occurs in stage 1 (rather than waiting for
|
||||
# user intervention).
|
||||
boot.kernelParams =
|
||||
[ "console=${serialDevice}" "panic=1" "boot.panic_on_fail" ];
|
||||
[ "console=${qemuSerialDevice}" "panic=1" "boot.panic_on_fail" ];
|
||||
|
||||
# `xwininfo' is used by the test driver to query open windows.
|
||||
environment.systemPackages = [ pkgs.xorg.xwininfo ];
|
||||
|
|
|
|||
|
|
@ -10,21 +10,11 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
with import ../../lib/qemu-flags.nix { inherit pkgs; };
|
||||
|
||||
let
|
||||
|
||||
qemu = config.system.build.qemu or pkgs.qemu_test;
|
||||
qemuKvm = {
|
||||
"i686-linux" = "${qemu}/bin/qemu-kvm";
|
||||
"x86_64-linux" = "${qemu}/bin/qemu-kvm -cpu kvm64";
|
||||
"armv7l-linux" = "${qemu}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
|
||||
"aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
|
||||
}.${pkgs.stdenv.system};
|
||||
|
||||
# FIXME: figure out a common place for this instead of copy pasting
|
||||
serialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"
|
||||
else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0"
|
||||
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";
|
||||
|
||||
vmName =
|
||||
if config.networking.hostName == ""
|
||||
|
|
@ -34,7 +24,7 @@ let
|
|||
cfg = config.virtualisation;
|
||||
|
||||
qemuGraphics = if cfg.graphics then "" else "-nographic";
|
||||
kernelConsole = if cfg.graphics then "" else "console=${serialDevice}";
|
||||
kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";
|
||||
ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
|
||||
|
||||
# Shell script to start the VM.
|
||||
|
|
@ -83,7 +73,7 @@ let
|
|||
'')}
|
||||
|
||||
# Start QEMU.
|
||||
exec ${qemuKvm} \
|
||||
exec ${qemuBinary qemu} \
|
||||
-name ${vmName} \
|
||||
-m ${toString config.virtualisation.memorySize} \
|
||||
-smp ${toString config.virtualisation.cores} \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ system ? builtins.currentSystem }:
|
||||
|
||||
with import ../lib/testing.nix { inherit system; };
|
||||
with import ../lib/qemu-flags.nix;
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ system ? builtins.currentSystem }:
|
||||
|
||||
with import ../lib/testing.nix { inherit system; };
|
||||
with import ../lib/qemu-flags.nix;
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ system ? builtins.currentSystem }:
|
||||
|
||||
with import ../lib/testing.nix { inherit system; };
|
||||
with import ../lib/qemu-flags.nix;
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ system ? builtins.currentSystem }:
|
||||
|
||||
with import ../lib/testing.nix { inherit system; };
|
||||
with import ../lib/qemu-flags.nix;
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ system ? builtins.currentSystem }:
|
||||
|
||||
with import ../../lib/testing.nix { inherit system; };
|
||||
with import ../../lib/qemu-flags.nix;
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -95,10 +95,10 @@
|
|||
ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ahungry-theme";
|
||||
version = "1.8.0";
|
||||
version = "1.10.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar";
|
||||
sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v";
|
||||
url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar";
|
||||
sha256 = "14q5yw56n82qph09bk7wmj5b1snhh9w0nk5s1l7yn9ldg71xq6pm";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -765,15 +765,15 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
|
||||
el-search = callPackage ({ cl-print, elpaBuild, emacs, fetchurl, lib, stream }:
|
||||
elpaBuild {
|
||||
pname = "el-search";
|
||||
version = "1.5.1";
|
||||
version = "1.5.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/el-search-1.5.1.tar";
|
||||
sha256 = "0bbq59d8x4ncrmpfq54w6rwpp604f1x834b81l7wflwxv7ni5msx";
|
||||
url = "https://elpa.gnu.org/packages/el-search-1.5.3.tar";
|
||||
sha256 = "095gpanpf88j65cbf4r6c787qxi07kqpvdsh0dsdpg9m3ivmxbra";
|
||||
};
|
||||
packageRequires = [ emacs stream ];
|
||||
packageRequires = [ cl-print emacs stream ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/el-search.html";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -1386,10 +1386,10 @@
|
|||
mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "mines";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mines-1.5.tar";
|
||||
sha256 = "1wpkn47iza78hzj396z5c05hsimnhhhmr1cq598azd6h8c1zca7g";
|
||||
url = "https://elpa.gnu.org/packages/mines-1.6.tar";
|
||||
sha256 = "1199s1v4my0qpvc5aaxzbqayjn59vilxbqnywvyhvm7hz088aps2";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
|
|
@ -1637,10 +1637,10 @@
|
|||
}) {};
|
||||
paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild {
|
||||
pname = "paced";
|
||||
version = "1.0";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/paced-1.0.tar";
|
||||
sha256 = "0ld7cnlk6pn41hx2yfga5w7vfgg4ql6k25ffnf400nsn7y6wcapd";
|
||||
url = "https://elpa.gnu.org/packages/paced-1.0.1.tar";
|
||||
sha256 = "1y2sl3iqz2vjgkbc859sm3h9jhnrgla9ynazy9d5rql0nsb6sn8p";
|
||||
};
|
||||
packageRequires = [ async emacs ];
|
||||
meta = {
|
||||
|
|
@ -1754,6 +1754,19 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rbit = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "rbit";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rbit-0.1.el";
|
||||
sha256 = "0h0f9jx4xmkbyxk39wibrvnj65b1ylkz4sk4np7qcavfjs6dz3lm";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/rbit.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "rcirc-color";
|
||||
version = "0.3";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -131,9 +131,6 @@ self:
|
|||
# upstream issue: mismatched filename
|
||||
link-hint = markBroken super.link-hint;
|
||||
|
||||
# part of a larger package
|
||||
llvm-mode = dontConfigure super.llvm-mode;
|
||||
|
||||
# upstream issue: missing file header
|
||||
maxframe = markBroken super.maxframe;
|
||||
|
||||
|
|
|
|||
|
|
@ -548,12 +548,12 @@
|
|||
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
|
||||
melpaBuild {
|
||||
pname = "ac-php";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xcwen";
|
||||
repo = "ac-php";
|
||||
rev = "519b5cd886f484693fd69b226e307d56137b321b";
|
||||
sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
|
||||
rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297";
|
||||
sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
|
||||
|
|
@ -569,12 +569,12 @@
|
|||
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
|
||||
melpaBuild {
|
||||
pname = "ac-php-core";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xcwen";
|
||||
repo = "ac-php";
|
||||
rev = "519b5cd886f484693fd69b226e307d56137b321b";
|
||||
sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
|
||||
rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297";
|
||||
sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
|
||||
|
|
@ -1094,12 +1094,12 @@
|
|||
ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ahungry-theme";
|
||||
version = "1.8.0";
|
||||
version = "1.10.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahungry";
|
||||
repo = "color-theme-ahungry";
|
||||
rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476";
|
||||
sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg";
|
||||
rev = "45bf75f17752c8e8dd4c8a4531c0aa419cdccb84";
|
||||
sha256 = "03xypgq6vy7819r42g23kgn7p775bc0v9blzhi0zp5c61p4cw8v3";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
|
||||
|
|
@ -1217,22 +1217,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
|
||||
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize }:
|
||||
melpaBuild {
|
||||
pname = "all-the-icons";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "domtronn";
|
||||
repo = "all-the-icons.el";
|
||||
rev = "bb69345ead914345faad582723a2b61618f13289";
|
||||
sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf";
|
||||
rev = "52d1f2d36468146c93aaf11399f581401a233306";
|
||||
sha256 = "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
|
||||
sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
|
||||
name = "all-the-icons";
|
||||
};
|
||||
packageRequires = [ emacs font-lock-plus memoize ];
|
||||
packageRequires = [ emacs memoize ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/all-the-icons";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -3376,12 +3376,12 @@
|
|||
bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "bug-reference-github";
|
||||
version = "0.2.0";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "arnested";
|
||||
repo = "bug-reference-github";
|
||||
rev = "671d32083aad5cf813a5e61075b70889bc95dec5";
|
||||
sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v";
|
||||
rev = "f570a0532bfb44f095b42cf68ab1f69799101137";
|
||||
sha256 = "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/5dfce86371692dddef78a6c1d772138b487b82cb/recipes/bug-reference-github";
|
||||
|
|
@ -4361,12 +4361,12 @@
|
|||
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "circe";
|
||||
version = "2.6";
|
||||
version = "2.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgenschaefer";
|
||||
repo = "circe";
|
||||
rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6";
|
||||
sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j";
|
||||
rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484";
|
||||
sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
|
||||
|
|
@ -5486,12 +5486,12 @@
|
|||
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "company-php";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xcwen";
|
||||
repo = "ac-php";
|
||||
rev = "519b5cd886f484693fd69b226e307d56137b321b";
|
||||
sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18";
|
||||
rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297";
|
||||
sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
|
||||
|
|
@ -6059,12 +6059,12 @@
|
|||
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "counsel-etags";
|
||||
version = "1.3.8";
|
||||
version = "1.3.9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redguardtoo";
|
||||
repo = "counsel-etags";
|
||||
rev = "e05fdb306eee197d63976d24bf0e16db241c6c06";
|
||||
sha256 = "1m6m2ygafy38483rd8qfq4zwmw1x7m5zpnvqdmsckiqik3s2z98n";
|
||||
rev = "2219bf8d9a4584abc905c7470455777553496056";
|
||||
sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
|
||||
|
|
@ -6542,12 +6542,12 @@
|
|||
cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
|
||||
melpaBuild {
|
||||
pname = "cwl-mode";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tom-tan";
|
||||
repo = "cwl-mode";
|
||||
rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
|
||||
sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
|
||||
rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7";
|
||||
sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
|
||||
|
|
@ -7277,12 +7277,12 @@
|
|||
dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "dimmer";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gonewest818";
|
||||
repo = "dimmer.el";
|
||||
rev = "031be18db14c5c45758d64584b0f94d77e8f32da";
|
||||
sha256 = "0csj6194cjds4lzyk850jfndg38447w0dk6xza4vafwx2nd9lfvf";
|
||||
rev = "12fc52a6570ec25020281735f5a0ca780a9105af";
|
||||
sha256 = "1jv9rrv15nb5hpwcaqlpjj932gyisrkwbv11czkg3v0bn7qn6yif";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer";
|
||||
|
|
@ -8901,13 +8901,13 @@
|
|||
pname = "eide";
|
||||
version = "2.1.2";
|
||||
src = fetchgit {
|
||||
url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
|
||||
url = "https://git.tuxfamily.org/eide/emacs-ide.git";
|
||||
rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
|
||||
sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
|
||||
sha256 = "1i5brijz7pnqdk411j091fb8clapsbsihaak70g12fa5qic835fv";
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/34b70a5616e27ff9904a2803c86e049acfe9b26d/recipes/eide";
|
||||
sha256 = "168f4mz10byq1kdcfd029gkb3j6jk6lc4kdr4g204823x073f0ni";
|
||||
name = "eide";
|
||||
};
|
||||
packageRequires = [];
|
||||
|
|
@ -9094,22 +9094,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
|
||||
el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "el-spice";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vedang";
|
||||
repo = "el-spice";
|
||||
rev = "53921ffe9a84d9395eea90709309d3d5529921ea";
|
||||
sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i";
|
||||
rev = "972dace20ec61cd27b9322432d0c7a688c6f061a";
|
||||
sha256 = "1wrb46y4s4v0lwwyriz2qn1j1l804jyb4dmadf462jxln85rml70";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4666eee9f6837d6d9dba77e04aa4c8c4a93b47b5/recipes/el-spice";
|
||||
sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
|
||||
name = "el-spice";
|
||||
};
|
||||
packageRequires = [ thingatpt-plus ];
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/el-spice";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -9157,6 +9157,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
|
||||
melpaBuild {
|
||||
pname = "elbank";
|
||||
version = "1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NicolasPetton";
|
||||
repo = "Elbank";
|
||||
rev = "e4b532373a32889b8ab3389bd3e726dff5dd0bcf";
|
||||
sha256 = "0kqiwa5gr8q0rhr598v9p7dx88i3359j49j04crqwnc5y107s1xk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank";
|
||||
sha256 = "1ry84aiajyrnrspf7w4yjm0rmdam8ijrz0s7291yr8c70hslc997";
|
||||
name = "elbank";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/elbank";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "elcord";
|
||||
|
|
@ -9514,15 +9535,15 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
|
||||
elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
|
||||
melpaBuild {
|
||||
pname = "elpy";
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgenschaefer";
|
||||
repo = "elpy";
|
||||
rev = "99f0b6401bff25d40b9f58123533271f7870a286";
|
||||
sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j";
|
||||
rev = "30cb5e3c344edef572b6cffac94c6ff80bf6595f";
|
||||
sha256 = "17iwdaly9kw17ih86rk9w1iswn8r6vvj9sh71picsxg6gqdrqnrk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
|
||||
|
|
@ -9531,6 +9552,7 @@
|
|||
};
|
||||
packageRequires = [
|
||||
company
|
||||
emacs
|
||||
find-file-in-project
|
||||
highlight-indentation
|
||||
pyvenv
|
||||
|
|
@ -9608,12 +9630,12 @@
|
|||
elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "elx";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacscollective";
|
||||
repo = "elx";
|
||||
rev = "127fd4fca8ac6470cfda62f47bb1c29859862cfc";
|
||||
sha256 = "0j7j7wh89a34scilw11pbdb86nf515ig38pjkwyarfvj93gigc04";
|
||||
rev = "9f32e91ebbaebd7f1125107dce2aa979827b26c0";
|
||||
sha256 = "1hc4jw2fy25ri2hh3xw7sp67yfl2jvrgj1a25xa6svchjq3h1yf2";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
|
||||
|
|
@ -9763,8 +9785,8 @@
|
|||
sha256 = "07gvx0bbpf6j3g8kpk9908wf8fx1yb3075v6407wjxxighl0n5zz";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
|
||||
sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/emacsql-sqlite";
|
||||
sha256 = "1y81nabzzb9f7b8azb9giy23ckywcbrrg4b88gw5qyjizbb3h70x";
|
||||
name = "emacsql-sqlite";
|
||||
};
|
||||
packageRequires = [ cl-generic cl-lib emacs emacsql ];
|
||||
|
|
@ -11345,12 +11367,12 @@
|
|||
evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "evil-matchit";
|
||||
version = "2.2.5";
|
||||
version = "2.2.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redguardtoo";
|
||||
repo = "evil-matchit";
|
||||
rev = "ceb13ad1b34eb0debe2472c024841bdddce9e593";
|
||||
sha256 = "1wal8kwz1gx0cw1a91rf0d9wl490kjiilv6kwd779zf5041hnhwf";
|
||||
rev = "50bb88241983f0bf06d35a455a87c04eddc11c83";
|
||||
sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
|
||||
|
|
@ -12372,12 +12394,12 @@
|
|||
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "find-file-in-project";
|
||||
version = "5.4.6";
|
||||
version = "5.4.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "technomancy";
|
||||
repo = "find-file-in-project";
|
||||
rev = "31ebfd65d254904ba3e5ec96507c0b01d7768940";
|
||||
sha256 = "1xy7a6crng5x7k0x810ijrm882gm597ljwzi4cj2i93js625cw2b";
|
||||
rev = "7be14de3c737e70606d208d8d443b89e58cd646d";
|
||||
sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
|
||||
|
|
@ -17162,12 +17184,12 @@
|
|||
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
|
||||
melpaBuild {
|
||||
pname = "helm";
|
||||
version = "2.8.7";
|
||||
version = "2.8.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-helm";
|
||||
repo = "helm";
|
||||
rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161";
|
||||
sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9";
|
||||
rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26";
|
||||
sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
|
||||
|
|
@ -17390,22 +17412,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }:
|
||||
helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-cider";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "clojure-emacs";
|
||||
repo = "helm-cider";
|
||||
rev = "a24ef274e382c1a158a76eae2570f1f007031cb8";
|
||||
sha256 = "062abfb4sfpcc6fx3nrf3j0bisglrhyrg7rxwhhcqm9jhalksmdl";
|
||||
rev = "9a948b834dd31b3f60d4701d6dd0ecfab0adbb72";
|
||||
sha256 = "0wssd9jv6xighjhfh3p8if1anz3rcrjr71a4j063v6gyknb7fv27";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
|
||||
sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x";
|
||||
name = "helm-cider";
|
||||
};
|
||||
packageRequires = [ cider emacs helm-core seq ];
|
||||
packageRequires = [ cider emacs helm-core ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/helm-cider";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -17498,12 +17520,12 @@
|
|||
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-core";
|
||||
version = "2.8.7";
|
||||
version = "2.8.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-helm";
|
||||
repo = "helm";
|
||||
rev = "5b2057c7755f6ea20e1ea011c6fb992d12650161";
|
||||
sha256 = "0hf27j1rv3xnnari70k7p1b51pdyv6zsp1r6b8xk4qwp8y0crpx9";
|
||||
rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26";
|
||||
sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
|
||||
|
|
@ -18587,6 +18609,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }:
|
||||
melpaBuild {
|
||||
pname = "helm-system-packages";
|
||||
version = "1.7.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-helm";
|
||||
repo = "helm-system-packages";
|
||||
rev = "22ff951b092a3fbde8eadf284a24e86bb4694f6a";
|
||||
sha256 = "0argxi8dppgyfljwn654a7183lva74wnnwzkk3xlrvgngmir56kp";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
|
||||
sha256 = "01mndx2zzh7r7gmpn6gd1vy1w3l6dnhvgn7n2p39viji1r8b39s4";
|
||||
name = "helm-system-packages";
|
||||
};
|
||||
packageRequires = [ emacs helm seq ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/helm-system-packages";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-themes";
|
||||
|
|
@ -19532,6 +19575,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ibuffer-tramp";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "svend";
|
||||
repo = "ibuffer-tramp";
|
||||
rev = "bcad0bda3a67f55d1be936bf8fa9ef735fe1e3f3";
|
||||
sha256 = "1ry7nbhqhjy6gkxd10s97nbm6flk5nm0l5q8071fprx8xxphqj8f";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a7449b15cb2a89cf06ea3de2cfdc6bc387db3b/recipes/ibuffer-tramp";
|
||||
sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
|
||||
name = "ibuffer-tramp";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/ibuffer-tramp";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ibuffer-vc";
|
||||
|
|
@ -19640,12 +19704,12 @@
|
|||
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
|
||||
melpaBuild {
|
||||
pname = "ido-completing-read-plus";
|
||||
version = "4.5";
|
||||
version = "4.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarwinAwardWinner";
|
||||
repo = "ido-completing-read-plus";
|
||||
rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
|
||||
sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
|
||||
rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7";
|
||||
sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
|
||||
|
|
@ -19742,22 +19806,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
|
||||
ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ido-ubiquitous";
|
||||
version = "4.5";
|
||||
version = "4.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarwinAwardWinner";
|
||||
repo = "ido-completing-read-plus";
|
||||
rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
|
||||
sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
|
||||
rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7";
|
||||
sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
|
||||
sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz";
|
||||
name = "ido-ubiquitous";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ido-completing-read-plus ];
|
||||
packageRequires = [ cl-lib ido-completing-read-plus ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/ido-ubiquitous";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -20104,14 +20168,14 @@
|
|||
pname = "impatient-mode";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "netguy204";
|
||||
repo = "imp.el";
|
||||
owner = "skeeto";
|
||||
repo = "impatient-mode";
|
||||
rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0";
|
||||
sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode";
|
||||
sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode";
|
||||
sha256 = "07z5ds3zgzkxvxwaalp9i5x2rl5sq4jjk8ygk1rfmsl52l5y1z6j";
|
||||
name = "impatient-mode";
|
||||
};
|
||||
packageRequires = [ cl-lib htmlize simple-httpd ];
|
||||
|
|
@ -21254,12 +21318,12 @@
|
|||
js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "js-auto-format-mode";
|
||||
version = "1.0.6";
|
||||
version = "1.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ybiquitous";
|
||||
repo = "js-auto-format-mode";
|
||||
rev = "37e83641fd5eab45e813e4bc74a835fe7229c160";
|
||||
sha256 = "0hmrhp3lijd77kl0b98nbl1p8fmgjfry2hhvh5vickx3315w7qgw";
|
||||
rev = "6bd44162ac422304803f606278bb0c08ab940a5d";
|
||||
sha256 = "1hy4wyw7yi93ngagg9qmkljjqaypfnzks3vny1pn6d5nw2acb1vx";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
|
||||
|
|
@ -21695,12 +21759,12 @@
|
|||
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "kaolin-themes";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ogdenwebb";
|
||||
repo = "emacs-kaolin-themes";
|
||||
rev = "88a25b89a480f1193cc1c5502f3a5d0b68cb7227";
|
||||
sha256 = "03bbpaih29yx8s16v59mca8v6sak6294zq7d534613la28n4h6w7";
|
||||
rev = "56bafd9b1b022ebfd98cad022792957164ec56fb";
|
||||
sha256 = "02nmrdc2ldvfzyn3s9qrvq61nl93krc1vyr4ad1vkmbyqrwszyvd";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
|
||||
|
|
@ -22472,12 +22536,12 @@
|
|||
linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "linum-relative";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "coldnew";
|
||||
repo = "linum-relative";
|
||||
rev = "b8a99dcfe38a491172a8193053fb7849634b43c0";
|
||||
sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s";
|
||||
rev = "896df4b40c1e1eb59f55fcee48a1543f0ccd724e";
|
||||
sha256 = "0b3n1gk2w1p72x0zfdz9l70winq2fnjpjrgq0awxx730xk7ypp5n";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative";
|
||||
|
|
@ -22689,12 +22753,12 @@
|
|||
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "live-py-mode";
|
||||
version = "2.20.1";
|
||||
version = "2.21.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "donkirkby";
|
||||
repo = "live-py-plugin";
|
||||
rev = "eed38dc66430802e754c48bb44aaf524d7b1596c";
|
||||
sha256 = "1rl279h18z9fka4zdaqm2h4jxpq3wykja3x7jyhj4bnrqvkw66gh";
|
||||
rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0";
|
||||
sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
|
||||
|
|
@ -27526,12 +27590,12 @@
|
|||
org-wild-notifier = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
|
||||
melpaBuild {
|
||||
pname = "org-wild-notifier";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akhramov";
|
||||
repo = "org-wild-notifier.el";
|
||||
rev = "f5bf3b13c630265051904cb4c9a0613ead86847c";
|
||||
sha256 = "0z2flnqimwndq8w7ahi57n7a87l5iknn3dpwirxynq4brzazzi7j";
|
||||
rev = "28f6af12a9efbcab53e310363c451f53ce8ea3f2";
|
||||
sha256 = "00v4f26np4i947xgqr03wylz4ichc168znlwxn4l6np1s85i3mzb";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier";
|
||||
|
|
@ -27997,12 +28061,12 @@
|
|||
ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
|
||||
melpaBuild {
|
||||
pname = "ox-hugo";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kaushalmodi";
|
||||
repo = "ox-hugo";
|
||||
rev = "b47f6f79603adb4f505500ed83150afca7601cfc";
|
||||
sha256 = "1xlkmiwgxsai0hsx9r1gx88bdj72vxaq0icr399ksnwba58rwmr1";
|
||||
rev = "9751d34e1133b89a533a978c085b0715f85db648";
|
||||
sha256 = "11h464cyc28ld0b0zridgm4drydc1qjxbm1y24zrwlkyqqjk6yr7";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
|
||||
|
|
@ -28394,12 +28458,12 @@
|
|||
paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "paren-face";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarsius";
|
||||
repo = "paren-face";
|
||||
rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf";
|
||||
sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7";
|
||||
rev = "166975683225367c866e6ae6f6acb88d24e21a35";
|
||||
sha256 = "02mh8w2na6qa94p3bh6pvdvmg36p2vrbp5hpjnwjcayrb92dskgy";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face";
|
||||
|
|
@ -30834,12 +30898,12 @@
|
|||
pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "pyvenv";
|
||||
version = "1.10";
|
||||
version = "1.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgenschaefer";
|
||||
repo = "pyvenv";
|
||||
rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55";
|
||||
sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh";
|
||||
rev = "f925bcb46ea64b699f7cd06933c48e0d5db88b73";
|
||||
sha256 = "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
|
||||
|
|
@ -31254,12 +31318,12 @@
|
|||
rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "rdf-prefix";
|
||||
version = "1.9";
|
||||
version = "1.10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "simenheg";
|
||||
repo = "rdf-prefix";
|
||||
rev = "25cc3c8902f16191496b549705b00ffc7dff51f1";
|
||||
sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy";
|
||||
rev = "164136d05505275d42d1ca3a390f55fcc89694b8";
|
||||
sha256 = "18jp3yynnk2248mzwf8h62awfw8fh25m5ah5di0dg62xw56l9nig";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
|
||||
|
|
@ -33757,12 +33821,12 @@
|
|||
smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
|
||||
melpaBuild {
|
||||
pname = "smart-mode-line";
|
||||
version = "2.10.1";
|
||||
version = "2.11.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Malabarba";
|
||||
repo = "smart-mode-line";
|
||||
rev = "8fd76a66abe4d37925e3d6152c6bd1e8648a293a";
|
||||
sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx";
|
||||
rev = "5aca51956fae55d7310c1f96b5d128201087864a";
|
||||
sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
|
||||
|
|
@ -33778,12 +33842,12 @@
|
|||
smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }:
|
||||
melpaBuild {
|
||||
pname = "smart-mode-line-powerline-theme";
|
||||
version = "2.10.1";
|
||||
version = "2.11.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Malabarba";
|
||||
repo = "smart-mode-line";
|
||||
rev = "8fd76a66abe4d37925e3d6152c6bd1e8648a293a";
|
||||
sha256 = "1176fxrzzk4fyp4wjyp0xyqrga74j5csr5x37mlgplh9790248dx";
|
||||
rev = "5aca51956fae55d7310c1f96b5d128201087864a";
|
||||
sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
|
||||
|
|
@ -34030,12 +34094,12 @@
|
|||
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "snakemake-mode";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyleam";
|
||||
repo = "snakemake-mode";
|
||||
rev = "22b3efd741e26f59e18c9fd28691d8b84c9130ab";
|
||||
sha256 = "0hjp5ci7miggw0gs2y8q867gi7p3dq2yyfkckkh52isrp0yvz0wf";
|
||||
rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7";
|
||||
sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
|
||||
|
|
@ -35121,12 +35185,12 @@
|
|||
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
|
||||
melpaBuild {
|
||||
pname = "swift-mode";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisbarrett";
|
||||
repo = "swift-mode";
|
||||
rev = "8c45f69a078c41619a7a3db6d54a732c3fad8e3f";
|
||||
sha256 = "1isy71vkws3ywm4iwa85dk12810az3h85n6bimd36dfqbhfwdrli";
|
||||
rev = "7739e4954cc614ecd6b37e935f82ad057e256d56";
|
||||
sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
|
||||
|
|
@ -36295,12 +36359,12 @@
|
|||
tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "tracking";
|
||||
version = "2.6";
|
||||
version = "2.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgenschaefer";
|
||||
repo = "circe";
|
||||
rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6";
|
||||
sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j";
|
||||
rev = "661a2cdb3a3d9bc11ee511a4f90116c88e0d3484";
|
||||
sha256 = "19fcvmm915dz9l2w1rna4yik96rb3hrk7042012g961xn4sgs0ih";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
|
||||
|
|
@ -37792,12 +37856,12 @@
|
|||
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
|
||||
melpaBuild {
|
||||
pname = "webpaste";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "etu";
|
||||
repo = "webpaste.el";
|
||||
rev = "aed3e00b6332a068d53ce482f5139a95c3dcd245";
|
||||
sha256 = "1p4sgn0rh8a5f0f6f1njq329zwgs6yp8j3zqs0yfz4kaikw1xw10";
|
||||
rev = "2da60b8857d107721b089346121a7d51296a58bf";
|
||||
sha256 = "1r945qz7z5z80qvzlqvz985mz51zy3pj3fk36y0flc380y4ap6hd";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
|
||||
|
|
@ -39048,22 +39112,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
|
||||
yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
|
||||
melpaBuild {
|
||||
pname = "yatemplate";
|
||||
version = "2.0";
|
||||
version = "3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mineo";
|
||||
repo = "yatemplate";
|
||||
rev = "90c14d2e2b8247eeba464a52560af484f8542558";
|
||||
sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is";
|
||||
rev = "c1de31d2b16d98af197a4392b6481346ab4e8d57";
|
||||
sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
|
||||
sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
|
||||
name = "yatemplate";
|
||||
};
|
||||
packageRequires = [ yasnippet ];
|
||||
packageRequires = [ emacs yasnippet ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/yatemplate";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -39074,8 +39138,8 @@
|
|||
version = "1.80";
|
||||
src = fetchhg {
|
||||
url = "https://www.yatex.org/hgrepos/yatex/";
|
||||
rev = "5bb46b7ab3de";
|
||||
sha256 = "1ap043fq9yl2n4slrjkjld9b743ac7ygj52z9af709v6sa660ahg";
|
||||
rev = "b1896ef49747";
|
||||
sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ callPackage }: {
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20180122";
|
||||
version = "20180129";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20180122.tar";
|
||||
sha256 = "0a3a5v5x43xknqc6m5rcgdsqlw047w1djq372akfn5wafsk8a916";
|
||||
url = "https://orgmode.org/elpa/org-20180129.tar";
|
||||
sha256 = "0cwxqr34c77qmv7flcpd46qwkn0nzli21s3m9km00mwc8xy308n4";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -14,10 +14,10 @@
|
|||
}) {};
|
||||
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
version = "20180122";
|
||||
version = "20180129";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20180122.tar";
|
||||
sha256 = "1ss6h03xkvgk2qm1dx4dxxxalbswjc1jl9v87q99nls8iavmqa8x";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20180129.tar";
|
||||
sha256 = "1bk7jmizlvfbq2bbis3kal8nllxj752a8dkq7j68q6kfbc6w1z24";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dunst-${version}";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunst-project";
|
||||
repo = "dunst";
|
||||
rev = "v${version}";
|
||||
sha256 = "1085v4193yfj8ksngp4mk5n0nwzr3s5y3cs3c74ymaldfl20x91k";
|
||||
sha256 = "0i518v2z9fklzl5w60gkwwmg30yz3bd0k4rxjrxjabx73pvxm1mz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl pkgconfig which systemd ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -88,8 +88,18 @@ stdenv.mkDerivation (rec {
|
|||
rm -f js/src/configure
|
||||
rm -f .mozconfig*
|
||||
|
||||
'' + lib.optionalString (stdenv.lib.versionAtLeast version "58.0.0") ''
|
||||
cat >.mozconfig <<END_MOZCONFIG
|
||||
${lib.concatStringsSep "\n" (map (flag: "ac_add_options ${flag}") configureFlags)}
|
||||
END_MOZCONFIG
|
||||
'' + lib.optionalString googleAPISupport ''
|
||||
# Google API key used by Chromium and Firefox.
|
||||
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
|
||||
# please get your own set of keys.
|
||||
echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" > $TMPDIR/ga
|
||||
'' + ''
|
||||
# this will run autoconf213
|
||||
make -f client.mk configure-files
|
||||
${if (stdenv.lib.versionAtLeast version "58.0.0") then "./mach configure" else "make -f client.mk configure-files"}
|
||||
|
||||
configureScript="$(realpath ./configure)"
|
||||
|
||||
|
|
@ -99,11 +109,6 @@ stdenv.mkDerivation (rec {
|
|||
test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
|
||||
|
||||
cd obj-*
|
||||
'' + lib.optionalString googleAPISupport ''
|
||||
# Google API key used by Chromium and Firefox.
|
||||
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
|
||||
# please get your own set of keys.
|
||||
echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -166,7 +171,7 @@ stdenv.mkDerivation (rec {
|
|||
++ flag gssSupport "negotiateauth"
|
||||
++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
|
||||
++ flag webrtcSupport "webrtc"
|
||||
++ lib.optional googleAPISupport "--with-google-api-keyfile=ga"
|
||||
++ lib.optional googleAPISupport "--with-google-api-keyfile=$TMPDIR/ga"
|
||||
++ flag crashreporterSupport "crashreporter"
|
||||
++ lib.optional drmSupport "--enable-eme=widevine"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ rec {
|
|||
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
version = "57.0.4";
|
||||
version = "58.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "58846037aebbf14b85e6b3a46dbe617c780c6916e437ea4ee32a2502a6b55e3689921a0be28b920dedf2f966195df04ac8e45411caeb2601a168ec08b4827cf0";
|
||||
sha512 = "08xgv1qm2xx5wjczqg1ldf0yqm939zsghhr4acbkwnymv5apfak3vx0kcr9iwqkmdqjdjmggxz439kjn510f92fik33zjfsjn7sd9k5";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchgit, pkgconfig
|
||||
{ stdenv, fetchurl, fetchgit, fetchpatch, pkgconfig
|
||||
, qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
|
||||
, alsaLib, python
|
||||
, jackSupport ? false, libjack2 ? null
|
||||
|
|
@ -17,7 +17,7 @@ let
|
|||
generic = overrides: source: stdenv.mkDerivation (source // overrides // {
|
||||
name = "${overrides.type}-${source.version}";
|
||||
|
||||
patches = optional jackSupport ./mumble-jack-support.patch;
|
||||
patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python ]
|
||||
++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}"
|
||||
|
|
@ -116,6 +116,13 @@ let
|
|||
url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz";
|
||||
sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh";
|
||||
};
|
||||
|
||||
# Fix compile error against boost 1.66 (#33655):
|
||||
patches = singleton (fetchpatch {
|
||||
url = "https://github.com/mumble-voip/mumble/commit/"
|
||||
+ "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch";
|
||||
sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh";
|
||||
});
|
||||
};
|
||||
|
||||
gitSource = rec {
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
, hicolor_icon_theme, libsoup, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "homebank-5.1.6";
|
||||
name = "homebank-5.1.7";
|
||||
src = fetchurl {
|
||||
url = "http://homebank.free.fr/public/${name}.tar.gz";
|
||||
sha256 = "1q4h890g6a6pm6kfiavbq9sbpsnap0f854sja2y5q3x0j0ay2q98";
|
||||
sha256 = "19szz86jxya8v4r3pa5czng9q2kn5hhbk273x1wqvdv40z0577jp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -100,6 +100,8 @@ rec {
|
|||
|
||||
gitflow = callPackage ./gitflow { };
|
||||
|
||||
grv = callPackage ./grv { };
|
||||
|
||||
hub = callPackage ./hub {
|
||||
inherit (darwin) Security;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }:
|
||||
let
|
||||
version = "0.1.0";
|
||||
in
|
||||
buildGoPackage {
|
||||
name = "grv-${version}";
|
||||
|
||||
buildInputs = [ ncurses readline curl libgit2_0_25 ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
goPackagePath = "github.com/rgburke/grv";
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rgburke";
|
||||
repo = "grv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qd9kq8l29v3gwwls98933bk0rdw44mrbnqgb1r6hm9m6vzjfcn3";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = " GRV is a terminal interface for viewing git repositories";
|
||||
homepage = https://github.com/rgburke/grv;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ andir ];
|
||||
};
|
||||
}
|
||||
102
pkgs/applications/version-management/git-and-tools/grv/deps.nix
Normal file
102
pkgs/applications/version-management/git-and-tools/grv/deps.nix
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/Sirupsen/logrus";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/Sirupsen/logrus";
|
||||
rev = "768a92a02685ee7535069fc1581341b41bab9b72";
|
||||
sha256 = "1m67cxb6p0zgq0xba63qb4vvy6z5d78alya0vnx5djfixygiij53";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/bradfitz/slice";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/bradfitz/slice";
|
||||
rev = "d9036e2120b5ddfa53f3ebccd618c4af275f47da";
|
||||
sha256 = "189h48w3ppvx2kqyxq0s55kxv629lljjxbyqjnlrgg8fy6ya8wgy";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gobwas/glob";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gobwas/glob";
|
||||
rev = "51eb1ee00b6d931c66d229ceeb7c31b985563420";
|
||||
sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
|
||||
sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/rgburke/goncurses";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rgburke/goncurses";
|
||||
rev = "9a788ac9d81e61c6a2ca6205ee8d72d738ed12b9";
|
||||
sha256 = "0xqwxscdszbybriyzqmsd2zkzda9anckx56q8gksfy3gwj286gpb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/rjeczalik/notify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rjeczalik/notify";
|
||||
rev = "27b537f07230b3f917421af6dcf044038dbe57e2";
|
||||
sha256 = "05alsqjz2x8jzz2yp8r20zwglcg7y1ywq60zy6icj18qs3abmlp0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/tchap/go-patricia";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/tchap/go-patricia";
|
||||
rev = "5ad6cdb7538b0097d5598c7e57f0a24072adf7dc";
|
||||
sha256 = "0351x63zqympgfsnjl78cgvqhvipl3kfs1i15hfaw91hqin6dykr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "go4.org";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/camlistore/go4";
|
||||
rev = "fba789b7e39ba524b9e60c45c37a50fae63a2a09";
|
||||
sha256 = "01irxqy8na646b4zbw7v3zwy3yx9m7flhim5c3z4lzq5hiy2h75i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "1875d0a70c90e57f11972aefd42276df65e895b9";
|
||||
sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "3dbebcf8efb6a5011a60c2b4591c1022a759af8a";
|
||||
sha256 = "02pwjyimpm13km3fk0rg2l9p37w7qycdwp74piawwgcgh80qnww9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/libgit2/git2go.v25";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/libgit2/git2go.v25";
|
||||
rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5";
|
||||
sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -21,10 +21,10 @@ let
|
|||
buildType = "release";
|
||||
# Manually sha256sum the extensionPack file, must be hex!
|
||||
# Do not forget to update the hash in ./guest-additions/default.nix!
|
||||
extpack = "98e9df4f23212c3de827af9d770b391cf2dba8d21f4de597145512c1479302cd";
|
||||
extpackRev = "119785";
|
||||
main = "053xpf0kxrig4jq5djfz9drhkxy1x5a4p9qvgxc0b3hnk6yn1869";
|
||||
version = "5.2.4";
|
||||
extpack = "70584a70b666e9332ae2c6be0e64da4b8e3a27124801156577f205750bdde4f5";
|
||||
extpackRev = "120293";
|
||||
main = "1rx45ivwk89ghjc5zdd7c7j92w0w3930xj7l1zhwrvshxs454w7y";
|
||||
version = "5.2.6";
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/672 for details
|
||||
extensionPack = requireFile rec {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "0qhsr6vc48ld2p9q3a6n6rfg57rsn163axr3r1m2yqr2snr4pnk0";
|
||||
sha256 = "1px9jp6lv7ff7kn4ns5r4dq7xl4wiz3h4ckgdhgvxs040njpdzy5";
|
||||
};
|
||||
|
||||
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
}:
|
||||
|
||||
with pkgs;
|
||||
with import ../../../nixos/lib/qemu-flags.nix { inherit pkgs; };
|
||||
|
||||
rec {
|
||||
|
||||
|
|
@ -22,8 +23,6 @@ rec {
|
|||
patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ];
|
||||
});
|
||||
|
||||
qemuProg = "${qemu}/bin/qemu-kvm";
|
||||
|
||||
|
||||
modulesClosure = makeModulesClosure {
|
||||
inherit kernel rootModules;
|
||||
|
|
@ -197,14 +196,13 @@ rec {
|
|||
export PATH=/bin:/usr/bin:${coreutils}/bin
|
||||
echo "Starting interactive shell..."
|
||||
echo "(To run the original builder: \$origBuilder \$origArgs)"
|
||||
exec ${busybox}/bin/setsid ${bashInteractive}/bin/bash < /dev/ttyS0 &> /dev/ttyS0
|
||||
exec ${busybox}/bin/setsid ${bashInteractive}/bin/bash < /dev/${qemuSerialDevice} &> /dev/${qemuSerialDevice}
|
||||
fi
|
||||
'';
|
||||
|
||||
|
||||
qemuCommandLinux = ''
|
||||
${qemuProg} \
|
||||
${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
|
||||
${qemuBinary qemu} \
|
||||
-nographic -no-reboot \
|
||||
-device virtio-rng-pci \
|
||||
-virtfs local,path=${storeDir},security_model=none,mount_tag=store \
|
||||
|
|
@ -212,7 +210,7 @@ rec {
|
|||
''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \
|
||||
-kernel ${kernel}/${img} \
|
||||
-initrd ${initrd}/initrd \
|
||||
-append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
|
||||
-append "console=${qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
|
||||
$QEMU_OPTS
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -606,7 +606,7 @@ self: super: {
|
|||
};
|
||||
|
||||
# Need newer versions of their dependencies than the ones we have in LTS-10.x.
|
||||
cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_22_0; };
|
||||
cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_23_0; };
|
||||
hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; });
|
||||
|
||||
# https://github.com/bos/configurator/issues/22
|
||||
|
|
|
|||
|
|
@ -41,4 +41,9 @@ self: super: {
|
|||
transformers = null;
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# GHC 8.4.x needs newer versions than LTS-10.x offers by default.
|
||||
hspec = dontCheck super.hspec_2_4_7; # test suite causes an infinite loop
|
||||
test-framework = self.test-framework_0_8_2_0;
|
||||
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -161,18 +161,19 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
|
|||
# : { root : Path
|
||||
# , source-overrides : Defaulted (Either Path VersionNumber)
|
||||
# , overrides : Defaulted (HaskellPackageOverrideSet)
|
||||
# , modifier : Defaulted
|
||||
# } -> NixShellAwareDerivation
|
||||
# Given a path to a haskell package directory whose cabal file is
|
||||
# named the same as the directory name, an optional set of
|
||||
# source overrides as appropriate for the 'packageSourceOverrides'
|
||||
# function, and an optional set of arbitrary overrides,
|
||||
# return a derivation appropriate for nix-build or nix-shell
|
||||
# to build that package.
|
||||
developPackage = { root, source-overrides ? {}, overrides ? self: super: {} }:
|
||||
# function, an optional set of arbitrary overrides, and an optional
|
||||
# haskell package modifier, return a derivation appropriate
|
||||
# for nix-build or nix-shell to build that package.
|
||||
developPackage = { root, source-overrides ? {}, overrides ? self: super: {}, modifier ? drv: drv }:
|
||||
let name = builtins.baseNameOf root;
|
||||
drv =
|
||||
(extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {};
|
||||
in if pkgs.lib.inNixShell then drv.env else drv;
|
||||
in if pkgs.lib.inNixShell then (modifier drv).env else modifier drv;
|
||||
|
||||
ghcWithPackages = selectFrom: withPackages (selectFrom self);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
variant ? "jit", buildWithPypy ? false }:
|
||||
|
||||
let
|
||||
commit-count = "1356";
|
||||
commit-count = "1364";
|
||||
common-flags = "--thread --gcrootfinder=shadowstack --continuation";
|
||||
variants = {
|
||||
jit = { flags = "--opt=jit"; target = "target.py"; };
|
||||
|
|
@ -13,8 +13,8 @@ let
|
|||
};
|
||||
pixie-src = fetchgit {
|
||||
url = "https://github.com/pixie-lang/pixie.git";
|
||||
rev = "d2a4267ea088f711af36a74928e8dfd8360584ad";
|
||||
sha256 = "1asf6yx7zy9cx4bsg8iai57dy3r3m45xcmkmw2vix70xvfy23ryf";
|
||||
rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";
|
||||
sha256 = "0pf31x5h2m6dpxlidv98qay1y179qw40cw4cb4v4xa88gmq2f3vm";
|
||||
};
|
||||
pypy-tag = "91db1a9";
|
||||
pypy-src = fetchurl {
|
||||
|
|
@ -56,24 +56,31 @@ let
|
|||
RPYTHON="`pwd`/pypy-src/rpython/bin/rpython";
|
||||
cd pixie-src
|
||||
$PYTHON $RPYTHON ${common-flags} ${target}
|
||||
export LD_LIBRARY_PATH="${library-path}:$LD_LIBRARY_PATH"
|
||||
find pixie -name "*.pxi" -exec ./pixie-vm -c {} \;
|
||||
)'';
|
||||
LD_LIBRARY_PATH = library-path;
|
||||
C_INCLUDE_PATH = include-path;
|
||||
LIBRARY_PATH = library-path;
|
||||
PATH = bin-path;
|
||||
installPhase = ''
|
||||
mkdir -p $out/share $out/bin
|
||||
cp pixie-src/pixie-vm $out/share/pixie-vm
|
||||
cp -R pixie-src/pixie $out/share/pixie
|
||||
makeWrapper $out/share/pixie-vm $out/bin/pixie \
|
||||
--prefix LD_LIBRARY_PATH : ${library-path} \
|
||||
--prefix C_INCLUDE_PATH : ${include-path} \
|
||||
--prefix LIBRARY_PATH : ${library-path} \
|
||||
--prefix PATH : ${bin-path}
|
||||
cat > $out/bin/pxi <<EOF
|
||||
#!$shell
|
||||
>&2 echo "[\$\$] WARNING: 'pxi' and 'pixie-vm' are deprecated aliases for 'pixie', please update your scripts."
|
||||
exec $out/bin/pixie "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/pxi
|
||||
--prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \
|
||||
--prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \
|
||||
--prefix LIBRARY_PATH : ${LIBRARY_PATH} \
|
||||
--prefix PATH : ${PATH}
|
||||
'';
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
RES=$(./pixie-src/pixie-vm -e "(print :ok)")
|
||||
if [ "$RES" != ":ok" ]; then
|
||||
echo "ERROR Unexpected output: '$RES'"
|
||||
return 1
|
||||
else
|
||||
echo "$RES"
|
||||
fi
|
||||
'';
|
||||
meta = {
|
||||
description = "A clojure-like lisp, built with the pypy vm toolkit";
|
||||
|
|
|
|||
|
|
@ -1,31 +1,45 @@
|
|||
{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3, libxslt }:
|
||||
{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3
|
||||
, libxslt, systemd, libusb, libftdi1 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lirc-0.9.4";
|
||||
name = "lirc-0.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lirc/${name}.tar.bz2";
|
||||
sha256 = "19c6ldjsdnk1md66q3nb035ja1xj217k8iabhxpsb8rs10a6kwi6";
|
||||
sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb";
|
||||
};
|
||||
|
||||
preBuild = "patchShebangs .";
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
||||
# fix overriding PYTHONPATH
|
||||
sed -i 's,^PYTHONPATH *= *,PYTHONPATH := $(PYTHONPATH):,' \
|
||||
Makefile.in
|
||||
sed -i 's,PYTHONPATH=,PYTHONPATH=$(PYTHONPATH):,' \
|
||||
doc/Makefile.in
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
# use empty inc file instead of a from linux kernel generated one
|
||||
touch lib/lirc/input_map.inc
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig help2man ];
|
||||
|
||||
buildInputs = [ alsaLib xlibsWrapper python3 libxslt ];
|
||||
buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ]
|
||||
++ (with python3.pkgs; [ python pyyaml setuptools ]);
|
||||
|
||||
configureFlags = [
|
||||
"--with-driver=devinput"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--enable-sandboxed"
|
||||
"--with-systemdsystemunitdir=$(out)/lib/systemd/system"
|
||||
"--enable-uinput" # explicite activation because build env has no uinput
|
||||
"--enable-devinput" # explicite activation because build env has not /dev/input
|
||||
];
|
||||
|
||||
makeFlags = [ "m4dir=$(out)/m4" ];
|
||||
|
||||
installFlags = [
|
||||
"sysconfdir=\${out}/etc"
|
||||
"localstatedir=\${TMPDIR}"
|
||||
"sysconfdir=$out/etc"
|
||||
"localstatedir=$TMPDIR"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "nss-${version}";
|
||||
version = "3.33";
|
||||
version = "3.34.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_3_33_RTM/src/${name}.tar.gz";
|
||||
sha256 = "1r44qa4j7sri50mxxbnrpm6fxprwrhv76whi7bfq73j06syxmw4q";
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_3_34_1_RTM/src/${name}.tar.gz";
|
||||
sha256 = "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3";
|
||||
};
|
||||
|
||||
buildInputs = [ perl zlib sqlite ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{ name, src, preBuild ? "", target, androidPlatformVersions ? [ "25" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
|
||||
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
|
||||
, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.2"
|
||||
, enableWirelessDistribution ? false, installURL ? null
|
||||
, enableWirelessDistribution ? false, iosBuildStore ? false, installURL ? null
|
||||
}:
|
||||
|
||||
assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
|
||||
|
|
@ -145,7 +145,7 @@ stdenv.mkDerivation {
|
|||
security default-keychain -s $keychainName
|
||||
|
||||
# Do the actual build
|
||||
titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out
|
||||
titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target ${if iosBuildStore then "dist-appstore" else "dist-adhoc"} --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName-db --device-family universal --ios-version ${iosVersion} --output-dir $out
|
||||
|
||||
# Remove our generated keychain
|
||||
${deleteKeychain}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,11 @@ stdenv.mkDerivation {
|
|||
cd mobilesdk/*
|
||||
mv * 6.3.1.GA
|
||||
cd *
|
||||
|
||||
${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
|
||||
# Fixes a bad archive copying error when generating an IPA file
|
||||
sed -i -e "s|cp -rf|/bin/cp -rf|" iphone/cli/commands/_build.js
|
||||
''}
|
||||
|
||||
# Patch some executables
|
||||
|
||||
${if stdenv.system == "i686-linux" then
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ stdenv.mkDerivation {
|
|||
./linux-4.11.patch
|
||||
# source: https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl
|
||||
./linux-4.12.patch
|
||||
./linux-4.15.patch
|
||||
./null-pointer-fix.patch
|
||||
./gcc.patch
|
||||
];
|
||||
|
|
|
|||
47
pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch
Normal file
47
pkgs/os-specific/linux/broadcom-sta/linux-4.15.patch
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
See: https://lkml.org/lkml/2017/11/25/90
|
||||
|
||||
diff -urNZ a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
|
||||
--- a/src/wl/sys/wl_linux.c 2015-09-18 22:47:30.000000000 +0000
|
||||
+++ b/src/wl/sys/wl_linux.c 2018-01-31 22:52:10.859856221 +0000
|
||||
@@ -93,7 +93,11 @@
|
||||
|
||||
#include <wlc_wowl.h>
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||
+static void wl_timer(struct timer_list *tl);
|
||||
+#else
|
||||
static void wl_timer(ulong data);
|
||||
+#endif
|
||||
static void _wl_timer(wl_timer_t *t);
|
||||
static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
|
||||
|
||||
@@ -2298,9 +2302,15 @@
|
||||
}
|
||||
|
||||
static void
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||
+wl_timer(struct timer_list *tl)
|
||||
+{
|
||||
+ wl_timer_t *t = from_timer(t, tl, timer);
|
||||
+#else
|
||||
wl_timer(ulong data)
|
||||
{
|
||||
wl_timer_t *t = (wl_timer_t *)data;
|
||||
+#endif
|
||||
|
||||
if (!WL_ALL_PASSIVE_ENAB(t->wl))
|
||||
_wl_timer(t);
|
||||
@@ -2352,9 +2362,13 @@
|
||||
|
||||
bzero(t, sizeof(wl_timer_t));
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||
+ timer_setup(&t->timer, wl_timer, 0);
|
||||
+#else
|
||||
init_timer(&t->timer);
|
||||
t->timer.data = (ulong) t;
|
||||
t->timer.function = wl_timer;
|
||||
+#endif
|
||||
t->wl = wl;
|
||||
t->fn = fn;
|
||||
t->arg = arg;
|
||||
|
|
@ -3,15 +3,13 @@
|
|||
with stdenv.lib;
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.14.15";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
version = "4.14.16";
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0hk15qslkq15x53zkp70gnhdmjg5j9xigyykmig3g03gqsh97hzz";
|
||||
sha256 = "095c2cjmjfsgnmml4f3lzc0pbhjy8nv8w07rywgpp5s5494dn2q7";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.4.113";
|
||||
version = "4.4.114";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0gbpmx09jq2cryqnnv3z4d7971gkrvn7nndxz1diny9ain4x4wmp";
|
||||
sha256 = "1nag129dv3krn9b3f958fv2ns56x1nlgf8fy3mx74pkzqm6hnh4m";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.9.78";
|
||||
version = "4.9.79";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1wy02y9nkwsi3bbcg5w4jzxp3f7aalylh1gh79bzi4knysz4zlfj";
|
||||
sha256 = "0kf2zh7gf8jsm11vmp2hx2bji54ndsaj74ma405rj0qyxdchd45i";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, pkgconfig
|
||||
, ethtool, libnl, libudev, python, perl
|
||||
, ethtool, nettools, libnl, libudev, python, perl
|
||||
} :
|
||||
|
||||
let
|
||||
|
|
@ -16,16 +16,24 @@ in stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ libnl ethtool libudev python perl ];
|
||||
buildInputs = [ libnl ethtool nettools libudev python perl ];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/rxe_cfg --replace ethtool "${ethtool}/bin/ethtool"
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_RUNDIR=/run"
|
||||
"-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace providers/rxe/rxe_cfg.in \
|
||||
--replace ethtool "${ethtool}/bin/ethtool" \
|
||||
--replace ifconfig "${nettools}/bin/ifconfig"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "RDMA Core Userspace Libraries and Daemons";
|
||||
homepage = https://github.com/linux-rdma/rdma-core;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ markuskowa ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tp_smapi-${version}-${kernel.version}";
|
||||
version = "0.42";
|
||||
version = "unstable-2017-12-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evgeni";
|
||||
repo = "tp_smapi";
|
||||
rev = "tp-smapi/${version}";
|
||||
sha256 = "12lnig90lrmkmqwl386q7ssqs9p0jikqhwl2wsmcmii1gn92hzfy";
|
||||
rev = "76c5120f7be4880cf2c6801f872327e4e70c449f";
|
||||
sha256 = "0g8l7rmylspl17qnqpa2h4yj7h3zvy6xlmj5nlnixds9avnbz2vy";
|
||||
name = "tp-smapi-${version}";
|
||||
};
|
||||
|
||||
|
|
@ -39,11 +39,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "IBM ThinkPad hardware functions driver";
|
||||
homepage = https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41;
|
||||
homepage = https://github.com/evgeni/tp_smapi;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
||||
# driver is only ment for linux thinkpads i think bellow platforms should cover it.
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dovecot-pigeonhole-${version}";
|
||||
version = "0.4.21";
|
||||
version = "0.5.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
|
||||
sha256 = "0snxrx9lk3j0rrcd4jlhwlqk4v31n1qfx2asgwb4scy5i2vrrq2a";
|
||||
url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
|
||||
sha256 = "1lpsdqh9pwqx917z5v23bahhhbrcb3y5ps3l413sli8cn4a6sdan";
|
||||
};
|
||||
|
||||
buildInputs = [ dovecot openssl ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "elvish-${version}";
|
||||
version = "0.10";
|
||||
version = "0.11";
|
||||
|
||||
goPackagePath = "github.com/elves/elvish";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
repo = "elvish";
|
||||
owner = "elves";
|
||||
rev = version;
|
||||
sha256 = "0v6byd81nz0fbd3sdlippi1jn1z3gbqc2shnr7akd1n6k9259vrj";
|
||||
sha256 = "1rzgy1ql381nwsdjgiwv4mdr1xwivnpmzgkdzms8ipn2lbwhff87";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
30
pkgs/tools/audio/beets/alternatives-beets-1.4.6.patch
Normal file
30
pkgs/tools/audio/beets/alternatives-beets-1.4.6.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
diff --git a/test/helper.py b/test/helper.py
|
||||
index c216226..d409c09 100644
|
||||
--- a/test/helper.py
|
||||
+++ b/test/helper.py
|
||||
@@ -11,6 +11,7 @@ import beets
|
||||
from beets import plugins
|
||||
from beets import ui
|
||||
from beets.library import Item
|
||||
+from beets.util import MoveOperation
|
||||
|
||||
from beetsplug import alternatives
|
||||
from beetsplug import convert
|
||||
@@ -183,7 +184,7 @@ class TestHelper(Assertions):
|
||||
item = Item.from_path(os.path.join(self.fixture_dir, 'min.' + ext))
|
||||
item.add(self.lib)
|
||||
item.update(values)
|
||||
- item.move(copy=True)
|
||||
+ item.move(operation=MoveOperation.COPY)
|
||||
item.write()
|
||||
album = self.lib.add_album([item])
|
||||
album.albumartist = item.artist
|
||||
@@ -201,7 +202,7 @@ class TestHelper(Assertions):
|
||||
item = Item.from_path(os.path.join(self.fixture_dir, 'min.mp3'))
|
||||
item.add(self.lib)
|
||||
item.update(values)
|
||||
- item.move(copy=True)
|
||||
+ item.move(operation=MoveOperation.COPY)
|
||||
item.write()
|
||||
return item
|
||||
|
||||
|
|
@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec {
|
|||
sha256 = "10za6h59pxa13y8i4amqhc6392csml0dl771lssv6b6a98kamsy7";
|
||||
};
|
||||
|
||||
patches = [ ./alternatives-beets-1.4.6.patch ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py
|
||||
sed -i -e '/test_suite/d' setup.py
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "moreutils-${version}";
|
||||
version = "0.61";
|
||||
version = "0.62";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.joeyh.name/moreutils";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr";
|
||||
sha256 = "0sk7rgqsqbdwr69mh7y4v9lv4v0nfmsrqgvbpy2gvy82snhfzar2";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec {
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "i2p-0.9.32";
|
||||
name = "i2p-0.9.33";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
|
||||
sha256 = "1c82yckwzp51wqrr8qhww3sifm1a9nzrymsf9qv99ngsxq4n5l6i";
|
||||
sha256 = "1hlildi34p34xgpm0gqh09r2jb6nsa7a52gr074r6203xkl2racw";
|
||||
};
|
||||
buildInputs = [ jdk ant gettext which ];
|
||||
patches = [ ./i2p.patch ];
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
name = pname + "-" + version;
|
||||
pname = "i2pd";
|
||||
version = "2.17.0";
|
||||
version = "2.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PurpleI2P";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1yl5h7mls50vkg7x5510mljmgsm02arqhcanwkrqw4ilwvcp1mgz";
|
||||
sha256 = "019psm86n4k7nzxhw7cnbw144gqni59sf35wiy58a6x6dabmvq8h";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib; [ boost zlib openssl ]
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ let
|
|||
inherit name src;
|
||||
version = lib.getVersion name;
|
||||
|
||||
is112 = lib.versionAtLeast version "1.12pre";
|
||||
is20 = lib.versionAtLeast version "2.0pre";
|
||||
|
||||
VERSION_SUFFIX = lib.optionalString fromGit suffix;
|
||||
|
||||
|
|
@ -34,14 +34,14 @@ let
|
|||
|
||||
nativeBuildInputs =
|
||||
[ pkgconfig ]
|
||||
++ lib.optionals (!is112) [ perl ]
|
||||
++ lib.optionals (!is20) [ perl ]
|
||||
++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];
|
||||
|
||||
buildInputs = [ curl openssl sqlite xz ]
|
||||
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
|
||||
++ lib.optionals fromGit [ brotli ] # Since 1.12
|
||||
++ lib.optional stdenv.isLinux libseccomp
|
||||
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112)
|
||||
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
|
||||
(aws-sdk-cpp.override {
|
||||
apis = ["s3"];
|
||||
customMemoryManagement = false;
|
||||
|
|
@ -65,11 +65,11 @@ let
|
|||
"--disable-init-state"
|
||||
"--enable-gc"
|
||||
]
|
||||
++ lib.optionals (!is112) [
|
||||
++ lib.optionals (!is20) [
|
||||
"--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
|
||||
"--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
|
||||
"--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
|
||||
] ++ lib.optionals (is112 && stdenv.isLinux) [
|
||||
] ++ lib.optionals (is20 && stdenv.isLinux) [
|
||||
"--with-sandbox-shell=${sh}/bin/busybox"
|
||||
];
|
||||
|
||||
|
|
@ -160,13 +160,13 @@ in rec {
|
|||
}) // { perl-bindings = nixStable; };
|
||||
|
||||
nixUnstable = (lib.lowPrio (common rec {
|
||||
name = "nix-unstable-1.12${suffix}";
|
||||
suffix = "pre5873_b76e282d";
|
||||
name = "nix-2.0${suffix}";
|
||||
suffix = "pre5889_c287d731";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "b76e282da8824b679368370e43c994e588994a9a";
|
||||
sha256 = "11clfc8fh8q8s3k4canmn36xhh3zcl2zd8wwddp4pdvdal16b5n6";
|
||||
rev = "c287d7312103bae5e154c0c4dd493371a22ea207";
|
||||
sha256 = "1dwhz93dlk62prh3wfwf8vxfcqjdn21wk0ms65kf5r8ahkfgpgq4";
|
||||
};
|
||||
fromGit = true;
|
||||
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "spectre-meltdown-checker-${version}";
|
||||
version = "0.33";
|
||||
version = "0.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "speed47";
|
||||
repo = "spectre-meltdown-checker";
|
||||
rev = "v${version}";
|
||||
sha256 = "0a0vbzjfmvcvak804y2s0301f9bcnr0nwg2piafx6i6ibisp917y";
|
||||
sha256 = "0jlqxzii883yl5iqmywqqqjlhgswn033566a3vpspycj3sr8zrd2";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
name = "pdf2djvu-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz";
|
||||
sha256 = "1h92f9prx69wz9h57lncxj8ddh2xg6q7hjhlqqzzf30k59il4zcy";
|
||||
sha256 = "0kc3n4lm9dd13w66ng7l637ha241q89xrv9da0wzsdg6v0gp6ifg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -116,7 +116,9 @@ let
|
|||
lib.optionalAttrs allowCustomOverrides
|
||||
((config.packageOverrides or (super: {})) super);
|
||||
|
||||
# The complete chain of package set builders, applied from top to bottom
|
||||
# The complete chain of package set builders, applied from top to bottom.
|
||||
# stdenvOverlays must be last as it brings package forward from the
|
||||
# previous bootstrapping phases which have already been overlayed.
|
||||
toFix = lib.foldl' (lib.flip lib.extends) (self: {}) ([
|
||||
stdenvBootstappingAndPlatforms
|
||||
platformCompat
|
||||
|
|
@ -125,9 +127,9 @@ let
|
|||
splice
|
||||
allPackages
|
||||
aliases
|
||||
stdenvOverrides
|
||||
configOverrides
|
||||
] ++ overlays);
|
||||
] ++ overlays ++ [
|
||||
stdenvOverrides ]);
|
||||
|
||||
in
|
||||
# Return the complete set of packages.
|
||||
|
|
|
|||
Loading…
Reference in a new issue