Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
cee7df4846
@ -313,6 +313,12 @@
|
||||
githubId = 43479487;
|
||||
name = "Titouan Biteau";
|
||||
};
|
||||
alerque = {
|
||||
email = "caleb@alerque.com";
|
||||
github = "alerque";
|
||||
githubId = 173595;
|
||||
name = "Caleb Maclennan";
|
||||
};
|
||||
alexarice = {
|
||||
email = "alexrice999@hotmail.co.uk";
|
||||
github = "alexarice";
|
||||
@ -4739,6 +4745,12 @@
|
||||
githubId = 1202012;
|
||||
name = "Ignat Loskutov";
|
||||
};
|
||||
louisdk1 = {
|
||||
email = "louis@louis.dk";
|
||||
github = "louisdk1";
|
||||
githubId = 4969294;
|
||||
name = "Louis Tim Larsen";
|
||||
};
|
||||
lovek323 = {
|
||||
email = "jason@oconal.id.au";
|
||||
github = "lovek323";
|
||||
@ -4791,6 +4803,12 @@
|
||||
githubId = 59375051;
|
||||
name = "Lucas Ransan";
|
||||
};
|
||||
lucperkins = {
|
||||
email = "lucperkins@gmail.com";
|
||||
github = "lucperkins";
|
||||
githubId = 1523104;
|
||||
name = "Luc Perkins";
|
||||
};
|
||||
lucus16 = {
|
||||
email = "lars.jellema@gmail.com";
|
||||
github = "Lucus16";
|
||||
|
||||
@ -2,9 +2,11 @@ pkgs: with pkgs.lib;
|
||||
|
||||
rec {
|
||||
|
||||
# Check whenever fileSystem is needed for boot
|
||||
fsNeededForBoot = fs: fs.neededForBoot
|
||||
|| elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ];
|
||||
# Check whenever fileSystem is needed for boot. NOTE: Make sure
|
||||
# pathsNeededForBoot is closed under the parent relationship, i.e. if /a/b/c
|
||||
# is in the list, put /a and /a/b in as well.
|
||||
pathsNeededForBoot = [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ];
|
||||
fsNeededForBoot = fs: fs.neededForBoot || elem fs.mountPoint pathsNeededForBoot;
|
||||
|
||||
# Check whenever `b` depends on `a` as a fileSystem
|
||||
fsBefore = a: b: a.mountPoint == b.device
|
||||
|
||||
@ -49,6 +49,8 @@ let
|
||||
] ++ service.registrationFlags
|
||||
++ optional (service.buildsDir != null)
|
||||
"--builds-dir ${service.buildsDir}"
|
||||
++ optional (service.cloneUrl != null)
|
||||
"--clone-url ${service.cloneUrl}"
|
||||
++ optional (service.preCloneScript != null)
|
||||
"--pre-clone-script ${service.preCloneScript}"
|
||||
++ optional (service.preBuildScript != null)
|
||||
@ -377,6 +379,14 @@ in
|
||||
in context of selected executor (Locally, Docker, SSH).
|
||||
'';
|
||||
};
|
||||
cloneUrl = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "http://gitlab.example.local";
|
||||
description = ''
|
||||
Overwrite the URL for the GitLab instance. Used if the Runner can’t connect to GitLab on the URL GitLab exposes itself.
|
||||
'';
|
||||
};
|
||||
dockerImage = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
|
||||
@ -559,10 +559,12 @@ in
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
If set, this file system will be mounted in the initial
|
||||
ramdisk. By default, this applies to the root file system
|
||||
and to the file system containing
|
||||
<filename>/nix/store</filename>.
|
||||
If set, this file system will be mounted in the initial ramdisk.
|
||||
Note that the file system will always be mounted in the initial
|
||||
ramdisk if its mount point is one of the following:
|
||||
${concatStringsSep ", " (
|
||||
forEach utils.pathsNeededForBoot (i: "<filename>${i}</filename>")
|
||||
)}.
|
||||
'';
|
||||
};
|
||||
});
|
||||
|
||||
@ -37,7 +37,14 @@ let
|
||||
default = null;
|
||||
example = "/mnt-root/root/.swapkey";
|
||||
type = types.nullOr types.str;
|
||||
description = "File system location of keyfile. This unlocks the drive after the root has been mounted to <literal>/mnt-root</literal>.";
|
||||
description = ''
|
||||
Path to a keyfile used to unlock the backing encrypted
|
||||
device. At the time this keyfile is accessed, the
|
||||
<literal>neededForBoot</literal> filesystems (see
|
||||
<literal>fileSystems.<name?>.neededForBoot</literal>)
|
||||
will have been mounted under <literal>/mnt-root</literal>,
|
||||
so the keyfile path should usually start with "/mnt-root/".
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -65,12 +72,16 @@ in
|
||||
boot.initrd = {
|
||||
luks = {
|
||||
devices =
|
||||
builtins.listToAttrs (map (dev: { name = dev.encrypted.label; value = { device = dev.encrypted.blkDev; }; }) keylessEncDevs);
|
||||
builtins.listToAttrs (map (dev: {
|
||||
name = dev.encrypted.label;
|
||||
value = { device = dev.encrypted.blkDev; };
|
||||
}) keylessEncDevs);
|
||||
forceLuksSupportInInitrd = true;
|
||||
};
|
||||
postMountCommands =
|
||||
concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n") keyedEncDevs;
|
||||
concatMapStrings (dev:
|
||||
"cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n"
|
||||
) keyedEncDevs;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -285,6 +285,7 @@ in
|
||||
prosody = handleTest ./xmpp/prosody.nix {};
|
||||
prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {};
|
||||
proxy = handleTest ./proxy.nix {};
|
||||
pt2-clone = handleTest ./pt2-clone.nix {};
|
||||
qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {};
|
||||
quagga = handleTest ./quagga.nix {};
|
||||
quorum = handleTest ./quorum.nix {};
|
||||
|
||||
@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
services.blockbook-frontend."test" = {
|
||||
enable = true;
|
||||
};
|
||||
services.bitcoind = {
|
||||
services.bitcoind.mainnet = {
|
||||
enable = true;
|
||||
rpc = {
|
||||
port = 8030;
|
||||
|
||||
35
nixos/tests/pt2-clone.nix
Normal file
35
nixos/tests/pt2-clone.nix
Normal file
@ -0,0 +1,35 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "pt2-clone";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ fgaz ];
|
||||
};
|
||||
|
||||
machine = { config, pkgs, ... }: {
|
||||
imports = [
|
||||
./common/x11.nix
|
||||
];
|
||||
|
||||
services.xserver.enable = true;
|
||||
sound.enable = true;
|
||||
environment.systemPackages = [ pkgs.pt2-clone ];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript =
|
||||
''
|
||||
machine.wait_for_x()
|
||||
# Add a dummy sound card, or the program won't start
|
||||
machine.execute("modprobe snd-dummy")
|
||||
|
||||
machine.execute("pt2-clone &")
|
||||
|
||||
machine.wait_for_window(r"ProTracker")
|
||||
machine.sleep(5)
|
||||
# One of the few words that actually get recognized
|
||||
if "LENGTH" not in machine.get_screen_text():
|
||||
raise Exception("Program did not start successfully")
|
||||
machine.screenshot("screen")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, fetchgit
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
@ -91,6 +92,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}";
|
||||
description = "A modern music player for GNOME";
|
||||
|
||||
@ -1,24 +1,29 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, nixosTests
|
||||
, alsaLib
|
||||
, SDL2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pt2-clone";
|
||||
version = "1.20";
|
||||
version = "1.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "pt2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "0s4yk8w19qa58n5p558n6m7d5mslr9h9z5q3ayrgqcchdlm8cfky";
|
||||
sha256 = "1w6lbq4366bawy975glvjizk57zhvl562xhxwzn7p5hpm2bvw09b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
|
||||
|
||||
passthru.tests = {
|
||||
pt2-clone-opens = nixosTests.pt2-clone;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A highly accurate clone of the classic ProTracker 2.3D software for Amiga";
|
||||
homepage = "https://16-bits.org/pt2.php";
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
{ stdenv, fetchFromGitHub, perlPackages, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "realTimeConfigQuickScan";
|
||||
version = "unstable-2020-08-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raboof";
|
||||
repo = pname;
|
||||
rev = "4b482db17f8d8567ba0abf33459ceb5f756f088c";
|
||||
sha256 = "00l69gzwla9gjv5kpklgxlwnl48wnh8h6w0k8i69qr2cxigg4rhj";
|
||||
};
|
||||
|
||||
buildInputs = [ perlPackages.perl makeWrapper ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/doc
|
||||
# Install Script Files:
|
||||
# *.pm files
|
||||
for i in *.pm; do
|
||||
install -Dm 755 "$i" "$out/share/$i"
|
||||
done
|
||||
# Install doc files:
|
||||
install -D COPYING "$out/share/doc/COPYING"
|
||||
install -D README.md "$out/share/doc/README.md"
|
||||
# Install Executable scripts:
|
||||
install -Dm 755 realTimeConfigQuickScan.pl "$out/bin/realTimeConfigQuickScan"
|
||||
install -Dm 755 QuickScan.pl "$out/bin/QuickScan"
|
||||
wrapProgram $out/bin/realTimeConfigQuickScan \
|
||||
--set PERL5LIB "$out/share"
|
||||
wrapProgram $out/bin/QuickScan \
|
||||
--set PERL5LIB "$out/share:${with perlPackages; makePerlPath [ Tk ]}"
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
description = "Linux configuration checker for systems to be used for real-time audio";
|
||||
homepage = "https://github.com/raboof/realtimeconfigquickscan";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
platforms = platforms.linux ;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,18 +6,21 @@
|
||||
, alsaLib
|
||||
, SDL
|
||||
, jack2
|
||||
, audiofile
|
||||
, goocanvas # graphical envelope editing
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "soundtracker";
|
||||
version = "1.0.0.1";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
# Past releases get moved to the "old releases" directory.
|
||||
# Only the latest release (currently a prerelease) is at the top level.
|
||||
url = "mirror://sourceforge/soundtracker/old%20releases/soundtracker-${version}.tar.bz2";
|
||||
sha256 = "1ggliswz5ngmlnrnyhv3x1arh5w77an0ww9p53cddp9aas5q11jm";
|
||||
# Only the latest release is at the top level.
|
||||
# Nonetheless, only the name of the file seems to affect which file is
|
||||
# downloaded, so this path should be fine both for old and current releases.
|
||||
url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.bz2";
|
||||
sha256 = "0m5iiqccch6w53khpvdldz59zymw13vmwqc5ggx3sn41riwbd6ks";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -28,9 +31,12 @@ stdenv.mkDerivation rec {
|
||||
gtk2
|
||||
SDL
|
||||
jack2
|
||||
audiofile
|
||||
goocanvas
|
||||
] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker";
|
||||
longDescription = ''
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, cmake
|
||||
, ninja
|
||||
, vala
|
||||
@ -61,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, plymouth
|
||||
, pam
|
||||
@ -127,6 +128,13 @@ stdenv.mkDerivation rec {
|
||||
rm -rf $out/etc/apparmor.d $out/etc/init $out/etc/pam.d
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/CanonicalLtd/lightdm";
|
||||
description = "A cross-desktop display manager";
|
||||
|
||||
@ -18,9 +18,9 @@ let
|
||||
sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "4.2.0.4"; # "Android Studio 4.2 Canary 4"
|
||||
build = "201.6636798";
|
||||
sha256Hash = "1v3893g5kx2azmv0zj2k1rxpiksapnapy7rgfq6x6fq4d2q87wbc";
|
||||
version = "4.2.0.5"; # "Android Studio 4.2 Canary 5"
|
||||
build = "201.6682321";
|
||||
sha256Hash = "076q6d7kmi0wcsqak7n6ggp1qns4xj1134xcpdzb92qk3dmg3wrh";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, callPackage, fetchurl
|
||||
, python
|
||||
, jdk, cmake, libxml2, zlib, python3, ncurses5
|
||||
, dotnet-sdk_3
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
mkJetBrainsProduct = callPackage ./common.nix { };
|
||||
|
||||
# Sorted alphabetically
|
||||
|
||||
buildClion = { name, version, src, license, description, wmClass, ... }:
|
||||
@ -223,6 +223,8 @@ let
|
||||
# Patch built-in mono for ReSharperHost to start successfully
|
||||
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
|
||||
patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen
|
||||
rm -rf lib/ReSharperHost/linux-x64/dotnet
|
||||
ln -s ${dotnet-sdk_3} lib/ReSharperHost/linux-x64/dotnet
|
||||
'');
|
||||
});
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, vala
|
||||
{ stdenv, fetchFromGitHub, nix-update-script, pkgconfig, meson, ninja, python3, vala
|
||||
, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon
|
||||
, libgee, discount, wrapGAppsHook }:
|
||||
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -56,6 +56,8 @@ mkDerivation rec {
|
||||
"-DLICENSING_PROVIDER:BOOL=OFF"
|
||||
"-DMapper_MANUAL_QTHELP:BOOL=OFF"
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
# Usually enabled on Darwin
|
||||
"-DCMAKE_FIND_FRAMEWORK=never"
|
||||
# FindGDAL is broken and always finds /Library/Framework unless this is
|
||||
# specified
|
||||
"-DGDAL_INCLUDE_DIR=${gdal}/include"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, vala
|
||||
, pkgconfig
|
||||
@ -57,7 +58,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, vala
|
||||
, pkgconfig
|
||||
@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
, libgudev
|
||||
, libraw
|
||||
, glib
|
||||
, glib-networking
|
||||
, json-glib
|
||||
, gcr
|
||||
, libgee
|
||||
@ -77,6 +78,7 @@ stdenv.mkDerivation rec {
|
||||
libraw
|
||||
json-glib
|
||||
glib
|
||||
glib-networking
|
||||
gdk-pixbuf
|
||||
librsvg
|
||||
librest
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
|
||||
{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }:
|
||||
let
|
||||
# taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
|
||||
# license: Free for commercial use
|
||||
@ -9,7 +9,7 @@ let
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "write_stylus";
|
||||
version = "209";
|
||||
version = "300";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Write";
|
||||
@ -23,7 +23,7 @@ mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.styluslabs.com/write/write${version}.tar.gz";
|
||||
sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd";
|
||||
sha256 = "1kg4qqxgg7iyxl13hkbl3j27dykra56dj67hbv0392mwdcgavihq";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@ -44,7 +44,9 @@ mkDerivation rec {
|
||||
qtbase # libQt5PrintSupport.so.5
|
||||
qtsvg # libQt5Svg.so.5
|
||||
stdenv.cc.cc.lib # libstdc++.so.6
|
||||
libglvnd # ibGL.so.1
|
||||
libglvnd # libGL.so.1
|
||||
libX11 # libX11.so.6
|
||||
libXi # libXi.so.6
|
||||
];
|
||||
in ''
|
||||
patchelf \
|
||||
|
||||
38
pkgs/applications/logging/humioctl/default.nix
Normal file
38
pkgs/applications/logging/humioctl/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:
|
||||
|
||||
let
|
||||
humioCtlVersion = "0.25.0";
|
||||
sha256 = "1x8354m410nf9g167v0i1c77s5w2by7smdlyjwl89ixgdjw04ay3";
|
||||
vendorSha256 = "14bysjgvahr56hvd8walym11hh721i1q2g503n8m68wdzrrym4qy";
|
||||
in buildGoModule {
|
||||
name = "humioctl-${humioCtlVersion}";
|
||||
pname = "humioctl";
|
||||
version = humioCtlVersion;
|
||||
|
||||
vendorSha256 = vendorSha256;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "humio";
|
||||
repo = "cli";
|
||||
rev = "v${humioCtlVersion}";
|
||||
sha256 = sha256;
|
||||
};
|
||||
|
||||
buildFlagsArray = "-ldflags=-X main.version=${humioCtlVersion}";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/humioctl
|
||||
$out/bin/humioctl completion bash > humioctl.bash
|
||||
$out/bin/humioctl completion zsh > humioctl.zsh
|
||||
installShellCompletion humioctl.{bash,zsh}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/humio/cli";
|
||||
description = "A CLI for managing and sending data to Humio";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lucperkins ];
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, vala
|
||||
, meson
|
||||
, ninja
|
||||
@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, pantheon
|
||||
{ stdenv, fetchFromGitHub, nix-update-script, vala, pkgconfig, meson, ninja, python3, pantheon
|
||||
, gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
49
pkgs/applications/misc/nwg-launchers/default.nix
Normal file
49
pkgs/applications/misc/nwg-launchers/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtkmm3
|
||||
, meson
|
||||
, ninja
|
||||
, nlohmann_json
|
||||
, pkgconfig
|
||||
, swaylock
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nwg-launchers";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1mlym0mpg6njwgwniwlk95fk6wfwlzq8nwmkb5mkjlm2nqv5bdv1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
cmake
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtkmm3
|
||||
nlohmann_json
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/nwgbar \
|
||||
--prefix PATH : "${swaylock}/bin"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GTK-based launchers: application grid, button bar, dmenu for sway and other window managers";
|
||||
homepage = "https://github.com/nwg-piotr/nwg-launchers";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, vala
|
||||
, meson
|
||||
@ -54,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
{ stdenv, fetchFromGitHub, nix-update-script
|
||||
, vala, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils
|
||||
, gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }:
|
||||
|
||||
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, vala
|
||||
, meson
|
||||
@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, nix-update-script
|
||||
, python3Packages
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
@ -103,6 +104,13 @@ python3Packages.buildPythonApplication rec {
|
||||
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ wmctrl ]}")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A fast application launcher for Linux, written in Python, using GTK";
|
||||
homepage = "https://ulauncher.io/";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, meson, ninja, pkgconfig
|
||||
{ stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script
|
||||
, python3, gtk3, libsecret, gst_all_1, webkitgtk
|
||||
, glib-networking, gtkspell3, hunspell, desktop-file-utils
|
||||
, gobject-introspection, wrapGAppsHook }:
|
||||
@ -57,6 +57,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
patchPythonScript "$out/libexec/eolie-sp"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A new GNOME web browser";
|
||||
homepage = "https://wiki.gnome.org/Apps/Eolie";
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, desktop-file-utils
|
||||
, vala
|
||||
, gettext
|
||||
@ -55,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
|
||||
{ stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, gettext, python3
|
||||
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
|
||||
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon
|
||||
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, vala
|
||||
{ stdenv, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, vala
|
||||
, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
@ -78,6 +79,12 @@ rustPlatform.buildRustPackage rec {
|
||||
checkPhase = null;
|
||||
installPhase = null;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Matrix group messaging app";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/fractal";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel
|
||||
, qtwebengine
|
||||
# Runtime
|
||||
, coreutils, libjpeg_turbo, faac, pciutils, procps, utillinux
|
||||
, coreutils, faac, pciutils, procps, utillinux
|
||||
, pulseaudioSupport ? true, libpulseaudio ? null
|
||||
}:
|
||||
|
||||
@ -40,7 +40,7 @@ in mkDerivation {
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo faac qtbase
|
||||
dbus glib libGL libX11 libXfixes libuuid libxcb faac qtbase
|
||||
qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2
|
||||
qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
|
||||
];
|
||||
@ -70,7 +70,7 @@ in mkDerivation {
|
||||
cp -ar ${files} $out/share/zoom-us
|
||||
|
||||
# TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd
|
||||
ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $out/share/zoom-us/libturbojpeg.so
|
||||
cp libturbojpeg.so $out/share/zoom-us/libturbojpeg.so
|
||||
|
||||
# Again, requires faac with a nonstandard filename.
|
||||
ln -s $(readlink -e "${faac}/lib/libfaac.so") $out/share/zoom-us/libfaac1.so
|
||||
|
||||
@ -6,13 +6,13 @@ with stdenv.lib;
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "convos";
|
||||
version = "4.23";
|
||||
version = "4.29";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nordaaker";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0py9dvqf67vhgdlx20jzwnh313ns1d29yiiqgijydyfj2lflyz12";
|
||||
sha256 = "07m9lhwgqq77hi4n2zrya7n8apkjv8xi166bxa0n7pnlknlp74ar";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
@ -39,16 +39,6 @@ perlPackages.buildPerlPackage rec {
|
||||
substituteInPlace t/web-register-open-to-public.t \
|
||||
--replace '!127.0.0.1!' '!localhost!'
|
||||
|
||||
# Time-impurity in test, (fixed in master)
|
||||
#
|
||||
substituteInPlace t/web-load-user.t \
|
||||
--replace '400' '410'
|
||||
|
||||
# Disk-space check fails on zfs, (fixed in master)
|
||||
#
|
||||
substituteInPlace t/web-admin.t \
|
||||
--replace 'qr{/dev/}' 'qr{\w}'
|
||||
|
||||
# Module::Install is a runtime dependency not covered by the tests, so we add
|
||||
# a test for it.
|
||||
#
|
||||
|
||||
@ -44,7 +44,7 @@ let
|
||||
"-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360
|
||||
"-DENABLE_PHP=OFF"
|
||||
]
|
||||
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"]
|
||||
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
|
||||
++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
|
||||
;
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, cmake
|
||||
, pkgconfig
|
||||
, vala_0_40
|
||||
@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
@ -52,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
|
||||
, json-glib, libsoup, webkitgtk, geocode-glib
|
||||
, json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script
|
||||
, libappindicator, desktop-file-utils, appstream, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -38,6 +38,13 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Know the forecast of the next hours & days";
|
||||
homepage = "https://gitlab.com/bitseater/meteo";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, vala, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, gtk3
|
||||
{ stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, gtk3
|
||||
, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
@ -65,7 +66,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, vala_0_46
|
||||
@ -52,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = stdenv.lib.optional (!withPantheon) "-Dnoele=yes";
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, gdk-pixbuf
|
||||
@ -61,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, glib
|
||||
, gtk3
|
||||
, vala
|
||||
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
@ -55,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -8,11 +8,11 @@ with stdenv.lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.12.2";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "12zzb1c4cl07ccxaravkmia8vdyw5ffxrlx9v95ampvv6a0swpb9";
|
||||
sha256 = "05z1pp2lnbr82pw97wy0j0qk2vv1qv9c46df13d03xdfsc3gsm50";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
@ -49,6 +50,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Simple GTK frontend for the mpv video player";
|
||||
longDescription = ''
|
||||
|
||||
@ -2,24 +2,21 @@
|
||||
, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype
|
||||
, perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
|
||||
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders
|
||||
, libXNVCtrl, enableXnvctrl ? false
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mythtv";
|
||||
version = "30.0";
|
||||
version = "31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MythTV";
|
||||
repo = "mythtv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pfzjb07xwd3mfgmbr4kkiyfyvwy9fkl13ik7bvqds86m0ws5bw4";
|
||||
sha256 = "092w5kvc1gjz6jd2lk2jhcazasz2h3xh0i5iq80k8x3znyp4i6v5";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes build with exiv2 0.27.1.
|
||||
./exiv2.patch
|
||||
# Disables OS detection used while checking for xnvctrl support.
|
||||
# Disables OS detection used while checking if enforce_wshadow should be disabled.
|
||||
./disable-os-detection.patch
|
||||
];
|
||||
|
||||
@ -29,17 +26,16 @@ mkDerivation rec {
|
||||
freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL
|
||||
perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
|
||||
libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
|
||||
] ++ stdenv.lib.optional enableXnvctrl libXNVCtrl;
|
||||
];
|
||||
nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ];
|
||||
|
||||
configureFlags =
|
||||
[ "--dvb-path=${linuxHeaders}/include" ]
|
||||
++ stdenv.lib.optionals (!enableXnvctrl) [ "--disable-xnvctrl" ];
|
||||
[ "--dvb-path=${linuxHeaders}/include" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://www.mythtv.org/";
|
||||
description = "Open Source DVR";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.titanous ];
|
||||
};
|
||||
|
||||
@ -1,51 +1,31 @@
|
||||
--- a/configure 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ b/configure 2019-10-26 11:54:01.920776490 +0200
|
||||
@@ -6642,29 +6642,29 @@
|
||||
require libXinerama X11/extensions/Xinerama.h XineramaQueryExtension -lXinerama
|
||||
require libXext "X11/Xdefs.h X11/Xlib.h X11/extensions/Xext.h" XMissingExtension -lXext
|
||||
if enabled xnvctrl; then
|
||||
- case $target_os in
|
||||
- linux)
|
||||
+# case $target_os in
|
||||
+# linux)
|
||||
# Bah. Suse linux doesn't have xnvctrl.
|
||||
- . /etc/os-release
|
||||
- case $ID in
|
||||
- *suse*)
|
||||
+# . /etc/os-release
|
||||
+# case $ID in
|
||||
+# *suse*)
|
||||
# This is hopefully temporary.
|
||||
- disable xnvctrl_external
|
||||
- ;;
|
||||
- *)
|
||||
- require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
|
||||
- ;;
|
||||
- esac
|
||||
- ;;
|
||||
- freebsd)
|
||||
+# disable xnvctrl_external
|
||||
+# ;;
|
||||
+# *)
|
||||
+ require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
|
||||
+# ;;
|
||||
+# esac
|
||||
+# ;;
|
||||
+# freebsd)
|
||||
# This is hopefully temporary, and will eventually
|
||||
# check for a system library too.
|
||||
- disable xnvctrl_external
|
||||
- ;;
|
||||
- *)
|
||||
- disable xnvctrl
|
||||
- ;;
|
||||
- esac
|
||||
+# disable xnvctrl_external
|
||||
+# ;;
|
||||
+# *)
|
||||
+# disable xnvctrl
|
||||
+# ;;
|
||||
+# esac
|
||||
fi
|
||||
fi
|
||||
--- a/configure 2020-07-21 20:50:58.653989766 +0200
|
||||
+++ b/configure 2020-07-21 20:52:21.236610586 +0200
|
||||
@@ -6537,17 +6537,17 @@
|
||||
}
|
||||
|
||||
enable enforce_wshadow
|
||||
-case $target_os in
|
||||
- android)
|
||||
- disable enforce_wshadow
|
||||
- ;;
|
||||
- linux)
|
||||
- . /etc/os-release
|
||||
- if test $ID = "centos"; then
|
||||
- disable enforce_wshadow
|
||||
- fi
|
||||
- ;;
|
||||
-esac
|
||||
+#case $target_os in
|
||||
+# android)
|
||||
+# disable enforce_wshadow
|
||||
+# ;;
|
||||
+# linux)
|
||||
+# . /etc/os-release
|
||||
+# if test $ID = "centos"; then
|
||||
+# disable enforce_wshadow
|
||||
+# fi
|
||||
+# ;;
|
||||
+#esac
|
||||
|
||||
if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then
|
||||
enable qtwebkit
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Patch source: https://aur.archlinux.org/cgit/aur.git/plain/004-exiv2.patch?h=mythtv&id=76ea37f8556805b205878772ad7874e487c0d946
|
||||
--- a/libs/libmythmetadata/imagemetadata.cpp
|
||||
+++ b/libs/libmythmetadata/imagemetadata.cpp
|
||||
@@ -7,14 +7,7 @@
|
||||
#include "exitcodes.h" // for ffprobe
|
||||
|
||||
// libexiv2 for Exif metadata
|
||||
-//#include <exiv2/exiv2.hpp>
|
||||
-// Note: Older versions of Exiv2 don't have the exiv2.hpp include
|
||||
-// file. Using image.hpp instead seems to work.
|
||||
-#ifdef _MSC_VER
|
||||
-#include <exiv2/src/image.hpp>
|
||||
-#else
|
||||
-#include <exiv2/image.hpp>
|
||||
-#endif
|
||||
+#include <exiv2/exiv2.hpp>
|
||||
|
||||
// To read FFMPEG Metadata
|
||||
extern "C" {
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
@ -68,6 +69,13 @@ stdenv.mkDerivation rec {
|
||||
gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg_3 gifski ]})
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/phw/peek";
|
||||
description = "Simple animated GIF screen recorder with an easy to use interface";
|
||||
|
||||
@ -3,18 +3,6 @@
|
||||
|
||||
with lib; let
|
||||
|
||||
glibc-ldconf = glibc.overrideAttrs (oldAttrs: {
|
||||
# ldconfig needs help reading libraries that have been patchelf-ed, as the
|
||||
# .dynstr section is no longer in the first LOAD segment. See also
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=23964 and
|
||||
# https://github.com/NixOS/patchelf/issues/44
|
||||
patches = oldAttrs.patches ++ [ (fetchpatch {
|
||||
name = "ldconfig-patchelf.patch";
|
||||
url = "https://sourceware.org/bugzilla/attachment.cgi?id=11444";
|
||||
sha256 = "0nzzmq7pli37iyjrgcmvcy92piiwjybpw245ds7q43pbgdm7lc3s";
|
||||
})];
|
||||
});
|
||||
|
||||
libnvidia-container = callPackage ./libnvc.nix { };
|
||||
|
||||
nvidia-container-runtime = fetchFromGitHub {
|
||||
@ -72,7 +60,7 @@ in stdenv.mkDerivation rec {
|
||||
wrapProgram $out/bin/nvidia-container-cli \
|
||||
--prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
|
||||
cp ${./config.toml} $out/etc/config.toml
|
||||
substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc-ldconf}
|
||||
substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
5
pkgs/common-updater/nix-update.nix
Normal file
5
pkgs/common-updater/nix-update.nix
Normal file
@ -0,0 +1,5 @@
|
||||
{ nix-update }:
|
||||
|
||||
{ attrPath }:
|
||||
|
||||
[ "${nix-update}/bin/nix-update" attrPath ]
|
||||
@ -1,44 +1,21 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2007.01";
|
||||
in
|
||||
fetchzip {
|
||||
name = "cascadia-code-${version}";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cascadia-code";
|
||||
version = "1911.21";
|
||||
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/Cascadia.ttf";
|
||||
sha256 = "1m5ymbngjg3n1g3p6vhcq7d825bwwln9afih651ar3jn7j9njnyg";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaMono.ttf";
|
||||
sha256 = "0vkhm6rhspzd1iayxrzaag099wsc94azfqa3ips7f4x9s8fmbp80";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaMonoPL.ttf";
|
||||
sha256 = "0xxqd8m2ydn97jngp1a3ik1mzpjbm65pfq02a82gfbbvajq5d673";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaPL.ttf";
|
||||
sha256 = "1s83c9flvifd05nbhnk8knwnik7p621sr7i94smknigc7d72wqav";
|
||||
})
|
||||
];
|
||||
sha256 = "173dpr0k4y5b02ps9426pyaazl2pxj1kw5l5jrikbi6zjv4590gb";
|
||||
|
||||
unpackCmd = ''
|
||||
ttfName=$(basename $(stripHash $curSrc))
|
||||
cp $curSrc ./$ttfName
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
'';
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
install -Dm444 -t $out/share/fonts/truetype *.ttf
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "1gkjs7qa409r4ykdy4ik8i0c3z49hzpklw6kyijhhifhyyyzhz4h";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
|
||||
homepage = "https://github.com/microsoft/cascadia-code";
|
||||
license = licenses.ofl;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "5.0.0";
|
||||
version = "5.1.0";
|
||||
|
||||
in fetchzip {
|
||||
name = "ibm-plex-${version}";
|
||||
@ -13,7 +13,7 @@ in fetchzip {
|
||||
unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "1m8a9p0bryrj05v7sg9kqvyp0ddhgdwd0zjbn0i4l296cj5s2k97";
|
||||
sha256 = "1lcbj6zkpnsq38s2xkx3z4d7bd43k630lmzmgdcv1w05gjij0pw5";
|
||||
|
||||
meta = with lib; {
|
||||
description = "IBM Plex Typeface";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
version = "3.2.2";
|
||||
version = "3.3.1";
|
||||
in fetchzip {
|
||||
name = "iosevka-bin-${version}";
|
||||
|
||||
@ -12,7 +12,7 @@ in fetchzip {
|
||||
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
|
||||
'';
|
||||
|
||||
sha256 = "11966fvqamlg88vlgs47fl3ambi48h0mjj4a758i5y8myb2hk6bd";
|
||||
sha256 = "1hfccivk5f7i489s78yh2x96ic6rf5ncbsjqnrxqmfs9n1gjhfbj";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://be5invis.github.io/Iosevka/";
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, fetchurl, libarchive }:
|
||||
|
||||
let
|
||||
version = "0.12.6";
|
||||
version = "0.12.11";
|
||||
in fetchurl {
|
||||
name = "sarasa-gothic-${version}";
|
||||
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
sha256 = "1b15gsmv2jr0r8xssr8216s8xsghr6w5wm3w3imm3qlh3kqk1qg8";
|
||||
sha256 = "0vcp8583by7pfqinq8p2jx2bn4dqq816x4bxgv05k0kb9ziwj7aj";
|
||||
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "0.42";
|
||||
version = "0.50";
|
||||
in fetchzip {
|
||||
name = "sudo-font-${version}";
|
||||
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
|
||||
sha256 = "1rqpwihf2sakrhkaw041r3xc9fhafaqn22n79haqkmwv4vmnspch";
|
||||
url = "https://github.com/jenskutilek/sudo-font/raw/v${version}/dist/sudo.zip";
|
||||
sha256 = "1mk81r9p7ks6av3rj06c6n9vx2qv2hwx6zfbc2mk1filxjirk1ll";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "victor-mono";
|
||||
version = "1.3.1";
|
||||
version = "1.4.1";
|
||||
in fetchFromGitHub rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -26,7 +26,7 @@ in fetchFromGitHub rec {
|
||||
unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname}
|
||||
'';
|
||||
|
||||
sha256 = "1yj91rhs9pd705406r4lqabdfzjclbz837nzm6z1rziy6mbpd61s";
|
||||
sha256 = "1g3jjrqd2fiw2hdifhff2fn20p5a0xfma3964f67ibdyri976zq5";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free programming font with cursive italics and ligatures";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase, pantheon }:
|
||||
{ mkDerivation, lib, fetchFromGitHub, nix-update-script, cmake, ninja, qtbase, pantheon }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "adwaita-qt";
|
||||
@ -27,7 +27,7 @@ mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "enlightenment";
|
||||
version = "0.24.1";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "02aadl5fqvpmpjnisrc4aw7ffwyp1109y4k1wvmp33ciihbvdqmf";
|
||||
sha256 = "1wfz0rwwsx7c1mkswn4hc9xw1i6bsdirhxiycf7ha2vcipqy465y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, gnome3
|
||||
}:
|
||||
|
||||
@ -23,6 +24,13 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "gnomeExtensions.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A simple MPRIS indicator button for GNOME Shell";
|
||||
license = licenses.gpl3;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv
|
||||
, nix-update-script
|
||||
, appstream
|
||||
, appstream-glib
|
||||
, dbus
|
||||
@ -30,17 +31,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appcenter";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "04q2gp9yyqsg4jd53rivcmikw52psxijrzfy2vxzjsx8fccd48ra";
|
||||
sha256 = "1bwkjxl4k49hvy88llif82hdancda9692vjwkw4bxy2cbz8444zx";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, desktop-file-utils
|
||||
, nix-update-script
|
||||
, elementary-gtk-theme
|
||||
, elementary-icon-theme
|
||||
, fetchFromGitHub
|
||||
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, glib
|
||||
{ stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkgconfig, vala, glib
|
||||
, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop
|
||||
, gala, wingpanel, plank, switchboard, gettext, bamf, fetchpatch }:
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkgconfig
|
||||
, meson
|
||||
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = pantheon.updateScript {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user