Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
6a445e1717
345 changed files with 21845 additions and 1683 deletions
|
|
@ -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;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@
|
|||
"adapter.auto-port-config": {
|
||||
"mode": "dsp",
|
||||
"monitor": false,
|
||||
"control": false,
|
||||
"position": "unknown"
|
||||
}
|
||||
}
|
||||
|
|
@ -109,6 +110,7 @@
|
|||
"adapter.auto-port-config": {
|
||||
"mode": "dsp",
|
||||
"monitor": false,
|
||||
"control": false,
|
||||
"position": "unknown"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,7 +201,9 @@ in {
|
|||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf";
|
||||
ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
|
||||
ExecStartPost = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done'';
|
||||
ExecStartPost = pkgs.writeShellScript "wait-for-netdata-up" ''
|
||||
while [ "$(${pkgs.netdata}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done
|
||||
'';
|
||||
|
||||
TimeoutStopSec = 60;
|
||||
Restart = "on-failure";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
|
||||
testScript = ''
|
||||
def airsonic_is_up(_) -> bool:
|
||||
return machine.succeed("curl --fail http://localhost:4040/login")
|
||||
status, _ = machine.execute("curl --fail http://localhost:4040/login")
|
||||
return status == 0
|
||||
|
||||
|
||||
machine.start()
|
||||
|
|
|
|||
|
|
@ -167,6 +167,9 @@ in stdenv.mkDerivation rec {
|
|||
"-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON"
|
||||
"-Daudacity_conan_enabled=Off"
|
||||
"-Daudacity_use_ffmpeg=loaded"
|
||||
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
doCheck = false; # Test fails
|
||||
|
|
|
|||
|
|
@ -35,6 +35,9 @@ stdenv.mkDerivation rec {
|
|||
cp in-formant $out/bin
|
||||
'';
|
||||
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A real-time pitch and formant tracking software";
|
||||
homepage = "https://github.com/in-formant/in-formant";
|
||||
|
|
|
|||
|
|
@ -24,11 +24,7 @@
|
|||
, withDebug ? false
|
||||
}:
|
||||
|
||||
let
|
||||
opt = lib.optional;
|
||||
mkFlag = c: f: if c then "--with-${f}" else "--without-${f}";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "moc";
|
||||
version = "2.5.2";
|
||||
|
|
@ -39,56 +35,56 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = []
|
||||
++ opt ffmpegSupport ./moc-ffmpeg4.patch
|
||||
++ opt pulseSupport ./pulseaudio.patch;
|
||||
++ lib.optional ffmpegSupport ./moc-ffmpeg4.patch
|
||||
++ lib.optional pulseSupport ./pulseaudio.patch;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ opt pulseSupport autoreconfHook;
|
||||
++ lib.optional pulseSupport autoreconfHook;
|
||||
|
||||
buildInputs = [ ncurses db popt libtool ]
|
||||
# Sound sub-systems
|
||||
++ opt alsaSupport alsa-lib
|
||||
++ opt pulseSupport libpulseaudio
|
||||
++ opt jackSupport libjack2
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional pulseSupport libpulseaudio
|
||||
++ lib.optional jackSupport libjack2
|
||||
# Audio formats
|
||||
++ opt (aacSupport || mp3Support) libid3tag
|
||||
++ opt aacSupport faad2
|
||||
++ opt flacSupport flac
|
||||
++ opt midiSupport timidity
|
||||
++ opt modplugSupport libmodplug
|
||||
++ opt mp3Support libmad
|
||||
++ lib.optional (aacSupport || mp3Support) libid3tag
|
||||
++ lib.optional aacSupport faad2
|
||||
++ lib.optional flacSupport flac
|
||||
++ lib.optional midiSupport timidity
|
||||
++ lib.optional modplugSupport libmodplug
|
||||
++ lib.optional mp3Support libmad
|
||||
++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
|
||||
++ opt vorbisSupport libvorbis
|
||||
++ opt speexSupport speex
|
||||
++ opt ffmpegSupport ffmpeg
|
||||
++ opt sndfileSupport libsndfile
|
||||
++ opt wavpackSupport wavpack
|
||||
++ lib.optional vorbisSupport libvorbis
|
||||
++ lib.optional speexSupport speex
|
||||
++ lib.optional ffmpegSupport ffmpeg
|
||||
++ lib.optional sndfileSupport libsndfile
|
||||
++ lib.optional wavpackSupport wavpack
|
||||
# Misc
|
||||
++ opt curlSupport curl
|
||||
++ opt samplerateSupport libsamplerate
|
||||
++ lib.optional curlSupport curl
|
||||
++ lib.optional samplerateSupport libsamplerate
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ];
|
||||
|
||||
configureFlags = [
|
||||
# Sound sub-systems
|
||||
(mkFlag alsaSupport "alsa")
|
||||
(mkFlag pulseSupport "pulse")
|
||||
(mkFlag jackSupport "jack")
|
||||
(mkFlag ossSupport "oss")
|
||||
(lib.withFeature alsaSupport "alsa")
|
||||
(lib.withFeature pulseSupport "pulse")
|
||||
(lib.withFeature jackSupport "jack")
|
||||
(lib.withFeature ossSupport "oss")
|
||||
# Audio formats
|
||||
(mkFlag aacSupport "aac")
|
||||
(mkFlag flacSupport "flac")
|
||||
(mkFlag midiSupport "timidity")
|
||||
(mkFlag modplugSupport "modplug")
|
||||
(mkFlag mp3Support "mp3")
|
||||
(mkFlag musepackSupport "musepack")
|
||||
(mkFlag vorbisSupport "vorbis")
|
||||
(mkFlag speexSupport "speex")
|
||||
(mkFlag ffmpegSupport "ffmpeg")
|
||||
(mkFlag sndfileSupport "sndfile")
|
||||
(mkFlag wavpackSupport "wavpack")
|
||||
(lib.withFeature aacSupport "aac")
|
||||
(lib.withFeature flacSupport "flac")
|
||||
(lib.withFeature midiSupport "timidity")
|
||||
(lib.withFeature modplugSupport "modplug")
|
||||
(lib.withFeature mp3Support "mp3")
|
||||
(lib.withFeature musepackSupport "musepack")
|
||||
(lib.withFeature vorbisSupport "vorbis")
|
||||
(lib.withFeature speexSupport "speex")
|
||||
(lib.withFeature ffmpegSupport "ffmpeg")
|
||||
(lib.withFeature sndfileSupport "sndfile")
|
||||
(lib.withFeature wavpackSupport "wavpack")
|
||||
# Misc
|
||||
(mkFlag curlSupport "curl")
|
||||
(mkFlag samplerateSupport "samplerate")
|
||||
(lib.withFeature curlSupport "curl")
|
||||
(lib.withFeature samplerateSupport "samplerate")
|
||||
("--enable-debug=" + (if withDebug then "yes" else "no"))
|
||||
"--disable-cache"
|
||||
"--without-rcc"
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "ptcollab";
|
||||
version = "0.6.1.0";
|
||||
version = "0.6.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuxshao";
|
||||
repo = "ptcollab";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zkDMZT1kKCLqNvvxZFKVuXFqZptX/LG/R9kRUcNJphw=";
|
||||
sha256 = "sha256-ydn3qKOK0GwA/mBPbGwSIac09b9cz6YOFbuDFFV8jJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
|||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
buildInputs = [ lv2 rnnoise-nu ];
|
||||
|
||||
mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
|
||||
mesonFlags = [ "--prefix=${placeholder "out"}/lib/lv2" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
|
|
|
|||
|
|
@ -138,6 +138,11 @@ stdenv.mkDerivation rec {
|
|||
util-linux
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sound editor with graphical UI";
|
||||
homepage = "https://tenacityaudio.org/";
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.166.5";
|
||||
version = "1.167.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-mFSVYC6a9iAiUcWZOlxuVxFwuwIgH8eQmh8YKaMw2Wg=";
|
||||
sha256 = "sha256-cK96lcncSojEcQrZIPiJ9j9F4cIcaXvWNI9wuR3tVBU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.06.19",
|
||||
"sha256": "sha256-4pkwgg2U6NAGv+fVFKIli2Qe3fyDMiliFLJSgsh1hsQ="
|
||||
"rev": "2022.07.17",
|
||||
"sha256": "sha256-KMGmimbtUQHa8i5wt4KLA/HotLbb/ISzdznmdqPXkNU="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.07.01",
|
||||
"sha256": "sha256-Il8NMBoShJtY5itDr9EBJ8NpfiPux/pNzs9LUc/nn30="
|
||||
"rev": "2022.07.18",
|
||||
"sha256": "sha256-3ae1XAGu+4p+EVReH7VZZOTOwOu5juybPXjK7XN16CQ="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0rq0bc99hsji4ni5mqw1rhzn2rng9rldm4xbdxlkrjyprc6qvffz";
|
||||
x86_64-darwin = "1yjcb65w0anxyjc1nd9kbwr4hwnrlk9c6kp1a2ncy1g181klzarl";
|
||||
aarch64-linux = "1fk7887clz9sd7fmz7lkxql7bnsvnbjd9fjixym2746x9if5ds42";
|
||||
aarch64-darwin = "1bfgsjnm5r1wpss69ncx310j23mbwhixdxmg07m3kpcfqrmznvgc";
|
||||
armv7l-linux = "0131i5cx2737wmngybvlw7d9c4gnilmla33nlrhf74ihic98jwlc";
|
||||
x86_64-linux = "0jixjbj1h9l0zrkb8sc3p4x7kjh87dramaz6j8369vv6mc4h8ymr";
|
||||
x86_64-darwin = "1lqxjzyzhr3dpvjpmmlvknaxjzryr6yz8rg1mh5p211wfi13rf1c";
|
||||
aarch64-linux = "0y4q1kpwhz0hyipsc7hah6xgz9p3sn0ysaqzw32dl91hkr6d52mf";
|
||||
aarch64-darwin = "1d89gr4aj0vl05rz9d5iv8kkgb8p5jbfc9b0hjj1cp0d276x6ipy";
|
||||
armv7l-linux = "11cawg3ql9iq9z56i68h26cz7ydg0az298cbs2kpsz2lzkw97wbd";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.68.1";
|
||||
version = "1.69.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1gx64ff9sgjqn8vw2hjpn3qlfpfyyhc5ivzc52vqyczaj1fcny65";
|
||||
x86_64-darwin = "0sv0iyqfw24k14r28qzvlpdb81b7fqhbgb1lqzb75adhdfpjwz31";
|
||||
aarch64-linux = "13mg7nn43k4bs1gl8cx1kly90yxz7iial6a1fpy4grxsk8mna1rj";
|
||||
aarch64-darwin = "0mnj3lckpqwb3kmg7x7r34idaxyhy55gpiiyj0gmpqp8hp0ai5sc";
|
||||
armv7l-linux = "0cvvigzmqp21jxwdfpkspdj7sva9bj977f9689qgb012kqvy41b2";
|
||||
x86_64-linux = "0nsqrhijx5ic467fk2d803x93yazjkybg9cwmkk2l343fdg86kyq";
|
||||
x86_64-darwin = "0hxafssjjx4gvbqpra517ar8dik5hkrnzx54v89g8p6s7kzkp1j0";
|
||||
aarch64-linux = "1sl3w17a0j4b6rgl3xkna34i24s5ig8fs8kh2ysigb34h2izjdwi";
|
||||
aarch64-darwin = "08wqiplyb16s7nvhlik7307jm3jznq7g611bp01q12bkxfa3bpp8";
|
||||
armv7l-linux = "0vzl70545dplvd7nkl5g8x7mninjv3bkdp6d2ww6g2hdbdx0hlhr";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
|
|
@ -28,7 +28,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.68.1";
|
||||
version = "1.69.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -17,5 +17,10 @@ stdenv.mkDerivation {
|
|||
cp -v vc4emul/vc4emul $out/bin/vc4emul
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
meta.license = lib.licenses.mit;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,7 +128,6 @@ in mkDerivation rec {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DWITH_3D=True"
|
||||
"-DWITH_PDAL=TRUE"
|
||||
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
|
||||
|
|
|
|||
|
|
@ -128,7 +128,6 @@ in mkDerivation rec {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DWITH_3D=True"
|
||||
"-DWITH_PDAL=TRUE"
|
||||
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"
|
||||
|
|
|
|||
|
|
@ -44,13 +44,6 @@ in mkDerivation rec {
|
|||
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
# During build, binaries are called that rely on freshly built
|
||||
# libraries. These reside in build/lib, and are not found by
|
||||
# default.
|
||||
preBuild = ''
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DPARAVIEW_ENABLE_FFMPEG=ON"
|
||||
|
|
|
|||
|
|
@ -27,8 +27,4 @@ mkDerivation {
|
|||
wayland qtwayland
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
# We need the RPATH for linking, because the `libkdeinit5_dolphin.so` links
|
||||
# private against its dependencies and without the correct RPATH, these
|
||||
# dependencies are not found.
|
||||
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "doc" ]; # headers are just two and very small
|
||||
|
||||
preConfigure =
|
||||
if stdenv.isDarwin then ''
|
||||
export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'' else ''
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "break-time";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdepillabout";
|
||||
repo = "break-time";
|
||||
rev = "v${version}";
|
||||
sha256 = "18p9gfp0inbnjsc7af38fghyklr7qnl2kkr25isfy9d5m8cpxqc6";
|
||||
sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "01y1p40vz30h2jkh37zipqvmfybgpq6wdcdglkab85jivmd1lslx";
|
||||
cargoSha256 = "sha256-DpX5tcIWt/pPGujufivmAGonVIiHERfa8Yb1JZpu3WA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ mkDerivation rec {
|
|||
"-DGTEST_ROOT=${gtest.src}/googletest"
|
||||
"-DQT_TRANSLATIONS_DIR=${qttranslations}/translations"
|
||||
"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
|
||||
# file RPATH_CHANGE could not write new RPATH
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,9 @@ mkDerivation rec {
|
|||
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
|
||||
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
|
||||
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
|
||||
|
||||
# file RPATH_CHANGE could not write new RPATH
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.25.21";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ziIMTMK6G8vXje6GWPvcIWmlubq75XVrJUzZlA+R0Rc=";
|
||||
sha256 = "sha256-6A6RxvobT0T/Pbd7Zcn8++I/7OVAhXSZI1NhYeDB3iY=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
|
||||
tags = [ "netgo" ];
|
||||
|
||||
vendorSha256 = "sha256-wL8Unht/ZRAGDuC/U4SFV5PdExy78F4DMyM8+7CMtOY=";
|
||||
vendorSha256 = "sha256-1FmhoLfTQSygAScbvABHZJO3611T7cfuCboyu2ShbNo=";
|
||||
|
||||
# TODO investigate why some config tests are failing
|
||||
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.124";
|
||||
version = "1.2.128";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fdCFdsRMdH9xu2YIYt6r7BxqbdzrzUxLxB1k4WEnGIo=";
|
||||
sha256 = "sha256-H1GzIxj6ZrlcNM4Y0oKYoVBsMFj4wYP9XYicAmIpaik=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AbTlchqVD3TySrcHcF3/QfMhbkNg4A4oef9Qkn2v6xY=";
|
||||
vendorSha256 = "sha256-78V+cw0A3Q3Gagl4KrserFXvV17MSqhpaFG38VKwhKg=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages, unzip }:
|
||||
|
||||
let
|
||||
# OpenAsar fails with default unzip, throwing "lchmod (file attributes) error: Operation not supported"
|
||||
unzipFix =
|
||||
if stdenv.isLinux then
|
||||
unzip.overrideAttrs (oldAttrs: {
|
||||
buildFlags = oldAttrs.buildFlags ++ [ "LOCAL_UNZIP=-DNO_LCHMOD" ];
|
||||
})
|
||||
else
|
||||
unzip;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openasar";
|
||||
version = "unstable-2022-06-27";
|
||||
|
|
@ -24,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
# Hardcode unzip path
|
||||
substituteInPlace ./src/updater/moduleUpdater.js \
|
||||
--replace \'unzip\' \'${unzipFix}/bin/unzip\'
|
||||
--replace \'unzip\' \'${unzip}/bin/unzip\'
|
||||
# Remove auto-update feature
|
||||
echo "module.exports = async () => log('AsarUpdate', 'Removed');" > ./src/asarUpdate.js
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -83,6 +83,9 @@ mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DMINIZIP_INCLUDE_DIRS=${minizip2}/include"
|
||||
"-DMINIZIP_LIBRARIES=minizip"
|
||||
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
# The default install phase fails because the paths are somehow messed up in
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
, libopus
|
||||
, alsa-lib
|
||||
, libpulseaudio
|
||||
, pipewire
|
||||
, range-v3
|
||||
, tl-expected
|
||||
, hunspell
|
||||
|
|
@ -35,6 +36,7 @@
|
|||
, util-linuxMinimal
|
||||
, pcre
|
||||
, libpthreadstubs
|
||||
, libXdamage
|
||||
, libXdmcp
|
||||
, libselinux
|
||||
, libsepol
|
||||
|
|
@ -127,6 +129,7 @@ env.mkDerivation rec {
|
|||
libopus
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
pipewire
|
||||
range-v3
|
||||
tl-expected
|
||||
hunspell
|
||||
|
|
@ -139,6 +142,7 @@ env.mkDerivation rec {
|
|||
util-linuxMinimal # Required for libmount thus not nativeBuildInputs.
|
||||
pcre
|
||||
libpthreadstubs
|
||||
libXdamage
|
||||
libXdmcp
|
||||
libselinux
|
||||
libsepol
|
||||
|
|
|
|||
|
|
@ -26,13 +26,12 @@
|
|||
|
||||
let
|
||||
pname = "pcloud";
|
||||
version = "1.9.7";
|
||||
code = "XZ0FAtXZNxFJbda6KhLejU9tKAg4N0TEqx3V";
|
||||
|
||||
# Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive
|
||||
version = "1.9.9";
|
||||
code = "XZWTVkVZQM0GNXA4hrFGPkefzUUWVLKOpPIX";
|
||||
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
|
||||
src = fetchzip {
|
||||
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
|
||||
hash = "sha256-6eMRFuZOLcoZd2hGw7QV+kAmzE5lK8uK6ZpGs4n7/zw=";
|
||||
hash = "sha256-8566vKrE3/QCm4qW9KxEAO+r+YfMRYOhV2Da7qic48M=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -59,10 +59,6 @@ in stdenv.mkDerivation {
|
|||
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export LD_LIBRARY_PATH="$PWD/run"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# to remove "cycle detected in the references"
|
||||
mkdir -p $dev/lib/wireshark
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake qttranslations ];
|
||||
propagatedBuildInputs = [ qtsvg qtwebengine ];
|
||||
cmakeFlags = "-DINSTALL_BUNDLED_DICTS=0";
|
||||
cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ePub XHTML Visual Editor";
|
||||
|
|
|
|||
|
|
@ -154,8 +154,6 @@ stdenv.mkDerivation rec {
|
|||
test-xml-pricedb \
|
||||
test-xml-transaction \
|
||||
test-xml2-is-file
|
||||
|
||||
export LD_LIBRARY_PATH="$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$PWD/lib/gnucash/test/future"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
|||
|
|
@ -22,10 +22,6 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals portaudioSupport [ portaudio ];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
|
||||
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Digital Speech Decoder";
|
||||
|
|
|
|||
|
|
@ -75,7 +75,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
|
||||
|
||||
cmakeFlags = optionals (withScripting) [
|
||||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
]
|
||||
++ optionals (withScripting) [
|
||||
"-DKICAD_SCRIPTING_WXPYTHON=ON"
|
||||
]
|
||||
++ optionals (!withScripting) [
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/btorsim contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A generic parser and tool package for the BTOR2 format";
|
||||
homepage = "https://github.com/Boolector/btor2tools";
|
||||
|
|
|
|||
|
|
@ -47,6 +47,9 @@ let
|
|||
"-DBUILD_STATIC=OFF"
|
||||
"-DJAVA=${boolToCmake includeJava}"
|
||||
"-DGPL=${boolToCmake includeGplCode}"
|
||||
|
||||
# file RPATH_CHANGE could not write new RPATH
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
|
||||
postInstall = optionalString includeJava ''
|
||||
|
|
|
|||
|
|
@ -134,7 +134,6 @@ stdenv.mkDerivation rec {
|
|||
"-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON"
|
||||
"-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON"
|
||||
"-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON"
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;TrainedModelSerialization'" # Sporadic segfault
|
||||
"-DENABLE_TESTING=${enableIf doCheck}"
|
||||
"-DDISABLE_META_INTEGRATION_TESTS=ON"
|
||||
|
|
|
|||
|
|
@ -65,6 +65,9 @@ stdenv.mkDerivation rec {
|
|||
"-Denable_compile_warnings=off"
|
||||
"-Denable_compile_optimizations=${optionOnOff optimize}"
|
||||
"-Denable_lto=${optionOnOff optimize}"
|
||||
|
||||
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
];
|
||||
makeFlags = optional debug "VERBOSE=1";
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ assert sendEmailSupport -> perlSupport;
|
|||
assert svnSupport -> perlSupport;
|
||||
|
||||
let
|
||||
version = "2.36.1";
|
||||
version = "2.37.0";
|
||||
svn = subversionClient.override { perlBindings = perlSupport; };
|
||||
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
|
||||
in
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0";
|
||||
sha256 = "sha256-n3+hcRvQDE7D3eL+REB9wT8S5HcrXjxypY20wHSVQR8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional withManual "doc";
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ stdenv.mkDerivation rec {
|
|||
cd "$sourceRoot"
|
||||
patchPhase
|
||||
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libXext}/lib"
|
||||
${stdenv.shell} bootStrap.bash \
|
||||
--with-core \
|
||||
${if withQT then "--with-qt" else "--without-qt"} \
|
||||
|
|
|
|||
|
|
@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional (!stdenv.isLinux) libiconv
|
||||
++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ];
|
||||
|
||||
cmakeFlags = lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ];
|
||||
cmakeFlags = [
|
||||
# file RPATH_CHANGE could not write new RPATH:
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
] ++ lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ];
|
||||
|
||||
postInstall = lib.optionalString enableOcr ''
|
||||
wrapProgram "$out/bin/ccextractor" \
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
# Disable warnings that are irrelevant to us as packagers
|
||||
cmakeFlags = "-Wno-dev";
|
||||
cmakeFlags = [ "-Wno-dev" ];
|
||||
|
||||
# We run one of the executables we build while the build is
|
||||
# still running (and patchelf hasn't been invoked) which means
|
||||
|
|
|
|||
|
|
@ -3,12 +3,14 @@
|
|||
rec {
|
||||
# https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch
|
||||
toTargetArch = platform:
|
||||
if platform.isAarch32 then "arm"
|
||||
/**/ if platform ? rustc.platform then platform.rustc.platform.arch
|
||||
else if platform.isAarch32 then "arm"
|
||||
else platform.parsed.cpu.name;
|
||||
|
||||
# https://doc.rust-lang.org/reference/conditional-compilation.html#target_os
|
||||
toTargetOs = platform:
|
||||
if platform.isDarwin then "macos"
|
||||
/**/ if platform ? rustc.platform then platform.rustc.platform.os or "none"
|
||||
else if platform.isDarwin then "macos"
|
||||
else platform.parsed.kernel.name;
|
||||
|
||||
# Returns the name of the rust target, even if it is custom. Adjustments are
|
||||
|
|
@ -31,7 +33,7 @@ rec {
|
|||
# Returns the name of the rust target if it is standard, or the json file
|
||||
# containing the custom target spec.
|
||||
toRustTargetSpec = platform:
|
||||
if (platform.rustc or {}) ? platform
|
||||
if platform ? rustc.platform
|
||||
then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform)
|
||||
else toRustTarget platform;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "arc-icon-theme";
|
||||
version = "2016-11-22";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }:
|
||||
{ lib, stdenvNoCC, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "BeautyLine";
|
||||
version = "0.0.1";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, clickgen
|
||||
, unzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bibata-cursors";
|
||||
version = "1.1.2";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, clickgen
|
||||
, unzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bibata-extra-cursors";
|
||||
version = "1.0.1";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bibata-cursors-translucent";
|
||||
version = "1.1.1";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeFontsConf
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, makeFontsConf
|
||||
, inkscape, xcursorgen, bc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "capitaine-cursors";
|
||||
version = "4";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitLab, bc, librsvg, xcursorgen }:
|
||||
{ lib, stdenvNoCC, fetchFromGitLab, bc, librsvg, xcursorgen }:
|
||||
|
||||
let
|
||||
dimensions = {
|
||||
|
|
@ -16,7 +16,7 @@ let
|
|||
# meta.longDescription.)
|
||||
map variantName product;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "comixcursors";
|
||||
version = "0.9.2";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "faba-icon-theme";
|
||||
version = "4.3";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "faba-mono-icons";
|
||||
version = "2016-04-30";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "gruvbox-dark-icons-gtk";
|
||||
version = "1.0.0";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "hicolor-icon-theme";
|
||||
version = "0.17";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iconpack-jade";
|
||||
version = "1.25";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iconpack-obsidian";
|
||||
version = "4.15";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv
|
||||
{ lib, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, perl
|
||||
, inkscape
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
, targets ? [ "all" ]
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "iso-flags";
|
||||
version = "unstable-18012020";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "kora-icon-theme";
|
||||
version = "1.5.2";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, breeze-icons
|
||||
, elementary-icon-theme
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
, hicolor-icon-theme
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "la-capitaine-icon-theme";
|
||||
version = "0.6.2";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "moka-icon-theme";
|
||||
version = "unstable-2019-05-29";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv
|
||||
{ stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nordzy-cursor-theme";
|
||||
version = "0.1.0";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, inkscape, xcursorgen }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, inkscape, xcursorgen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-cursor-theme";
|
||||
version = "1.2";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "22.07.11";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "22.07.11";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme";
|
||||
version = "21.10.31";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "oranchelo-icon-theme";
|
||||
version = "0.8.0.1";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "paper-icon-theme";
|
||||
version = "unstable-2020-03-12";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "papirus-icon-theme";
|
||||
version = "20220710";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
, hicolor-icon-theme
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "pop-icon-theme";
|
||||
version = "2021-11-17";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchzip
|
||||
, xorg
|
||||
, hicolor-icon-theme
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "vanilla-dmz";
|
||||
version = "0.4.5";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, hicolor-icon-theme
|
||||
|
|
@ -13,7 +13,7 @@ let
|
|||
in
|
||||
lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2021-11-09";
|
||||
|
||||
|
|
|
|||
|
|
@ -13,17 +13,17 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "shared-mime-info-unstable";
|
||||
version = "2021-12-03";
|
||||
pname = "shared-mime-info";
|
||||
version = "2.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "xdg";
|
||||
repo = "shared-mime-info";
|
||||
rev = "5a406b06792e26a83c7346b3c2443c0bd8d4cdb2";
|
||||
sha256 = "1v7dx7mr0m4lcff1aasg9gxn280zn0ffn6fjg9xc44pnllg01n6s";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-QrRe/DcjpTMejHXDSOLbjpJywod8qIjP6/leTZ21rhE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -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; };
|
||||
|
|
|
|||
|
|
@ -119,7 +119,6 @@ stdenv.mkDerivation rec {
|
|||
"-DENABLE_UOA=OFF"
|
||||
"-DENABLE_VALA_BINDINGS=ON"
|
||||
"-DENABLE_INTROSPECTION=ON"
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
|
||||
"-DWITH_PHONENUMBER=ON"
|
||||
"-DWITH_GWEATHER4=ON"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -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,9 +22,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [ glib ]
|
||||
buildInputs = [
|
||||
glib
|
||||
]
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
++ lib.optional pulseaudioSupport libpulseaudio;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue