Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
60a3973a55
@ -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'
|
||||
'';
|
||||
}
|
||||
@ -1750,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";
|
||||
@ -3911,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";
|
||||
|
||||
@ -408,16 +408,6 @@
|
||||
from nixpkgs due to the lack of maintainers.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <option>powerManagement.cpuFreqGovernor</option> option has been
|
||||
aliased to <option>powerManagement.cpufreq.governor</option>. On laptops,
|
||||
<option>powerManagement.cpuFreqGovernor</option> is sometimes set in
|
||||
<literal>/etc/nixos/hardware-configuration.nix</literal>, so you can
|
||||
rename it to the new name, or run
|
||||
<literal>nixos-generate-config</literal> again.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -104,7 +104,7 @@ if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {
|
||||
|
||||
foreach $e (@desired_governors) {
|
||||
if (index($governors, $e) != -1) {
|
||||
last if (push @attrs, "powerManagement.cpufreq.governor = lib.mkDefault \"$e\";");
|
||||
last if (push @attrs, "powerManagement.cpuFreqGovernor = lib.mkDefault \"$e\";");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -286,9 +286,6 @@ with lib;
|
||||
(mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
|
||||
(mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
|
||||
|
||||
# cpufeq
|
||||
(mkAliasOptionModule [ "powerManagement" "cpuFreqGovernor" ] [ "powerManagement" "cpufreq" "governor" ])
|
||||
|
||||
] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
|
||||
"jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
|
||||
"snmpExporter" "unifiExporter" "varnishExporter" ]
|
||||
|
||||
@ -55,7 +55,7 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
powerManagement.scsiLinkPolicy = null;
|
||||
powerManagement.cpufreq.governor = null;
|
||||
powerManagement.cpuFreqGovernor = null;
|
||||
powerManagement.cpufreq.max = null;
|
||||
powerManagement.cpufreq.min = null;
|
||||
|
||||
|
||||
@ -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}
|
||||
|
||||
|
||||
|
||||
@ -4,44 +4,49 @@ with lib;
|
||||
|
||||
let
|
||||
cpupower = config.boot.kernelPackages.cpupower;
|
||||
cfg = config.powerManagement.cpufreq;
|
||||
cfg = config.powerManagement;
|
||||
in
|
||||
|
||||
{
|
||||
###### interface
|
||||
|
||||
options.powerManagement.cpufreq = {
|
||||
options.powerManagement = {
|
||||
|
||||
governor = 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, although this may be overwriten in your
|
||||
performance governor, although this may be overwritten in your
|
||||
hardware-configuration.nix file.
|
||||
|
||||
Often used values: "ondemand", "powersave", "performance"
|
||||
'';
|
||||
};
|
||||
|
||||
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.
|
||||
'';
|
||||
};
|
||||
cpufreq = {
|
||||
|
||||
min = mkOption {
|
||||
type = types.nullOr types.ints.unsigned;
|
||||
default = null;
|
||||
example = 800000;
|
||||
description = ''
|
||||
The minimum frequency the CPU will use.
|
||||
'';
|
||||
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.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
@ -51,16 +56,16 @@ in
|
||||
|
||||
config =
|
||||
let
|
||||
governorEnable = cfg.governor != null;
|
||||
maxEnable = cfg.max != null;
|
||||
minEnable = cfg.min != null;
|
||||
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 = optional governorEnable "cpufreq_${cfg.governor}";
|
||||
boot.kernelModules = optional governorEnable "cpufreq_${cfg.cpuFreqGovernor}";
|
||||
|
||||
environment.systemPackages = [ cpupower ];
|
||||
|
||||
@ -74,9 +79,9 @@ in
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = "yes";
|
||||
ExecStart = "${cpupower}/bin/cpupower frequency-set " +
|
||||
optionalString governorEnable "--governor ${cfg.governor} " +
|
||||
optionalString maxEnable "--max ${toString cfg.max} " +
|
||||
optionalString minEnable "--min ${toString cfg.min} ";
|
||||
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;
|
||||
|
||||
@ -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 ]
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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,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,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 @@
|
||||
|
||||
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 ];
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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,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
|
||||
|
||||
@ -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";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -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 ];
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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]
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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 ];
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import ./shared.nix {
|
||||
majorVersion = "1";
|
||||
minorVersion = "0";
|
||||
maintenanceVersion = "1";
|
||||
src_sha256 = "0bqb5c63c7jnb753nplqj5v4k9pvh792k8y4b1n5pq8jiibr86i0";
|
||||
maintenanceVersion = "3";
|
||||
src_sha256 = "0666chsc19wx02k5m1yilf6wbc9bw27ay8p1d00jkh8m0jkrpf7l";
|
||||
}
|
||||
|
||||
@ -93,9 +93,6 @@ self: super: {
|
||||
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
|
||||
};
|
||||
|
||||
# https://github.com/bitemyapp/esqueleto/issues/105
|
||||
esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
|
||||
|
||||
# Fix test trying to access /home directory
|
||||
shell-conduit = overrideCabal super.shell-conduit (drv: {
|
||||
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
|
||||
|
||||
@ -41,40 +41,6 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# LTS-12.x versions do not compile.
|
||||
# base-orphans = self.base-orphans_0_8;
|
||||
# brick = self.brick_0_45;
|
||||
# cassava-megaparsec = doJailbreak super.cassava-megaparsec;
|
||||
# config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
|
||||
# contravariant = self.contravariant_1_5;
|
||||
# fgl = self.fgl_5_7_0_1;
|
||||
# free = self.free_5_1;
|
||||
# haddock-library = dontCheck super.haddock-library_1_7_0;
|
||||
# HaTeX = doJailbreak super.HaTeX;
|
||||
# hpack = self.hpack_0_31_1;
|
||||
# hslua = self.hslua_1_0_1;
|
||||
# hslua-module-text = self.hslua-module-text_0_2_0;
|
||||
# hspec = self.hspec_2_6_0;
|
||||
# hspec-contrib = self.hspec-contrib_0_5_1;
|
||||
# hspec-core = self.hspec-core_2_6_0;
|
||||
# hspec-discover = self.hspec-discover_2_6_0;
|
||||
# hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
|
||||
# hspec-meta = self.hspec-meta_2_6_0;
|
||||
# JuicyPixels = self.JuicyPixels_3_3_3;
|
||||
# lens = self.lens_4_17;
|
||||
# megaparsec = dontCheck (doJailbreak super.megaparsec);
|
||||
# pandoc = self.pandoc_2_5;
|
||||
# pandoc-citeproc = self.pandoc-citeproc_0_15;
|
||||
# pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
|
||||
# patience = markBrokenVersion "0.1.1" super.patience;
|
||||
# polyparse = self.polyparse_1_12_1;
|
||||
# semigroupoids = self.semigroupoids_5_3_1;
|
||||
# tagged = self.tagged_0_8_6;
|
||||
# vty = self.vty_5_25_1;
|
||||
# wizards = doJailbreak super.wizards;
|
||||
# wl-pprint-extras = doJailbreak super.wl-pprint-extras;
|
||||
# yaml = self.yaml_0_11_0_0;
|
||||
|
||||
# https://github.com/tibbe/unordered-containers/issues/214
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
||||
@ -87,13 +53,16 @@ self: super: {
|
||||
psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
|
||||
system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
|
||||
unicode-transforms = dontCheck super.unicode-transforms;
|
||||
RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14
|
||||
RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14
|
||||
monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66
|
||||
|
||||
# https://github.com/jgm/skylighting/issues/55
|
||||
skylighting-core = dontCheck super.skylighting-core;
|
||||
|
||||
# Break out of "yaml >=0.10.4.0 && <0.11".
|
||||
# Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
|
||||
stack = doJailbreak super.stack;
|
||||
|
||||
# Break out of "tasty >= 0.11 && < 1.2": https://github.com/jgm/pandoc/issues/5200
|
||||
pandoc = doJailbreak super.pandoc;
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -126,6 +126,25 @@ self: super: builtins.intersectAttrs super {
|
||||
# the system-fileio tests use canonicalizePath, which fails in the sandbox
|
||||
system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
|
||||
|
||||
# Prevents needing to add `security_tool` as a run-time dependency for
|
||||
# everything using x509-system to give access to the `security` executable.
|
||||
x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
|
||||
then let inherit (pkgs.darwin) security_tool;
|
||||
in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
|
||||
# darwin.security_tool is broken in Mojave (#45042)
|
||||
|
||||
# We will use the system provided security for now.
|
||||
# Beware this WILL break in sandboxes!
|
||||
|
||||
# TODO(matthewbauer): If someone really needs this to work in sandboxes,
|
||||
# I think we can add a propagatedImpureHost dep here, but I’m hoping to
|
||||
# get a proper fix available soonish.
|
||||
postPatch = (drv.postPatch or "") + ''
|
||||
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
|
||||
'';
|
||||
})
|
||||
else super.x509-system;
|
||||
|
||||
# https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
|
||||
gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
@ -303,6 +322,9 @@ self: super: builtins.intersectAttrs super {
|
||||
# https://github.com/bos/pcap/issues/5
|
||||
pcap = addExtraLibrary super.pcap pkgs.libpcap;
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/53336
|
||||
greenclip = addExtraLibrary super.greenclip pkgs.xorg.libXdmcp;
|
||||
|
||||
# The cabal files for these libraries do not list the required system dependencies.
|
||||
miniball = overrideCabal super.miniball (drv: {
|
||||
librarySystemDepends = [ pkgs.miniball ];
|
||||
|
||||
3495
pkgs/development/haskell-modules/hackage-packages.nix
generated
3495
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,33 +0,0 @@
|
||||
{ build-idris-package
|
||||
, fetchFromGitHub
|
||||
, effects
|
||||
, lib
|
||||
, ncurses
|
||||
}:
|
||||
build-idris-package {
|
||||
name = "curses";
|
||||
version = "2017-10-12";
|
||||
|
||||
idrisDeps = [ effects ];
|
||||
|
||||
extraBuildInputs = [ ncurses ];
|
||||
|
||||
postUnpack = ''
|
||||
sed -i 's/^libs = curses$/libs = ncurses/g' source/curses.ipkg
|
||||
sed -i 's/\#include <curses.h>/#include \<ncurses.h\>/g' source/src/cursesrun.h
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakobBruenker";
|
||||
repo = "curses-idris";
|
||||
rev = "ea4bbcfcf691f0dc731f2dfa676011809db084cb";
|
||||
sha256 = "17q8hg5f61lk2kh3j4cwrwja282sihlcjdrx233z4237alp9w4g1";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "libusb binding for idris and Effectful curses programming";
|
||||
homepage = https://github.com/JakobBruenker/curses-idris;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.brainrape ];
|
||||
};
|
||||
}
|
||||
@ -75,8 +75,6 @@
|
||||
|
||||
cube = callPackage ./cube.nix {};
|
||||
|
||||
curses = callPackage ./curses.nix {};
|
||||
|
||||
data = callPackage ./data.nix {};
|
||||
|
||||
derive = callPackage ./derive.nix {};
|
||||
|
||||
@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="angelscript";
|
||||
version = "2.32.0";
|
||||
version = "2.33.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
|
||||
sha256 = "0675hza06v3grxyqfy70gzm57idmbbm7qvi6bg5vf8m6mpw757dl";
|
||||
sha256 = "18qywbi1k53xgnlr9v6ycin669j5v5qspq7lli4jhf6l4c5hk49n";
|
||||
};
|
||||
buildInputs = [
|
||||
unzip
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "groovy-${version}";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
|
||||
sha256 = "1s661d5kwiafv5i1pq2b7k8b2fd7m2zp3xwcrf4iv1iik033djdj";
|
||||
sha256 = "16hj2v6r89s3qrgbnkinwwzv16mphb6jjw8ijgmmd9y2063nchc2";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "actor-framework-${version}";
|
||||
version = "0.16.2";
|
||||
version = "0.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actor-framework";
|
||||
repo = "actor-framework";
|
||||
rev = "${version}";
|
||||
sha256 = "0sdr9mrrkrj9nfwqbznz3pkqfsnsi8kanfy99x01js1spqihy1s3";
|
||||
sha256 = "0nqw1cv7wxbcn2qwm08qffb6k4n3kgvdiaphks5gjgm305jk4vnx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, makeWrapper
|
||||
, qtbase, libuuid, libcap, uwsgi, grantlee }:
|
||||
, qtbase, libuuid, libcap, uwsgi, grantlee, pcre
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cutelyst-${version}";
|
||||
@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
||||
buildInputs = [ qtbase libuuid libcap uwsgi grantlee ];
|
||||
buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPLUGIN_UWSGI=ON"
|
||||
|
||||
@ -1,26 +1,24 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
|
||||
, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
|
||||
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
|
||||
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:
|
||||
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme
|
||||
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3 }:
|
||||
|
||||
let
|
||||
version = "1.0.5";
|
||||
desktop_schemas = gnome3.gsettings-desktop-schemas;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "flatpak-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flatpak";
|
||||
version = "1.1.2";
|
||||
|
||||
# TODO: split out lib once we figure out what to do with triggerdir
|
||||
outputs = [ "out" "man" "doc" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
|
||||
sha256 = "1wj88lp23bzz0c5n1i84nr2xff572i5cc10fqd9xh7qhj3ivk1w0";
|
||||
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "01z7ybskxh6r58yh1m98z0z36fba4ljaxpqmh4y6kkaw8pyhhs6i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-test-paths.patch;
|
||||
inherit coreutils glibcLocales;
|
||||
inherit coreutils gettext glibcLocales;
|
||||
hicolorIconTheme = hicolor-icon-theme;
|
||||
})
|
||||
(substituteAll {
|
||||
@ -34,12 +32,13 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobject-introspection
|
||||
gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
|
||||
gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
|
||||
libsoup lzma ostree polkit python3 systemd xorg.libXau
|
||||
gnome3.gsettings-desktop-schemas glib-networking
|
||||
];
|
||||
|
||||
checkInputs = [ valgrind ];
|
||||
@ -65,12 +64,6 @@ in stdenv.mkDerivation rec {
|
||||
patchShebangs tests
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/flatpak \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
|
||||
--prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Linux application sandboxing and distribution framework";
|
||||
homepage = https://flatpak.org/;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
--- a/tests/libtest.sh
|
||||
+++ b/tests/libtest.sh
|
||||
@@ -296,7 +296,7 @@
|
||||
# running installed-tests: assume we know what we're doing
|
||||
:
|
||||
elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
|
||||
- --ro-bind / / /bin/true > bwrap-result 2>&1; then
|
||||
+ --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then
|
||||
sed -e 's/^/# /' < bwrap-result
|
||||
echo "1..0 # SKIP Cannot run bwrap"
|
||||
exit 0
|
||||
@@ -328,7 +328,7 @@
|
||||
# running installed-tests: assume we know what we're doing
|
||||
_flatpak_bwrap_works=true
|
||||
elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
|
||||
- --ro-bind / / /bin/true > bwrap-result 2>&1; then
|
||||
+ --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then
|
||||
_flatpak_bwrap_works=false
|
||||
else
|
||||
_flatpak_bwrap_works=true
|
||||
@@ -309,12 +309,12 @@
|
||||
export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
|
||||
DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
|
||||
@ -24,6 +24,24 @@
|
||||
gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
|
||||
fusermount -u $XDG_RUNTIME_DIR/doc || :
|
||||
if test -n "${TEST_SKIP_CLEANUP:-}"; then
|
||||
--- a/tests/make-test-app.sh
|
||||
+++ b/tests/make-test-app.sh
|
||||
@@ -114,13 +114,13 @@ msgid "Hello world"
|
||||
msgstr "Hallo Welt"
|
||||
EOF
|
||||
mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES
|
||||
-msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po
|
||||
+@gettext@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po
|
||||
cat > fr.po <<EOF
|
||||
msgid "Hello world"
|
||||
msgstr "Bonjour le monde"
|
||||
EOF
|
||||
mkdir -p ${DIR}/files/fr/share/fr/LC_MESSAGES
|
||||
-msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po
|
||||
+@gettext@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po
|
||||
|
||||
flatpak build-finish ${DIR}
|
||||
mkdir -p repos
|
||||
--- a/tests/make-test-runtime.sh
|
||||
+++ b/tests/make-test-runtime.sh
|
||||
@@ -26,6 +26,7 @@
|
||||
@ -61,7 +79,7 @@
|
||||
- fi
|
||||
-}
|
||||
-
|
||||
for i in $@; do
|
||||
for i in $@ bash ls cat echo readlink; do
|
||||
- I=`which $i`
|
||||
- add_bin $I
|
||||
-done
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.17.0";
|
||||
version = "1.17.2";
|
||||
name = "grpc-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "17y8lhkx22qahjk89fa0bh76q76mk9vwza59wbwcpzmy0yhl2k23";
|
||||
sha256 = "1rq20951h5in3dy0waa60dsqj27kmg6ylp2gdsxyfrq5jarlj89g";
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkdatabox-0.9.3.0";
|
||||
name = "gtkdatabox-0.9.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz";
|
||||
sha256 = "1wigd4bdlrz4pma2l2wd3z8sx7pqmsvq845nya5vma9ibi96nhhz";
|
||||
sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcouchbase-${version}";
|
||||
version = "2.10.2";
|
||||
version = "2.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "1znhy99nhiv21j2jwsx9dsmg8br01wg0hsf1yfwsjny0myv13xkm";
|
||||
sha256 = "0a3fin5rcwa3xwd980mrzrkr7dpjdwbri81mqwxw1fkppjqw23z4";
|
||||
};
|
||||
|
||||
cmakeFlags = "-DLCB_NO_MOCK=ON";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libraw-${version}";
|
||||
version = "0.19.1";
|
||||
version = "0.19.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
|
||||
sha256 = "1xjyw4n9gfr2r637pjbpbi3h98h9mdjn61b0hsxwqynq2vdij452";
|
||||
sha256 = "0i4nhjm5556xgn966x0i503ygk2wafq6z83kg0lisacjjab4f3a0";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2
|
||||
{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2, libgcrypt
|
||||
, cryptoSupport ? false
|
||||
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
}:
|
||||
@ -28,7 +28,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
|
||||
|
||||
buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ];
|
||||
buildInputs = [ libxml2.dev ]
|
||||
++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]
|
||||
++ stdenv.lib.optionals cryptoSupport [ libgcrypt ];
|
||||
|
||||
propagatedBuildInputs = [ findXMLCatalogs ];
|
||||
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
|
||||
stdenv.mkDerivation rec {
|
||||
name = "live555-${version}";
|
||||
version = "2018.11.26";
|
||||
version = "2018.12.14";
|
||||
|
||||
src = fetchurl { # the upstream doesn't provide a stable URL
|
||||
urls = [
|
||||
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
|
||||
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
|
||||
];
|
||||
sha256 = "0izvy50xmyycrl7aj43kj1w9k8lcsmdqwwqk1cdizmc4wmj56f5k";
|
||||
sha256 = "0irafygp23m2xmjv06qgs1sccymbwqvn51wggk0c60lnj1v1zhwd";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -162,7 +162,10 @@ let self = stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
# TODO: probably not all .la files are completely fixed, but it shouldn't matter;
|
||||
postInstall = optionalString (galliumDrivers != []) ''
|
||||
postInstall = ''
|
||||
# Some installs don't have any drivers so this directory is never created.
|
||||
mkdir -p $drivers
|
||||
'' + optionalString (galliumDrivers != []) ''
|
||||
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
|
||||
mv -t "$drivers/lib/" \
|
||||
$out/lib/libXvMC* \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, SDL2, libpng }:
|
||||
{ stdenv, fetchurl, pkgconfig, SDL2, libpng, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qrencode";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ SDL2 libpng ];
|
||||
buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-tests"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
|
||||
, glew, libXrandr, libXrender, udev, xcbutilimage
|
||||
, IOKit, Foundation, AppKit, OpenAL
|
||||
, cf-private, IOKit, Foundation, AppKit, OpenAL
|
||||
}:
|
||||
|
||||
let
|
||||
@ -16,10 +16,13 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
|
||||
libXrandr libXrender xcbutilimage
|
||||
] ++ stdenv.lib.optional stdenv.isLinux udev
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
|
||||
buildInputs = [ freetype libjpeg openal flac libvorbis glew ]
|
||||
++ stdenv.lib.optional stdenv.isLinux udev
|
||||
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL
|
||||
# Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate
|
||||
cf-private
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
|
||||
"-DSFML_MISC_INSTALL_PREFIX=share/SFML"
|
||||
|
||||
@ -1,19 +1,18 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }:
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3 }:
|
||||
|
||||
let
|
||||
version = "1.0.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "xdg-desktop-portal-gtk-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal-gtk";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flatpak";
|
||||
repo = "xdg-desktop-portal-gtk";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "06dzh3vzq5nw3r89kb1qi3r2z8wjh9zmzc0hfnva4vnx7mwgm7ax";
|
||||
sha256 = "1djgsp3n10w6lamwwjn64p9722lvxpalj26h19zscbspnhfldb4f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ];
|
||||
buildInputs = [ glib gtk3 ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ];
|
||||
buildInputs = [ glib gtk3 gnome3.gsettings-desktop-schemas ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Desktop integration portals for sandboxed apps";
|
||||
|
||||
@ -1,30 +1,35 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }:
|
||||
|
||||
let
|
||||
version = "1.0.3";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "xdg-desktop-portal-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal";
|
||||
version = "1.1.0";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flatpak";
|
||||
repo = "xdg-desktop-portal";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "113k5sr4l58rm8sgp4qbjrhyjg37c5ad54i58njsm98knb5r2ppv";
|
||||
sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./respect-path-env-var.patch
|
||||
# https://github.com/flatpak/xdg-desktop-portal/pull/263
|
||||
(fetchpatch {
|
||||
url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch;
|
||||
sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ];
|
||||
buildInputs = [ glib pipewire fuse ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ];
|
||||
buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = true; # XXX: investigate!
|
||||
|
||||
configureFlags = [
|
||||
"--enable-installed-tests"
|
||||
"--disable-geoclue" # Requires 2.5.2, not released yet
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "astroquery";
|
||||
version = "0.3.8";
|
||||
version = "0.3.9";
|
||||
|
||||
doCheck = false; # Tests require the pytest-astropy package
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "800d9730c9e2bd299f14c29b4d709d1605c82833223a2e4f784fea7ad805c168";
|
||||
sha256 = "0zw3xp2rfc6h2v569iqsyvzhfnzp7bfjb7jrj61is1hrqw1cqjrb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "av";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9037d73d7a812c3dc75d9cc27d03215483c9e782eae63a07142c0725c6bd2df0";
|
||||
sha256 = "0h5d6yy6mjaflzh9z8fv3j1rjwijmzqfrpz88zxk0qfmbprdc91z";
|
||||
};
|
||||
|
||||
buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, blockdiag
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blockdiagcontrib-cisco";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "06iw3q1w4g3lbgcmyz8m93rv0pfnk2gp8k83rs9ir671ym99gwr2";
|
||||
};
|
||||
|
||||
buildInputs = [ blockdiag ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Noderenderer plugin for blockdiag containing Cisco networking symbols";
|
||||
homepage = "https://bitbucket.org/blockdiag/blockdiag-contrib/";
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
license = licenses.psfl;
|
||||
};
|
||||
|
||||
}
|
||||
@ -33,11 +33,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bokeh";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "43aa8b867f2db99c0cf3178149d2533e9e954a8355d6161381d0b8765c90db5e";
|
||||
sha256 = "07rczl2xkkqzpm45m0rlb2hki48b6w1k912gmwacf5aisnc0a0rw";
|
||||
};
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
23
pkgs/development/python-modules/casttube/default.nix
Normal file
23
pkgs/development/python-modules/casttube/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, requests }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "casttube";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0g7mksfl341vfsxqvw8h15ci2qwd1rczg41n4fb2hw7y9rikqnzj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Interact with the Youtube Chromecast api";
|
||||
homepage = http://github.com/ur1katz/casttube;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
}
|
||||
@ -5,15 +5,21 @@
|
||||
, backports_functools_lru_cache, requests_toolbelt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
srcInfo = if isPy3k then {
|
||||
version = "18.0.1";
|
||||
sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
|
||||
} else {
|
||||
version = "17.4.1";
|
||||
sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
|
||||
};
|
||||
in buildPythonPackage rec {
|
||||
pname = "CherryPy";
|
||||
version = "18.0.1";
|
||||
|
||||
disabled = !isPy3k;
|
||||
inherit (srcInfo) version;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
|
||||
inherit pname;
|
||||
inherit (srcInfo) version sha256;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "daemonize";
|
||||
version = "2.4.7";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c0194e861826be456c7c69985825ac7b79632d8ac7ad4cde8e12fee7971468c8";
|
||||
sha256 = "1hwbl3gf9fdds9sc14zgjyjisjvxidrvqc11xlbb0b6jz17nw0nx";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "daphne";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
owner = "django";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0v3krlqdv39y021dcyf6fl9zys0z1dpw5mqfmkryna5ngxwzlkwd";
|
||||
sha256 = "0mpn2xbpx2r67bj5crfvxfwlznxlp7rcfbb2xly6ad3d0c7djkdi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
|
||||
@ -26,12 +26,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "distributed";
|
||||
version = "1.24.2";
|
||||
version = "1.25.1";
|
||||
|
||||
# get full repository need conftest.py to run tests
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8ab24f0ea634dab7b6667c32b18c98794141f3ef3b081293dfea1943498ce987";
|
||||
sha256 = "1qay94amxs0k6lmwhy07bq54m5zms0rjmnp7a66fldipjla6w8lg";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dropbox";
|
||||
version = "9.2.0";
|
||||
version = "9.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "121wn4l6f6r4vm7yq0y9d1xsn5y77l6a4vgakyy2yaz8wv6j9w7c";
|
||||
sha256 = "1ckpbksdby70d70m58b904h8y8v7m82h12n3q3qk58r4yrqwvld5";
|
||||
};
|
||||
|
||||
# Set DROPBOX_TOKEN environment variable to a valid token.
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user