forked from mirrors/nixpkgs
Merge remote-tracking branch 'origin/staging' into cross-nixos
This commit is contained in:
Shea Levy
commit
95579af5ec
|
|
@ -71,6 +71,7 @@
|
|||
auntie = "Jonathan Glines <auntieNeo@gmail.com>";
|
||||
avnik = "Alexander V. Nikolaev <avn@avnik.info>";
|
||||
aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
|
||||
babariviere = "Bastien Riviere <babariviere@protonmail.com>";
|
||||
bachp = "Pascal Bach <pascal.bach@nextrem.ch>";
|
||||
backuitist = "Bruno Bieth";
|
||||
badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
|
||||
|
|
@ -380,6 +381,7 @@
|
|||
ledif = "Adam Fidel <refuse@gmail.com>";
|
||||
leemachin = "Lee Machin <me@mrl.ee>";
|
||||
leenaars = "Michiel Leenaars <ml.software@leenaa.rs>";
|
||||
lejonet = "Daniel Kuehn <daniel@kuehn.se>";
|
||||
leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
|
||||
lethalman = "Luca Bruno <lucabru@src.gnome.org>";
|
||||
lewo = "Antoine Eiche <lewo@abesis.fr>";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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: ''
|
||||
|
|
|
|||
|
|
@ -304,6 +304,7 @@
|
|||
mighttpd2 = 285;
|
||||
hass = 286;
|
||||
monero = 287;
|
||||
ceph = 288;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
|
||||
|
||||
|
|
@ -576,6 +577,7 @@
|
|||
mighttpd2 = 285;
|
||||
hass = 286;
|
||||
monero = 287;
|
||||
ceph = 288;
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing
|
||||
# uid. Users and groups with the same name should have equal
|
||||
|
|
|
|||
|
|
@ -439,6 +439,7 @@
|
|||
./services/network-filesystems/u9fs.nix
|
||||
./services/network-filesystems/yandex-disk.nix
|
||||
./services/network-filesystems/xtreemfs.nix
|
||||
./services/network-filesystems/ceph.nix
|
||||
./services/networking/amuled.nix
|
||||
./services/networking/aria2.nix
|
||||
./services/networking/asterisk.nix
|
||||
|
|
|
|||
371
nixos/modules/services/network-filesystems/ceph.nix
Normal file
371
nixos/modules/services/network-filesystems/ceph.nix
Normal file
|
|
@ -0,0 +1,371 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
ceph = pkgs.ceph;
|
||||
cfg = config.services.ceph;
|
||||
# function that translates "camelCaseOptions" to "camel case options", credits to tilpner in #nixos@freenode
|
||||
translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars);
|
||||
generateDaemonList = (daemonType: daemons: extraServiceConfig:
|
||||
mkMerge (
|
||||
map (daemon:
|
||||
{ "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; }
|
||||
) daemons
|
||||
)
|
||||
);
|
||||
generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: {
|
||||
enable = true;
|
||||
description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}";
|
||||
after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
|
||||
wants = [ "network-online.target" "local-fs.target" "time-sync.target" ];
|
||||
partOf = [ "ceph-${daemonType}.target" ];
|
||||
wantedBy = [ "ceph-${daemonType}.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
LimitNOFILE = 1048576;
|
||||
LimitNPROC = 1048576;
|
||||
Environment = "CLUSTER=${clusterName}";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
PrivateDevices = "yes";
|
||||
PrivateTmp = "true";
|
||||
ProtectHome = "true";
|
||||
ProtectSystem = "full";
|
||||
Restart = "on-failure";
|
||||
StartLimitBurst = "5";
|
||||
StartLimitInterval = "30min";
|
||||
ExecStart = "${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} -f --cluster ${clusterName} --id ${if daemonType == "rgw" then "client.${daemonId}" else daemonId} --setuser ceph --setgroup ceph";
|
||||
} // extraServiceConfig
|
||||
// optionalAttrs (daemonType == "osd") { ExecStartPre = "${ceph.out}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; };
|
||||
} // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) { preStart = ''
|
||||
daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"
|
||||
if [ ! -d ''$daemonPath ]; then
|
||||
mkdir -m 755 -p ''$daemonPath
|
||||
chown -R ceph:ceph ''$daemonPath
|
||||
fi
|
||||
'';
|
||||
} // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; }
|
||||
);
|
||||
generateTargetFile = (daemonType:
|
||||
{
|
||||
"ceph-${daemonType}" = {
|
||||
description = "Ceph target allowing to start/stop all ceph-${daemonType} services at once";
|
||||
partOf = [ "ceph.target" ];
|
||||
before = [ "ceph.target" ];
|
||||
};
|
||||
}
|
||||
);
|
||||
in
|
||||
{
|
||||
options.services.ceph = {
|
||||
# Ceph has a monolithic configuration file but different sections for
|
||||
# each daemon, a separate client section and a global section
|
||||
enable = mkEnableOption "Ceph global configuration";
|
||||
|
||||
global = {
|
||||
fsid = mkOption {
|
||||
type = types.str;
|
||||
example = ''
|
||||
433a2193-4f8a-47a0-95d2-209d7ca2cca5
|
||||
'';
|
||||
description = ''
|
||||
Filesystem ID, a generated uuid, its must be generated and set before
|
||||
attempting to start a cluster
|
||||
'';
|
||||
};
|
||||
|
||||
clusterName = mkOption {
|
||||
type = types.str;
|
||||
default = "ceph";
|
||||
description = ''
|
||||
Name of cluster
|
||||
'';
|
||||
};
|
||||
|
||||
monInitialMembers = mkOption {
|
||||
type = with types; nullOr commas;
|
||||
default = null;
|
||||
example = ''
|
||||
node0, node1, node2
|
||||
'';
|
||||
description = ''
|
||||
List of hosts that will be used as monitors at startup.
|
||||
'';
|
||||
};
|
||||
|
||||
monHost = mkOption {
|
||||
type = with types; nullOr commas;
|
||||
default = null;
|
||||
example = ''
|
||||
10.10.0.1, 10.10.0.2, 10.10.0.3
|
||||
'';
|
||||
description = ''
|
||||
List of hostname shortnames/IP addresses of the initial monitors.
|
||||
'';
|
||||
};
|
||||
|
||||
maxOpenFiles = mkOption {
|
||||
type = types.int;
|
||||
default = 131072;
|
||||
description = ''
|
||||
Max open files for each OSD daemon.
|
||||
'';
|
||||
};
|
||||
|
||||
authClusterRequired = mkOption {
|
||||
type = types.enum [ "cephx" "none" ];
|
||||
default = "cephx";
|
||||
description = ''
|
||||
Enables requiring daemons to authenticate with eachother in the cluster.
|
||||
'';
|
||||
};
|
||||
|
||||
authServiceRequired = mkOption {
|
||||
type = types.enum [ "cephx" "none" ];
|
||||
default = "cephx";
|
||||
description = ''
|
||||
Enables requiring clients to authenticate with the cluster to access services in the cluster (e.g. radosgw, mds or osd).
|
||||
'';
|
||||
};
|
||||
|
||||
authClientRequired = mkOption {
|
||||
type = types.enum [ "cephx" "none" ];
|
||||
default = "cephx";
|
||||
description = ''
|
||||
Enables requiring the cluster to authenticate itself to the client.
|
||||
'';
|
||||
};
|
||||
|
||||
publicNetwork = mkOption {
|
||||
type = with types; nullOr commas;
|
||||
default = null;
|
||||
example = ''
|
||||
10.20.0.0/24, 192.168.1.0/24
|
||||
'';
|
||||
description = ''
|
||||
A comma-separated list of subnets that will be used as public networks in the cluster.
|
||||
'';
|
||||
};
|
||||
|
||||
clusterNetwork = mkOption {
|
||||
type = with types; nullOr commas;
|
||||
default = null;
|
||||
example = ''
|
||||
10.10.0.0/24, 192.168.0.0/24
|
||||
'';
|
||||
description = ''
|
||||
A comma-separated list of subnets that will be used as cluster networks in the cluster.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
mgr = {
|
||||
enable = mkEnableOption "Ceph MGR daemon";
|
||||
daemons = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
example = ''
|
||||
[ "name1" "name2" ];
|
||||
'';
|
||||
description = ''
|
||||
A list of names for manager daemons that should have a service created. The names correspond
|
||||
to the id part in ceph i.e. [ "name1" ] would result in mgr.name1
|
||||
'';
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
type = with types; attrsOf str;
|
||||
default = {};
|
||||
description = ''
|
||||
Extra configuration to add to the global section for manager daemons.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
mon = {
|
||||
enable = mkEnableOption "Ceph MON daemon";
|
||||
daemons = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
example = ''
|
||||
[ "name1" "name2" ];
|
||||
'';
|
||||
description = ''
|
||||
A list of monitor daemons that should have a service created. The names correspond
|
||||
to the id part in ceph i.e. [ "name1" ] would result in mon.name1
|
||||
'';
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
type = with types; attrsOf str;
|
||||
default = {};
|
||||
description = ''
|
||||
Extra configuration to add to the monitor section.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
osd = {
|
||||
enable = mkEnableOption "Ceph OSD daemon";
|
||||
daemons = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
example = ''
|
||||
[ "name1" "name2" ];
|
||||
'';
|
||||
description = ''
|
||||
A list of OSD daemons that should have a service created. The names correspond
|
||||
to the id part in ceph i.e. [ "name1" ] would result in osd.name1
|
||||
'';
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
type = with types; attrsOf str;
|
||||
default = {
|
||||
"osd journal size" = "10000";
|
||||
"osd pool default size" = "3";
|
||||
"osd pool default min size" = "2";
|
||||
"osd pool default pg num" = "200";
|
||||
"osd pool default pgp num" = "200";
|
||||
"osd crush chooseleaf type" = "1";
|
||||
};
|
||||
description = ''
|
||||
Extra configuration to add to the OSD section.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
mds = {
|
||||
enable = mkEnableOption "Ceph MDS daemon";
|
||||
daemons = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
example = ''
|
||||
[ "name1" "name2" ];
|
||||
'';
|
||||
description = ''
|
||||
A list of metadata service daemons that should have a service created. The names correspond
|
||||
to the id part in ceph i.e. [ "name1" ] would result in mds.name1
|
||||
'';
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
type = with types; attrsOf str;
|
||||
default = {};
|
||||
description = ''
|
||||
Extra configuration to add to the MDS section.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
rgw = {
|
||||
enable = mkEnableOption "Ceph RadosGW daemon";
|
||||
daemons = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
example = ''
|
||||
[ "name1" "name2" ];
|
||||
'';
|
||||
description = ''
|
||||
A list of rados gateway daemons that should have a service created. The names correspond
|
||||
to the id part in ceph i.e. [ "name1" ] would result in client.name1, radosgw daemons
|
||||
aren't daemons to cluster in the sense that OSD, MGR or MON daemons are. They are simply
|
||||
daemons, from ceph, that uses the cluster as a backend.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
client = {
|
||||
enable = mkEnableOption "Ceph client configuration";
|
||||
extraConfig = mkOption {
|
||||
type = with types; attrsOf str;
|
||||
default = {};
|
||||
example = ''
|
||||
{
|
||||
# This would create a section for a radosgw daemon named node0 and related
|
||||
# configuration for it
|
||||
"client.radosgw.node0" = { "some config option" = "true"; };
|
||||
};
|
||||
'';
|
||||
description = ''
|
||||
Extra configuration to add to the client section. Configuration for rados gateways
|
||||
would be added here, with their own sections, see example.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf config.services.ceph.enable {
|
||||
assertions = [
|
||||
{ assertion = cfg.global.fsid != "";
|
||||
message = "fsid has to be set to a valid uuid for the cluster to function";
|
||||
}
|
||||
{ assertion = cfg.mgr.enable == true;
|
||||
message = "ceph 12.x requires atleast 1 MGR daemon enabled for the cluster to function";
|
||||
}
|
||||
{ assertion = cfg.mon.enable == true -> cfg.mon.daemons != [];
|
||||
message = "have to set id of atleast one MON if you're going to enable Monitor";
|
||||
}
|
||||
{ assertion = cfg.mds.enable == true -> cfg.mds.daemons != [];
|
||||
message = "have to set id of atleast one MDS if you're going to enable Metadata Service";
|
||||
}
|
||||
{ assertion = cfg.osd.enable == true -> cfg.osd.daemons != [];
|
||||
message = "have to set id of atleast one OSD if you're going to enable OSD";
|
||||
}
|
||||
{ assertion = cfg.mgr.enable == true -> cfg.mgr.daemons != [];
|
||||
message = "have to set id of atleast one MGR if you're going to enable MGR";
|
||||
}
|
||||
];
|
||||
|
||||
warnings = optional (cfg.global.monInitialMembers == null)
|
||||
''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function'';
|
||||
|
||||
environment.etc."ceph/ceph.conf".text = let
|
||||
# Translate camelCaseOptions to the expected camel case option for ceph.conf
|
||||
translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global;
|
||||
# Merge the extraConfig set for mgr daemons, as mgr don't have their own section
|
||||
globalAndMgrConfig = translatedGlobalConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig;
|
||||
# Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf
|
||||
globalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) (filterAttrs (name: value: value != null) globalAndMgrConfig);
|
||||
totalConfig = {
|
||||
"global" = globalConfig;
|
||||
} // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { "mon" = cfg.mon.extraConfig; }
|
||||
// optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { "mds" = cfg.mds.extraConfig; }
|
||||
// optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { "osd" = cfg.osd.extraConfig; }
|
||||
// optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig;
|
||||
in
|
||||
generators.toINI {} totalConfig;
|
||||
|
||||
users.extraUsers = singleton {
|
||||
name = "ceph";
|
||||
uid = config.ids.uids.ceph;
|
||||
description = "Ceph daemon user";
|
||||
};
|
||||
|
||||
users.extraGroups = singleton {
|
||||
name = "ceph";
|
||||
gid = config.ids.gids.ceph;
|
||||
};
|
||||
|
||||
systemd.services = let
|
||||
services = []
|
||||
++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
|
||||
++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; })
|
||||
++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; })
|
||||
++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { })
|
||||
++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; });
|
||||
in
|
||||
mkMerge services;
|
||||
|
||||
systemd.targets = let
|
||||
targets = [
|
||||
{ "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; }
|
||||
] ++ optional cfg.mon.enable (generateTargetFile "mon")
|
||||
++ optional cfg.mds.enable (generateTargetFile "mds")
|
||||
++ optional cfg.osd.enable (generateTargetFile "osd")
|
||||
++ optional cfg.rgw.enable (generateTargetFile "rgw")
|
||||
++ optional cfg.mgr.enable (generateTargetFile "mgr");
|
||||
in
|
||||
mkMerge targets;
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /run/ceph 0770 ceph ceph -"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -650,7 +650,11 @@ let
|
|||
unitFiles = map (name: {
|
||||
target = "systemd/network/${name}";
|
||||
source = "${cfg.units.${name}.unit}/${name}";
|
||||
}) (attrNames cfg.units);
|
||||
}) (attrNames cfg.units) ++
|
||||
(map (entry: {
|
||||
target = "systemd/network/${entry}";
|
||||
source = "${config.systemd.package}/lib/systemd/network/${entry}";
|
||||
}) (attrNames (builtins.readDir "${config.systemd.package}/lib/systemd/network")));
|
||||
in
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -230,6 +230,7 @@ in rec {
|
|||
tests.borgbackup = callTest tests/borgbackup.nix {};
|
||||
tests.buildbot = callTest tests/buildbot.nix {};
|
||||
tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {};
|
||||
tests.ceph = callTestOnTheseSystems ["x86_64-linux"] tests/ceph.nix {};
|
||||
tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable;
|
||||
tests.cjdns = callTest tests/cjdns.nix {};
|
||||
tests.cloud-init = callTest tests/cloud-init.nix {};
|
||||
|
|
|
|||
140
nixos/tests/ceph.nix
Normal file
140
nixos/tests/ceph.nix
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
import ./make-test.nix ({pkgs, ...}: rec {
|
||||
name = "All-in-one-basic-ceph-cluster";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ lejonet ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
aio = { config, pkgs, ... }: {
|
||||
virtualisation = {
|
||||
emptyDiskImages = [ 20480 20480 ];
|
||||
vlans = [ 1 ];
|
||||
};
|
||||
|
||||
networking = {
|
||||
firewall.allowPing = true;
|
||||
useDHCP = false;
|
||||
interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
|
||||
{ address = "192.168.1.1"; prefixLength = 24; }
|
||||
];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
bash
|
||||
sudo
|
||||
ceph
|
||||
xfsprogs
|
||||
];
|
||||
nixpkgs.config.packageOverrides = super: {
|
||||
ceph = super.ceph.override({ nss = super.nss; libxfs = super.libxfs; libaio = super.libaio; jemalloc = super.jemalloc; });
|
||||
};
|
||||
|
||||
boot.kernelModules = [ "xfs" ];
|
||||
|
||||
services.ceph.enable = true;
|
||||
services.ceph.global = {
|
||||
fsid = "066ae264-2a5d-4729-8001-6ad265f50b03";
|
||||
monInitialMembers = "aio";
|
||||
monHost = "192.168.1.1";
|
||||
};
|
||||
|
||||
services.ceph.mon = {
|
||||
enable = true;
|
||||
daemons = [ "aio" ];
|
||||
};
|
||||
|
||||
services.ceph.mgr = {
|
||||
enable = true;
|
||||
daemons = [ "aio" ];
|
||||
};
|
||||
|
||||
services.ceph.osd = {
|
||||
enable = true;
|
||||
daemons = [ "0" "1" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
startAll;
|
||||
|
||||
$aio->waitForUnit("network.target");
|
||||
|
||||
# Create the ceph-related directories
|
||||
$aio->mustSucceed(
|
||||
"mkdir -p /var/lib/ceph/mgr/ceph-aio/",
|
||||
"mkdir -p /var/lib/ceph/mon/ceph-aio/",
|
||||
"mkdir -p /var/lib/ceph/osd/ceph-{0..1}/",
|
||||
"chown ceph:ceph -R /var/lib/ceph/"
|
||||
);
|
||||
|
||||
# Bootstrap ceph-mon daemon
|
||||
$aio->mustSucceed(
|
||||
"mkdir -p /var/lib/ceph/bootstrap-osd && chown ceph:ceph /var/lib/ceph/bootstrap-osd",
|
||||
"sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
|
||||
"ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
|
||||
"ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
|
||||
"monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap",
|
||||
"sudo -u ceph ceph-mon --mkfs -i aio --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
|
||||
"touch /var/lib/ceph/mon/ceph-aio/done",
|
||||
"systemctl start ceph-mon-aio"
|
||||
);
|
||||
$aio->waitForUnit("ceph-mon-aio");
|
||||
|
||||
# Can't check ceph status until a mon is up
|
||||
$aio->succeed("ceph -s | grep 'mon: 1 daemons'");
|
||||
|
||||
# Start the ceph-mgr daemon, it has no deps and hardly any setup
|
||||
$aio->mustSucceed(
|
||||
"ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring",
|
||||
"systemctl start ceph-mgr-aio"
|
||||
);
|
||||
$aio->waitForUnit("ceph-mgr-aio");
|
||||
$aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'");
|
||||
|
||||
# Bootstrap both OSDs
|
||||
$aio->mustSucceed(
|
||||
"mkfs.xfs /dev/vdb",
|
||||
"mkfs.xfs /dev/vdc",
|
||||
"mount /dev/vdb /var/lib/ceph/osd/ceph-0",
|
||||
"mount /dev/vdc /var/lib/ceph/osd/ceph-1",
|
||||
"ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-0/keyring --name osd.0 --add-key AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==",
|
||||
"ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-1/keyring --name osd.1 --add-key AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==",
|
||||
"echo '{\"cephx_secret\": \"AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==\"}' | ceph osd new 55ba2294-3e24-478f-bee0-9dca4c231dd9 -i -",
|
||||
"echo '{\"cephx_secret\": \"AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==\"}' | ceph osd new 5e97a838-85b6-43b0-8950-cb56d554d1e5 -i -"
|
||||
);
|
||||
|
||||
# Initialize the OSDs with regular filestore
|
||||
$aio->mustSucceed(
|
||||
"ceph-osd -i 0 --mkfs --osd-uuid 55ba2294-3e24-478f-bee0-9dca4c231dd9",
|
||||
"ceph-osd -i 1 --mkfs --osd-uuid 5e97a838-85b6-43b0-8950-cb56d554d1e5",
|
||||
"chown -R ceph:ceph /var/lib/ceph/osd",
|
||||
"systemctl start ceph-osd-0",
|
||||
"systemctl start ceph-osd-1"
|
||||
);
|
||||
|
||||
$aio->waitUntilSucceeds("ceph osd stat | grep '2 osds: 2 up, 2 in'");
|
||||
$aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active)'");
|
||||
$aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
|
||||
|
||||
$aio->mustSucceed(
|
||||
"ceph osd pool create aio-test 100 100",
|
||||
"ceph osd pool ls | grep 'aio-test'",
|
||||
"ceph osd pool rename aio-test aio-other-test",
|
||||
"ceph osd pool ls | grep 'aio-other-test'",
|
||||
"ceph -s | grep '1 pools, 100 pgs'",
|
||||
"ceph osd getcrushmap -o crush",
|
||||
"crushtool -d crush -o decrushed",
|
||||
"sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush",
|
||||
"crushtool -c modcrush -o recrushed",
|
||||
"ceph osd setcrushmap -i recrushed",
|
||||
"ceph osd pool set aio-other-test size 2"
|
||||
);
|
||||
$aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
|
||||
$aio->waitUntilSucceeds("ceph -s | grep '100 active+clean'");
|
||||
$aio->mustFail(
|
||||
"ceph osd pool ls | grep 'aio-test'",
|
||||
"ceph osd pool delete aio-other-test aio-other-test --yes-i-really-really-mean-it"
|
||||
);
|
||||
'';
|
||||
})
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "praat-${version}";
|
||||
version = "5.4.17";
|
||||
version = "6.0.37";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
|
||||
sha256 = "0s2hrksghg686059vc90h3ywhd2702pqcvy99icw27q5mdk6dqsx";
|
||||
sha256 = "1c675jfzcrwfn8lcswm5y5kmazkhnb0p4mzlf5sim57hms88ffjq";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, pkgconfig, qt4, alsaLib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
name = "qmidiroute-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz";
|
||||
sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2";
|
||||
sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "17.04";
|
||||
version = "17.12.1";
|
||||
name = "rosegarden-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
|
||||
sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq";
|
||||
sha256 = "155kqbxg85wqv0w97cmmx8wq0r4xb3qpnk20lfma04vj8k6hc1mg";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ mkDerivation rec {
|
|||
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free an open source painting application";
|
||||
description = "A free and open source painting application";
|
||||
homepage = https://krita.org/;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -42,10 +42,8 @@ stdenv.mkDerivation rec {
|
|||
pythonPath = [ pygobject3 pyxdg ];
|
||||
|
||||
preConfigure = "./bootstrap";
|
||||
postFixup = ''
|
||||
wrapPythonPrograms
|
||||
rm "$out/share/icons/hicolor/icon-theme.cache"
|
||||
'';
|
||||
|
||||
postFixup = "wrapPythonPrograms";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
54
pkgs/applications/misc/regextester/default.nix
Normal file
54
pkgs/applications/misc/regextester/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, libxml2
|
||||
, pkgconfig
|
||||
, gtk3
|
||||
, granite
|
||||
, gnome3
|
||||
, cmake
|
||||
, ninja
|
||||
, vala
|
||||
, elementary-cmake-modules
|
||||
, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "regextester-${version}";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artemanufrij";
|
||||
repo = "regextester";
|
||||
rev = version;
|
||||
sha256 = "07shdm10dc7jz2hka5dc51yp81a0dgc47nmkrp6fs6r9wqx0j30n";
|
||||
};
|
||||
|
||||
XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
|
||||
"${granite}/share"
|
||||
"${gnome3.libgee}/share"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
wrapGAppsHook
|
||||
vala
|
||||
cmake
|
||||
ninja
|
||||
gettext
|
||||
libxml2
|
||||
elementary-cmake-modules
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3
|
||||
granite
|
||||
gnome3.libgee
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A desktop application to test regular expressions interactively";
|
||||
homepage = https://github.com/artemanufrij/regextester;
|
||||
maintainers = with maintainers; [ samdroid-apps ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,25 +3,19 @@
|
|||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "rssguard";
|
||||
version = "3.5.5";
|
||||
version = "3.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinrotter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48";
|
||||
sha256 = "1pdas7hg3nzykm3qi951fk25c9s6gjb7my82b9xzjn2yd7ks71by";
|
||||
};
|
||||
|
||||
buildInputs = [ qtwebengine qttools ];
|
||||
nativeBuildInputs = [ qmake wrapGAppsHook ];
|
||||
qmakeFlags = [ "CONFIG+=release" ];
|
||||
|
||||
# FIXME: This shouldn't be needed after 3.5.5.
|
||||
# See: https://github.com/martinrotter/rssguard/issues/175
|
||||
preConfigure = ''
|
||||
lrelease rssguard.pro
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Simple RSS/Atom feed reader with online synchronization";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
name = "skrooge-${version}";
|
||||
version = "2.10.5";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
|
||||
sha256 = "1c1yihypb6qgbzfcrw4ylqr9zivyba10xzvibrmfkrilxi6i582n";
|
||||
sha256 = "11ns0j3ss09aqd8snfzd52xf0cgsjjcgzalb031p7v17rn14yqaq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "root-${version}";
|
||||
version = "6.10.08";
|
||||
version = "6.12.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
||||
sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic";
|
||||
sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -30,29 +30,31 @@ stdenv.mkDerivation rec {
|
|||
# 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 '"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
|
||||
substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }:
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "rabbitvcs-${version}";
|
||||
version = "0.16";
|
||||
version = "0.17.1";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rabbitvcs";
|
||||
repo = "rabbitvcs";
|
||||
rev = "v${version}";
|
||||
sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly";
|
||||
sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy";
|
||||
};
|
||||
|
||||
pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ];
|
||||
|
|
|
|||
|
|
@ -1,32 +1,36 @@
|
|||
{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv
|
||||
, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost
|
||||
, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost
|
||||
, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark
|
||||
, withGUI ? true
|
||||
, qtbase ? null
|
||||
, qtmultimedia ? null
|
||||
}:
|
||||
|
||||
assert withGUI -> qt5 != null;
|
||||
assert withGUI -> qtbase != null && qtmultimedia != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mkvtoolnix-${version}";
|
||||
version = "20.0.0";
|
||||
version = "21.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0qrjvvp0pvw9i91rh0zrxpclq7xap2dpjip0s5bm4gv14gh4l4mc";
|
||||
owner = "mbunkus";
|
||||
repo = "mkvtoolnix";
|
||||
rev = "release-${version}";
|
||||
sha256 = "06nixp0qqa6g2fv40f7l0i0sqbc7qswpgq4534l98nan08wjbk2r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
|
||||
nativeBuildInputs = [
|
||||
pkgconfig autoconf automake gettext
|
||||
drake ruby docbook_xsl libxslt
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
expat file xdg_utils boost libebml zlib libmatroska libogg
|
||||
libvorbis flac cmark
|
||||
]
|
||||
++ optional stdenv.isDarwin libiconv
|
||||
++ optionals withGUI [qt5.qtbase qt5.qtmultimedia];
|
||||
expat file xdg_utils boost libebml zlib
|
||||
libmatroska libogg libvorbis flac cmark
|
||||
] ++ optional stdenv.isDarwin libiconv
|
||||
++ optionals withGUI [ qtbase qtmultimedia ];
|
||||
|
||||
preConfigure = "./autogen.sh; patchShebangs .";
|
||||
buildPhase = "drake -j $NIX_BUILD_CORES";
|
||||
|
|
|
|||
27
pkgs/applications/video/mpc-qt/default.nix
Normal file
27
pkgs/applications/video/mpc-qt/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mpc-qt-${version}";
|
||||
version = "17.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cmdrkotori";
|
||||
repo = "mpc-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vi4zsmbzxj6ms8wls9zv15vrskdrhgnj6l41m1fk4scs4jzvbkm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake qttools ];
|
||||
|
||||
buildInputs = [ mpv qtx11extras ];
|
||||
|
||||
qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Media Player Classic Qute Theater";
|
||||
homepage = https://github.com/cmdrkotori/mpc-qt;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchgit, lib
|
||||
, yad, mkvtoolnix, libnotify }:
|
||||
, yad, mkvtoolnix-cli, libnotify }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mpv-convert-script-2016-03-18.lua";
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
substituteInPlace convert_script.lua \
|
||||
${subs "NOTIFY_CMD" "notify-send" "${libnotify}/bin/notify-send"} \
|
||||
${subs "YAD_CMD" "yad" "${yad}/bin/yad"} \
|
||||
${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix}/bin/mkvmerge"}
|
||||
${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix-cli}/bin/mkvmerge"}
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "remotebox-${version}";
|
||||
version = "2.2";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
|
||||
sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5";
|
||||
sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz";
|
||||
};
|
||||
|
||||
buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ];
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
|
|||
cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/
|
||||
|
||||
wrapProgram $out/bin/rkt \
|
||||
--prefix LD_LIBRARY_PATH : ${systemd.lib}/lib \
|
||||
--prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \
|
||||
--prefix PATH : ${iptables}/bin
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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" ];
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue