Merge remote-tracking branch 'upstream/master' into staging

This commit is contained in:
Tuomas Tynkkynen 2018-03-01 06:09:20 +02:00
commit b8b2225f6b
267 changed files with 1555 additions and 1631 deletions

View File

@ -1,192 +0,0 @@
#!/usr/bin/env bash
set -o pipefail
GNOME_FTP=ftp.gnome.org/pub/GNOME/sources
# projects that don't follow the GNOME major versioning, or that we don't want to
# programmatically update
NO_GNOME_MAJOR="ghex gtkhtml gdm gucharmap"
usage() {
echo "Usage: $0 <show project>|<update project>|<update-all> [major.minor]" >&2
exit 0
}
if [ "$#" -lt 1 ]; then
usage
fi
GNOME_TOP=pkgs/desktops/gnome-3
action=$1
# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
# any conversations with sysadmin. Somehow lftp works.
if [ "$FTP_CLIENT" = "lftp" ]; then
ls_ftp() {
lftp -c "open $1; cls"
}
else
ls_ftp() {
curl -s -l "$1"/
}
fi
find_project() {
exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d "$@"
}
show_project() {
local project=$1
local majorVersion=$2
local version=
if [ -z "$majorVersion" ]; then
echo "Looking for available versions..." >&2
local available_baseversions=$(ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n)
if [ "$?" -ne 0 ]; then
echo "Project $project not found" >&2
return 1
fi
echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2
echo -en "Choose one of them: " >&2
read majorVersion
fi
if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then
# not a major version
version=$majorVersion
majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2)
fi
local FTPDIR=${GNOME_FTP}/${project}/${majorVersion}
#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
# gnome's LATEST-IS is broken. Do not trust it.
if [ -z "$version" ]; then
local files=$(ls_ftp "${FTPDIR}")
declare -A versions
for f in $files; do
case $f in
(LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*):
;;
($project-*.*.9*.tar.*):
tmp=${f#$project-}
tmp=${tmp%.tar*}
echo "Ignored unstable version ${tmp}" >&2
;;
($project-*.tar.*):
tmp=${f#$project-}
tmp=${tmp%.tar*}
versions[${tmp}]=1
;;
(*):
echo "UNKNOWN FILE $f" >&2
;;
esac
done
echo "Found versions ${!versions[@]}" >&2
version=$(echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1)
if [ -z "$version" ]; then
echo "No version available for major $majorVersion" >&2
return 1
fi
echo "Latest version is: ${version}" >&2
fi
local name=${project}-${version}
echo "Fetching .sha256 file" >&2
local sha256out=$(curl -s -f http://"${FTPDIR}"/"${name}".sha256sum)
if [ "$?" -ne "0" ]; then
echo "Version not found" >&2
return 1
fi
extensions=( "xz" "bz2" "gz" )
echo "Choosing archive extension (known are ${extensions[@]})..." >&2
for ext in ${extensions[@]}; do
if echo -e "$sha256out" | grep -q "\\.tar\\.${ext}$"; then
ext_pref=$ext
sha256=$(echo -e "$sha256out" | grep "\\.tar\\.${ext}$" | cut -f1 -d\ )
break
fi
done
echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
echo "# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = \"${project}-${version}\";
src = fetchurl {
url = mirror://gnome/sources/${project}/${majorVersion}/${project}-${version}.tar.${ext_pref};
sha256 = \"${sha256}\";
};
}"
return 0
}
update_project() {
local project=$1
local majorVersion=$2
# find project in nixpkgs tree
projectPath=$(find_project -name "$project" -print)
if [ -z "$projectPath" ]; then
echo "Project $project not found under $GNOME_TOP"
exit 1
fi
src=$(show_project "$project" "$majorVersion")
if [ "$?" -eq "0" ]; then
echo "Updating $projectPath/src.nix" >&2
echo -e "$src" > "$projectPath"/src.nix
fi
return 0
}
if [ "$action" = "update-all" ]; then
majorVersion=$2
if [ -z "$majorVersion" ]; then
echo "No major version specified" >&2
usage
fi
# find projects
projects=$(find_project -exec basename '{}' \;)
for project in $projects; do
if echo "$NO_GNOME_MAJOR"|grep -q $project; then
echo "Skipping $project"
else
echo "= Updating $project to $majorVersion" >&2
update_project "$project" "$majorVersion"
echo >&2
fi
done
else
project=$2
majorVersion=$3
if [ -z "$project" ]; then
echo "No project specified, exiting" >&2
usage
fi
if [ "$action" = show ]; then
show_project "$project" "$majorVersion"
elif [ "$action" = update ]; then
update_project "$project" "$majorVersion"
else
echo "Unknown action $action" >&2
usage
fi
fi

View File

@ -1,5 +1,6 @@
{ package ? null
, maintainer ? null
, path ? null
}:
# TODO: add assert statements
@ -9,22 +10,24 @@ let
pkgs = import ./../../default.nix { };
packagesWith = cond: return: set:
pkgs.lib.flatten
(pkgs.lib.mapAttrsToList
(name: pkg:
let
result = builtins.tryEval (
if pkgs.lib.isDerivation pkg && cond name pkg
then [(return name pkg)]
else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false
then packagesWith cond return pkg
pkgs.lib.unique
(pkgs.lib.flatten
(pkgs.lib.mapAttrsToList
(name: pkg:
let
result = builtins.tryEval (
if pkgs.lib.isDerivation pkg && cond name pkg
then [(return name pkg)]
else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false
then packagesWith cond return pkg
else []
);
in
if result.success then result.value
else []
);
in
if result.success then result.value
else []
)
set
)
set
);
packagesWithUpdateScriptAndMaintainer = maintainer':
@ -47,6 +50,14 @@ let
(name: pkg: pkg)
pkgs;
packagesWithUpdateScript = path:
let
attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." path) null pkgs;
in
packagesWith (name: pkg: builtins.hasAttr "updateScript" pkg)
(name: pkg: pkg)
attrSet;
packageByName = name:
let
package = pkgs.lib.attrByPath (pkgs.lib.splitString "." name) null pkgs;
@ -63,6 +74,8 @@ let
[ (packageByName package) ]
else if maintainer != null then
packagesWithUpdateScriptAndMaintainer maintainer
else if path != null then
packagesWithUpdateScript path
else
builtins.throw "No arguments provided.\n\n${helpText}";
@ -76,7 +89,11 @@ let
% nix-shell maintainers/scripts/update.nix --argstr package garbas
to run update script for specific package.
to run update script for specific package, or
% nix-shell maintainers/scripts/update.nix --argstr path gnome3
to run update script for all package under an attribute path.
'';
runUpdateScript = package: ''

View File

@ -430,6 +430,13 @@ following incompatible changes:</para>
and <literal>stopJob</literal> provide an optional <literal>$user</literal> argument for that purpose.
</para>
</listitem>
<listitem>
<para>
Enabling bash completion on NixOS, <literal>programs.bash.enableCompletion</literal>, will now also enable
completion for the Nix command line tools by installing the
<link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link> package.
</para>
</listitem>
</itemizedlist>
</section>

View File

@ -211,6 +211,9 @@ in
"/share/bash-completion"
];
environment.systemPackages = optional cfg.enableCompletion
pkgs.nix-bash-completions;
environment.shells =
[ "/run/current-system/sw/bin/bash"
"/var/run/current-system/sw/bin/bash"

View File

@ -32,11 +32,17 @@ in
description = "Whether to enable Disnix";
};
enableMultiUser = mkOption {
type = types.bool;
default = true;
description = "Whether to support multi-user mode by enabling the Disnix D-Bus service";
};
useWebServiceInterface = mkOption {
default = false;
description = "Whether to enable the DisnixWebService interface running on Apache Tomcat";
};
package = mkOption {
type = types.path;
description = "The Disnix package";
@ -52,7 +58,7 @@ in
config = mkIf cfg.enable {
dysnomia.enable = true;
environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
services.dbus.enable = true;
@ -71,7 +77,7 @@ in
};
systemd.services = {
disnix = {
disnix = mkIf cfg.enableMultiUser {
description = "Disnix server";
wants = [ "dysnomia.target" ];
wantedBy = [ "multi-user.target" ];
@ -92,7 +98,7 @@ in
}
// (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {})
// (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {});
serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service";
};

View File

@ -1,8 +1,12 @@
{ config, lib, pkgs, ... }:
with lib;
{
let cfg = config.nix.sshServe;
command =
if cfg.protocol == "ssh"
then "nix-store --serve"
else "nix-daemon --stdio";
in {
options = {
nix.sshServe = {
@ -10,7 +14,7 @@ with lib;
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable serving the Nix store as a binary cache via SSH.";
description = "Whether to enable serving the Nix store as a remote store via SSH.";
};
keys = mkOption {
@ -20,14 +24,20 @@ with lib;
description = "A list of SSH public keys allowed to access the binary cache via SSH.";
};
protocol = mkOption {
type = types.enum [ "ssh" "ssh-ng" ];
default = "ssh";
description = "The specific Nix-over-SSH protocol to use.";
};
};
};
config = mkIf config.nix.sshServe.enable {
config = mkIf cfg.enable {
users.extraUsers.nix-ssh = {
description = "Nix SSH substituter user";
description = "Nix SSH store user";
uid = config.ids.uids.nix-ssh;
useDefaultShell = true;
};
@ -41,11 +51,11 @@ with lib;
PermitTTY no
PermitTunnel no
X11Forwarding no
ForceCommand ${config.nix.package.out}/bin/nix-store --serve
ForceCommand ${config.nix.package.out}/bin/${command}
Match All
'';
users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = config.nix.sshServe.keys;
users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = cfg.keys;
};
}

View File

@ -192,7 +192,7 @@ in {
serviceConfig = {
Type = "simple";
ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}'';
ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -P -d -k -c ${daemonConfFile}'';
Restart = "on-failure";
};
};

View File

@ -319,6 +319,7 @@ in rec {
tests.nfs4 = callTest tests/nfs.nix { version = 4; };
tests.nginx = callTest tests/nginx.nix { };
tests.nghttpx = callTest tests/nghttpx.nix { };
tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { };
tests.novacomd = callTestOnTheseSystems ["x86_64-linux"] tests/novacomd.nix { };
tests.leaps = callTest tests/leaps.nix { };
tests.nsd = callTest tests/nsd.nix {};

View File

@ -0,0 +1,39 @@
import ./make-test.nix ({ pkgs, lib, ... }:
let inherit (import ./ssh-keys.nix pkgs)
snakeOilPrivateKey snakeOilPublicKey;
ssh-config = builtins.toFile "ssh.conf" ''
UserKnownHostsFile=/dev/null
StrictHostKeyChecking=no
'';
in
{ name = "nix-ssh-serve";
meta.maintainers = [ lib.maintainers.shlevy ];
nodes =
{ server.nix.sshServe =
{ enable = true;
keys = [ snakeOilPublicKey ];
protocol = "ssh-ng";
};
server.nix.package = pkgs.nixUnstable;
client.nix.package = pkgs.nixUnstable;
};
testScript = ''
startAll;
$client->succeed("mkdir -m 700 /root/.ssh");
$client->copyFileFromHost("${ssh-config}", "/root/.ssh/config");
$client->succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa");
$client->succeed("chmod 600 /root/.ssh/id_ecdsa");
$client->succeed("nix-store --add /etc/machine-id > mach-id-path");
$server->waitForUnit("sshd");
$client->fail("diff /root/other-store\$(cat mach-id-path) /etc/machine-id");
# Currently due to shared store this is a noop :(
$client->succeed("nix copy --to ssh-ng://nix-ssh\@server \$(cat mach-id-path)");
$client->succeed("nix-store --realise \$(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh\@server");
$client->succeed("diff /root/other-store\$(cat mach-id-path) /etc/machine-id");
'';
}
)

View File

@ -1,20 +1,7 @@
import ./make-test.nix ({ pkgs, ... }:
let
snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" ''
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49
AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN
r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA==
-----END EC PRIVATE KEY-----
'';
snakeOilPublicKey = pkgs.lib.concatStrings [
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
"yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
"9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil"
];
let inherit (import ./ssh-keys.nix pkgs)
snakeOilPrivateKey snakeOilPublicKey;
in {
name = "openssh";
meta = with pkgs.stdenv.lib.maintainers; {

15
nixos/tests/ssh-keys.nix Normal file
View File

@ -0,0 +1,15 @@
pkgs:
{ snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" ''
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49
AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN
r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA==
-----END EC PRIVATE KEY-----
'';
snakeOilPublicKey = pkgs.lib.concatStrings [
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
"yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
"9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil"
];
}

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool
, libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection
, gtk3, python, pygobject3, pyxdg, libdrm, libxcb }:
, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "redshift-${version}";
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
libdrm
libxcb
python
hicolor-icon-theme
];
pythonPath = [ pygobject3 pyxdg ];

View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "tilda-${version}";
version = "1.3.3";
version = "1.4.1";
src = fetchurl {
url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki";
sha256 = "0w2hry2bqcqrkik4l100b1a9jlsih6sq8zwhfpl8zzfq20i00lfs";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "urh-${version}";
version = "1.7.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "jopohl";
repo = "urh";
rev = "v${version}";
sha256 = "00l1zs3qw89z1hlylprzrpf6nf7h22h0nw43h97gv775vaqqgczv";
sha256 = "02jq2jas6gm08z4l09azi6dcsydaaaqbxfv4mb7pnrc1w8m593zr";
};
buildInputs = [ hackrf rtl-sdr ];

View File

@ -1,6 +1,6 @@
{stdenv, autoreconfHook, fetchFromGitHub, bison}:
let version = "0.9"; in
let version = "1.1.1"; in
stdenv.mkDerivation rec {
name = "tcpkali-${version}";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "machinezone";
repo = "tcpkali";
rev = "v${version}";
sha256 = "03cbmnc60wkd7f4bapn5cbm3c4zas2l0znsbpci2mn8ms8agif82";
sha256 = "09ky3cccaphcqc6nhfs00pps99lasmzc2pf5vk0gi8hlqbbhilxf";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ bison];

View File

@ -1,13 +1,13 @@
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
, cmake, makeWrapper, libjpeg, python }:
let version = "4.9.0"; in
let version = "5.1.0"; in
stdenv.mkDerivation rec {
name = "tulip-${version}";
src = fetchurl {
url = "mirror://sourceforge/auber/${name}_src.tar.gz";
sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3";
sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h";
};
buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ];

View File

@ -15,37 +15,46 @@ stdenv.mkDerivation rec {
sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn";
};
configureFlags = [ "--with-inotify" ];
configureFlags = [ "--enable-recollq" ] ++
(if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
buildInputs = [ qt4 xapian file python bison];
buildInputs = [ qt4 xapian file python bison ];
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.am
sed -i 's/-Wl,--no-undefined -Wl,--warn-unresolved-symbols//' Makefile.in
'';
# the filters search through ${PATH} using a sh proc 'checkcmds' for the
# filtering utils. Short circuit this by replacing the filtering command with
# the absolute path to the filtering command.
postInstall = ''
for f in $out/share/recoll/filters/* ; do
substituteInPlace $f --replace antiword ${lib.getBin antiword}/bin/antiword
substituteInPlace $f --replace awk ${lib.getBin gawk}/bin/awk
substituteInPlace $f --replace catppt ${lib.getBin catdoc}/bin/catppt
substituteInPlace $f --replace djvused ${lib.getBin djvulibre}/bin/djvused
substituteInPlace $f --replace djvutxt ${lib.getBin djvulibre}/bin/djvutxt
substituteInPlace $f --replace egrep ${lib.getBin gnugrep}/bin/egrep
substituteInPlace $f --replace groff ${lib.getBin groff}/bin/groff
substituteInPlace $f --replace gunzip ${lib.getBin gzip}/bin/gunzip
substituteInPlace $f --replace iconv ${lib.getBin libiconv}/bin/iconv
substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx
substituteInPlace $f --replace pdftotext ${lib.getBin poppler_utils}/bin/pdftotext
substituteInPlace $f --replace pstotext ${lib.getBin ghostscript}/bin/ps2ascii
substituteInPlace $f --replace sed ${lib.getBin gnused}/bin/sed
substituteInPlace $f --replace tar ${lib.getBin gnutar}/bin/tar
substituteInPlace $f --replace unzip ${lib.getBin unzip}/bin/unzip
substituteInPlace $f --replace xls2csv ${lib.getBin catdoc}/bin/xls2csv
substituteInPlace $f --replace xsltproc ${lib.getBin libxslt}/bin/xsltproc
substituteInPlace $f --replace unrtf ${lib.getBin unrtf}/bin/unrtf
substituteInPlace $f --replace untex ${lib.getBin untex}/bin/untex
substituteInPlace $f --replace wpd2html ${lib.getBin libwpd}/bin/wpd2html
substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl
if [[ ! "$f" =~ \.zip$ ]]; then
substituteInPlace $f --replace '"antiword"' '"${lib.getBin antiword}/bin/antiword"'
substituteInPlace $f --replace '"awk"' '"${lib.getBin gawk}/bin/awk"'
substituteInPlace $f --replace '"catppt"' '"${lib.getBin catdoc}/bin/catppt"'
substituteInPlace $f --replace '"djvused"' '"${lib.getBin djvulibre}/bin/djvused"'
substituteInPlace $f --replace '"djvutxt"' '"${lib.getBin djvulibre}/bin/djvutxt"'
substituteInPlace $f --replace '"egrep"' '"${lib.getBin gnugrep}/bin/egrep"'
substituteInPlace $f --replace '"groff"' '"${lib.getBin groff}/bin/groff"'
substituteInPlace $f --replace '"gunzip"' '"${lib.getBin gzip}/bin/gunzip"'
substituteInPlace $f --replace '"iconv"' '"${lib.getBin libiconv}/bin/iconv"'
substituteInPlace $f --replace '"pdftotext"' '"${lib.getBin poppler_utils}/bin/pdftotext"'
substituteInPlace $f --replace '"pstotext"' '"${lib.getBin ghostscript}/bin/ps2ascii"'
substituteInPlace $f --replace '"sed"' '"${lib.getBin gnused}/bin/sed"'
substituteInPlace $f --replace '"tar"' '"${lib.getBin gnutar}/bin/tar"'
substituteInPlace $f --replace '"unzip"' '"${lib.getBin unzip}/bin/unzip"'
substituteInPlace $f --replace '"xls2csv"' '"${lib.getBin catdoc}/bin/xls2csv"'
substituteInPlace $f --replace '"xsltproc"' '"${lib.getBin libxslt}/bin/xsltproc"'
substituteInPlace $f --replace '"unrtf"' '"${lib.getBin unrtf}/bin/unrtf"'
substituteInPlace $f --replace '"untex"' '"${lib.getBin untex}/bin/untex"'
substituteInPlace $f --replace '"wpd2html"' '"${lib.getBin libwpd}/bin/wpd2html"'
substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl
fi
done
'' + stdenv.lib.optionalString stdenv.isLinux ''
substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
'';
enableParallelBuilding = true;

View File

@ -1,14 +0,0 @@
# | Discard the context of a string while ensuring that expected path
# validity invariants hold.
#
# This relies on import-from-derivation, but it is only useful in
# contexts where the string is going to be used in an
# import-from-derivation anyway.
#
# safeDiscardStringContext : String → String
{ writeText }: s:
builtins.seq
(import (writeText
"discard.nix"
"${builtins.substring 0 0 s}null\n"))
(builtins.unsafeDiscardStringContext s)

View File

@ -3,17 +3,30 @@
, dbus, intltool, libwnck3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) src name;
name = "accerciser-${version}";
version = "3.22.0";
nativeBuildInputs = [ pkgconfig ];
src = fetchurl {
url = "mirror://gnome/sources/accerciser/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool intltool ];
buildInputs = [
gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi
gtk3 libxml2 python3Packages.python python3Packages.pyatspi
python3Packages.pygobject3 python3Packages.ipython
at-spi2-core dbus intltool libwnck3 gnome3.defaultIconTheme
at-spi2-core dbus libwnck3 gnome3.defaultIconTheme
];
wrapPrefixVariables = [ "PYTHONPATH" ];
passthru = {
updateScript = gnome3.updateScript {
packageName = "accerciser";
attrPath = "gnome3.accerciser";
};
};
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Accerciser;
description = "Interactive Python accessibility explorer";

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "accerciser-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/accerciser/3.22/accerciser-3.22.0.tar.xz;
sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
};
}

View File

@ -5,7 +5,17 @@
, gnome3, librsvg, gdk_pixbuf, libxml2 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "bijiben-${version}";
version = "3.27.1";
src = fetchurl {
url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "bijiben"; attrPath = "gnome3.bijiben"; };
};
doCheck = true;
@ -34,7 +44,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Bijiben;
description = "Note editor designed to remain simple to use";
broken = true;
maintainers = gnome3.maintainers;
license = licenses.gpl3;
platforms = platforms.linux;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "bijiben-3.27.1";
src = fetchurl {
url = mirror://gnome/sources/bijiben/3.27/bijiben-3.27.1.tar.xz;
sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64";
};
}

View File

@ -5,7 +5,17 @@
, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome-desktop, libxml2 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "cheese-${version}";
version = "3.26.0";
src = fetchurl {
url = "mirror://gnome/sources/cheese/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; };
};
nativeBuildInputs = [
pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "cheese-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/cheese/3.26/cheese-3.26.0.tar.xz;
sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605";
};
}

View File

@ -7,7 +7,17 @@
let
majVer = gnome3.version;
in stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "evolution-${version}";
version = "3.26.3";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "091621f21827e2dfb8057f3b2c3a215c4e97a692c59d0a4ee33108af571de60e";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "evolution"; attrPath = "gnome3.evolution"; };
};
doCheck = true;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evolution-3.26.3";
src = fetchurl {
url = mirror://gnome/sources/evolution/3.26/evolution-3.26.3.tar.xz;
sha256 = "091621f21827e2dfb8057f3b2c3a215c4e97a692c59d0a4ee33108af571de60e";
};
}

View File

@ -2,7 +2,17 @@
, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "file-roller-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/file-roller/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "file-roller"; attrPath = "gnome3.file-roller"; };
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "file-roller-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/file-roller/3.26/file-roller-3.26.2.tar.xz;
sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5";
};
}

View File

@ -4,7 +4,17 @@
, gnome3, librsvg, gdk_pixbuf, file, gspell }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gedit-${version}";
version = "3.22.1";
src = fetchurl {
url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gedit"; attrPath = "gnome3.gedit"; };
};
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gedit-3.22.1";
src = fetchurl {
url = mirror://gnome/sources/gedit/3.22/gedit-3.22.1.tar.xz;
sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b";
};
}

View File

@ -2,7 +2,17 @@
wrapGAppsHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "ghex-${version}";
version = "3.18.3";
src = fetchurl {
url = "mirror://gnome/sources/ghex/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; };
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "ghex-3.18.3";
src = fetchurl {
url = mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz;
sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
};
}

View File

@ -4,7 +4,17 @@
, gnome3, gdk_pixbuf, libxslt }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "glade-${version}";
version = "3.20.2";
src = fetchurl {
url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; };
};
nativeBuildInputs = [
pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "glade-3.20.2";
src = fetchurl {
url = mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz;
sha256 = "07d1545570951aeded20e9fdc6d3d8a56aeefe2538734568c5335be336c6abed";
};
}

View File

@ -9,7 +9,17 @@
# TODO: ovirt (optional)
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-boxes-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-boxes"; attrPath = "gnome3.gnome-boxes"; };
};
enableParallelBuilding = true;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-boxes-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-boxes/3.26/gnome-boxes-3.26.2.tar.xz;
sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210";
};
}

View File

@ -3,7 +3,17 @@
, glib, gnome-online-accounts, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-calendar-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calendar/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-calendar"; attrPath = "gnome3.gnome-calendar"; };
};
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-calendar-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-calendar/3.26/gnome-calendar-3.26.2.tar.xz;
sha256 = "19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e";
};
}

View File

@ -2,7 +2,17 @@
, intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-characters-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-characters"; attrPath = "gnome3.gnome-characters"; };
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
buildInputs = [

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-characters-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-characters/3.26/gnome-characters-3.26.2.tar.xz;
sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b";
};
}

View File

@ -4,7 +4,17 @@
, gnome3, gdk_pixbuf, geoclue2, libgweather }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-clocks-${version}";
version = "3.26.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-clocks/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-clocks"; attrPath = "gnome3.gnome-clocks"; };
};
doCheck = true;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-clocks-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-clocks/3.26/gnome-clocks-3.26.1.tar.xz;
sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7";
};
}

View File

@ -6,7 +6,17 @@
, gmp, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-documents-${version}";
version = "3.26.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-documents"; attrPath = "gnome3.gnome-documents"; };
};
doCheck = true;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-documents-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-documents/3.26/gnome-documents-3.26.1.tar.xz;
sha256 = "ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9";
};
}

View File

@ -1,7 +1,17 @@
{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-getting-started-docs-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-getting-started-docs"; attrPath = "gnome3.gnome-getting-started-docs"; };
};
buildInputs = [ intltool itstool libxml2 ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-getting-started-docs-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-getting-started-docs/3.26/gnome-getting-started-docs-3.26.2.tar.xz;
sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775";
};
}

View File

@ -2,7 +2,17 @@
, intltool, itstool, libxml2, systemd }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-logs-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "e17ca011e7bea756bd841e027e56cfe8c214bed4817cb35732ace4aa73ff8f5c";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-logs"; attrPath = "gnome3.gnome-logs"; };
};
configureFlags = [ "--disable-tests" ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-logs-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-logs/3.26/gnome-logs-3.26.2.tar.xz;
sha256 = "e17ca011e7bea756bd841e027e56cfe8c214bed4817cb35732ace4aa73ff8f5c";
};
}

View File

@ -4,7 +4,17 @@
, webkitgtk }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-maps-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-maps/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-maps"; attrPath = "gnome3.gnome-maps"; };
};
doCheck = true;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-maps-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-maps/3.26/gnome-maps-3.26.2.tar.xz;
sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050";
};
}

View File

@ -4,7 +4,17 @@
, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-music-${version}";
version = "3.26.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-music/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-music"; attrPath = "gnome3.gnome-music"; };
};
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-music-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-music/3.26/gnome-music-3.26.1.tar.xz;
sha256 = "7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3";
};
}

View File

@ -6,7 +6,17 @@
, dleyna-renderer }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-photos-${version}";
version = "3.26.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-photos/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-photos"; attrPath = "gnome3.gnome-photos"; };
};
# doCheck = true;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-photos-3.26.3";
src = fetchurl {
url = mirror://gnome/sources/gnome-photos/3.26/gnome-photos-3.26.3.tar.xz;
sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab";
};
}

View File

@ -12,7 +12,17 @@
, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-power-manager-${version}";
version = "3.26.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-power-manager/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-power-manager"; attrPath = "gnome3.gnome-power-manager"; };
};
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-power-manager-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-power-manager/3.26/gnome-power-manager-3.26.0.tar.xz;
sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e";
};
}

View File

@ -2,7 +2,17 @@
, libgweather, intltool, itstool, geoclue2 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-weather-${version}";
version = "3.26.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-weather/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-weather"; attrPath = "gnome3.gnome-weather"; };
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-weather-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz;
sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
};
}

View File

@ -4,7 +4,17 @@
, gnome3, wrapGAppsHook, telepathy-logger, gspell }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "polari-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/polari/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "polari"; attrPath = "gnome3.polari"; };
};
propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "polari-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/polari/3.26/polari-3.26.2.tar.xz;
sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190";
};
}

View File

@ -5,7 +5,17 @@
, libsecret, avahi, p11-kit, openssh }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "seahorse-${version}";
version = "3.20.0";
src = fetchurl {
url = "mirror://gnome/sources/seahorse/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "seahorse"; attrPath = "gnome3.seahorse"; };
};
doCheck = true;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "seahorse-3.20.0";
src = fetchurl {
url = mirror://gnome/sources/seahorse/3.20/seahorse-3.20.0.tar.xz;
sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df";
};
}

View File

@ -2,7 +2,17 @@
, libsecret, itstool, makeWrapper, librsvg }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "vinagre-${version}";
version = "3.22.0";
src = fetchurl {
url = "mirror://gnome/sources/vinagre/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "vinagre"; attrPath = "gnome3.vinagre"; };
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "vinagre-3.22.0";
src = fetchurl {
url = mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz;
sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
};
}

View File

@ -2,7 +2,17 @@
, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "adwaita-icon-theme-${version}";
version = "3.26.1";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "adwaita-icon-theme"; attrPath = "gnome3.adwaita-icon-theme"; };
};
# For convenience, we can specify adwaita-icon-theme only in packages
propagatedBuildInputs = [ hicolor-icon-theme ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "adwaita-icon-theme-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.1.tar.xz;
sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d";
};
}

View File

@ -4,7 +4,17 @@
, gnome3, librsvg, gdk_pixbuf, file }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "baobab-${version}";
version = "3.26.1";
src = fetchurl {
url = "mirror://gnome/sources/baobab/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "baobab"; };
};
doCheck = true;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "baobab-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/baobab/3.26/baobab-3.26.1.tar.xz;
sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e";
};
}

View File

@ -2,7 +2,17 @@
, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "dconf-editor-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/dconf-editor/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "dconf-editor"; attrPath = "gnome3.dconf-editor"; };
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "dconf-editor-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz;
sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1";
};
}

View File

@ -10,7 +10,17 @@
, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "empathy-${version}";
version = "3.12.14";
src = fetchurl {
url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "empathy"; };
};
propagatedUserEnvPkgs = [
gnome-online-accounts shared-mime-info

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "empathy-3.12.14";
src = fetchurl {
url = mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz;
sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3";
};
}

View File

@ -2,7 +2,17 @@
, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "eog-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/eog/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "eog"; attrPath = "gnome3.eog"; };
};
nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "eog-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/eog/3.26/eog-3.26.2.tar.xz;
sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad";
};
}

View File

@ -5,7 +5,17 @@
, gdk_pixbuf, gnome-common, gst_all_1, json-glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "epiphany-${version}";
version = "3.26.4";
src = fetchurl {
url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "epiphany"; };
};
# Tests need an X display
mesonFlags = [ "-Dunit_tests=false" ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "epiphany-3.26.4";
src = fetchurl {
url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.4.tar.xz;
sha256 = "390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea";
};
}

View File

@ -8,7 +8,17 @@
}:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "evince-${version}";
version = "3.26.0";
src = fetchurl {
url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "evince"; };
};
nativeBuildInputs = [
pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp-tools autoreconfHook

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evince-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/evince/3.26/evince-3.26.0.tar.xz;
sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8";
};
}

View File

@ -4,7 +4,17 @@
, vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "evolution-data-server-${version}";
version = "3.26.3";
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "evolution-data-server"; };
};
nativeBuildInputs = [
cmake pkgconfig intltool python3 gperf makeWrapper

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "evolution-data-server-3.26.3";
src = fetchurl {
url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.3.tar.xz;
sha256 = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5";
};
}

View File

@ -5,13 +5,12 @@
# TODO: enable more folks backends
let
majorVersion = "0.11";
in
stdenv.mkDerivation rec {
name = "folks-${majorVersion}.4";
version = "0.11.4";
in stdenv.mkDerivation rec {
name = "folks-${version}";
src = fetchurl {
url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
url = "mirror://gnome/sources/folks/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
};
@ -30,6 +29,14 @@ stdenv.mkDerivation rec {
postBuild = "rm -rf $out/share/gtk-doc";
passthru = {
updateScript = gnome3.updateScript {
packageName = "folks";
attrPath = "gnome3.folks";
versionPolicy = "none";
};
};
meta = {
description = "Folks";

View File

@ -3,7 +3,17 @@
, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gcr-${version}";
version = "3.20.0";
src = fetchurl {
url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gcr"; attrPath = "gnome3.gcr"; };
};
outputs = [ "out" "dev" ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gcr-3.20.0";
src = fetchurl {
url = mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz;
sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379";
};
}

View File

@ -4,7 +4,17 @@
, librsvg, coreutils }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gdm-${version}";
version = "3.26.2.1";
src = fetchurl {
url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gdm"; attrPath = "gnome3.gdm"; };
};
# Only needed to make it build
preConfigure = ''

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gdm-3.26.2.1";
src = fetchurl {
url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz;
sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57";
};
}

View File

@ -1,7 +1,17 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "geocode-glib-${version}";
version = "3.24.0";
src = fetchurl {
url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "geocode-glib"; attrPath = "gnome3.geocode-glib"; };
};
buildInputs = with gnome3;
[ intltool pkgconfig glib libsoup json-glib ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "geocode-glib-3.24.0";
src = fetchurl {
url = mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz;
sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e";
};
}

View File

@ -3,7 +3,17 @@
, makeWrapper }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gjs-${version}";
version = "1.50.4";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gjs"; attrPath = "gnome3.gjs"; };
};
outputs = [ "out" "installedTests" ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gjs-1.50.4";
src = fetchurl {
url = mirror://gnome/sources/gjs/1.50/gjs-1.50.4.tar.xz;
sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a";
};
}

View File

@ -1,7 +1,17 @@
{ stdenv, fetchurl, pkgconfig, gnome3, intltool }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-backgrounds-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; };
};
nativeBuildInputs = [ pkgconfig intltool ];

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-backgrounds-3.26.2";
src = fetchurl {
url = mirror://gnome/sources/gnome-backgrounds/3.26/gnome-backgrounds-3.26.2.tar.xz;
sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f";
};
}

View File

@ -2,7 +2,17 @@
, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-bluetooth-${version}";
version = "3.26.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-bluetooth"; attrPath = "gnome3.gnome-bluetooth"; };
};
nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ];
buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-bluetooth-3.26.1";
src = fetchurl {
url = mirror://gnome/sources/gnome-bluetooth/3.26/gnome-bluetooth-3.26.1.tar.xz;
sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f";
};
}

View File

@ -3,7 +3,17 @@
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-calculator-${version}";
version = "3.26.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-calculator"; attrPath = "gnome3.gnome-calculator"; };
};
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-calculator-3.26.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-calculator/3.26/gnome-calculator-3.26.0.tar.xz;
sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7";
};
}

View File

@ -1,7 +1,17 @@
{ stdenv, fetchurl, which, gnome3, autoconf, automake }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-common-${version}";
version = "3.18.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-common/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; };
};
patches = [(fetchurl {
name = "gnome-common-patch";

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-common-3.18.0";
src = fetchurl {
url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz;
sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
};
}

View File

@ -6,7 +6,17 @@
, libsoup, vala, dbus-glib, automake, autoconf }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-contacts-${version}";
version = "3.26";
src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-contacts"; attrPath = "gnome3.gnome-contacts"; };
};
doCheck = true;

View File

@ -1,10 +0,0 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gnome-contacts-3.26";
src = fetchurl {
url = mirror://gnome/sources/gnome-contacts/3.26/gnome-contacts-3.26.tar.xz;
sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1";
};
}

View File

@ -8,7 +8,17 @@
, fontconfig, sound-theme-freedesktop, grilo }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
name = "gnome-control-center-${version}";
version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-control-center/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-control-center"; attrPath = "gnome3.gnome-control-center"; };
};
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];

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