Merge branch 'master' into haskell-github
This commit is contained in:
Ryan Mulligan
GitHub
commit
88029fc8af
@ -2,8 +2,8 @@
|
||||
let
|
||||
lib = pkgs.lib;
|
||||
locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; };
|
||||
in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs; };
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
name = "nixpkgs-manual";
|
||||
|
||||
buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ];
|
||||
@ -32,6 +32,7 @@ pkgs.stdenv.mkDerivation {
|
||||
postPatch = ''
|
||||
rm -rf ./functions/library/locations.xml
|
||||
ln -s ${locationsXml} ./functions/library/locations.xml
|
||||
ln -s ${functionDocs} ./functions/library/generated
|
||||
echo ${lib.version} > .version
|
||||
'';
|
||||
|
||||
|
||||
@ -12,4 +12,13 @@
|
||||
<xi:include href="./library/asserts.xml" />
|
||||
|
||||
<xi:include href="./library/attrsets.xml" />
|
||||
|
||||
<!-- These docs are generated via nixdoc. To add another generated
|
||||
library function file to this list, the file
|
||||
`lib-function-docs.nix` must also be updated. -->
|
||||
<xi:include href="./library/generated/strings.xml" />
|
||||
<xi:include href="./library/generated/trivial.xml" />
|
||||
<xi:include href="./library/generated/lists.xml" />
|
||||
<xi:include href="./library/generated/debug.xml" />
|
||||
<xi:include href="./library/generated/options.xml" />
|
||||
</section>
|
||||
|
||||
26
doc/lib-function-docs.nix
Normal file
26
doc/lib-function-docs.nix
Normal file
@ -0,0 +1,26 @@
|
||||
# Generates the documentation for library functons via nixdoc. To add
|
||||
# another library function file to this list, the include list in the
|
||||
# file `doc/functions/library.xml` must also be updated.
|
||||
|
||||
{ pkgs ? import ./.. {}, locationsXml }:
|
||||
|
||||
with pkgs; stdenv.mkDerivation {
|
||||
name = "nixpkgs-lib-docs";
|
||||
src = ./../lib;
|
||||
|
||||
buildInputs = [ nixdoc ];
|
||||
installPhase = ''
|
||||
function docgen {
|
||||
nixdoc -c "$1" -d "$2" -f "../lib/$1.nix" > "$out/$1.xml"
|
||||
}
|
||||
|
||||
mkdir -p $out
|
||||
ln -s ${locationsXml} $out/locations.xml
|
||||
|
||||
docgen strings 'String manipulation functions'
|
||||
docgen trivial 'Miscellaneous functions'
|
||||
docgen lists 'List manipulation functions'
|
||||
docgen debug 'Debugging functions'
|
||||
docgen options 'NixOS / nixpkgs option handling'
|
||||
'';
|
||||
}
|
||||
@ -307,23 +307,19 @@ packageOverrides = pkgs: {
|
||||
</screen>
|
||||
</para>
|
||||
</section>
|
||||
|
||||
<section xml:id="sec-elm">
|
||||
<title>Elm</title>
|
||||
|
||||
<para>
|
||||
The Nix expressions for Elm reside in
|
||||
<filename>pkgs/development/compilers/elm</filename>. They are generated
|
||||
automatically by <command>update-elm.rb</command> script. One should specify
|
||||
versions of Elm packages inside the script, clear the
|
||||
<filename>packages</filename> directory and run the script from inside it.
|
||||
<literal>elm-reactor</literal> is special because it also has Elm package
|
||||
dependencies. The process is not automated very much for now -- you should
|
||||
get the <literal>elm-reactor</literal> source tree (e.g. with
|
||||
<command>nix-shell</command>) and run <command>elm2nix.rb</command> inside
|
||||
it. Place the resulting <filename>package.nix</filename> file into
|
||||
<filename>packages/elm-reactor-elm.nix</filename>.
|
||||
To update Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
To package Elm applications, <link xlink:href="https://github.com/hercules-ci/elm2nix#elm2nix">read about elm2nix</link>.
|
||||
</para>
|
||||
</section>
|
||||
|
||||
<section xml:id="sec-shell-helpers">
|
||||
<title>Interactive shell helpers</title>
|
||||
|
||||
|
||||
@ -279,8 +279,14 @@ rec {
|
||||
"2" = # We only do 2-part hacks for things Nix already supports
|
||||
if elemAt l 1 == "cygwin"
|
||||
then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; }
|
||||
# MSVC ought to be the default ABI so this case isn't needed. But then it
|
||||
# becomes difficult to handle the gnu* variants for Aarch32 correctly for
|
||||
# minGW. So it's easier to make gnu* the default for the MinGW, but
|
||||
# hack-in MSVC for the non-MinGW case right here.
|
||||
else if elemAt l 1 == "windows"
|
||||
then { cpu = elemAt l 0; kernel = "windows"; abi = "msvc"; }
|
||||
else if (elemAt l 1) == "elf"
|
||||
then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
|
||||
then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
|
||||
else { cpu = elemAt l 0; kernel = elemAt l 1; };
|
||||
"3" = # Awkwards hacks, beware!
|
||||
if elemAt l 1 == "apple"
|
||||
@ -288,7 +294,7 @@ rec {
|
||||
else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
|
||||
then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; }
|
||||
else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; }
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; }
|
||||
else if hasPrefix "netbsd" (elemAt l 2)
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
|
||||
else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
|
||||
@ -324,13 +330,12 @@ rec {
|
||||
else getKernel args.kernel;
|
||||
abi =
|
||||
/**/ if args ? abi then getAbi args.abi
|
||||
else if isLinux parsed then
|
||||
else if isLinux parsed || isWindows parsed then
|
||||
if isAarch32 parsed then
|
||||
if lib.versionAtLeast (parsed.cpu.version or "0") "6"
|
||||
then abis.gnueabihf
|
||||
else abis.gnueabi
|
||||
else abis.gnu
|
||||
else if isWindows parsed then abis.gnu
|
||||
else abis.unknown;
|
||||
};
|
||||
|
||||
|
||||
@ -391,6 +391,11 @@
|
||||
github = "asppsa";
|
||||
name = "Alastair Pharo";
|
||||
};
|
||||
astro = {
|
||||
email = "astro@spaceboyz.net";
|
||||
github = "astro";
|
||||
name = "Astro";
|
||||
};
|
||||
astsmtl = {
|
||||
email = "astsmtl@yandex.ru";
|
||||
github = "astsmtl";
|
||||
@ -1745,6 +1750,11 @@
|
||||
github = "hamhut1066";
|
||||
name = "Hamish Hutchings";
|
||||
};
|
||||
hansjoergschurr = {
|
||||
email = "commits@schurr.at";
|
||||
github = "hansjoergschurr";
|
||||
name = "Hans-Jörg Schurr";
|
||||
};
|
||||
haslersn = {
|
||||
email = "haslersn@fius.informatik.uni-stuttgart.de";
|
||||
github = "haslersn";
|
||||
@ -3906,6 +3916,10 @@
|
||||
github = "fkz";
|
||||
name = "Fabian Schmitthenner";
|
||||
};
|
||||
schmittlauch = {
|
||||
email = "t.schmittlauch+nixos@orlives.de";
|
||||
github = "schmittlauch";
|
||||
};
|
||||
schneefux = {
|
||||
email = "schneefux+nixos_pkg@schneefux.xyz";
|
||||
github = "schneefux";
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, e2fsprogs
|
||||
, libfaketime
|
||||
, perl
|
||||
, lkl
|
||||
}:
|
||||
|
||||
let
|
||||
@ -18,16 +19,13 @@ in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "ext4-fs.img";
|
||||
|
||||
nativeBuildInputs = [e2fsprogs.bin libfaketime perl];
|
||||
nativeBuildInputs = [e2fsprogs.bin libfaketime perl lkl];
|
||||
|
||||
buildCommand =
|
||||
''
|
||||
# Add the closures of the top-level store objects.
|
||||
storePaths=$(cat ${sdClosureInfo}/store-paths)
|
||||
|
||||
# Also include a manifest of the closures in a format suitable for nix-store --load-db.
|
||||
cp ${sdClosureInfo}/registration nix-path-registration
|
||||
|
||||
# Make a crude approximation of the size of the target image.
|
||||
# If the script starts failing, increase the fudge factors here.
|
||||
numInodes=$(find $storePaths | wc -l)
|
||||
@ -38,55 +36,16 @@ pkgs.stdenv.mkDerivation {
|
||||
truncate -s $bytes $out
|
||||
faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out
|
||||
|
||||
# Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
|
||||
# For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
|
||||
# cd /nix/store/abcd...efg-coreutils-8.23/bin
|
||||
# write /nix/store/abcd...efg-coreutils-8.23/bin/sleep sleep
|
||||
# sif sleep mode 040555
|
||||
# sif sleep gid 30000
|
||||
# In particular, debugfs doesn't handle absolute target paths; you have to 'cd' in the virtual
|
||||
# filesystem first. Likewise the intermediate directories must already exist (using `find`
|
||||
# handles that for us). And when setting the file's permissions, the inode type flags (__S_IFDIR,
|
||||
# __S_IFREG) need to be set as well.
|
||||
(
|
||||
echo write nix-path-registration nix-path-registration
|
||||
echo mkdir nix
|
||||
echo cd /nix
|
||||
echo mkdir store
|
||||
# Also include a manifest of the closures in a format suitable for nix-store --load-db.
|
||||
cp ${sdClosureInfo}/registration nix-path-registration
|
||||
cptofs -t ext4 -i $out nix-path-registration /
|
||||
|
||||
# XXX: This explodes in exciting ways if anything in /nix/store has a space in it.
|
||||
find $storePaths -printf '%y %f %h %m\n'| while read -r type file dir perms; do
|
||||
# echo "TYPE=$type DIR=$dir FILE=$file PERMS=$perms" >&2
|
||||
# Create nix/store before copying paths
|
||||
faketime -f "1970-01-01 00:00:01" mkdir -p nix/store
|
||||
cptofs -t ext4 -i $out nix /
|
||||
|
||||
echo "cd $dir"
|
||||
case $type in
|
||||
d)
|
||||
echo "mkdir $file"
|
||||
echo sif $file mode $((040000 | 0$perms)) # magic constant is __S_IFDIR
|
||||
;;
|
||||
f)
|
||||
echo "write $dir/$file $file"
|
||||
echo sif $file mode $((0100000 | 0$perms)) # magic constant is __S_IFREG
|
||||
;;
|
||||
l)
|
||||
echo "symlink $file $(readlink "$dir/$file")"
|
||||
;;
|
||||
*)
|
||||
echo "Unknown entry: $type $dir $file $perms" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
echo sif $file gid 30000 # chgrp to nixbld
|
||||
done
|
||||
) | faketime -f "1970-01-01 00:00:01" debugfs -w $out -f /dev/stdin > errorlog 2>&1
|
||||
|
||||
# The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually.
|
||||
if egrep -q 'Could not allocate|File not found' errorlog; then
|
||||
cat errorlog
|
||||
echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
|
||||
return 1
|
||||
fi
|
||||
echo "copying store paths to image..."
|
||||
cptofs -t ext4 -i $out $storePaths /nix/store/
|
||||
|
||||
# I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build.
|
||||
if ! fsck.ext4 -n -f $out; then
|
||||
|
||||
@ -93,6 +93,7 @@ in
|
||||
VERSION_CODENAME=${toLower cfg.codeName}
|
||||
VERSION_ID="${cfg.version}"
|
||||
PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})"
|
||||
LOGO="nix-snowflake"
|
||||
HOME_URL="https://nixos.org/"
|
||||
SUPPORT_URL="https://nixos.org/nixos/support.html"
|
||||
BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"
|
||||
|
||||
@ -29,11 +29,20 @@ with lib;
|
||||
security.apparmor.enable = mkDefault true;
|
||||
|
||||
boot.kernelParams = [
|
||||
# Slab/slub sanity checks, redzoning, and poisoning
|
||||
"slub_debug=FZP"
|
||||
|
||||
# Disable slab merging to make certain heap overflow attacks harder
|
||||
"slab_nomerge"
|
||||
|
||||
# Overwrite free'd memory
|
||||
"page_poison=1"
|
||||
|
||||
# Disable legacy virtual syscalls
|
||||
"vsyscall=none"
|
||||
|
||||
# Enable PTI even if CPU claims to be safe from meltdown
|
||||
"pti=on"
|
||||
];
|
||||
|
||||
boot.blacklistedKernelModules = [
|
||||
|
||||
@ -7,11 +7,18 @@ let
|
||||
swayPackage = pkgs.sway;
|
||||
|
||||
swayWrapped = pkgs.writeShellScriptBin "sway" ''
|
||||
if [[ "$#" -ge 1 ]]; then
|
||||
set -o errexit
|
||||
|
||||
if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
|
||||
export _SWAY_WRAPPER_ALREADY_EXECUTED=1
|
||||
${cfg.extraSessionCommands}
|
||||
fi
|
||||
|
||||
if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
|
||||
export DBUS_SESSION_BUS_ADDRESS
|
||||
exec sway-setcap "$@"
|
||||
else
|
||||
${cfg.extraSessionCommands}
|
||||
exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
|
||||
exec ${pkgs.dbus}/bin/dbus-run-session sway-setcap "$@"
|
||||
fi
|
||||
'';
|
||||
swayJoined = pkgs.symlinkJoin {
|
||||
|
||||
@ -9,7 +9,8 @@ in
|
||||
options.programs.xss-lock = {
|
||||
enable = mkEnableOption "xss-lock";
|
||||
lockerCommand = mkOption {
|
||||
example = "xlock";
|
||||
default = "${pkgs.i3lock}/bin/i3lock";
|
||||
example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
|
||||
type = types.string;
|
||||
description = "Locker to be used with xsslock";
|
||||
};
|
||||
|
||||
@ -32,7 +32,6 @@ in {
|
||||
default = [];
|
||||
description = "Extra arguments to lircd.";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
@ -43,14 +42,15 @@ in {
|
||||
# Note: LIRC executables raises a warning, if lirc_options.conf do not exists
|
||||
environment.etc."lirc/lirc_options.conf".text = cfg.options;
|
||||
|
||||
passthru.lirc.socket = "/run/lirc/lircd";
|
||||
|
||||
environment.systemPackages = [ pkgs.lirc ];
|
||||
|
||||
systemd.sockets.lircd = {
|
||||
description = "LIRC daemon socket";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
socketConfig = {
|
||||
# default search path
|
||||
ListenStream = "/run/lirc/lircd";
|
||||
ListenStream = config.passthru.lirc.socket;
|
||||
SocketUser = "lirc";
|
||||
SocketMode = "0660";
|
||||
};
|
||||
|
||||
@ -56,6 +56,8 @@ in
|
||||
|
||||
powerManagement.scsiLinkPolicy = null;
|
||||
powerManagement.cpuFreqGovernor = null;
|
||||
powerManagement.cpufreq.max = null;
|
||||
powerManagement.cpufreq.min = null;
|
||||
|
||||
systemd.sockets."systemd-rfkill".enable = false;
|
||||
|
||||
|
||||
@ -33,12 +33,14 @@ in {
|
||||
default = [];
|
||||
description = "Additional command line arguments to pass to VDR.";
|
||||
};
|
||||
|
||||
enableLirc = mkEnableOption "enable LIRC";
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = mkIf cfg.enable (mkMerge [{
|
||||
systemd.tmpfiles.rules = [
|
||||
"d ${cfg.videoDir} 0755 vdr vdr -"
|
||||
"Z ${cfg.videoDir} - vdr vdr -"
|
||||
@ -67,5 +69,13 @@ in {
|
||||
};
|
||||
|
||||
users.groups.vdr = {};
|
||||
};
|
||||
}
|
||||
|
||||
(mkIf cfg.enableLirc {
|
||||
services.lirc.enable = true;
|
||||
users.users.vdr.extraGroups = [ "lirc" ];
|
||||
services.vdr.extraArguments = [
|
||||
"--lirc=${config.passthru.lirc.socket}"
|
||||
];
|
||||
})]);
|
||||
}
|
||||
|
||||
@ -33,6 +33,7 @@ let
|
||||
tor = import ./exporters/tor.nix { inherit config lib pkgs; };
|
||||
unifi = import ./exporters/unifi.nix { inherit config lib pkgs; };
|
||||
varnish = import ./exporters/varnish.nix { inherit config lib pkgs; };
|
||||
bind = import ./exporters/bind.nix { inherit config lib pkgs; };
|
||||
};
|
||||
|
||||
mkExporterOpts = ({ name, port }: {
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
{ config, lib, pkgs }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.bind;
|
||||
in
|
||||
{
|
||||
port = 9119;
|
||||
extraOpts = {
|
||||
bindURI = mkOption {
|
||||
type = types.str;
|
||||
default = "http://localhost:8053/";
|
||||
description = ''
|
||||
HTTP XML API address of an Bind server.
|
||||
'';
|
||||
};
|
||||
bindTimeout = mkOption {
|
||||
type = types.str;
|
||||
default = "10s";
|
||||
description = ''
|
||||
Timeout for trying to get stats from Bind.
|
||||
'';
|
||||
};
|
||||
bindVersion = mkOption {
|
||||
type = types.enum [ "xml.v2" "xml.v3" "auto" ];
|
||||
default = "auto";
|
||||
description = ''
|
||||
BIND statistics version. Can be detected automatically.
|
||||
'';
|
||||
};
|
||||
bindGroups = mkOption {
|
||||
type = types.listOf (types.enum [ "server" "view" "tasks" ]);
|
||||
default = [ "server" "view" ];
|
||||
description = ''
|
||||
List of statistics to collect. Available: [server, view, tasks]
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-bind-exporter}/bin/bind_exporter \
|
||||
-web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
|
||||
-bind.pid-file /var/run/named/named.pid \
|
||||
-bind.timeout ${toString cfg.bindTimeout} \
|
||||
-bind.stats-url ${cfg.bindURI} \
|
||||
-bind.stats-version ${cfg.bindVersion} \
|
||||
-bind.stats-groups ${concatStringsSep "," cfg.bindGroups} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -27,7 +27,7 @@ in
|
||||
};
|
||||
|
||||
arguments = mkOption {
|
||||
default = "-v pulse";
|
||||
default = "-v -o pa";
|
||||
description = ''
|
||||
Arguments to pass to the daemon. Defaults to a local pulseaudio
|
||||
server.
|
||||
|
||||
@ -352,6 +352,10 @@ in
|
||||
path = [ cfgc.package pkgs.gawk ];
|
||||
environment.LD_LIBRARY_PATH = nssModulesPath;
|
||||
|
||||
restartTriggers = optionals (!cfg.startWhenNeeded) [
|
||||
config.environment.etc."ssh/sshd_config".source
|
||||
];
|
||||
|
||||
preStart =
|
||||
''
|
||||
# Make sure we don't write to stdout, since in case of
|
||||
@ -387,6 +391,7 @@ in
|
||||
Restart = "always";
|
||||
Type = "simple";
|
||||
});
|
||||
|
||||
};
|
||||
in
|
||||
|
||||
|
||||
@ -191,7 +191,9 @@ let
|
||||
'') names}
|
||||
|
||||
${concatMapStrings (pkg: ''
|
||||
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
|
||||
if test -d ${pkg}/share/xsessions; then
|
||||
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
|
||||
fi
|
||||
'') cfg.displayManager.extraSessionFilePackages}
|
||||
|
||||
|
||||
|
||||
@ -10,43 +10,81 @@ in
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
options.powerManagement = {
|
||||
|
||||
powerManagement.cpuFreqGovernor = mkOption {
|
||||
# TODO: This should be aliased to powerManagement.cpufreq.governor.
|
||||
# https://github.com/NixOS/nixpkgs/pull/53041#commitcomment-31825338
|
||||
cpuFreqGovernor = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "ondemand";
|
||||
description = ''
|
||||
Configure the governor used to regulate the frequence of the
|
||||
available CPUs. By default, the kernel configures the
|
||||
performance governor.
|
||||
performance governor, although this may be overwritten in your
|
||||
hardware-configuration.nix file.
|
||||
|
||||
Often used values: "ondemand", "powersave", "performance"
|
||||
'';
|
||||
};
|
||||
|
||||
cpufreq = {
|
||||
|
||||
max = mkOption {
|
||||
type = types.nullOr types.ints.unsigned;
|
||||
default = null;
|
||||
example = 2200000;
|
||||
description = ''
|
||||
The maximum frequency the CPU will use. Defaults to the maximum possible.
|
||||
'';
|
||||
};
|
||||
|
||||
min = mkOption {
|
||||
type = types.nullOr types.ints.unsigned;
|
||||
default = null;
|
||||
example = 800000;
|
||||
description = ''
|
||||
The minimum frequency the CPU will use.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf (!config.boot.isContainer && config.powerManagement.cpuFreqGovernor != null) {
|
||||
config =
|
||||
let
|
||||
governorEnable = cfg.cpuFreqGovernor != null;
|
||||
maxEnable = cfg.cpufreq.max != null;
|
||||
minEnable = cfg.cpufreq.min != null;
|
||||
enable =
|
||||
!config.boot.isContainer &&
|
||||
(governorEnable || maxEnable || minEnable);
|
||||
in
|
||||
mkIf enable {
|
||||
|
||||
boot.kernelModules = [ "cpufreq_${cfg.cpuFreqGovernor}" ];
|
||||
boot.kernelModules = optional governorEnable "cpufreq_${cfg.cpuFreqGovernor}";
|
||||
|
||||
environment.systemPackages = [ cpupower ];
|
||||
environment.systemPackages = [ cpupower ];
|
||||
|
||||
systemd.services.cpufreq = {
|
||||
description = "CPU Frequency Governor Setup";
|
||||
after = [ "systemd-modules-load.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ cpupower pkgs.kmod ];
|
||||
unitConfig.ConditionVirtualization = false;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = "yes";
|
||||
ExecStart = "${cpupower}/bin/cpupower frequency-set -g ${cfg.cpuFreqGovernor}";
|
||||
SuccessExitStatus = "0 237";
|
||||
systemd.services.cpufreq = {
|
||||
description = "CPU Frequency Setup";
|
||||
after = [ "systemd-modules-load.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ cpupower pkgs.kmod ];
|
||||
unitConfig.ConditionVirtualization = false;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = "yes";
|
||||
ExecStart = "${cpupower}/bin/cpupower frequency-set " +
|
||||
optionalString governorEnable "--governor ${cfg.cpuFreqGovernor} " +
|
||||
optionalString maxEnable "--max ${toString cfg.cpufreq.max} " +
|
||||
optionalString minEnable "--min ${toString cfg.cpufreq.min} ";
|
||||
SuccessExitStatus = "0 237";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -106,6 +106,25 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
bind = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
};
|
||||
metricProvider = {
|
||||
services.bind.enable = true;
|
||||
services.bind.extraConfig = ''
|
||||
statistics-channels {
|
||||
inet 127.0.0.1 port 8053 allow { localhost; };
|
||||
};
|
||||
'';
|
||||
};
|
||||
exporterTest = ''
|
||||
waitForUnit("prometheus-bind-exporter.service");
|
||||
waitForOpenPort(9119);
|
||||
succeed("curl -sSf http://localhost:9119/metrics" | grep -q 'bind_query_recursions_total 0');
|
||||
'';
|
||||
};
|
||||
|
||||
dovecot = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
|
||||
@ -9,7 +9,6 @@ with lib;
|
||||
machine = {
|
||||
imports = [ ./common/x11.nix ./common/user-account.nix ];
|
||||
programs.xss-lock.enable = true;
|
||||
programs.xss-lock.lockerCommand = "${pkgs.xlockmore}/bin/xlock";
|
||||
services.xserver.displayManager.auto.user = "alice";
|
||||
};
|
||||
|
||||
@ -20,6 +19,6 @@ with lib;
|
||||
|
||||
$machine->fail("pgrep xlock");
|
||||
$machine->succeed("su -l alice -c 'xset dpms force standby'");
|
||||
$machine->waitUntilSucceeds("pgrep xlock");
|
||||
$machine->waitUntilSucceeds("pgrep i3lock");
|
||||
'';
|
||||
})
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode, hexdump
|
||||
{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump
|
||||
, withGui }:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
] ++ optionals withGui [
|
||||
qt4
|
||||
protobuf
|
||||
libqrencode
|
||||
qrencode
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib;
|
||||
assert withReplaygain -> withTaglib;
|
||||
|
||||
let
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
pname = "cantata";
|
||||
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
|
||||
fstats = x: map (fstat x);
|
||||
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "CDrummond";
|
||||
repo = "cantata";
|
||||
rev = "v${version}";
|
||||
sha256 = "11hjday5vj0wzkc8yb5wbs05jwa8mvgxswd5qvhpci0zkl975yzn";
|
||||
sha256 = "1m651fmdbnb50glym75kzma0bllvqbmrb2afp1g9g5cxm1898c0f";
|
||||
};
|
||||
|
||||
buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
, llvm, qt48Full, libqrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
|
||||
, llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
|
||||
, bc, coreutils, which
|
||||
}:
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
llvm qt48Full libqrencode libmicrohttpd libjack2 alsaLib faust curl
|
||||
llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl
|
||||
bc coreutils which
|
||||
];
|
||||
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gpodder";
|
||||
version = "3.10.5";
|
||||
version = "3.10.6";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gpodder";
|
||||
repo = "gpodder";
|
||||
rev = version;
|
||||
sha256 = "00lvma40d62h4haybabh15x1y7rnmd84whbjgjv773igwagkn9vw";
|
||||
sha256 = "11nccsnlxrj8wwl8dyz9a0yrzma6ipx5gwj2lc7m308z60r8wvjs";
|
||||
};
|
||||
|
||||
postPatch = with stdenv.lib; ''
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "lollypop";
|
||||
version = "0.9.908";
|
||||
version = "0.9.909";
|
||||
|
||||
format = "other";
|
||||
doCheck = false;
|
||||
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
url = "https://gitlab.gnome.org/World/lollypop";
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0sjhp0lw41qdp5jah9shq69ga43rkxi3vijm57x8w147nj87ch7c";
|
||||
sha256 = "19d82dy0wprabg5kzcgs3ydmp9iz3h437n55cnlp20mbpya09k7n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopidy";
|
||||
repo = "mopidy";
|
||||
rev = "v${version}";
|
||||
sha256 = "012gg6x6d27adbfnwd4a607dl49bzk74az6h9djfvl2w0rbxzhhr";
|
||||
sha256 = "01vl162c7ssf69b0m65ys9fxnsqnfa1whwbprnc063lkcnrnlkr1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
@ -1,20 +1,24 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
|
||||
, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
|
||||
, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
|
||||
, qtwebkit, qtxmlpatterns
|
||||
, qtwebengine, qtxmlpatterns
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "musescore-${version}";
|
||||
version = "2.3.2";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "musescore";
|
||||
repo = "MuseScore";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1";
|
||||
sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./remove_qtwebengine_install_hack.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
|
||||
|
||||
@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
|
||||
portaudio portmidi # tesseract
|
||||
qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns
|
||||
qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
--- a/mscore/CMakeLists.txt
|
||||
+++ b/mscore/CMakeLists.txt
|
||||
@@ -660,22 +660,6 @@ if (MINGW)
|
||||
else (MINGW)
|
||||
|
||||
if ( NOT MSVC )
|
||||
-## install qwebengine core
|
||||
- if (NOT APPLE AND USE_WEBENGINE)
|
||||
- install(FILES
|
||||
- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
|
||||
- DESTINATION bin
|
||||
- )
|
||||
- install(DIRECTORY
|
||||
- ${QT_INSTALL_DATA}/resources
|
||||
- DESTINATION lib/qt5
|
||||
- )
|
||||
- install(DIRECTORY
|
||||
- ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
|
||||
- DESTINATION lib/qt5/translations
|
||||
- )
|
||||
- endif(NOT APPLE AND USE_WEBENGINE)
|
||||
-
|
||||
target_link_libraries(mscore
|
||||
${ALSA_LIB}
|
||||
${QT_LIBRARIES}
|
||||
@ -24,6 +24,7 @@
|
||||
, libsndfile
|
||||
, libebur128
|
||||
, boost
|
||||
, dbus
|
||||
, fftwFloat
|
||||
, calf
|
||||
, zita-convolver
|
||||
@ -43,14 +44,14 @@ let
|
||||
zam-plugins # maximizer
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "pulseeffects-${version}";
|
||||
version = "4.4.1";
|
||||
pname = "pulseeffects";
|
||||
version = "4.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "pulseeffects";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hb575h9hdknhwvhn5lak89ddavn4v5c0nipnv8dsfnmjhfli5qm";
|
||||
sha256 = "1dcly8rzbfnfqrl7biicbixdqgqazrwa4x8l3m3r8f4bf3sqpmhd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -80,6 +81,7 @@ in stdenv.mkDerivation rec {
|
||||
libsamplerate
|
||||
libsndfile
|
||||
boost
|
||||
dbus
|
||||
fftwFloat
|
||||
zita-convolver
|
||||
hicolor-icon-theme
|
||||
@ -91,8 +93,6 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 $out/lib/gstreamer-1.0
|
||||
|
||||
gappsWrapperArgs+=(
|
||||
--set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}"
|
||||
--set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf,
|
||||
{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk_pixbuf,
|
||||
tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection,
|
||||
gst_all_1, withGstPlugins ? true,
|
||||
xineBackend ? false, xineLib,
|
||||
@ -9,18 +9,14 @@
|
||||
let optionals = stdenv.lib.optionals; in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "quodlibet${tag}";
|
||||
version = "4.2.0";
|
||||
|
||||
# XXX, tests fail
|
||||
# https://github.com/quodlibet/quodlibet/issues/2820
|
||||
doCheck = false;
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
|
||||
sha256 = "0w64i999ipzgjb4c4lzw7jp792amd6km46wahx7m3bpzly55r3f6";
|
||||
sha256 = "0b1rvr4hqs2bjmhayms7vxxkn3d92k9v7p1269rjhf11hpk122l7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook gettext intltool ];
|
||||
nativeBuildInputs = [ wrapGAppsHook gettext ];
|
||||
|
||||
checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
|
||||
|
||||
@ -39,13 +35,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
checkHomeDir=$(mktemp -d)
|
||||
mkdir -p $checkHomeDir/.cache/thumbnails/normal # Required by TThumb.test_recreate_broken_cache_file
|
||||
env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \
|
||||
HOME=$checkHomeDir \
|
||||
HOME=$(mktemp -d) \
|
||||
xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
py.test
|
||||
py.test${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"}
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
|
||||
@ -18,9 +18,9 @@ let
|
||||
sha256Hash = "1rql4kxjic4qjcd8zssw2mmi55cxpzd0wp5g0kzwk5wybsfdcqhy";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "3.4.0.8"; # "Android Studio 3.4 Canary 9"
|
||||
build = "183.5186062";
|
||||
sha256Hash = "04i7ys0qzj3039h41q4na6737gl55wpp6hiwfas2h6zwvj25a9z9";
|
||||
version = "3.4.0.9"; # "Android Studio 3.4 Canary 10"
|
||||
build = "183.5202479";
|
||||
sha256Hash = "067mkf8n7bwv0f900d6d2hwxdhcgnp6dxqf6v81y1hf285ybymld";
|
||||
};
|
||||
in rec {
|
||||
# Old alias
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "focuswriter-${version}";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
|
||||
sha256 = "0321wqhjfs020q113lgh959qq03zfamm72zk22mnqxf3ng3adc3g";
|
||||
sha256 = "0ny0bri9yp6wcsj9s8vd0j4mzx44yw57axjx5piv44q2jgsgz401";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake qttools ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "1.34";
|
||||
version = "1.34.1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.geany.org/${name}.tar.bz2";
|
||||
sha256 = "63b93d25d037eaffa77895ae6dd29c91bca570e4053eff5cc8490f87e6021f8e";
|
||||
sha256 = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool libintl ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "okteta-${version}";
|
||||
version = "0.25.4";
|
||||
version = "0.25.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
|
||||
sha256 = "0liar1xbns6mr6j320nyxqfii82i4ysp62hf3j6jg1112v874amf";
|
||||
sha256 = "1680hx4n36msz86gyjsdr5v7nf8rpybvzrvfw8y98l95hfq3l6g9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "OpenOrienteering-Mapper-${version}";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
|
||||
buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
|
||||
qtsensors clipper zlib proj doxygen cups];
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "OpenOrienteering";
|
||||
repo = "mapper";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pnqwvmg97mgc2ci3abmx07l0njxcrbljh75w8ym31g0jq76pgr9";
|
||||
sha256 = "0rw34kp2vd1la97vnk9plwvis6lvyib2bvs7lgkhpnm4p5l7dp1g";
|
||||
};
|
||||
|
||||
cmakeFlags =
|
||||
|
||||
@ -13,8 +13,8 @@ let
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "7.0.8-14";
|
||||
sha256 = "0pbrmzsjc8l4klfsz739rnmw61m712r82ryjl8ycvbxdzxwnwm9v";
|
||||
version = "7.0.8-22";
|
||||
sha256 = "1ivljgf192xh7pq1apdic923pvcb3aq74mx8d4hi65hhc9748gv7";
|
||||
patches = [];
|
||||
};
|
||||
in
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "goxel-${version}";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guillaumechereau";
|
||||
repo = "goxel";
|
||||
rev = "v${version}";
|
||||
sha256 = "0g6jkihjmsx6lyfl301qrq26gwvq89sk7xkkba6vrpklfs2jafkb";
|
||||
sha256 = "14rycn6sd3wp90c9ghpif1al3rv1fdgvhmpldmwap0pk790kfxs1";
|
||||
};
|
||||
|
||||
patches = [ ./disable-imgui_ini.patch ];
|
||||
|
||||
@ -93,6 +93,7 @@ let
|
||||
kcalc = callPackage ./kcalc.nix {};
|
||||
kcalcore = callPackage ./kcalcore.nix {};
|
||||
kcalutils = callPackage ./kcalutils.nix {};
|
||||
kcharselect = callPackage ./kcharselect.nix {};
|
||||
kcolorchooser = callPackage ./kcolorchooser.nix {};
|
||||
kcontacts = callPackage ./kcontacts.nix {};
|
||||
kdav = callPackage ./kdav.nix {};
|
||||
|
||||
19
pkgs/applications/kde/kcharselect.nix
Normal file
19
pkgs/applications/kde/kcharselect.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kbookmarks, kconfig, kconfigwidgets, kcrash, kcoreaddons, ki18n, kwidgetsaddons, kxmlgui
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "kcharselect";
|
||||
meta = {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.schmittlauch ];
|
||||
description = "A tool to select special characters from all installed fonts and copy them into the clipboard";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
kbookmarks kconfig kconfigwidgets kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "CopyQ-${version}";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b3lrhrffvq46n9xc0lzbxhhn1lzmq2lrijjdwizc52458d6h90y";
|
||||
sha256 = "1f2q9lzs5z31rl689ai2hig4nrj8cg9g25hhsrj6r85q9vkwkqjs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, libcap
|
||||
, libevent
|
||||
, libtool
|
||||
, libqrencode
|
||||
, qrencode
|
||||
, udev
|
||||
, libusb
|
||||
, makeWrapper
|
||||
@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
|
||||
libtool
|
||||
udev
|
||||
libusb
|
||||
libqrencode
|
||||
qrencode
|
||||
|
||||
qtbase
|
||||
qtwebsockets
|
||||
|
||||
@ -1,35 +1,36 @@
|
||||
{ stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
|
||||
librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }:
|
||||
{ stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkgconfig,
|
||||
librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eaglemode-0.86.0";
|
||||
name = "eaglemode-${version}";
|
||||
version = "0.94.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
|
||||
sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f";
|
||||
sha256 = "1sr3bd9y9j2svqvdwhrak29yy9cxf92w9vq2cim7a8hzwi9qfy9k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ perl libX11 libjpeg libpng libtiff
|
||||
librsvg glib gtk2 libXxf86vm libXext poppler xineLib ];
|
||||
buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff
|
||||
librsvg glib gtk2 libXxf86vm libXext poppler xineLib ghostscript makeWrapper ];
|
||||
|
||||
# The program tries to dlopen both Xxf86vm and Xext, so we use the
|
||||
# The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the
|
||||
# trick on NIX_LDFLAGS and dontPatchELF to make it find them.
|
||||
# I use 'yes y' to skip a build error linking with xineLib,
|
||||
# because xine stopped exporting "_x_vo_new_port"
|
||||
# https://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
|
||||
buildPhase = ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext -lXinerama"
|
||||
perl make.pl build
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
# eaglemode expects doc to be in the root directory
|
||||
forceShare = [ "man" "info" ];
|
||||
|
||||
installPhase = ''
|
||||
perl make.pl install dir=$out
|
||||
# I don't like this... but it seems the way they plan to run it by now.
|
||||
# Run 'eaglemode.sh', not 'eaglemode'.
|
||||
ln -s $out/eaglemode.sh $out/bin/eaglemode.sh
|
||||
wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${ghostscript}/bin"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
@ -38,6 +39,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,20 +2,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gpxsee-${version}";
|
||||
version = "6.3";
|
||||
version = "7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumic0";
|
||||
repo = "GPXSee";
|
||||
rev = version;
|
||||
sha256 = "0kbnmcis04kjqkd0msfjd8rdmdf23c71dpzx9wcpf2yadc9rv4c9";
|
||||
sha256 = "1dgag8j3566qwiz1pschfq2wqdp7y1pr4cm9na4zwrdjhn3ci6v5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qttools ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
|
||||
substituteInPlace src/common/programpaths.cpp --replace /usr/share/ $out/share/
|
||||
lrelease lang/*.ts
|
||||
'';
|
||||
|
||||
@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.gpxsee.org/;
|
||||
homepage = https://www.gpxsee.org/;
|
||||
description = "GPX viewer and analyzer";
|
||||
longDescription = ''
|
||||
GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX,
|
||||
TCX, KML, FIT, IGC and NMEA files.
|
||||
TCX, KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files.
|
||||
'';
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.womfoo ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "josm-${version}";
|
||||
version = "14460";
|
||||
version = "14620";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
sha256 = "1j95319dvj4cwi1af94n1p8m1z1191j1jx6x06l4vz8bcjxaaqf5";
|
||||
sha256 = "0ypn2awmclxsx4i7mmghs5blz2j5srdayzcxcqn5b4p1r57072bn";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk11 makeWrapper ];
|
||||
|
||||
@ -17,13 +17,13 @@ let
|
||||
};
|
||||
|
||||
in with python.pkgs; buildPythonApplication rec {
|
||||
version = "0.12.2";
|
||||
version = "0.13.0";
|
||||
name = "khard-${version}";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
|
||||
sha256 = "0lxcvzmafpvqcifgq2xjh1ca07z0vhihn5jnw8zrpmsqdc9p6b4j";
|
||||
sha256 = "06b9xcdg1na6mxa2pnlh0wfsk02k2h6hlki089aaikbg8k8ykj8f";
|
||||
};
|
||||
|
||||
# setup.py reads the UTF-8 encoded readme.
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "latte-dock";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
|
||||
sha256 = "1jgg1ag8sxrkif1bqgz5pizn1xmiljas00rqcskszx10j0595mnk";
|
||||
sha256 = "0zm2xckyaymd53a38mf1bh9in4bh2bshbr3z8z9gn6mp7c60jay3";
|
||||
name = "${name}.tar.xz";
|
||||
};
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "18.08.1";
|
||||
version = "18.12";
|
||||
name = "mediainfo-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9";
|
||||
sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -1,25 +1,32 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, ncurses, conf ? null }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nnn-${version}";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "nnn";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vkrhsdwgacln335rjywdf7nj7fg1x55szmm8xrvwda8y2qjqhc4";
|
||||
sha256 = "01y2vkw1wakpnpzhzia3d44iir060i8vma3b3ww5wgwg7bfpzs4b";
|
||||
};
|
||||
|
||||
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
|
||||
preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ ncurses readline ];
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
|
||||
|
||||
# shell completions
|
||||
postInstall = ''
|
||||
install -Dm555 scripts/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash
|
||||
install -Dm555 scripts/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions
|
||||
install -Dm555 scripts/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Small ncurses-based file browser forked from noice";
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notejot";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "lainsce";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17rqyckq7z5cxj3mbfrar1zzgwbzhrx87ps7mm6bf798hwflm9qk";
|
||||
sha256 = "1n41sg9a38p9qp8pz3lx9rnb8kc069vkbwf963zzpzs2745h6s9v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.3.3";
|
||||
version = "4.3.4";
|
||||
|
||||
binpath = stdenv.lib.makeBinPath
|
||||
[ cabextract
|
||||
@ -55,7 +55,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
|
||||
sha256 = "117xivwa87i2w66klplmwd5q7pfxcbrj2rjm11wl8iy5h3xpqkak";
|
||||
sha256 = "019dvb55zqrhlbx73p6913807ql866rm0j011ix5mkk2g79dzhqp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl
|
||||
, wxGTK31, libXi, libXt, libXtst, xercesc, xextproto
|
||||
, libqrencode, libuuid, libyubikey, yubikey-personalization
|
||||
, qrencode, libuuid, libyubikey, yubikey-personalization
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig zip ];
|
||||
buildInputs = [
|
||||
gettext perl libqrencode libuuid
|
||||
gettext perl qrencode libuuid
|
||||
libXi libXt libXtst wxGTK31 xercesc xextproto
|
||||
libyubikey yubikey-personalization
|
||||
];
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
|
||||
index 0646e4bc..f827dbfe 100755
|
||||
--- a/script/rofi-theme-selector
|
||||
+++ b/script/rofi-theme-selector
|
||||
@@ -42,34 +42,7 @@ function find_themes()
|
||||
DIRS=${XDG_DATA_DIRS}
|
||||
OLDIFS=${IFS}
|
||||
IFS=:
|
||||
- if [ -z "${XDG_DATA_DIRS}" ]
|
||||
- then
|
||||
- echo "XDG_DATA_DIRS needs to be set for this script to function correctly."
|
||||
- echo -n "Using dirs from \$PATH: "
|
||||
- DIRS=
|
||||
- # Iterate over items in $PATH
|
||||
- for p in ${PATH}; do
|
||||
- # Remove trailing / if exists.
|
||||
- x=${p%/}
|
||||
- # remove both /bin and /sbin and /games from end
|
||||
- x=${x%/bin}
|
||||
- x=${x%/sbin}
|
||||
- x=${x%/games}
|
||||
- # Add /share
|
||||
- x=${x}/share
|
||||
- # Check if entry exists Prepend : so :${x}: matches nicely
|
||||
- case ":${DIRS}" in
|
||||
- *$x:*);;
|
||||
- *) DIRS+="$x:";;
|
||||
- esac
|
||||
- done
|
||||
- # Remove trailing :
|
||||
- DIRS=${DIRS%:}
|
||||
- echo "${DIRS}"
|
||||
- fi
|
||||
- # Add user dir.
|
||||
- DIRS+=":${HOME}/.local/share/"
|
||||
- DIRS+=":${HOME}/.config/"
|
||||
+ DIRS+=":%ROFIOUT%/"
|
||||
for p in ${DIRS}; do
|
||||
p=${p%/}
|
||||
TD=${p}/rofi/themes
|
||||
@@ -164,7 +137,12 @@ Current theme: <b>${CUR}</b>"""
|
||||
###
|
||||
function set_theme()
|
||||
{
|
||||
- CDIR="${HOME}/.config/rofi/"
|
||||
+ if [ -d "${XDG_CONFIG_HOME}" ]; then
|
||||
+ CDIR="${XDG_CONFIG_HOME}/rofi/"
|
||||
+ else
|
||||
+ CDIR="${HOME}/.config/rofi/"
|
||||
+ fi
|
||||
+
|
||||
if [ ! -d "${CDIR}" ]
|
||||
then
|
||||
mkdir -p ${CDIR}
|
||||
@ -4,28 +4,20 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
name = "rofi-unwrapped-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz";
|
||||
sha256 = "1dc33zf33z38jcxb0lxpyd31waalpf6d4cd9z5f9m5qphdk1g679";
|
||||
sha256 = "1rczxz6l32vnclarzga1sm1d5iq9rfscb9j7f8ih185n59hf0517";
|
||||
};
|
||||
|
||||
# config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781
|
||||
patches = [ ./config.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs "script"
|
||||
# root not present in build /etc/passwd
|
||||
sed -i 's/~root/~nobody/g' test/helper-expand.c
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace "$out"/bin/rofi-theme-selector \
|
||||
--replace "%ROFIOUT%" "$out/share"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
|
||||
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
, meson, ninja, pkgconfig, vala, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils
|
||||
, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }:
|
||||
, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }:
|
||||
|
||||
|
||||
let
|
||||
version = "0.6.5";
|
||||
version = "0.6.7";
|
||||
sqlGda = libgda.override {
|
||||
mysqlSupport = true;
|
||||
postgresSupport = true;
|
||||
@ -17,16 +17,16 @@ in stdenv.mkDerivation rec {
|
||||
owner = "Alecaddd";
|
||||
repo = "sequeler";
|
||||
rev = "v${version}";
|
||||
sha256 = "18d0dwrsn69fx1lwm6ihhk2r4996pxiy4hfv608gc1kl4s4f4sqp";
|
||||
sha256 = "0sxmky27pl0aqnh857xb54rnfg1kbr2smdzyrzw67cbv00f6d30p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ];
|
||||
|
||||
buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ];
|
||||
buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
chmod +x build-aux/meson_post_install.py
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "translate-shell";
|
||||
version = "0.9.6.8";
|
||||
version = "0.9.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soimort";
|
||||
repo = "translate-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "17fc5nlc594lvmihx39h4ddmi8ja3qqsyswzxadbaz7l3zm356b8";
|
||||
sha256 = "1xyf0vdxmbgqcgsr1gvgwh1q4fh080h68radkim6pfcwzffliszm";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "urh-${version}";
|
||||
version = "2.5.1";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jopohl";
|
||||
repo = "urh";
|
||||
rev = "v${version}";
|
||||
sha256 = "01n4swm2q2i10qvhfw1q04wxf48xwqlddfg7842ff98i2d9yxy13";
|
||||
sha256 = "050c7vhxxwvmkahdhwdk371qhfnmass5bs9zxr8yj4mqfnihcmi8";
|
||||
};
|
||||
|
||||
buildInputs = [ hackrf rtl-sdr airspy limesuite ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "visidata";
|
||||
version = "1.5";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saulpw";
|
||||
repo = "visidata";
|
||||
rev = "v${version}";
|
||||
sha256 = "0schpfksxddbsv0s54pv1jrf151nw9kr51m41fp0ycnw7z2jqirm";
|
||||
sha256 = "1pflv7nnv9nyfhynrdbh5pgvjxzj53hgqd972dis9rwwwkla26ng";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xkbmon-${version}";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xkbmon";
|
||||
repo = "xkbmon";
|
||||
rev = version;
|
||||
sha256 = "1smyqsd9cpbzqaplm221a8mq0nham6rg6hjsm9g5gph94xmk6d67";
|
||||
sha256 = "1x2xwak0yp0xkl63jzz3k1pf074mh9yxgppwwm96ms3zaslq44yp";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/xkbmon/xkbmon;
|
||||
description = "Command-line keyboard layout monitor for X11";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xpad-${version}";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2";
|
||||
sha256 = "1ab33vg3fz57lz19jjwa3vp3vnln4pnh60hwlkq59la53s8lyijk";
|
||||
sha256 = "0gv9indihr2kbv9iqdqq4mfj6l6qgzwc06jm08gmg10f262sni34";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xterm-339";
|
||||
name = "xterm-341";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${name}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${name}.tgz"
|
||||
];
|
||||
sha256 = "1kigkl4va1jxycqcf5dkg4d74j1fgrxhfbp8ib367crn6fqnprk5";
|
||||
sha256 = "0i6b6gpr5qzbgv3jfl86q8d47bgppxr5gq503ng1ll2x5gx7v833";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "0.57.18";
|
||||
version = "0.58.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "0p5j3kkkalnyi6brgd9vfv43is00g2b6p1y3hajjr2vbm9iwpzg7";
|
||||
sha256 = "0xybcgsxjmd8bxi4x4midzw71s23j8icpspqf5sadskhldvshzr3";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, freetype, fontconfig, libXft, libXrender, libxcb, expat
|
||||
, libuuid
|
||||
, gstreamer, gst-plugins-base, libxml2
|
||||
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome2
|
||||
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
|
||||
, nss, nspr
|
||||
, patchelf, makeWrapper
|
||||
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
|
||||
@ -13,11 +13,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${product}-${version}";
|
||||
product = "vivaldi";
|
||||
version = "2.1.1337.51-1";
|
||||
version = "2.2.1388.37-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
|
||||
sha256 = "00rxp6rardxjg17g2b28y2rj8szqlainp4ga6c58z981zkxvdlls";
|
||||
sha256 = "07q04lvwnjn5kprlwyndv9h2s25637ngchch26ka8lry1lxkdv55";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
|
||||
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
|
||||
atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
|
||||
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
|
||||
freetype fontconfig libXrender libuuid expat glib nss nspr
|
||||
gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
|
||||
] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
{ stdenv, fetchurl
|
||||
, dbus-glib, gtk3, libexif, libXScrnSaver, ninja, nss
|
||||
, pciutils, pkgconfig, python2, xdg_utils, gn
|
||||
, pciutils, pkgconfig, python2, xdg_utils, gn, at-spi2-core
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${product}-${version}";
|
||||
product = "vivaldi-ffmpeg-codecs";
|
||||
version = "70.0.3538.77";
|
||||
version = "71.0.3578.98";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
|
||||
sha512 = "128hvkcbyw70j31dj4jviqqjrzyfx38689nb8v0kk5vi2zlgfy5ibz2gyrv4bvrb53ld262y9pvam51nbdmrx2vqd9xrs173py7v0a0";
|
||||
sha512 = "3baldqqdm8jzrs37w756ijgzwpmvma73rqbpnfkf0j41rmikrjdl6w7ycll98jch8rhzpgz3yfb9nk0gmsgxs233wn441bcdkhr1syv";
|
||||
};
|
||||
|
||||
buildInputs = [ ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gtk3 libexif libXScrnSaver ninja nss pciutils python2 xdg_utils gn
|
||||
pkgconfig dbus-glib
|
||||
pkgconfig dbus-glib at-spi2-core.dev
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://davmail.sourceforce.net/;
|
||||
homepage = http://davmail.sourceforge.net/;
|
||||
description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
|
||||
maintainers = [ maintainers.hinton ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, libsodium, ncurses, curl
|
||||
, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus
|
||||
, libqrencode, gdk_pixbuf, libnotify }:
|
||||
, qrencode, gdk_pixbuf, libnotify }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "toxic-${version}";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
|
||||
] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
|
||||
openal libopus libvpx freealut libqrencode
|
||||
openal libopus libvpx freealut qrencode
|
||||
];
|
||||
nativeBuildInputs = [ pkgconfig libconfig ];
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ stdenv, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib
|
||||
, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
|
||||
, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
|
||||
, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell, pulseaudio, pciutils
|
||||
{ stdenv, fetchurl, dpkg, makeDesktopItem, libuuid, gtk3, atk, cairo, pango
|
||||
, gdk_pixbuf, glib, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi
|
||||
, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes
|
||||
, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev
|
||||
, xdg_utils, hunspell, pulseaudio, pciutils, at-spi2-atk
|
||||
}:
|
||||
let
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
@ -15,9 +16,10 @@ let
|
||||
freetype
|
||||
gdk_pixbuf
|
||||
glib
|
||||
gnome2.GConf
|
||||
gtk2
|
||||
gtk3
|
||||
at-spi2-atk
|
||||
hunspell
|
||||
libuuid
|
||||
libnotify
|
||||
libX11
|
||||
libXcomposite
|
||||
@ -41,7 +43,7 @@ let
|
||||
xorg.libxcb
|
||||
];
|
||||
|
||||
version = "3.3.2872";
|
||||
version = "3.5.2881";
|
||||
|
||||
plat = {
|
||||
"i686-linux" = "i386";
|
||||
@ -49,8 +51,8 @@ let
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
sha256 = {
|
||||
"i686-linux" = "16dw4ycajxviqrf4i32rkrhg1j1mdkmk252y8vjwr18xlyn958qb";
|
||||
"x86_64-linux" = "04ysk91h2izyb41b243zki4j08bis9yzjq2va9bakp1lv6ywm8pw";
|
||||
"i686-linux" = "0s5j6acsiymsikvah9f1ywandzvcdx5m8csrc7ymhv0gx2a9xm1d";
|
||||
"x86_64-linux" = "17siis4xws27jmhf1gyb6cvip6clak27zxckyk0b312kkc4q363i";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
in
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "weechat-matrix-bridge-2018-05-29";
|
||||
name = "weechat-matrix-bridge-2018-11-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "torhve";
|
||||
repo = "weechat-matrix-protocol-script";
|
||||
rev = "ace3fefc0e35a627f8a528032df2e3111e41eb1b";
|
||||
sha256 = "1snf8vn5n9wzrnqnvdrcli4199s5p114jbjlgrj5c27i53173wqw";
|
||||
rev = "8d32e90d864a8f3f09ecc2857cd5dd6e39a8c3f7";
|
||||
sha256 = "0qqd6qmkrdc0r3rnl53c3yp93fbcz7d3mdw3vq5gmdqxyym4s9lj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -24,11 +24,11 @@ let
|
||||
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "thunderbird-${version}";
|
||||
version = "60.3.3";
|
||||
version = "60.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||
sha512 = "04m6mgm4nfnq3nfkv0d1al5b7bw95kfcjpyd7aschqi6wnn21g8qacx42ynj89i5l9vc1jx8nz0wy266sy6x5iv9q585c6l6j9gvkrh";
|
||||
sha512 = "0flg3j0bvgpyk4wbb8d17yl8rddww7q9m9n5brqx1jlj0vjk8lrf8awvxxhn5ssyhy2ys2sklnw75y35hnws3hijs8l9l8ahznfqjq8";
|
||||
};
|
||||
|
||||
# from firefox, but without sound libraries
|
||||
|
||||
@ -3,24 +3,20 @@
|
||||
let
|
||||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoPackage rec {
|
||||
version = "0.14.54";
|
||||
version = "1.0.0";
|
||||
name = "${stname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
sha256 = "0l73ka71l6gxv46wmlyzj8zhfpfj3vf6nv6x3x0z25ymr3wa2fza";
|
||||
sha256 = "1qkjnij9jw3d4pjkdr6npz5ps604qg6g36jnsng0k1r2qnrydnwh";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/syncthing/syncthing";
|
||||
|
||||
patches = [
|
||||
./add-stcli-target.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/syncthing/syncthing/commit/e7072feeb7669948c3e43f55d21aec15481c33ba.patch";
|
||||
sha256 = "1pcybww2vdx45zhd1sd53v7fp40vfgkwqgy8flv7hxw2paq8hxd4";
|
||||
})
|
||||
];
|
||||
BUILD_USER="nix";
|
||||
BUILD_HOST="nix";
|
||||
|
||||
24
pkgs/applications/networking/websocketd/default.nix
Normal file
24
pkgs/applications/networking/websocketd/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, buildGoPackage, fetchgit }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "websocketd-${version}";
|
||||
version = "0.3.0";
|
||||
rev = "729c67f052f8f16a0a0aa032816a57649c0ebed3";
|
||||
|
||||
goPackagePath = "github.com/joewalnes/websocketd";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/joewalnes/websocketd";
|
||||
sha256 = "1n4fag75lpfxg1pm1pr5v0p44dijrxj59s6dn4aqxirhxkq91lzb";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
|
||||
homepage = "http://websocketd.com/";
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
license = licenses.bsd2;
|
||||
};
|
||||
}
|
||||
12
pkgs/applications/networking/websocketd/deps.nix
generated
Normal file
12
pkgs/applications/networking/websocketd/deps.nix
generated
Normal file
@ -0,0 +1,12 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/websocket";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/websocket";
|
||||
rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
|
||||
sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -1,91 +0,0 @@
|
||||
{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx
|
||||
, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
|
||||
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
|
||||
, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme
|
||||
, pcre
|
||||
}:
|
||||
|
||||
/* If you experience GConf errors when running GnuCash on NixOS, see
|
||||
* http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications
|
||||
* for a possible solution.
|
||||
*/
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnucash-2.4.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
|
||||
sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [
|
||||
libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
|
||||
libgnomeprint goffice enchant gettext intltool perl guile slibGuile
|
||||
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
|
||||
perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
|
||||
hicolor-icon-theme pcre
|
||||
];
|
||||
propagatedUserEnvPkgs = [ gconf ];
|
||||
|
||||
configureFlags = [
|
||||
"CFLAGS=-O3"
|
||||
"CXXFLAGS=-O3"
|
||||
"--disable-dbi"
|
||||
"--enable-ofx"
|
||||
"--enable-aqbanking"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Auto-updaters don't make sense in Nix.
|
||||
rm $out/bin/gnc-fq-update
|
||||
|
||||
sed -i $out/bin/update-gnucash-gconf \
|
||||
-e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|'
|
||||
|
||||
for prog in $(echo "$out/bin/"*)
|
||||
do
|
||||
# Don't wrap the gnc-fq-* scripts, since gnucash calls them as
|
||||
# "perl <script>', i.e. they must be Perl scripts.
|
||||
if [[ $prog =~ gnc-fq ]]; then continue; fi
|
||||
wrapProgram "$prog" \
|
||||
--set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH" \
|
||||
--prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH" \
|
||||
--prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0" \
|
||||
--prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0" \
|
||||
--prefix PERL5LIB ":" "$PERL5LIB" \
|
||||
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
|
||||
--prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
|
||||
done
|
||||
'';
|
||||
|
||||
# The following settings fix failures in the test suite. It's not required otherwise.
|
||||
NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";
|
||||
preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
|
||||
|
||||
doCheck = false; # https://github.com/NixOS/nixpkgs/issues/11084
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Personal and small-business financial-accounting application";
|
||||
|
||||
longDescription = ''
|
||||
GnuCash is personal and small-business financial-accounting software,
|
||||
freely licensed under the GNU GPL and available for GNU/Linux, BSD,
|
||||
Solaris, macOS and Microsoft Windows.
|
||||
|
||||
Designed to be easy to use, yet powerful and flexible, GnuCash allows
|
||||
you to track bank accounts, stocks, income and expenses. As quick and
|
||||
intuitive to use as a checkbook register, it is based on professional
|
||||
accounting principles to ensure balanced books and accurate reports.
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
homepage = http://www.gnucash.org/;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ];
|
||||
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,116 +0,0 @@
|
||||
{ fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper
|
||||
, libxml2, libxslt, perl, perlPackages, gconf, guile
|
||||
, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
|
||||
, webkit, glibcLocales, gsettings-desktop-schemas, dconf
|
||||
, gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
|
||||
, pango, gdk_pixbuf, hicolor-icon-theme
|
||||
}:
|
||||
|
||||
/*
|
||||
Two cave-ats right now:
|
||||
1. HTML reports are broken
|
||||
2. You need to have dconf installed (GNOME3 should have it automatically,
|
||||
otherwise put it in environment.systemPackages), for settings
|
||||
*/
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnucash-2.6.18-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
|
||||
sha256 = "1794qi7lkn1kbnhzk08wawacfcphbln3ngdl3q0qax5drv7hnwv8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
sha256 = "11nlf9j7jm1i37mfcmmnkplxr3nlf257fxd01095vd65i2rn1m8h";
|
||||
name = "fix-brittle-test.patch";
|
||||
url = "https://github.com/Gnucash/gnucash/commit/42ac55e03a1a84739f4a5b7a247c31d91c0adc4a.patch";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ intltool pkgconfig file makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
# general
|
||||
libxml2 libxslt glibcLocales gettext swig enchant
|
||||
bzip2 isocodes
|
||||
# glib, gtk...
|
||||
glib gtk2 goffice webkit hicolor-icon-theme
|
||||
# gnome...
|
||||
dconf gconf libgnomecanvas gsettings-desktop-schemas
|
||||
# financial
|
||||
libofx aqbanking gwenhywfar
|
||||
# perl
|
||||
perl perlPackages.FinanceQuote perlPackages.DateManip
|
||||
# guile
|
||||
guile slibGuile
|
||||
# database backends
|
||||
libdbi libdbiDrivers
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./src
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"CFLAGS=-O3"
|
||||
"CXXFLAGS=-O3"
|
||||
"--enable-dbi"
|
||||
"--with-dbi-dbd-dir=${libdbiDrivers}/lib/dbd/"
|
||||
"--enable-ofx"
|
||||
"--enable-aqbanking"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Auto-updaters don't make sense in Nix.
|
||||
rm $out/bin/gnc-fq-update
|
||||
|
||||
#sed -i $out/bin/update-gnucash-gconf \
|
||||
# -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|'
|
||||
|
||||
for prog in $(echo "$out/bin/"*)
|
||||
do
|
||||
# Don't wrap the gnc-fq-* scripts, since gnucash calls them as
|
||||
# "perl <script>', i.e. they must be Perl scripts.
|
||||
if [[ $prog =~ gnc-fq ]]; then continue; fi
|
||||
wrapProgram "$prog" \
|
||||
--set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH" \
|
||||
--prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH" \
|
||||
--prefix PERL5LIB ":" "$PERL5LIB" \
|
||||
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
|
||||
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
|
||||
--prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
|
||||
done
|
||||
'';
|
||||
|
||||
# The following settings fix failures in the test suite. It's not required otherwise.
|
||||
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk2 pango gdk_pixbuf ];
|
||||
preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Personal and small-business financial-accounting application";
|
||||
|
||||
longDescription = ''
|
||||
GnuCash is personal and small-business financial-accounting software,
|
||||
freely licensed under the GNU GPL and available for GNU/Linux, BSD,
|
||||
Solaris, macOS and Microsoft Windows.
|
||||
|
||||
Designed to be easy to use, yet powerful and flexible, GnuCash allows
|
||||
you to track bank accounts, stocks, income and expenses. As quick and
|
||||
intuitive to use as a checkbook register, it is based on professional
|
||||
accounting principles to ensure balanced books and accurate reports.
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
homepage = http://www.gnucash.org/;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ];
|
||||
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -25,11 +25,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnucash-${version}";
|
||||
version = "3.3";
|
||||
version = "3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
|
||||
sha256 = "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3";
|
||||
sha256 = "1ms2wg4sh5gq3rpjmmnp85rh5nc9ahca1imxkvhz4d3yiwy8hm52";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
|
||||
|
||||
58
pkgs/applications/office/trilium/default.nix
Normal file
58
pkgs/applications/office/trilium/default.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ stdenv, fetchurl, p7zip, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }:
|
||||
|
||||
let
|
||||
description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.";
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Trilium";
|
||||
exec = "trilium";
|
||||
icon = "trilium";
|
||||
comment = description;
|
||||
desktopName = "Trilium Notes";
|
||||
categories = "Office";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "trilium-${version}";
|
||||
version = "0.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.7z";
|
||||
sha256 = "184b0b0s8q32h1mpkrin8x1q0kjvard7r7xqrclziwwxg4khp3cz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip /* for unpacking */
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = atomEnv.packages;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/trilium
|
||||
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
|
||||
|
||||
cp -r ./* $out/share/trilium
|
||||
ln -s $out/share/trilium/trilium $out/bin/trilium
|
||||
|
||||
ln -s $out/share/trilium/resources/app/src/public/images/trilium.svg $out/share/icons/hicolor/scalable/apps/trilium.svg
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
|
||||
# This "shouldn't" be needed, remove when possible :)
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/trilium --prefix LD_LIBRARY_PATH : "${atomEnv.libPath}"
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit description;
|
||||
homepage = https://github.com/zadam/trilium;
|
||||
license = licenses.agpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ emmanuelrosa dtzWill ];
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "picard-tools-${version}";
|
||||
version = "2.18.20";
|
||||
version = "2.18.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "0dx6fxn6d7mawkah242fdi9wm8pdzmm4m004fb9ak2fsvrs2m5pk";
|
||||
sha256 = "0p1na79p0kz1x1nd88100487s4f306p8k4m7dq5r4m2kdsc1dqin";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkwave-${version}";
|
||||
version = "3.3.97";
|
||||
version = "3.3.98";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
|
||||
sha256 = "0jy5qk0b0np9xsxgnvv8jjgyw81l170wrm5q04qs48wpw7d0rm3v";
|
||||
sha256 = "1xi2b9yck8fagnjhnhhwrhz5rfvrs2h2m6m64m210m5xnfzbp9pg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,24 +1,18 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd }:
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, cmake, python3, xxd, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cryptominisat-${version}";
|
||||
version = "5.0.1";
|
||||
version = "5.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msoos";
|
||||
repo = "cryptominisat";
|
||||
rev = version;
|
||||
sha256 = "0cpw5d9vplxvv3aaplhnga55gz1hy29p7s4pkw1306knkbhlzvkb";
|
||||
sha256 = "1a1494gj4j73yij0hjbzsn2hglk9zy5c5wfwgig3j67cis28saf5";
|
||||
};
|
||||
|
||||
buildInputs = [ python xxd ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
patches = [(fetchpatch rec {
|
||||
name = "fix-exported-library-name.patch";
|
||||
url = "https://github.com/msoos/cryptominisat/commit/7a47795cbe5ad5a899731102d297f234bcade077.patch";
|
||||
sha256 = "11hf3cfqs4cykn7rlgjglq29lzqfxvlm0f20qasi0kdrz01cr30f";
|
||||
})];
|
||||
buildInputs = [ python3 boost ];
|
||||
nativeBuildInputs = [ cmake xxd ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An advanced SAT Solver";
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gromacs-2018.4";
|
||||
name = "gromacs-2019";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.4.tar.gz";
|
||||
sha256 = "14d8mbck1lrmz97vvy322irk557wxh0zdd6n962lm69hqxcf8bkg";
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.tar.gz";
|
||||
sha256 = "02qd27pgc5kwkk68m8hwarkbb1b9z5rdrm67yjqyxd5my2jq3cn5";
|
||||
};
|
||||
|
||||
buildInputs = [cmake fftw]
|
||||
|
||||
@ -7,13 +7,13 @@ with stdenv.lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "gitea-${version}";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-gitea";
|
||||
repo = "gitea";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ijxpihdg8k6gs1xpim0iviqakvjadjzp0a5ki2czykilnyg8y85";
|
||||
sha256 = "02d37mh1qxsq9lc9ylk5sgdlc1cgwh6fri077crk43mnyb5lhj3j";
|
||||
# Required to generate the same checksum on MacOS due to unicode encoding differences
|
||||
# More information: https://github.com/NixOS/nixpkgs/pull/48128
|
||||
extraPostFetch = ''
|
||||
|
||||
@ -14,9 +14,13 @@ stdenv.mkDerivation {
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/man/man1
|
||||
mkdir -p $out/share/zsh/site-functions
|
||||
mkdir -p $out/share/bash-completion/completions
|
||||
sed -e 's:/bin/bash:/usr/bin/env bash:' $src/yadm > $out/bin/yadm
|
||||
chmod 755 $out/bin/yadm
|
||||
install -m 644 $src/yadm.1 $out/share/man/man1/yadm.1
|
||||
install -m644 $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
|
||||
install -m644 $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, fdk_aac
|
||||
, ffmpeg
|
||||
@ -39,6 +40,13 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "0ri9qkqk3h71b1a5bwpjzqdr21bbmfqbykg48l779d20zln23n1i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff";
|
||||
sha256 = "162fnkxh2wyn6wrrm1kzv7c2mn96kx35vlmk2qwn1nqlifbpsfyq";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake
|
||||
pkgconfig
|
||||
];
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
{ stdenv, fetchgit, pkgconfig, dbus-glib, autoreconfHook, xorg }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kbdd";
|
||||
pname = "kbdd";
|
||||
version = "unstable-2017-01-29";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://github.com/qnikst/kbdd;
|
||||
rev = "47dee0232f157cd865e43d92005a2ba107f6fd75";
|
||||
sha256 = "1ys9w1lncsfg266g9sfnm95an2add3g51mryg0hnrzcqa4knz809";
|
||||
src = fetchFromGitHub {
|
||||
owner = "qnikst";
|
||||
repo = "kbdd";
|
||||
rev = "0e1056f066ab6e3c74fd0db0c9710a9a2b2538c3";
|
||||
sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
let
|
||||
pname = "cantarell-fonts";
|
||||
version = "0.110";
|
||||
version = "0.111";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "19rll0h4xjn83lqm0zc4088y0vkrx1wxg8jz9imvgd8snmfxfm54";
|
||||
sha256 = "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja gettext appstream-glib ];
|
||||
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "052nxmhw2j8yvcj90r8xhjf0mzim8h6syip7winxb28vavj6jnba";
|
||||
outputHash = "12ps2gjv1lmzbmkv16vgjmaahl3ayadpniyrx0z31sqn443r57hq";
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
|
||||
22
pkgs/data/fonts/cooper-hewitt/default.nix
Normal file
22
pkgs/data/fonts/cooper-hewitt/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
fetchzip rec {
|
||||
name = "cooper-hewitt-2014-06-09";
|
||||
|
||||
url = https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip;
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/
|
||||
'';
|
||||
|
||||
sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/;
|
||||
description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
};
|
||||
}
|
||||
@ -1,64 +0,0 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "font-droid-${version}";
|
||||
version = "2015-12-09";
|
||||
at = "2776afefa9e0829076cd15fdc41e7950e2ffab82";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans.ttf";
|
||||
sha256 = "1yml18dm86rrkihb2zz0ng8b1j2bb14hxc1d3hp0998vsr9s1w4h";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans-Bold.ttf";
|
||||
sha256 = "1z61hz92d3l1pawmbc6iwi689v8rr0xlkx59pl89m1g9aampdrmh";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/google/fonts/raw/${at}/apache/droidsansmono/DroidSansMono.ttf";
|
||||
sha256 = "0rzspxg457q4f4cp2wz93py13lbnqbhf12q4mzgy6j30njnjwl9h";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif.ttf";
|
||||
sha256 = "1y7jzi7dz8j1yp8dxbmbvd6dpsck2grk3q1kd5rl7f31vlq5prj1";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Bold.ttf";
|
||||
sha256 = "1c61b423sn5nnr2966jdzq6fy8pw4kg79cr3nbby83jsly389f9b";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Italic.ttf";
|
||||
sha256 = "1bvrilgi0s72hiiv32hlxnzazslh3rbz8wgmsln0i9mnk7jr9bs0";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-BoldItalic.ttf";
|
||||
sha256 = "052vlkmhy9c5nyk4byvhzya3y57fb09lqxd6spar6adf9ajbylgi";
|
||||
})
|
||||
];
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
sourceRoot = "./";
|
||||
|
||||
unpackCmd = ''
|
||||
ttfName=$(basename $(stripHash $curSrc))
|
||||
cp $curSrc ./$ttfName
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/droid
|
||||
cp *.ttf $out/share/fonts/droid
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "1l3lqfdr9pm05b1py9yr3cf65gi1my7jrrlvikqpqg2zr066n6c3";
|
||||
|
||||
meta = {
|
||||
description = "Droid Family fonts by Google Android";
|
||||
homepage = https://github.com/google/fonts;
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
version = "5.5.0";
|
||||
version = "5.6.3";
|
||||
in fetchzip rec {
|
||||
name = "font-awesome-${version}";
|
||||
|
||||
@ -9,12 +9,10 @@ in fetchzip rec {
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Brands-Regular-400.otf" -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Regular-400.otf" -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "1drjc40glfqhwmfn3s4gz8hz1x0ncrwdr9n1i25m1l7pvsk26f5f";
|
||||
sha256 = "0y3zar7hyx5pj8rpyk2kz3sx6zgrfif2ka2h4rg0b8h8qbja0al6";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Font Awesome - OTF font";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
in fetchzip {
|
||||
name = "inter-ui-${version}";
|
||||
|
||||
@ -12,7 +12,7 @@ in fetchzip {
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "16qmb8farkh41i56f0vvbxcg32rbg7my64amwz5y8gyy73i3320q";
|
||||
sha256 = "0cdjpwylynwmab0x5z5lw43k39vis74xj1ciqg8nw12ccprbmj60";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://rsms.me/inter/;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
in fetchzip rec {
|
||||
name = "iosevka-bin-${version}";
|
||||
|
||||
@ -12,7 +12,7 @@ in fetchzip rec {
|
||||
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
|
||||
'';
|
||||
|
||||
sha256 = "1i21ja348k22rlf8z9jp90cidpmcnwqsw12vdrmm556sdwdkrkpc";
|
||||
sha256 = "0jr9d02dk4zbq3kyhpfs6gyynwss60210pc1dfxn0qbw3j9ch2l4";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://be5invis.github.io/Iosevka/;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "material-design-icons-${version}";
|
||||
version = "3.2.89";
|
||||
version = "3.3.92";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Templarian";
|
||||
repo = "MaterialDesign-Webfont";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rxaiiij96kqncsrlkyp109m36v28cgxild7z04k4jh79fvmhjvn";
|
||||
sha256 = "0k8pv2nsp3al4i4awx5mv7cscpm8akjn567jl9dwzangcsai0l53";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,26 +1,24 @@
|
||||
{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "terminus-font-4.46";
|
||||
pname = "terminus-font";
|
||||
version = "4.47";
|
||||
name = "${pname}-${version}"; # set here for use in URL below
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
|
||||
sha256 = "1kavqw38aarz0vpwz4b7l6l8xkyc5096zaf9ypqnvdwraqz46aaf";
|
||||
url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz";
|
||||
sha256 = "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];
|
||||
nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
sh ./configure --prefix=$out
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
make install fontdir
|
||||
'';
|
||||
installTargets = [ "install" "fontdir" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A clean fixed width font";
|
||||
@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
16x32. The styles are normal and bold (except for 6x12), plus
|
||||
EGA/VGA-bold for 8x14 and 8x16.
|
||||
'';
|
||||
homepage = http://www.is-vn.bg/hamster/;
|
||||
homepage = http://terminus-font.sourceforge.net/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ astsmtl ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7882a52a634fbc2da03adc9616aa83b27b06d7a2.tar.gz";
|
||||
sha256 = "1gw480w1d1117l8hbp7rh1jmjjqx11pzb3995m5wi2q9mvi645x2";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/62720a1288846aabc4e42d4404a85ea771d24a11.tar.gz";
|
||||
sha256 = "1qr07s0l7ip28639fbhwi8nhcyzs3mmhzqd0zny5an0dwxlx14qb";
|
||||
}
|
||||
|
||||
31
pkgs/data/themes/mojave/default.nix
Normal file
31
pkgs/data/themes/mojave/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mojave-gtk-theme";
|
||||
version = "2019-01-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "053bfc5pslwpqhn05dzznh236g1z4cnn2dzwvb914f6m855fbxfg";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk_engines ];
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
installPhase = ''
|
||||
patchShebangs .
|
||||
mkdir -p $out/share/themes
|
||||
name= ./install.sh -d $out/share/themes
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Mac OSX Mojave like theme for GTK based desktop environments";
|
||||
homepage = https://github.com/vinceliuice/Mojave-gtk-theme;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
@ -3,9 +3,9 @@
|
||||
mkXfceDerivation rec {
|
||||
category = "xfce";
|
||||
pname = "xfce4-panel";
|
||||
version = "4.13.3";
|
||||
version = "4.13.4";
|
||||
|
||||
sha256 = "00b2b16wqwzdbh1vsnpl2kasa7f9i1hr1wkkjmvzmy2v7bmkygr0";
|
||||
sha256 = "13hnzh31d2b1331lnsbfaxg4fqhqa7hmdwkiqsl9hyr8pqimjb2g";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
|
||||
|
||||
@ -44,6 +44,11 @@ let
|
||||
# BEAM-based languages.
|
||||
elixir = elixir_1_7;
|
||||
|
||||
elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
@ -64,10 +69,8 @@ let
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix {
|
||||
inherit rebar erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
# Remove old versions of elixir, when the supports fades out:
|
||||
# https://hexdocs.pm/elixir/compatibility-and-deprecations.html
|
||||
|
||||
lfe = lfe_1_2;
|
||||
lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "closure-compiler-${version}";
|
||||
version = "20181125";
|
||||
version = "20181210";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
|
||||
sha256 = "1vg7cyya0r2sjrbcwf4pshg7jzgvb9ynpa0b41zkl4x1y0a16bkc";
|
||||
sha256 = "0c79ki4lacfwks5f2q7kzcg6v3a65zs5srm14k09gh5k1hvvnayd";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -112,6 +112,10 @@ let
|
||||
# Set compiler for NVCC.
|
||||
wrapProgram $out/bin/nvcc \
|
||||
--prefix PATH : ${gcc}/bin
|
||||
|
||||
# nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
|
||||
wrapProgram $out/bin/nvprof \
|
||||
--prefix LD_LIBRARY_PATH : $out/lib
|
||||
'' + lib.optionalString (lib.versionOlder version "8.0") ''
|
||||
# Hack to fix building against recent Glibc/GCC.
|
||||
echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
, makeWrapper, unzip, which
|
||||
, curl, tzdata, gdb, darwin
|
||||
, callPackage, targetPackages, ldc
|
||||
, version ? "2.081.2"
|
||||
, dmdSha256 ? "1wwk4shqldvgyczv1ihmljpfj3yidq7mxcj69i9kjl7jqx54hw62"
|
||||
, druntimeSha256 ? "0dqfsy34q2q7mk2gsi4ix3vgqg7szg3m067fghgx53vnvrzlpsc0"
|
||||
, phobosSha256 ? "1dan59lc4wggsrv5aax7jsxnzg7fz37xah84k1cbwjb3xxhhkd9n"
|
||||
, version ? "2.083.1"
|
||||
, dmdSha256 ? "0b52yq7slgbrawb22kib9bk2x9xjiy6axwz1317fck5axl093d90"
|
||||
, druntimeSha256 ? "1hm9p59ih21yv8x7cqjhkyy94677q4f8wk9fs9i1rybx8x19njyn"
|
||||
, phobosSha256 ? "1zmz0f1wj0dgxy2cy63ljjc1sl2sgb7ij8bamlxw9nxrchwi3l43"
|
||||
}:
|
||||
|
||||
let
|
||||
@ -48,12 +48,15 @@ let
|
||||
# Remove cppa test for now because it doesn't work.
|
||||
rm dmd/test/runnable/cppa.d
|
||||
rm dmd/test/runnable/extra-files/cppb.cpp
|
||||
''
|
||||
|
||||
+ stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin) ''
|
||||
rm dmd/test/runnable/test16096.sh
|
||||
'';
|
||||
|
||||
# Compile with PIC to prevent colliding modules with binutils 2.28.
|
||||
# https://issues.dlang.org/show_bug.cgi?id=17375
|
||||
usePIC = "-fPIC";
|
||||
ROOT_HOME_DIR = "$(echo ~root)";
|
||||
|
||||
phobosPatches = ''
|
||||
# Ugly hack so the dlopen call has a chance to succeed.
|
||||
@ -105,13 +108,14 @@ let
|
||||
cd ../druntime
|
||||
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
|
||||
cd ../phobos
|
||||
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/
|
||||
echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
|
||||
make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -J$(pwd)"
|
||||
cd ..
|
||||
'';
|
||||
|
||||
# Disable tests on Darwin for now because of
|
||||
# https://github.com/NixOS/nixpkgs/issues/41099
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
cd dmd
|
||||
@ -197,7 +201,8 @@ let
|
||||
|
||||
buildPhase = ''
|
||||
cd phobos
|
||||
make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/
|
||||
echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
|
||||
make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd DFLAGS="-version=TZDatabaseDir -J$(pwd)"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user