mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 19:33:03 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
f0d5e4f5ad
@ -111,7 +111,6 @@ in
|
||||
[
|
||||
"${cfg.package}/bin/k3s ${cfg.role}"
|
||||
]
|
||||
++ (optional (config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd")
|
||||
++ (optional cfg.disableAgent "--disable-agent")
|
||||
++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}")
|
||||
++ (optional (cfg.token != "") "--token ${cfg.token}")
|
||||
|
||||
@ -280,7 +280,6 @@ in
|
||||
CapabilityBoundingSet = "";
|
||||
# ProtectClock= adds DeviceAllow=char-rtc r
|
||||
DeviceAllow = "";
|
||||
LockPersonality = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateMounts = true;
|
||||
@ -300,13 +299,17 @@ in
|
||||
RestrictSUIDSGID = true;
|
||||
UMask = "0066";
|
||||
ProtectProc = "invisible";
|
||||
ProcSubset = "pid";
|
||||
SystemCallFilter = [
|
||||
"~@debug"
|
||||
"~@mount"
|
||||
"~@privileged"
|
||||
"~@capset"
|
||||
"~@clock"
|
||||
"~@cpu-emulation"
|
||||
"~@module"
|
||||
"~@mount"
|
||||
"~@obsolete"
|
||||
"~@raw-io"
|
||||
"~@reboot"
|
||||
"~setdomainname"
|
||||
"~sethostname"
|
||||
];
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ];
|
||||
|
||||
@ -314,6 +317,17 @@ in
|
||||
PrivateNetwork = false;
|
||||
# Cannot be true due to Node
|
||||
MemoryDenyWriteExecute = false;
|
||||
|
||||
# The more restrictive "pid" option makes `nix` commands in CI emit
|
||||
# "GC Warning: Couldn't read /proc/stat"
|
||||
# You may want to set this to "pid" if not using `nix` commands
|
||||
ProcSubset = "all";
|
||||
# Coverage programs for compiled code such as `cargo-tarpaulin` disable
|
||||
# ASLR (address space layout randomization) which requires the
|
||||
# `personality` syscall
|
||||
# You may want to set this to `true` if not using coverage tooling on
|
||||
# compiled code
|
||||
LockPersonality = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -155,10 +155,11 @@ in {
|
||||
FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile;
|
||||
FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile;
|
||||
FLANNELD_ETCD_CAFILE = cfg.etcd.caFile;
|
||||
ETCDCTL_CERT_FILE = cfg.etcd.certFile;
|
||||
ETCDCTL_KEY_FILE = cfg.etcd.keyFile;
|
||||
ETCDCTL_CA_FILE = cfg.etcd.caFile;
|
||||
ETCDCTL_PEERS = concatStringsSep "," cfg.etcd.endpoints;
|
||||
ETCDCTL_CERT = cfg.etcd.certFile;
|
||||
ETCDCTL_KEY = cfg.etcd.keyFile;
|
||||
ETCDCTL_CACERT = cfg.etcd.caFile;
|
||||
ETCDCTL_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints;
|
||||
ETCDCTL_API = "3";
|
||||
} // optionalAttrs (cfg.storageBackend == "kubernetes") {
|
||||
FLANNELD_KUBE_SUBNET_MGR = "true";
|
||||
FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig;
|
||||
@ -167,7 +168,7 @@ in {
|
||||
path = [ pkgs.iptables ];
|
||||
preStart = optionalString (cfg.storageBackend == "etcd") ''
|
||||
echo "setting network configuration"
|
||||
until ${pkgs.etcd}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'
|
||||
until ${pkgs.etcd}/bin/etcdctl put /coreos.com/network/config '${builtins.toJSON networkConfig}'
|
||||
do
|
||||
echo "setting network configuration, retry"
|
||||
sleep 1
|
||||
|
||||
@ -23,16 +23,16 @@
|
||||
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
|
||||
}) rec {
|
||||
pname = "dbeaver";
|
||||
version = "22.1.1"; # When updating also update mvnSha256
|
||||
version = "22.1.2"; # When updating also update mvnSha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-+MFULieuwfvuAP0HjJ+C0hb/uqhHtnP/nOoIfWwjtoI=";
|
||||
sha256 = "sha256-iADQls//lgoq+IY4mzy/emyraFAJidHn46dMeAy5k6k=";
|
||||
};
|
||||
|
||||
mvnSha256 = "pSZL+GDSXSm+sLymlSlq2ZIRdYJY1B3PCmCpjtosdGY=";
|
||||
mvnSha256 = "cTFeH9MxPnF1vaV+Q5/7HfIsO5eEbNDIsyekHsFH9vw=";
|
||||
mvnParameters = "-P desktop,all-platforms";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, git, curl, expat, gcc, openssl, zlib }:
|
||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, git }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
|
||||
buildInputs = [ stdenv.cc.cc curl expat openssl zlib ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -29,6 +28,12 @@ stdenv.mkDerivation rec {
|
||||
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
|
||||
cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop
|
||||
|
||||
# remove the `git` in `dugite` because we want the `git` in `nixpkgs`
|
||||
chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git
|
||||
chmod +w $out/share/${pname}/resources/app/node_modules/dugite
|
||||
rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git
|
||||
chmod -w $out/share/${pname}/resources/app/node_modules/dugite
|
||||
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace Exec=Logseq Exec=${pname} \
|
||||
--replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png
|
||||
@ -37,8 +42,9 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--prefix PATH : ${lib.makeBinPath [ git ]} \
|
||||
--set "LOCAL_GIT_DIRECTORY" ${git} \
|
||||
--add-flags $out/share/${pname}/resources/app
|
||||
'';
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.31.3";
|
||||
sha256 = "16c6rr0hzlzlfc5xsphp23s3rxavkgfcsblzm15wzd85c2ahm81l";
|
||||
manifestsSha256 = "1nr44h5sy97ki2vn2426i2idnnc4pv1n3j6n4p11mf73dy9qzgzp";
|
||||
version = "0.31.4";
|
||||
sha256 = "182h6is1kq3yc7il1a0xr5mbrsn3z900dkzxb4m79gl5lsrpb1vm";
|
||||
manifestsSha256 = "0h37ydgykl5kc50zwqn8xyi89aby75937cqaiw1hkpnw9ilc0akz";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vHRk6oADEvDmYCeBK/puGSMd4L9K1x/CVPtuYZY9klk=";
|
||||
vendorSha256 = "sha256-2DeX5si2yVh1C+ikkg9xEpcf2trEBr0qPp+9fgbMfO4=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
||||
@ -46,10 +46,10 @@ with lib;
|
||||
# Those pieces of software we entirely ignore upstream's handling of, and just
|
||||
# make sure they're in the path if desired.
|
||||
let
|
||||
k3sVersion = "1.24.2+k3s2"; # k3s git tag
|
||||
k3sCommit = "a237260237b549b90dd3aae449de09231caf1351"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "1dmlsq7f0z0wq8ypbmdqwk1hl59pcnywvqhz7qblzm3wnbdb62cl";
|
||||
k3sVendorSha256 = "sha256-w5dYkewoNnI9GvqCAkmecg7JsKgO+gu1WcyPRItLvWY=";
|
||||
k3sVersion = "1.24.3+k3s1"; # k3s git tag
|
||||
k3sCommit = "990ba0e88c90f8ed8b50e0ccd375937b841b176e"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "0slw2j7d7ccj7k9z06l5ch3nxi07jbm6xijs774hisyv25jx94rd";
|
||||
k3sVendorSha256 = "sha256-8jWpTUE/tJf2qpFjdsV+0i8hRf6JqATwr/YbXrZa/iA=";
|
||||
|
||||
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
|
||||
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
sha256 = "WSK2b1DYSYEFqmVIOlhjFGyqC9ok/9rWAz2ZgUZejzo=";
|
||||
sha256 = "WcxRVup7wjA9YNyL6UpFoMfkCmXixfbYatcrmA4OHh4=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
@ -1,27 +1,40 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, gdk-pixbuf
|
||||
, gnome-themes-extra
|
||||
, gtk-engine-murrine
|
||||
, jdupes
|
||||
, librsvg
|
||||
, sassc
|
||||
, which
|
||||
, gitUpdater
|
||||
, themeVariants ? [] # default: blue
|
||||
, colorVariants ? [] # default: all
|
||||
, tweaks ? []
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
pname = "qogir-theme";
|
||||
version = "2022-05-29";
|
||||
|
||||
in
|
||||
lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "all" ] themeVariants
|
||||
lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
|
||||
lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2022-07-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "z8o/1Qc7XmefX9CuVr0Gq2MmKw2NlkUk+5Lz0Z593do=";
|
||||
sha256 = "NGgTToaSJBwmHnZjWbJ3dSJg9Mmfchj3W0xgK0CMb9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jdupes
|
||||
sassc
|
||||
which
|
||||
];
|
||||
@ -36,13 +49,29 @@ stdenv.mkDerivation rec {
|
||||
gtk-engine-murrine # murrine engine for Gtk2
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs install.sh clean-old-theme.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
patchShebangs .
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/themes
|
||||
name= HOME="$TMPDIR" ./install.sh -t all -d $out/share/themes
|
||||
|
||||
name= HOME="$TMPDIR" ./install.sh \
|
||||
${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \
|
||||
${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \
|
||||
${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
|
||||
--dest $out/share/themes
|
||||
|
||||
mkdir -p $out/share/doc/${pname}
|
||||
cp -a src/firefox $out/share/doc/${pname}
|
||||
|
||||
rm $out/share/themes/*/{AUTHORS,COPYING}
|
||||
|
||||
jdupes --link-soft --recurse $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { inherit pname version; };
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
@ -12,10 +13,14 @@
|
||||
, texlive
|
||||
, mate
|
||||
, wrapGAppsHook
|
||||
, enableEpub ? true, webkitgtk
|
||||
, enableDjvu ? true, djvulibre
|
||||
, enablePostScript ? true, libspectre
|
||||
, enableXps ? true, libgxps
|
||||
, enableEpub ? true
|
||||
, webkitgtk
|
||||
, enableDjvu ? true
|
||||
, djvulibre
|
||||
, enablePostScript ? true
|
||||
, libspectre
|
||||
, enableXps ? true
|
||||
, libgxps
|
||||
, enableImages ? false
|
||||
, mateUpdateScript
|
||||
}:
|
||||
@ -47,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
mate.caja
|
||||
mate.mate-desktop
|
||||
hicolor-icon-theme
|
||||
texlive.bin.core # for synctex, used by the pdf back-end
|
||||
texlive.bin.core # for synctex, used by the pdf back-end
|
||||
]
|
||||
++ optionals enableDjvu [ djvulibre ]
|
||||
++ optionals enableEpub [ webkitgtk ]
|
||||
|
||||
@ -1,6 +1,16 @@
|
||||
{ lib, stdenv, fetchurl, substituteAll
|
||||
, pkg-config, gobject-introspection, gdk-pixbuf
|
||||
, gtk3, mate, python3, dropbox, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, substituteAll
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, gdk-pixbuf
|
||||
, gtk3
|
||||
, mate
|
||||
, python3
|
||||
, dropbox
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
let
|
||||
dropboxd = "${dropbox}/bin/dropbox";
|
||||
|
||||
@ -1,5 +1,17 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript
|
||||
, glib, substituteAll }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk3
|
||||
, gupnp
|
||||
, mate
|
||||
, imagemagick
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
, glib
|
||||
, substituteAll
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "caja-extensions";
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ], mateUpdateScript }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, makeWrapper
|
||||
, caja-extensions
|
||||
, caja
|
||||
, extensions ? [ caja-extensions ]
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "${caja.pname}-with-extensions";
|
||||
@ -6,7 +13,9 @@ stdenv.mkDerivation {
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
inherit caja;
|
||||
|
||||
|
||||
@ -1,4 +1,18 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk3
|
||||
, libnotify
|
||||
, libxml2
|
||||
, libexif
|
||||
, exempi
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "caja";
|
||||
|
||||
@ -6,9 +6,10 @@ let
|
||||
self = rec {
|
||||
|
||||
# Update script tailored to mate packages from git repository
|
||||
mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }:
|
||||
pkgs.httpTwoLevelsUpdater {
|
||||
inherit pname version odd-unstable url;
|
||||
mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }:
|
||||
pkgs.gitUpdater {
|
||||
inherit pname version odd-unstable rev-prefix;
|
||||
url = if url == null then "https://git.mate-desktop.org/${pname}" else url;
|
||||
attrPath = "mate.${pname}";
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,17 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, libxml2
|
||||
, gtk3
|
||||
, file
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "engrampa";
|
||||
|
||||
@ -1,4 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, exempi
|
||||
, lcms2
|
||||
, libexif
|
||||
, libjpeg
|
||||
, librsvg
|
||||
, libxml2
|
||||
, libpeas
|
||||
, shared-mime-info
|
||||
, gtk3
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eom";
|
||||
|
||||
@ -1,4 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk3
|
||||
, libxklavier
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmatekbd";
|
||||
@ -9,9 +17,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [ gtk3 libxklavier ];
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libxklavier
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -1,6 +1,14 @@
|
||||
{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib
|
||||
, alsaSupport ? stdenv.isLinux, alsa-lib
|
||||
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
|
||||
{ config
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, glib
|
||||
, alsaSupport ? stdenv.isLinux
|
||||
, alsa-lib
|
||||
, pulseaudioSupport ? config.pulseaudio or true
|
||||
, libpulseaudio
|
||||
, ossSupport ? false
|
||||
, mateUpdateScript
|
||||
}:
|
||||
@ -14,11 +22,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [ glib ]
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional pulseaudioSupport libpulseaudio;
|
||||
buildInputs = [
|
||||
glib
|
||||
]
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional pulseaudioSupport libpulseaudio;
|
||||
|
||||
configureFlags = lib.optional ossSupport "--enable-oss";
|
||||
|
||||
|
||||
@ -1,4 +1,13 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk3
|
||||
, libsoup
|
||||
, tzdata
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmateweather";
|
||||
@ -9,9 +18,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [ gtk3 libsoup tzdata ];
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libsoup
|
||||
tzdata
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-zoneinfo-dir=${tzdata}/share/zoneinfo"
|
||||
|
||||
@ -1,5 +1,22 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop
|
||||
, libXdamage, libXpresent, libstartup_notification, gnome, glib, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, libxml2
|
||||
, libcanberra-gtk3
|
||||
, libgtop
|
||||
, libXdamage
|
||||
, libXpresent
|
||||
, libstartup_notification
|
||||
, gnome
|
||||
, glib
|
||||
, gtk3
|
||||
, mate-settings-daemon
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marco";
|
||||
|
||||
@ -1,14 +1,37 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, dbus-glib, glib, gtk3, gtksourceview3
|
||||
, gucharmap, libmateweather, libnl, libwnck, libgtop, libxml2, libnotify, mate-panel, polkit
|
||||
, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, dbus-glib
|
||||
, glib
|
||||
, gtk3
|
||||
, gtksourceview3
|
||||
, gucharmap
|
||||
, libmateweather
|
||||
, libnl
|
||||
, libwnck
|
||||
, libgtop
|
||||
, libxml2
|
||||
, libnotify
|
||||
, mate-panel
|
||||
, polkit
|
||||
, upower
|
||||
, wirelesstools
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-applets";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0xy9dwiqvmimqshbfq80jxq65aznlgx491lqq8rl4x8c9sdl7q5p";
|
||||
sha256 = "Orj2HbN23DM85MGHIsY6B/qz6OEnK34OCXrUWXsXwsI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-backgrounds";
|
||||
|
||||
@ -1,4 +1,16 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libmpc, libxml2, mpfr, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, gtk3
|
||||
, libmpc
|
||||
, libxml2
|
||||
, mpfr
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-calc";
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
{ lib, stdenv, fetchurl, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-common";
|
||||
|
||||
@ -1,6 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib
|
||||
, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, glib
|
||||
, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, libxml2
|
||||
, dbus-glib
|
||||
, libxklavier
|
||||
, libcanberra-gtk3
|
||||
, librsvg
|
||||
, libappindicator-gtk3
|
||||
, glib
|
||||
, desktop-file-utils
|
||||
, dconf
|
||||
, gtk3
|
||||
, polkit
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
|
||||
@ -1,4 +1,15 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, isocodes
|
||||
, gnome
|
||||
, gtk3
|
||||
, dconf
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-desktop";
|
||||
|
||||
@ -1,4 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoreconfHook
|
||||
, gtk3
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-icon-theme-faenza";
|
||||
@ -9,9 +17,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gtk3 ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gtk3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ mate.mate-icon-theme hicolor-icon-theme ];
|
||||
propagatedBuildInputs = [
|
||||
mate.mate-icon-theme
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
@ -23,12 +37,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||
passthru.updateScript = mateUpdateScript {
|
||||
inherit pname version;
|
||||
url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Faenza icon theme from MATE";
|
||||
homepage = "https://mate-desktop.org";
|
||||
license = licenses.gpl2Plus;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = teams.mate.members;
|
||||
};
|
||||
|
||||
@ -1,4 +1,14 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, iconnamingutils
|
||||
, librsvg
|
||||
, gtk3
|
||||
, hicolor-icon-theme
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-icon-theme";
|
||||
@ -9,9 +19,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext iconnamingutils ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
iconnamingutils
|
||||
];
|
||||
|
||||
buildInputs = [ librsvg ];
|
||||
buildInputs = [
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
hicolor-icon-theme
|
||||
|
||||
@ -1,4 +1,15 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk3
|
||||
, libindicator-gtk3
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-indicator-applet";
|
||||
|
||||
@ -1,4 +1,16 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, libtool
|
||||
, libxml2
|
||||
, libcanberra-gtk3
|
||||
, gtk3
|
||||
, mate
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-media";
|
||||
|
||||
@ -1,4 +1,13 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, python3
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-menus";
|
||||
@ -9,9 +18,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1r7zf64aclaplz77hkl9kq0xnz6jk1l49z64i8v56c41pm59c283";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext gobject-introspection ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [ glib python3 ];
|
||||
buildInputs = [
|
||||
glib
|
||||
python3
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
|
||||
|
||||
@ -1,4 +1,16 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk3
|
||||
, libwnck
|
||||
, libfakekey
|
||||
, libXtst
|
||||
, mate
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-netbook";
|
||||
|
||||
@ -1,5 +1,19 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3,
|
||||
libnotify, libwnck, gtk3, libxml2, mate-desktop, mate-panel, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, glib
|
||||
, libcanberra-gtk3
|
||||
, libnotify
|
||||
, libwnck
|
||||
, gtk3
|
||||
, libxml2
|
||||
, mate-desktop
|
||||
, mate-panel
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-notification-daemon";
|
||||
|
||||
@ -1,4 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, glib
|
||||
, libwnck
|
||||
, librsvg
|
||||
, libxml2
|
||||
, dconf
|
||||
, gtk3
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-panel";
|
||||
|
||||
@ -1,4 +1,15 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk3
|
||||
, gobject-introspection
|
||||
, libappindicator-gtk3
|
||||
, libindicator-gtk3
|
||||
, polkit
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-polkit";
|
||||
|
||||
@ -1,4 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, libsecret, dbus-glib, upower, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, glib
|
||||
, itstool
|
||||
, libxml2
|
||||
, mate-panel
|
||||
, libnotify
|
||||
, libcanberra-gtk3
|
||||
, libsecret
|
||||
, dbus-glib
|
||||
, upower
|
||||
, gtk3
|
||||
, libtool
|
||||
, polkit
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-power-manager";
|
||||
@ -17,17 +36,17 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
itstool
|
||||
libxml2
|
||||
libcanberra-gtk3
|
||||
gtk3
|
||||
libsecret
|
||||
libnotify
|
||||
dbus-glib
|
||||
upower
|
||||
polkit
|
||||
mate-panel
|
||||
glib
|
||||
itstool
|
||||
libxml2
|
||||
libcanberra-gtk3
|
||||
gtk3
|
||||
libsecret
|
||||
libnotify
|
||||
dbus-glib
|
||||
upower
|
||||
polkit
|
||||
mate-panel
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-applets" ];
|
||||
|
||||
@ -1,4 +1,19 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk3
|
||||
, dbus-glib
|
||||
, libXScrnSaver
|
||||
, libnotify
|
||||
, libxml2
|
||||
, pam
|
||||
, systemd
|
||||
, mate
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-screensaver";
|
||||
|
||||
@ -1,5 +1,20 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify
|
||||
, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, gtk3
|
||||
, libxml2
|
||||
, libxslt
|
||||
, libatasmart
|
||||
, libnotify
|
||||
, lm_sensors
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-sensors-applet";
|
||||
|
||||
@ -1,6 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd,
|
||||
libSM, libXtst, gtk3, libepoxy, polkit, hicolor-icon-theme, mate,
|
||||
wrapGAppsHook, fetchpatch, mateUpdateScript
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, xtrans
|
||||
, dbus-glib
|
||||
, systemd
|
||||
, libSM
|
||||
, libXtst
|
||||
, gtk3
|
||||
, libepoxy
|
||||
, polkit
|
||||
, hicolor-icon-theme
|
||||
, mate
|
||||
, wrapGAppsHook
|
||||
, fetchpatch
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -1,7 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier,
|
||||
libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
|
||||
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
|
||||
wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, glib
|
||||
, dbus-glib
|
||||
, libxklavier
|
||||
, libcanberra-gtk3
|
||||
, libnotify
|
||||
, nss
|
||||
, polkit
|
||||
, dconf
|
||||
, gtk3
|
||||
, mate
|
||||
, pulseaudioSupport ? stdenv.config.pulseaudio or true
|
||||
, libpulseaudio
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-settings-daemon";
|
||||
|
||||
@ -1,16 +1,31 @@
|
||||
{ stdenv, mate, glib, wrapGAppsHook }:
|
||||
{ stdenv
|
||||
, mate
|
||||
, glib
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "${mate.mate-settings-daemon.pname}-wrapped";
|
||||
version = mate.mate-settings-daemon.version;
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
buildInputs = [ glib mate.mate-control-center ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
mate.mate-control-center
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/etc/xdg/autostart
|
||||
cp ${mate.mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/libexec
|
||||
makeWrapper ${mate.mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \
|
||||
@ -18,5 +33,6 @@ stdenv.mkDerivation {
|
||||
substituteInPlace $out/etc/xdg/autostart/mate-settings-daemon.desktop \
|
||||
--replace "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon"
|
||||
'';
|
||||
|
||||
meta = mate.mate-settings-daemon.meta // { priority = -10; };
|
||||
}
|
||||
|
||||
@ -1,4 +1,19 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, gtkmm3
|
||||
, libxml2
|
||||
, libgtop
|
||||
, libwnck
|
||||
, librsvg
|
||||
, polkit
|
||||
, systemd
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-system-monitor";
|
||||
|
||||
@ -1,4 +1,18 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript, nixosTests }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, libxml2
|
||||
, mate-desktop
|
||||
, dconf
|
||||
, vte
|
||||
, pcre2
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-terminal";
|
||||
|
||||
@ -1,5 +1,17 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3,
|
||||
gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, mate-icon-theme
|
||||
, gtk2
|
||||
, gtk3
|
||||
, gtk_engines
|
||||
, gtk-engine-murrine
|
||||
, gdk-pixbuf
|
||||
, librsvg
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-themes";
|
||||
@ -10,11 +22,23 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1avgzccdmr7y18rnp3xrhwk82alv2dlig3wh7ivgahcqdiiavrb1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext gtk3 ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
gtk3
|
||||
];
|
||||
|
||||
buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ];
|
||||
buildInputs = [
|
||||
mate-icon-theme
|
||||
gtk2
|
||||
gtk_engines
|
||||
gdk-pixbuf
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
@ -24,10 +48,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = mateUpdateScript {
|
||||
inherit pname version;
|
||||
url = "https://pub.mate-desktop.org/releases/themes";
|
||||
};
|
||||
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of themes from MATE";
|
||||
|
||||
@ -1,4 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, gettext
|
||||
, itstool
|
||||
, libxml2
|
||||
, yelp
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-user-guide";
|
||||
@ -9,9 +17,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1h620ngryqc4m8ybvc92ba8404djnm0l65f34mlw38g9ad8d9085";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ itstool gettext libxml2 ];
|
||||
nativeBuildInputs = [
|
||||
itstool
|
||||
gettext
|
||||
libxml2
|
||||
];
|
||||
|
||||
buildInputs = [ yelp ];
|
||||
buildInputs = [
|
||||
yelp
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace mate-user-guide.desktop.in.in \
|
||||
|
||||
@ -1,5 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2
|
||||
, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, gtk3
|
||||
, dbus-glib
|
||||
, libnotify
|
||||
, libxml2
|
||||
, libcanberra-gtk3
|
||||
, mod_dnssd
|
||||
, apacheHttpd
|
||||
, hicolor-icon-theme
|
||||
, mate
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-user-share";
|
||||
|
||||
@ -1,5 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3
|
||||
, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, itstool
|
||||
, glib
|
||||
, gtk3
|
||||
, libxml2
|
||||
, libgtop
|
||||
, libcanberra-gtk3
|
||||
, inkscape
|
||||
, udisks2
|
||||
, mate
|
||||
, hicolor-icon-theme
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-utils";
|
||||
|
||||
@ -1,4 +1,15 @@
|
||||
{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }:
|
||||
{ lib
|
||||
, python3
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, mate
|
||||
, gtk3
|
||||
, glib
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mozo";
|
||||
@ -12,11 +23,22 @@ python3.pkgs.buildPythonApplication rec {
|
||||
sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ];
|
||||
propagatedBuildInputs = [
|
||||
mate.mate-menus
|
||||
python3.pkgs.pygobject3
|
||||
];
|
||||
|
||||
buildInputs = [ gtk3 glib ];
|
||||
buildInputs = [
|
||||
gtk3
|
||||
glib
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -1,5 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3
|
||||
, adwaita-icon-theme, gtksourceview4, libpeas, mate-desktop, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, perl
|
||||
, itstool
|
||||
, isocodes
|
||||
, enchant
|
||||
, libxml2
|
||||
, python3
|
||||
, adwaita-icon-theme
|
||||
, gtksourceview4
|
||||
, libpeas
|
||||
, mate-desktop
|
||||
, wrapGAppsHook
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pluma";
|
||||
|
||||
@ -1,4 +1,13 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, gtk3
|
||||
, mate
|
||||
, python3Packages
|
||||
, mateUpdateScript
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "python-caja";
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "mousepad";
|
||||
version = "0.5.9";
|
||||
version = "0.5.10";
|
||||
odd-unstable = false;
|
||||
|
||||
sha256 = "sha256-xuSv2H1+/NNUAm+D8f+f5fPVR97iJ5vIDzPa3S0HLM0=";
|
||||
sha256 = "sha256-AKyFCzQE6OfMzKh5Lk16W01255vPeco1II80oLqT4oM=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
pname = "ristretto";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
sha256 = "sha256-OIt92DpDAZpy/fAOauGnzsufUi+y3Ag7KblZ5EUGuyQ=";
|
||||
sha256 = "sha256-Tkjl01OD6yDbKAHzZVRG7c7KnP0MURmsc0d0DbcFuFk=";
|
||||
|
||||
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];
|
||||
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfce4-settings";
|
||||
version = "4.16.2";
|
||||
version = "4.16.3";
|
||||
|
||||
sha256 = "sha256-DkybMfkgsC8fJuhOWLzKO5f2Y8YtqzUXMH/npTv21yY=";
|
||||
sha256 = "sha256-Jd1PJrIqzsutParZu8rNMuzHnycjr3eeZGXWIG3PqZY=";
|
||||
|
||||
postPatch = ''
|
||||
for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do
|
||||
|
||||
@ -7,6 +7,7 @@ with builtins; with lib; let
|
||||
{ case = "8.13"; out = { version = "1.13.7"; };}
|
||||
{ case = "8.14"; out = { version = "1.13.7"; };}
|
||||
{ case = "8.15"; out = { version = "1.15.0"; };}
|
||||
{ case = "8.16"; out = { version = "1.16.5"; };}
|
||||
] {} );
|
||||
in mkCoqDerivation {
|
||||
pname = "elpi";
|
||||
@ -14,12 +15,14 @@ in mkCoqDerivation {
|
||||
owner = "LPCIC";
|
||||
inherit version;
|
||||
defaultVersion = lib.switch coq.coq-version [
|
||||
{ case = "8.16"; out = "1.15.1"; }
|
||||
{ case = "8.15"; out = "1.14.0"; }
|
||||
{ case = "8.14"; out = "1.11.2"; }
|
||||
{ case = "8.13"; out = "1.11.1"; }
|
||||
{ case = "8.12"; out = "1.8.3_8.12"; }
|
||||
{ case = "8.11"; out = "1.6.3_8.11"; }
|
||||
] null;
|
||||
release."1.15.1".sha256 = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg=";
|
||||
release."1.14.0".sha256 = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp";
|
||||
release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n";
|
||||
release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY=";
|
||||
|
||||
@ -148,7 +148,6 @@ with python.pkgs; buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isAarch64;
|
||||
description = "An open source ecosystem for IoT development";
|
||||
homepage = "https://platformio.org";
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -30,7 +30,54 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul
|
||||
index 92a9112bca..b80ec1e801 100644
|
||||
--- a/mkspecs/features/mac/default_post.prf
|
||||
+++ b/mkspecs/features/mac/default_post.prf
|
||||
@@ -68,212 +68,6 @@ qt {
|
||||
@@ -1,9 +1,5 @@
|
||||
load(default_post)
|
||||
|
||||
-# Recompute SDK version in case the user set it explicitly
|
||||
-sdk_version = $$QMAKE_MAC_SDK_VERSION
|
||||
-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
|
||||
-
|
||||
contains(TEMPLATE, .*app) {
|
||||
!macx-xcode:if(isEmpty(BUILDS)|build_pass) {
|
||||
# Detect changes to the platform SDK
|
||||
@@ -16,36 +12,6 @@ contains(TEMPLATE, .*app) {
|
||||
QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk)
|
||||
}
|
||||
|
||||
- # Detect incompatible SDK versions
|
||||
-
|
||||
- isEmpty(QT_MAC_SDK_VERSION_MIN): \
|
||||
- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION
|
||||
-
|
||||
- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \
|
||||
- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \
|
||||
- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.")
|
||||
-
|
||||
- !isEmpty(QT_MAC_SDK_VERSION_MAX) {
|
||||
- # For Qt developers only
|
||||
- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \
|
||||
- CONFIG += sdk_no_version_check
|
||||
-
|
||||
- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1)
|
||||
-
|
||||
- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) {
|
||||
- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\
|
||||
- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.")
|
||||
- warning("This is an unsupported configuration. You may experience build issues," \
|
||||
- "and by using")
|
||||
- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \
|
||||
- "that Qt has not been prepared for.")
|
||||
-
|
||||
- warning("Please downgrade the SDK you use to build your app to version" \
|
||||
- "$$QT_MAC_SDK_VERSION_MAX, or configure")
|
||||
- warning("with CONFIG+=sdk_no_version_check when running qmake" \
|
||||
- "to silence this warning.")
|
||||
- }
|
||||
- }
|
||||
}
|
||||
|
||||
!no_objective_c:CONFIG += objective_c
|
||||
@@ -73,212 +39,6 @@ qt {
|
||||
}
|
||||
}
|
||||
|
||||
@ -308,37 +355,6 @@ index e3534561a5..3b01424e67 100644
|
||||
-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP
|
||||
-xcode_copy_phase_strip_setting.value = NO
|
||||
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
|
||||
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
|
||||
--- a/mkspecs/features/mac/sdk.mk
|
||||
+++ b/mkspecs/features/mac/sdk.mk
|
||||
@@ -1,25 +0,0 @@
|
||||
-
|
||||
-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
|
||||
- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null
|
||||
- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
|
||||
- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
|
||||
- # We don't want to complain about out of date SDK unless the target needs to be remade.
|
||||
- # This covers use-cases such as running 'make check' after moving the build to a
|
||||
- # computer without Xcode or with a different Xcode version.
|
||||
- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0)
|
||||
- ifeq ($(TARGET_UP_TO_DATE),0)
|
||||
- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),)
|
||||
- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.)
|
||||
- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),)
|
||||
- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.)
|
||||
- else ifneq ($(CURRENT_MAC_SDK_VERSION),)
|
||||
- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
|
||||
- else
|
||||
- $(info Unknown error resolving current platform SDK version.)
|
||||
- endif
|
||||
- $(info This requires a fresh build of your project. Please wipe the build directory)
|
||||
- ifneq ($(EXPORT__QMAKE_STASH_),)
|
||||
- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_))
|
||||
- endif
|
||||
- $(error ^)
|
||||
- endif
|
||||
- endif
|
||||
-endif
|
||||
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
|
||||
deleted file mode 100644
|
||||
index 3a9c2778bb..0000000000
|
||||
@ -406,6 +422,14 @@ index 3a9c2778bb..0000000000
|
||||
- $$tool = $$sysrooted $$member(value, 1, -1)
|
||||
- cache($$tool_variable, set stash, $$tool)
|
||||
-}
|
||||
--
|
||||
2.25.4
|
||||
|
||||
diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf
|
||||
deleted file mode 100644
|
||||
index df191eb13c..0000000000
|
||||
--- a/mkspecs/features/mac/toolchain.prf
|
||||
+++ /dev/null
|
||||
@@ -1,5 +0,0 @@
|
||||
-# Ensure that we process sdk.prf first, as it will update QMAKE_CXX,
|
||||
-# which the default path determination uses.
|
||||
-sdk: load(sdk)
|
||||
-
|
||||
-load(toolchain)
|
||||
|
||||
@ -195,7 +195,10 @@ stdenv.mkDerivation {
|
||||
# ignore "is only available on macOS 10.12.2 or newer" in obj-c code
|
||||
"-Wno-error=unguarded-availability"
|
||||
]
|
||||
++ lib.optionals withGtk3 [
|
||||
++ lib.optionals ((compareVersion "5.15.0" >= 0) && stdenv.isDarwin) [
|
||||
# .moc/moc_qprintdialog.cpp:96:31: error: no member named '_q_togglePageSetCombo' in 'QPrintDialogPrivate'
|
||||
"-DQ_OS_MAC"
|
||||
] ++ lib.optionals withGtk3 [
|
||||
''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
|
||||
''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
|
||||
]
|
||||
|
||||
@ -2,15 +2,18 @@
|
||||
, buildDunePackage, camlp5
|
||||
, ocaml
|
||||
, menhir, menhirLib
|
||||
, atdgen
|
||||
, stdlib-shims
|
||||
, re, perl, ncurses
|
||||
, ppxlib, ppx_deriving
|
||||
, ppxlib_0_15, ppx_deriving_0_15
|
||||
, coqPackages
|
||||
, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1"
|
||||
, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5"
|
||||
else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1"
|
||||
}:
|
||||
with lib;
|
||||
let fetched = coqPackages.metaFetch ({
|
||||
release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A=";
|
||||
release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s=";
|
||||
release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar";
|
||||
release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis=";
|
||||
@ -31,7 +34,8 @@ buildDunePackage rec {
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
||||
buildInputs = [ perl ncurses ]
|
||||
++ optional (versionAtLeast version "1.15" || version == "dev") menhir;
|
||||
++ optional (versionAtLeast version "1.15" || version == "dev") menhir
|
||||
++ optional (versionAtLeast version "1.16" || version == "dev") atdgen;
|
||||
|
||||
propagatedBuildInputs = [ re stdlib-shims ]
|
||||
++ (if versionAtLeast version "1.15" || version == "dev"
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioguardian";
|
||||
version = "2022.03.2";
|
||||
version = "2022.07.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eEvvcj8tHNErU6RrWar5mxG3xbQ5wCEEYJ95hXkdY54=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-87MumQ6MuhRRDHrcH1nmOPviKDaT4crYnq5Pd26qsLw=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-objects";
|
||||
version = "0.0.24";
|
||||
version = "0.0.26";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Hy/KLmu5mEIUazRi+XesTbKe+or/fzFL8e0zdV2WtC0=";
|
||||
hash = "sha256-g2oKxPQogdfS544fYgKBAxvmJgU35A0ewsPQcX1XOJE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-appengine-logging";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-undhXBAPB+3akWVu3ht0ZZBwErhmOq18TnXvloeZQjc=";
|
||||
hash = "sha256-pTakW1aYx5KlU8vgOXwu4kJDI4nEVi2y0YE0pTo3k30=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-audit-log";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-bYmQOEiu6YF0d+zjBlRIUbkDpexWHalmu7pajRJQmk0=";
|
||||
sha256 = "sha256-Yi8baD1TgpLr1zNH2i+CBeY+3gwL7Aq5nnmgZcSSZr0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ googleapis-common-protos protobuf ];
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.6.2";
|
||||
version = "3.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-y8W0qwm4rTHlDO8L+/fhIJlfW5PonUhAYBU5wLIZJ94=";
|
||||
hash = "sha256-WSFulX1aN+mSW3RTukXDe0N/BsLDQX2RKjqzPUsWb2Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-logging";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hIwKcQNPG6AHudqjy2dotACk51IeivwRbJZZaiFweqs=";
|
||||
sha256 = "sha256-n8LMhjyZmWnb8ALrOZkKZ8Ctlo70zjyTRF9HxJIudmQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.10.8";
|
||||
version = "2.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cQ5wFAwgqT2NT+jTfsg13wA7OOq8bk/QIRiIsK2ZyJ0=";
|
||||
hash = "sha256-cmgyWHK3JLXYEJPLAN5M4edWJlv71tfbhu0KNs5H1k4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.8.1";
|
||||
version = "3.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-t7kFCkyH3/MNGFX8S4OzgWnW/NSomAFDbDPCx9hV40g=";
|
||||
hash = "sha256-1VhEg22JMfUDeMT5/A1uX7jwqND4i0zVScFpMJKyCro=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.7.1";
|
||||
version = "3.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-q2I3ku8f55rSJQE5oiDttQOJFYtGPjmrW7htrZ+BMPU=";
|
||||
hash = "sha256-xidZ7EteyDUFxxXOXgSg6OUkzlIzEgnAMRledha0s/Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-firestore";
|
||||
version = "2.5.3";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ISPjpV2fjZSMbkJa6YzFGdrwyEC8MauLwS6pohMtFoY=";
|
||||
sha256 = "sha256-Iq+rOR7gMAfhn5WxfpFQ7s8MlwOxPm868DpgKg/sT/k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-secret-manager";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tSy0d8kdyDSE+/gcg4B+fplnLJ4ipoa+TZvUoExaYVU=";
|
||||
hash = "sha256-vlMh7Ww7ZPHWVUJMDqRO58bmn4nfTi3Gj/sBReHOvtQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-tasks";
|
||||
version = "2.9.1";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-wIO22BScrDJdbia6oOEuuXptedxrCehqWKLXmxTJmKE=";
|
||||
sha256 = "sha256-bN5nW/vqDXiSy/gGC/OVxhRQRJl0VLWL/G5BqViueY0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-texttospeech";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4I7zmjZMjXjkxjEtwWNbev0ryTOIyOWsVkC46tgRyqc=";
|
||||
sha256 = "sha256-HcLY/dpWQzsfCmwtwePidqlDuLHmlEgLUEdGkHOgdsw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-trace";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nxyd8zE8PEQupVutLWhLD4I1jNhhJ0ARpTi52f21iBE=";
|
||||
sha256 = "sha256-4EC6jLcFNF8G0dXvc+cZB6Ok3zeltc6Xon8EGRTkyCs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vision";
|
||||
version = "2.8.0";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LOGfvz61Fw6QNH83lFe8TwI3a72fHLeTFFcqM9QL3QY=";
|
||||
hash = "sha256-YQiqLVa9CVW82eXuzPWvcWFKzXcvX8v7cxazH2hrqAs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2022.7.8";
|
||||
version = "2022.7.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-Tzl7LH4Wisge3B7d2ChQnNPBAj1SNGmHI94k8fkMuqk=";
|
||||
sha256 = "sha256-yIzxgZOOra5hiAdrLA9miL50fwg/dCwP/lfAmfzWlaI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homematicip";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -25,8 +25,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "hahn-th";
|
||||
repo = "homematicip-rest-api";
|
||||
rev = version;
|
||||
hash = "sha256-rTTYJ/2R+/FLuL3rTWT7ieixN+Gv9GhwkUaKPfLqUGc=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pfVjnRO6iKEgLDQz4JMARzab21XLbbUDUMyMWatGlJ8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -133,6 +133,7 @@ buildPythonPackage rec {
|
||||
"-DBOOST_ROOT=${boost}"
|
||||
"-DBoost_NO_SYSTEM_PATHS=ON"
|
||||
"-DBoost_NO_BOOST_CMAKE=TRUE"
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON" # fails to find libs in pythonImportsCheckPhase otherwise
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safety";
|
||||
version = "2.0.0";
|
||||
version = "2.1.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d739d00a9e4203cfaba34540c822a73ca1d327159ed7776b3dce09391f81c35d";
|
||||
sha256 = "sha256-28Xf+i5H2nbMQ9/oy7v8qZ0pEY0MbFTfz6EcK9NJ3/Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "screenlogicpy";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dieselrabbit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0r9227s4v17jm5n0j31ssnak9f5p7xfvz4r1fwy61286is3j5gbb";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-1tBr7k7RutCHvea/56J7drl9P+WZ5bQpDeQwhgktc1s=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
homepage = "https://tatsu.readthedocs.io/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.28.1";
|
||||
version = "2.28.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rNjteFCdJ73wTN3MBfcGbf3k0w3X26Z7gIzbEUHWL/4=";
|
||||
sha256 = "sha256-OY+IzZMCx5bLY9ECGvKh+3rlB3QaPVCO344HRtjBagQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -26,7 +26,7 @@ let
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "domination";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
# The .zip releases do not contain the build.xml file
|
||||
src = fetchsvn {
|
||||
@ -34,8 +34,8 @@ in stdenv.mkDerivation {
|
||||
# There are no tags in the repository.
|
||||
# Look for commits like "new version x.y.z info on website"
|
||||
# or "website update for x.y.z".
|
||||
rev = "2109";
|
||||
sha256 = "sha256-awTaEkv0zUXgrKVKuFzi5sgHgrfiNmAFMODO5U0DL6I=";
|
||||
rev = "2212";
|
||||
sha256 = "sha256-XuPMxGDap8x7I+U7+1C+DlkQkoV/u2FCwYyTZFWmYHM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
|
||||
{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
|
||||
, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
|
||||
, zlib, libpng, libGL, libGLU, physfs
|
||||
, qtbase, qttools
|
||||
, qtbase, qttools, wrapQtAppsHook
|
||||
, llvm
|
||||
, withServer ? true
|
||||
}:
|
||||
@ -14,7 +14,7 @@ let
|
||||
]);
|
||||
|
||||
in
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hedgewars";
|
||||
version = "1.0.0";
|
||||
|
||||
@ -23,7 +23,7 @@ mkDerivation rec {
|
||||
sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools ];
|
||||
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
|
||||
@ -103,10 +103,5 @@ mkDerivation rec {
|
||||
all movement on the battlefield has ceased).'';
|
||||
maintainers = with maintainers; [ kragniz fpletz ];
|
||||
inherit (fpc.meta) platforms;
|
||||
|
||||
# Appears to be some sort of C++ linking error.
|
||||
# Example: https://hydra.nixos.org/build/174544990/nixlog/6
|
||||
broken = true;
|
||||
hydraPlatforms = platforms.none;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "redis";
|
||||
version = "7.0.3";
|
||||
version = "7.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.redis.io/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-LN59FyFP/jBZU9qf/xIzPopyyqV/1JI+SHL2NiogjnM=";
|
||||
sha256 = "sha256-8OZf2nTESj3U+p1RLU1Ngz3Qk5yTTpRqXGIqYw0Ffy8=";
|
||||
};
|
||||
|
||||
# Cross-compiling fixes
|
||||
|
||||
32
pkgs/tools/misc/mloader/default.nix
Normal file
32
pkgs/tools/misc/mloader/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib, python3Packages, fetchFromGitHub }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mloader";
|
||||
version = "1.1.8";
|
||||
|
||||
# PyPI tarball doesn't ship requirements.txt
|
||||
src = fetchFromGitHub {
|
||||
owner = "hurlenko";
|
||||
repo = "mloader";
|
||||
rev = version;
|
||||
sha256 = "sha256-cZ9jaRrzzc5M7QYGuLxMv1J1mlfp/UEJ4dugTuJIQ/A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
click
|
||||
protobuf
|
||||
requests
|
||||
];
|
||||
|
||||
# No tests in repository
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "mloader" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line tool to download manga from mangaplus";
|
||||
homepage = "https://github.com/hurlenko/mloader";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,7 @@ with lib;
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flannel";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
rev = "v${version}";
|
||||
|
||||
vendorSha256 = null;
|
||||
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||
inherit rev;
|
||||
owner = "flannel-io";
|
||||
repo = "flannel";
|
||||
sha256 = "sha256-cxdbXhj79xp5jT5xY3cIzt5XYndPC+TWIrxBjAvbP0g=";
|
||||
sha256 = "sha256-l0W896miwnILQo3VWozV1aMNZoSerydUzWltl7D9y1E=";
|
||||
};
|
||||
|
||||
ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "wafw00f";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnableSecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -8621,6 +8621,8 @@ with pkgs;
|
||||
|
||||
mktorrent = callPackage ../tools/misc/mktorrent { };
|
||||
|
||||
mloader = callPackage ../tools/misc/mloader { };
|
||||
|
||||
mmake = callPackage ../tools/misc/mmake { };
|
||||
|
||||
mmixware = callPackage ../development/tools/mmixware { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user