Merge master into staging-next
This commit is contained in:
commit
03120b685d
|
@ -2177,6 +2177,12 @@
|
||||||
githubId = 990767;
|
githubId = 990767;
|
||||||
name = "Daniel Olsen";
|
name = "Daniel Olsen";
|
||||||
};
|
};
|
||||||
|
daneads = {
|
||||||
|
email = "me@daneads.com";
|
||||||
|
github = "daneads";
|
||||||
|
githubId = 24708079;
|
||||||
|
name = "Dan Eads";
|
||||||
|
};
|
||||||
danharaj = {
|
danharaj = {
|
||||||
email = "dan@obsidian.systems";
|
email = "dan@obsidian.systems";
|
||||||
github = "danharaj";
|
github = "danharaj";
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -4,18 +4,17 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "librespot";
|
pname = "librespot";
|
||||||
version = "0.1.3";
|
version = "0.1.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "librespot-org";
|
owner = "librespot-org";
|
||||||
repo = "librespot";
|
repo = "librespot";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1ixh47yvaamrpzagqsiimc3y6bi4nbym95843d23am55zkrgnmy5";
|
sha256 = "153i9n3qwmmwc29f62cz8nbqrlry16iygvibm1sdnvpf0s6wk5f3";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "1csls8kzzx28ng6w9vdwhnnav5sqp2m5fj430db5z306xh5acg3d";
|
|
||||||
|
|
||||||
cargoPatches = [ ./cargo-lock.patch ];
|
cargoPatches = [ ./cargo-lock.patch ];
|
||||||
|
cargoSha256 = "11d64rpq4b5rdxk5wx0hhzgc6mvs6h2br0w3kfncfklp67vn3v4v";
|
||||||
|
|
||||||
cargoBuildFlags = with lib; [
|
cargoBuildFlags = with lib; [
|
||||||
"--no-default-features"
|
"--no-default-features"
|
||||||
|
|
|
@ -21,6 +21,8 @@ lib.makeScope newScope (self: with self; {
|
||||||
|
|
||||||
mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { };
|
mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { };
|
||||||
|
|
||||||
|
mopidy-podcast = callPackage ./podcast.nix { };
|
||||||
|
|
||||||
mopidy-scrobbler = callPackage ./scrobbler.nix { };
|
mopidy-scrobbler = callPackage ./scrobbler.nix { };
|
||||||
|
|
||||||
mopidy-somafm = callPackage ./somafm.nix { };
|
mopidy-somafm = callPackage ./somafm.nix { };
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
{ lib, python3Packages, mopidy }:
|
||||||
|
|
||||||
|
python3Packages.buildPythonApplication rec {
|
||||||
|
pname = "mopidy-podcast";
|
||||||
|
version = "3.0.0";
|
||||||
|
|
||||||
|
src = python3Packages.fetchPypi {
|
||||||
|
inherit version;
|
||||||
|
pname = "Mopidy-Podcast";
|
||||||
|
sha256 = "1z2b523yvdpcf8p7m7kczrvaw045lmxzhq4qj00dflxa2yw61qxr";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
mopidy
|
||||||
|
python3Packages.cachetools
|
||||||
|
python3Packages.uritools
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = with python3Packages; [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/tkem/mopidy-podcast";
|
||||||
|
description = "Mopidy extension for browsing and playing podcasts";
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = [
|
||||||
|
maintainers.daneads
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -4,13 +4,13 @@ with python3.pkgs;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "thonny";
|
pname = "thonny";
|
||||||
version = "3.3.2";
|
version = "3.3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1pzy7v48x4ip8v6aqm8hl5ywx7xiqbsfypxxifih8gnlangp1n8y";
|
sha256 = "0ga0pqvq3nglr4jgh8ajv0bv8c7q09h1jh6q6r5cwqa49fawkr02";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
|
|
@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
mkdir $out
|
mkdir $out
|
||||||
tar -C $out -xf ${src}
|
tar -C $out -xf $src
|
||||||
mv $out/usr/* $out/
|
mv $out/usr/* $out/
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
# Runtime dependencies;
|
# Runtime dependencies;
|
||||||
# A few additional ones (e.g. Node) are already shipped together with the
|
# A few additional ones (e.g. Node) are already shipped together with the
|
||||||
# AppImage, so we don't have to duplicate them here.
|
# AppImage, so we don't have to duplicate them here.
|
||||||
alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, udev, nss
|
alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -59,6 +59,7 @@ in stdenv.mkDerivation {
|
||||||
fuse
|
fuse
|
||||||
gtk3
|
gtk3
|
||||||
libdbusmenu-gtk2
|
libdbusmenu-gtk2
|
||||||
|
libXdamage
|
||||||
nss
|
nss
|
||||||
udev
|
udev
|
||||||
];
|
];
|
||||||
|
|
|
@ -2,22 +2,30 @@
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, appimageTools
|
, appimageTools
|
||||||
, libsecret
|
, libsecret
|
||||||
|
, gtk3
|
||||||
|
, gsettings-desktop-schemas
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "3.4.1";
|
version = "3.9.1";
|
||||||
pname = "timeular";
|
pname = "timeular";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
|
url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
|
||||||
sha256 = "1s5jjdl1nzq9yd582lqs904yl10mp0s25897zmifmcbw1vz38bar";
|
sha256 = "103hy443p697jdkz6li8s1n6kg1r55jmiw2vbjz12kskf7njg4y4";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimageContents = appimageTools.extractType2 {
|
appimageContents = appimageTools.extractType2 {
|
||||||
inherit name src;
|
inherit name src;
|
||||||
};
|
};
|
||||||
in appimageTools.wrapType2 rec {
|
in appimageTools.wrapType2 rec {
|
||||||
inherit name src;
|
inherit name src;
|
||||||
|
|
||||||
|
profile = ''
|
||||||
|
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
|
||||||
|
'';
|
||||||
|
|
||||||
extraPkgs = pkgs: with pkgs; [
|
extraPkgs = pkgs: with pkgs; [
|
||||||
libsecret
|
libsecret
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,19 +1,7 @@
|
||||||
{ lib
|
{ lib, stdenv ,fetchFromGitHub
|
||||||
, stdenv
|
, zig, wayland, pkg-config, scdoc
|
||||||
, fetchFromGitHub
|
, xwayland, wayland-protocols, wlroots
|
||||||
, libGL
|
, libxkbcommon, pixman, udev, libevdev, libX11, libGL
|
||||||
, libX11
|
|
||||||
, libevdev
|
|
||||||
, libxkbcommon
|
|
||||||
, pixman
|
|
||||||
, pkg-config
|
|
||||||
, scdoc
|
|
||||||
, udev
|
|
||||||
, wayland
|
|
||||||
, wayland-protocols
|
|
||||||
, wlroots
|
|
||||||
, xwayland
|
|
||||||
, zig
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -24,62 +12,33 @@ stdenv.mkDerivation rec {
|
||||||
owner = "ifreund";
|
owner = "ifreund";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "0c8e718d95a6a621b9cba0caa9158915e567b076";
|
rev = "0c8e718d95a6a621b9cba0caa9158915e567b076";
|
||||||
sha256 = "sha256-c3lzsA2oml7DlfYA5mipHafF3Y3mqY1eJR6e2H8DUMo=";
|
sha256 = "1jjh0dzxi7hy4mg8vag6ipfwb9qxm5lfc07njp1mx6m81nq76ybk";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
buildInputs = [ xwayland wayland-protocols wlroots pixman
|
||||||
pkg-config
|
libxkbcommon pixman udev libevdev libX11 libGL
|
||||||
scdoc
|
|
||||||
wayland-protocols
|
|
||||||
zig
|
|
||||||
];
|
|
||||||
buildInputs = [
|
|
||||||
libGL
|
|
||||||
libX11
|
|
||||||
libevdev
|
|
||||||
libxkbcommon
|
|
||||||
pixman
|
|
||||||
pixman
|
|
||||||
udev
|
|
||||||
wayland
|
|
||||||
wlroots
|
|
||||||
xwayland
|
|
||||||
];
|
];
|
||||||
|
|
||||||
dontConfigure = true;
|
preBuild = ''
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
runHook preBuild
|
|
||||||
export HOME=$TMPDIR
|
export HOME=$TMPDIR
|
||||||
zig build -Dman-pages -Drelease-safe -Dxwayland --prefix $out
|
'';
|
||||||
runHook postBuild
|
installPhase = ''
|
||||||
|
zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
nativeBuildInputs = [ zig wayland scdoc pkg-config ];
|
||||||
runHook preInstall
|
|
||||||
zig build -Dman-pages -Drelease-safe -Dxwayland --prefix $out install
|
installFlags = [ "DESTDIR=$(out)" ];
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/ifreund/river";
|
|
||||||
description = "A dynamic tiling wayland compositor";
|
description = "A dynamic tiling wayland compositor";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
river is a dynamic tiling wayland compositor that takes inspiration from
|
river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm.
|
||||||
dwm and bspwm.
|
|
||||||
|
|
||||||
Its design goals are:
|
|
||||||
- Simplicity and minimalism, river should not overstep the bounds of a
|
|
||||||
window manager.
|
|
||||||
- Window management based on a stack of views and tags.
|
|
||||||
- Dynamic layouts generated by external, user-written executables.
|
|
||||||
(A default rivertile layout generator is provided.)
|
|
||||||
- Scriptable configuration and control through a custom wayland protocol
|
|
||||||
and separate riverctl binary implementing it.
|
|
||||||
'';
|
'';
|
||||||
|
homepage = "https://github.com/ifreund/river";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ branwright1 AndersonTorres ];
|
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ branwright1 ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
{lib, stdenv, fetchurl}:
|
{lib, stdenv, fetchurl}:
|
||||||
|
|
||||||
|
let
|
||||||
|
year = "2017";
|
||||||
|
minor = "a";
|
||||||
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "man-pages-posix";
|
pname = "man-pages-posix";
|
||||||
version = "2017-a";
|
version = "${year}${minor}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/${pname}-${version}.tar.xz";
|
url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/${pname}-${year}-${minor}.tar.xz";
|
||||||
sha256 = "ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3";
|
sha256 = "ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -19,10 +19,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
patchShebangs install.sh
|
patchShebangs install.sh
|
||||||
mkdir -p $out/share/icons
|
mkdir -p $out/share/icons
|
||||||
./install.sh -a -d $out/share/icons
|
./install.sh -a -d $out/share/icons
|
||||||
jdupes -l -r $out/share/icons
|
jdupes -l -r $out/share/icons
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ buildPythonApplication rec {
|
||||||
sha256 = "2x8vwLTSngqQqmVrVh/mM4peATgaRqOSwrfm5XCkg/g=";
|
sha256 = "2x8vwLTSngqQqmVrVh/mM4peATgaRqOSwrfm5XCkg/g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "./src";
|
sourceRoot = "${src.name}/src";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://michaelcmartin.github.io/Ophis/";
|
homepage = "http://michaelcmartin.github.io/Ophis/";
|
||||||
|
|
|
@ -65,17 +65,20 @@ index fde6fa3..39b7b0a 100644
|
||||||
conf.set_quoted('LOCALEDIR', localedir)
|
conf.set_quoted('LOCALEDIR', localedir)
|
||||||
-conf.set_quoted('SYSCONFDIR', sysconfdir)
|
-conf.set_quoted('SYSCONFDIR', sysconfdir)
|
||||||
+conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
|
+conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
|
||||||
|
conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key'))
|
||||||
conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
|
conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
|
||||||
conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
|
conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
|
||||||
conf.set10('GCLUE_USE_MODEM_GPS_SOURCE', get_option('modem-gps-source'))
|
|
||||||
diff --git a/meson_options.txt b/meson_options.txt
|
diff --git a/meson_options.txt b/meson_options.txt
|
||||||
index 83bc60e..b726329 100644
|
index 83bc60e..b726329 100644
|
||||||
--- a/meson_options.txt
|
--- a/meson_options.txt
|
||||||
+++ b/meson_options.txt
|
+++ b/meson_options.txt
|
||||||
@@ -34,3 +34,6 @@ option('systemd-system-unit-dir',
|
@@ -34,6 +34,9 @@ option('systemd-system-unit-dir',
|
||||||
option('dbus-srv-user',
|
option('dbus-srv-user',
|
||||||
type: 'string', value: 'root',
|
type: 'string', value: 'root',
|
||||||
description: 'The user (existing) as which the service will run')
|
description: 'The user (existing) as which the service will run')
|
||||||
+option('sysconfdir_install',
|
+option('sysconfdir_install',
|
||||||
+ type: 'string', value: '',
|
+ type: 'string', value: '',
|
||||||
+ description: 'sysconfdir to use during installation')
|
+ description: 'sysconfdir to use during installation')
|
||||||
|
option('mozilla-api-key',
|
||||||
|
type: 'string', value: 'geoclue',
|
||||||
|
description: 'Your API key for Mozilla Location Service')
|
||||||
|
|
|
@ -1,50 +1,98 @@
|
||||||
{ lib, stdenv, fetchFromGitLab, intltool, meson, ninja, pkg-config, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf
|
{ lib
|
||||||
, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala
|
, stdenv
|
||||||
|
, fetchFromGitLab
|
||||||
|
, fetchpatch
|
||||||
|
, intltool
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, pkg-config
|
||||||
|
, gtk-doc
|
||||||
|
, docbook-xsl-nons
|
||||||
|
, docbook_xml_dtd_412
|
||||||
|
, glib
|
||||||
|
, json-glib
|
||||||
|
, libsoup
|
||||||
|
, libnotify
|
||||||
|
, gdk-pixbuf
|
||||||
|
, modemmanager
|
||||||
|
, avahi
|
||||||
|
, glib-networking
|
||||||
|
, python3
|
||||||
|
, wrapGAppsHook
|
||||||
|
, gobject-introspection
|
||||||
|
, vala
|
||||||
, withDemoAgent ? false
|
, withDemoAgent ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "geoclue";
|
pname = "geoclue";
|
||||||
version = "2.5.6";
|
version = "2.5.7";
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.freedesktop.org";
|
domain = "gitlab.freedesktop.org";
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "13fk6n4j74lvcsrg3kwbw1mkxgcr3iy9dnysmy0pclfsym8z5m5m";
|
sha256 = "1mv1vs4q94bqkmgkj53jcsw1x31kczwydyy3r27a7fycgzmii1pj";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
# Make the Mozilla API key configurable
|
||||||
|
# https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported)
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/95c9ad4dc176860c85a07d0db4cb4179929bdb54.patch";
|
||||||
|
sha256 = "/lq/dLBJl2vf16tt7emYoTtXY6iUw+4s2XcABUHp3Kc=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/1a00809a0d89b0849a57647c878d192354247a33.patch";
|
||||||
|
sha256 = "6FuiukgFWg2cEKt8LlKP4E0rfSH/ZQgk6Ip1mGJpNFQ=";
|
||||||
|
})
|
||||||
|
|
||||||
./add-option-for-installation-sysconfdir.patch
|
./add-option-for-installation-sysconfdir.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config intltool meson ninja wrapGAppsHook python3 vala gobject-introspection
|
pkg-config
|
||||||
|
intltool
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
wrapGAppsHook
|
||||||
|
python3
|
||||||
|
vala
|
||||||
|
gobject-introspection
|
||||||
# devdoc
|
# devdoc
|
||||||
gtk-doc docbook_xsl docbook_xml_dtd_412
|
gtk-doc
|
||||||
|
docbook-xsl-nons
|
||||||
|
docbook_xml_dtd_412
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib json-glib libsoup avahi
|
glib
|
||||||
] ++ optionals withDemoAgent [
|
json-glib
|
||||||
|
libsoup
|
||||||
|
avahi
|
||||||
|
] ++ lib.optionals withDemoAgent [
|
||||||
libnotify gdk-pixbuf
|
libnotify gdk-pixbuf
|
||||||
] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
|
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||||
|
modemmanager
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ glib glib-networking ];
|
propagatedBuildInputs = [
|
||||||
|
glib
|
||||||
|
glib-networking
|
||||||
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
|
"-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
|
||||||
"-Ddemo-agent=${boolToString withDemoAgent}"
|
"-Ddemo-agent=${lib.boolToString withDemoAgent}"
|
||||||
"--sysconfdir=/etc"
|
"--sysconfdir=/etc"
|
||||||
"-Dsysconfdir_install=${placeholder "out"}/etc"
|
"-Dsysconfdir_install=${placeholder "out"}/etc"
|
||||||
|
"-Dmozilla-api-key=5c28d1f4-9511-47ff-b11a-2bef80fc177c"
|
||||||
"-Ddbus-srv-user=geoclue"
|
"-Ddbus-srv-user=geoclue"
|
||||||
"-Ddbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
|
"-Ddbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
|
||||||
] ++ optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
"-D3g-source=false"
|
"-D3g-source=false"
|
||||||
"-Dcdma-source=false"
|
"-Dcdma-source=false"
|
||||||
"-Dmodem-gps-source=false"
|
"-Dmodem-gps-source=false"
|
||||||
|
|
|
@ -11,12 +11,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hyperscan";
|
pname = "hyperscan";
|
||||||
version = "5.3.0";
|
version = "5.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "intel";
|
owner = "intel";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
sha256 = "0psfkzmyhqfrs750b10d0xv37rcz6nwsw1mnc7zagijckwis2wvj";
|
sha256 = "sha256-AJAjaXVnGqIlMk+gb6lpTLUdZr8nxn2XSW4fj6j/cmk=";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = [ maintainers.bjornfor ];
|
maintainers = [ maintainers.bjornfor ];
|
||||||
|
mainProgram = "faketime";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,41 @@
|
||||||
|
{ lib
|
||||||
|
, buildDunePackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, alcotest
|
||||||
|
, cmdliner
|
||||||
|
, ppx_deriving
|
||||||
|
, ppxlib
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildDunePackage rec {
|
||||||
|
pname = "ppx_deriving_cmdliner";
|
||||||
|
version = "0.6.0";
|
||||||
|
|
||||||
|
minimumOCamlVersion = "4.08";
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "hammerlab";
|
||||||
|
repo = "ppx_deriving_cmdliner";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "19l32y2wv64d1c7fvln07dg3bkf7wf5inzjxlff7lbabskdbbras";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
cmdliner
|
||||||
|
ppx_deriving
|
||||||
|
ppxlib
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
checkInputs = [
|
||||||
|
alcotest
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Ppx_deriving plugin for generating command line interfaces from types for OCaml";
|
||||||
|
inherit (src.meta) homepage;
|
||||||
|
license = licenses.asl20;
|
||||||
|
maintainers = [ maintainers.romildo ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,15 +2,17 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pynmea2";
|
pname = "pynmea2";
|
||||||
version = "1.17.0";
|
version = "1.18.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0x5xrk51dpzsvky1ncikadm80a44a82j3mjjykmhmx7jddc5qh9d";
|
sha256 = "1b94lhpbgvnknb563dlwvs5vkk7w3ma54sj614ynh2dzgqrd6h73";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook ];
|
checkInputs = [ pytestCheckHook ];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "pynmea2" ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/Knio/pynmea2";
|
homepage = "https://github.com/Knio/pynmea2";
|
||||||
description = "Python library for the NMEA 0183 protcol";
|
description = "Python library for the NMEA 0183 protcol";
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pywizlight";
|
pname = "pywizlight";
|
||||||
version = "0.4.6";
|
version = "0.4.7";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sbidy";
|
owner = "sbidy";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = version;
|
||||||
sha256 = "sha256-BCHLd1SbdHWrl7dcLD69t2K5Sa1WtGpMxTmMyDWl9u4=";
|
sha256 = "0zagdb90bxmf06fzpljhqgsgzg36zc1yhdibacfrx8bmnx3l657h";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -12,16 +12,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "krankerl";
|
pname = "krankerl";
|
||||||
version = "0.13.0";
|
version = "0.13.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ChristophWurst";
|
owner = "ChristophWurst";
|
||||||
repo = "krankerl";
|
repo = "krankerl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1gp8b2m8kcz2f16zv9xwv4n1zki6imvz9z31kixh6amdj6fif3d1";
|
sha256 = "sha256-uIFcWHdW8887CDkFxZznh9akYs+vxsE9Bc9g1hKi7Kc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256:01hcxs14wwhhvr08x816wa3jcm4zvm6g7vais793cgijipyv00rc";
|
cargoSha256 = "sha256-6joHwz0HIVbta8ALvsJLMvmeDh9IFPR4Cx36H63MliI=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
{ lib
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromGitHub
|
||||||
|
, nix-update-script
|
||||||
|
, makeWrapper
|
||||||
|
, rr
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "cargo-rr";
|
||||||
|
version = "0.1.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "danielzfranklin";
|
||||||
|
repo = pname;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "01m8fdz9as2fxnzs9csvbc76qxzbb98a66dh7w4a5q855v38g0zy";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "0fjs76n6bbbv83s213h2dgsszgxy4hbjsclyk9m81b3bfbmmb9sa";
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
updateScript = nix-update-script {
|
||||||
|
attrPath = pname;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram $out/bin/cargo-rr --prefix PATH : ${lib.makeBinPath [ rr ]}
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger";
|
||||||
|
homepage = "https://github.com/danielzfranklin/cargo-rr";
|
||||||
|
license = with licenses; [ mit ];
|
||||||
|
maintainers = with maintainers; [ otavio ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1m52v6hhblrjji9c5885bn5qq0xlaw36krbmqfac7fhgsxmkxd2h";
|
sha256 = "1m52v6hhblrjji9c5885bn5qq0xlaw36krbmqfac7fhgsxmkxd2h";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
passthru.updateScript = ./update.sh;
|
||||||
|
|
||||||
# don't remove runtime deps
|
# don't remove runtime deps
|
||||||
dontPatchELF = true;
|
dontPatchELF = true;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
#!/usr/bin/env nix-shell
|
||||||
|
#!nix-shell -i bash -p common-updater-scripts curl jq
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
basedir="$(git rev-parse --show-toplevel)"
|
||||||
|
version="$(curl -sL https://cdn.cypress.io/desktop/ | jq '.version' --raw-output)"
|
||||||
|
|
||||||
|
cd "$basedir"
|
||||||
|
update-source-version cypress "$version"
|
|
@ -285,7 +285,7 @@ let
|
||||||
" (with patches: "
|
" (with patches: "
|
||||||
+ lib.concatStringsSep ", " (map (x: x.name) kernelPatches)
|
+ lib.concatStringsSep ", " (map (x: x.name) kernelPatches)
|
||||||
+ ")");
|
+ ")");
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2Only;
|
||||||
homepage = "https://www.kernel.org/";
|
homepage = "https://www.kernel.org/";
|
||||||
repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git";
|
repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git";
|
||||||
maintainers = [
|
maintainers = [
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
with lib;
|
with lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lxc";
|
pname = "lxc";
|
||||||
version = "4.0.7";
|
version = "4.0.8";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
|
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
|
||||||
sha256 = "0gqfc6nps8ja3iymh1mqbzakrlnzlf4lzfcxawz764w15z0214vl";
|
sha256 = "16qbmysiyrvb1inbbdr8qwqa0c6h9mwyrbx4ry18x0kvrhmqamdc";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "krapslog";
|
pname = "krapslog";
|
||||||
version = "0.1.2";
|
version = "0.1.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "acj";
|
owner = "acj";
|
||||||
repo = "krapslog-rs";
|
repo = "krapslog-rs";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1yllvy3z3115aqxhnjn9rq2z67rgf2w53naygnl6ixpjhpafcr3k";
|
sha256 = "sha256-BaR72djkvaMmdBqbykezLkY81Y7iajhNPcFGYq/qv7Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "05gvl6yiyibcdscdf9a6k28xizdr5kfqbhynfbjny2hpqqjmnxzl";
|
cargoSha256 = "sha256-rcLsqMegCos+v0OkdRvH9xoopE7R/njEUVteMY/6mj8=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Visualize a log file with sparklines";
|
description = "Visualize a log file with sparklines";
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "piston-cli";
|
pname = "piston-cli";
|
||||||
version = "1.2.2";
|
version = "1.3.0";
|
||||||
|
|
||||||
src = python3Packages.fetchPypi {
|
src = python3Packages.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "hhOistr5lHF6rIuMpudKwSuBQhaQDzTdelAOCjyVQZk=";
|
sha256 = "XzKXHZHYZRT3t4ZonM+Ngx1jIT1nmz4k34VSw29GFoM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ];
|
propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ];
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gopass";
|
pname = "gopass";
|
||||||
version = "1.12.5";
|
version = "1.12.6";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||||
|
|
||||||
|
@ -21,10 +21,10 @@ buildGoModule rec {
|
||||||
owner = "gopasspw";
|
owner = "gopasspw";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "06qc68q9px2g19iz23nbc4ay5dwqhgh99d1jj5l2dhb3mgknh19n";
|
sha256 = "17y9indpgqqx261bqvckfqq1q2zciahssaalaa5c5hb6bnw5ls52";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "1jir1lb60p86fmk5sh92ywchqva59c31g1badlq9pjgd7jip5vnl";
|
vendorSha256 = "106rn0bkvzf2fw21f6wpiya88ysj8sfc2zkkm47iqr23d2202i4b";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
@ -41,19 +41,18 @@ buildGoModule rec {
|
||||||
);
|
);
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
HOME=$TMPDIR
|
|
||||||
for shell in bash fish zsh; do
|
|
||||||
$out/bin/gopass completion $shell > gopass.$shell
|
|
||||||
installShellCompletion gopass.$shell
|
|
||||||
done
|
|
||||||
go run helpers/man/main.go > gopass.1
|
|
||||||
installManPage gopass.1
|
installManPage gopass.1
|
||||||
|
installShellCompletion --zsh --name _gopass zsh.completion
|
||||||
|
installShellCompletion --bash --name gopass.bash bash.completion
|
||||||
|
installShellCompletion --fish --name gopass.fish fish.completion
|
||||||
'' + lib.optionalString passAlias ''
|
'' + lib.optionalString passAlias ''
|
||||||
ln -s $out/bin/gopass $out/bin/pass
|
ln -s $out/bin/gopass $out/bin/pass
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram $out/bin/gopass --prefix PATH : "${wrapperPath}"
|
wrapProgram $out/bin/gopass \
|
||||||
|
--prefix PATH : "${wrapperPath}" \
|
||||||
|
--set GOPASS_NO_REMINDER true
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -1,20 +1,36 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib, runCommand, dieHook }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, pkg-config
|
||||||
|
, python3
|
||||||
|
, sqlite
|
||||||
|
, libedit
|
||||||
|
, runCommand
|
||||||
|
, dieHook
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
link-grammar = stdenv.mkDerivation rec {
|
link-grammar = stdenv.mkDerivation rec {
|
||||||
version = "5.8.1";
|
|
||||||
pname = "link-grammar";
|
pname = "link-grammar";
|
||||||
|
version = "5.9.1";
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" "man" ];
|
outputs = [ "bin" "out" "dev" "man" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
|
url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "sha256-EcT/VR+lFpJX2sxXUIDGOwdceQ7awpmEqUZBoJk7UFs=";
|
sha256 = "sha256-4D/rqoIGlvR+q7Az8E1xPYSQQMJMRVeRM9HQIbjssLo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config python3 ];
|
nativeBuildInputs = [
|
||||||
buildInputs = [ sqlite libedit zlib ];
|
pkg-config
|
||||||
|
python3
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
sqlite
|
||||||
|
libedit
|
||||||
|
];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--disable-java-bindings"
|
"--disable-java-bindings"
|
||||||
|
|
|
@ -11434,6 +11434,7 @@ in
|
||||||
cargo-release = callPackage ../tools/package-management/cargo-release {
|
cargo-release = callPackage ../tools/package-management/cargo-release {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
};
|
};
|
||||||
|
cargo-rr = callPackage ../development/tools/rust/cargo-rr { };
|
||||||
cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { };
|
cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { };
|
||||||
cargo-update = callPackage ../tools/package-management/cargo-update {
|
cargo-update = callPackage ../tools/package-management/cargo-update {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
|
@ -24721,6 +24722,7 @@ in
|
||||||
mopidy-mpd
|
mopidy-mpd
|
||||||
mopidy-mpris
|
mopidy-mpris
|
||||||
mopidy-musicbox-webclient
|
mopidy-musicbox-webclient
|
||||||
|
mopidy-podcast
|
||||||
mopidy-scrobbler
|
mopidy-scrobbler
|
||||||
mopidy-somafm
|
mopidy-somafm
|
||||||
mopidy-soundcloud
|
mopidy-soundcloud
|
||||||
|
|
|
@ -1076,6 +1076,8 @@ let
|
||||||
|
|
||||||
ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
|
ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
|
||||||
|
|
||||||
|
ppx_deriving_cmdliner = callPackage ../development/ocaml-modules/ppx_deriving_cmdliner {};
|
||||||
|
|
||||||
ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};
|
ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};
|
||||||
|
|
||||||
ppx_import = callPackage ../development/ocaml-modules/ppx_import (
|
ppx_import = callPackage ../development/ocaml-modules/ppx_import (
|
||||||
|
|
Loading…
Reference in New Issue