Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-03-21 06:17:15 +00:00 committed by GitHub
commit b0455cafa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 1498 additions and 210 deletions

View file

@ -0,0 +1,38 @@
# ibus-engines.typing-booster {#sec-ibus-typing-booster}
This package is an ibus-based completion method to speed up typing.
## Activating the engine {#sec-ibus-typing-booster-activate}
IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html).
On NixOS you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:
```nix
{ pkgs, ... }: {
i18n.inputMethod = {
enabled = "ibus";
ibus.engines = with pkgs.ibus-engines; [ typing-booster ];
};
}
```
## Using custom hunspell dictionaries {#sec-ibus-typing-booster-customize-hunspell}
The IBus engine is based on `hunspell` to support completion in many languages. By default the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:
```nix
ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; }
```
_Note: each language passed to `langs` must be an attribute name in `pkgs.hunspellDicts`._
## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker}
The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:
On NixOS it can be installed using the following expression:
```nix
{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; }
```

View file

@ -1,57 +0,0 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-ibus-typing-booster">
<title>ibus-engines.typing-booster</title>
<para>
This package is an ibus-based completion method to speed up typing.
</para>
<section xml:id="sec-ibus-typing-booster-activate">
<title>Activating the engine</title>
<para>
IBus needs to be configured accordingly to activate <literal>typing-booster</literal>. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the <link xlink:href="https://mike-fabian.github.io/ibus-typing-booster/documentation.html">upstream docs</link>.
</para>
<para>
On NixOS you need to explicitly enable <literal>ibus</literal> with given engines before customizing your desktop to use <literal>typing-booster</literal>. This can be achieved using the <literal>ibus</literal> module:
<programlisting>{ pkgs, ... }: {
i18n.inputMethod = {
enabled = "ibus";
ibus.engines = with pkgs.ibus-engines; [ typing-booster ];
};
}</programlisting>
</para>
</section>
<section xml:id="sec-ibus-typing-booster-customize-hunspell">
<title>Using custom hunspell dictionaries</title>
<para>
The IBus engine is based on <literal>hunspell</literal> to support completion in many languages. By default the dictionaries <literal>de-de</literal>, <literal>en-us</literal>, <literal>fr-moderne</literal> <literal>es-es</literal>, <literal>it-it</literal>, <literal>sv-se</literal> and <literal>sv-fi</literal> are in use. To add another dictionary, the package can be overridden like this:
<programlisting>ibus-engines.typing-booster.override {
langs = [ "de-at" "en-gb" ];
}</programlisting>
</para>
<para>
<emphasis>Note: each language passed to <literal>langs</literal> must be an attribute name in <literal>pkgs.hunspellDicts</literal>.</emphasis>
</para>
</section>
<section xml:id="sec-ibus-typing-booster-emoji-picker">
<title>Built-in emoji picker</title>
<para>
The <literal>ibus-engines.typing-booster</literal> package contains a program named <literal>emoji-picker</literal>. To display all emojis correctly, a special font such as <literal>noto-fonts-emoji</literal> is needed:
</para>
<para>
On NixOS it can be installed using the following expression:
<programlisting>{ pkgs, ... }: {
fonts.fonts = with pkgs; [ noto-fonts-emoji ];
}</programlisting>
</para>
</section>
</section>

View file

@ -12,7 +12,7 @@
<xi:include href="emacs.section.xml" /> <xi:include href="emacs.section.xml" />
<xi:include href="firefox.section.xml" /> <xi:include href="firefox.section.xml" />
<xi:include href="fish.section.xml" /> <xi:include href="fish.section.xml" />
<xi:include href="ibus.xml" /> <xi:include href="ibus.section.xml" />
<xi:include href="kakoune.section.xml" /> <xi:include href="kakoune.section.xml" />
<xi:include href="linux.section.xml" /> <xi:include href="linux.section.xml" />
<xi:include href="locales.section.xml" /> <xi:include href="locales.section.xml" />

View file

@ -133,8 +133,10 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = '' preStart = ''
install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem ${optionalString (cfg.insecure != true) ''
install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem
install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem
''}
''; '';
serviceConfig = mkMerge [ serviceConfig = mkMerge [

View file

@ -75,7 +75,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.unix; platforms = platforms.unix;
# couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
broken = true;
}; };
} }

View file

@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe";
in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; in "install -Dm555 lgpt.${extension} $out/bin/lgpt";
passthru.updateScript = unstableGitUpdater { }; passthru.updateScript = unstableGitUpdater {
url = "https://github.com/Mdashdotdashn/littlegptracker.git";
};
meta = with lib; { meta = with lib; {
description = "A music tracker similar to lsdj optimised to run on portable game consoles"; description = "A music tracker similar to lsdj optimised to run on portable game consoles";

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ocenaudio"; pname = "ocenaudio";
version = "3.9.6"; version = "3.10.2";
src = fetchurl { src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
sha256 = "07r49133kk99ya4grwby3admy892mkk9cfxz3wh0v81aznhpw4jg"; sha256 = "sha256-mmo6/zc/3R8ptXfY01RKUOLgmDhWTHiYBMlGqpdMTAo=";
}; };

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pt2-clone"; pname = "pt2-clone";
version = "1.28"; version = "1.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "8bitbubsy"; owner = "8bitbubsy";
repo = "pt2-clone"; repo = "pt2-clone";
rev = "v${version}"; rev = "v${version}";
sha256 = "1c2x43f46l7556kl9y9qign0g6ywdkh7ywkzv6c9y63n68ph20x2"; sha256 = "sha256-xnw4UL30nUv/Ru6x/7d05gC0X9nREMdXO9QWBjVoIvo=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "coolreader"; pname = "coolreader";
version = "3.2.53"; version = "3.2.55";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "buggins"; owner = "buggins";
repo = pname; repo = pname;
rev = "cr${version}"; rev = "cr${version}";
sha256 = "sha256-5it70cwRV56OMZI4dny5uwxWgoF42tjcEC4g3MC548s="; sha256 = "sha256-gYAaYGEjw7p6y4h5j6j/4Ld+b37Nv+kt04Wp+qb8gzY=";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

View file

@ -2,11 +2,11 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "gallery_dl"; pname = "gallery_dl";
version = "1.17.0"; version = "1.17.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "bf5196b9e18a45d62d7e823894f12def310264a258956882cbac13b5e856bf00"; sha256 = "1cfaa3a617d5d222d4b9b41634b1bdede2673a8620d6b0e62fb755ae224ca2ac";
}; };
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [ requests ];

View file

@ -0,0 +1,71 @@
{ lib
, python3
, fetchFromGitHub
, appstream-glib
, desktop-file-utils
, gettext
, glib
, gobject-introspection
, gtk3
, libhandy
, librsvg
, meson
, ninja
, pkg-config
, wrapGAppsHook
}:
python3.pkgs.buildPythonApplication rec {
pname = "portfolio";
version = "0.9.10";
format = "other";
src = fetchFromGitHub {
owner = "tchx84";
repo = "Portfolio";
rev = "v${version}";
sha256 = "06hk0kx6h8w263qa71bik68rg4r8qs94b6s60pyhzicfc822k0j4";
};
postPatch = ''
patchShebangs build-aux/meson
'';
nativeBuildInputs = [
appstream-glib
desktop-file-utils
gettext
glib
gobject-introspection
gtk3
meson
ninja
pkg-config
wrapGAppsHook
];
buildInputs = [
glib
gobject-introspection
libhandy
librsvg
];
propagatedBuildInputs = with python3.pkgs; [
pygobject3
];
postInstall = ''
ln -s dev.tchx84.Portfolio "$out/bin/portfolio"
'';
meta = with lib; {
description = "A minimalist file manager for those who want to use Linux mobile devices";
homepage = "https://github.com/tchx84/Portfolio";
changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -17,10 +17,10 @@ let
pname = "simplenote"; pname = "simplenote";
version = "2.2.0"; version = "2.5.0";
sha256 = { sha256 = {
x86_64-linux = "123b0fh14068s2z3k6s5mmh46xwlz02qfnpmj838zlm5hckjmifv"; x86_64-linux = "sha256-Mn1oie+YHNtYKriIAIHdO+tUQDqaA34dkAJgZvQy76I=";
}.${system} or throwSystem; }.${system} or throwSystem;
meta = with lib; { meta = with lib; {

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
, alsaLib, dbus, cups, libexif, ffmpeg_3, systemd , alsaLib, dbus, cups, libexif, ffmpeg_3, systemd
, freetype, fontconfig, libXft, libXrender, libxcb, expat , freetype, fontconfig, libXft, libXrender, libxcb, expat
@ -18,11 +18,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "vivaldi"; pname = "vivaldi";
version = "3.6.2165.36-1"; version = "3.7.2218.45-1";
src = fetchurl { src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08"; sha256 = "11q3whw01nbwvzccgn55b4lkr7dzlql961406r6by8xqvf8zgmp4";
}; };
unpackPhase = '' unpackPhase = ''
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ patchelf makeWrapper ]; nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [ buildInputs = [
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd
freetype fontconfig libXrender libuuid expat glib nss nspr freetype fontconfig libXrender libuuid expat glib nss nspr

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kpt"; pname = "kpt";
version = "0.37.1"; version = "0.38.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoogleContainerTools"; owner = "GoogleContainerTools";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM="; sha256 = "sha256-MBZa4LdpCZnVVbjzkYpPi9/CYGqVLeYy2N/AS1PSYBE=";
}; };
vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI="; vendorSha256 = "sha256-P0cN8aw62nPD1OlUAw1E36YxptxtPqqruZfDDG4Ag2w=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -88,8 +88,6 @@ stdenv.mkDerivation rec {
description = "Matrix group messaging app"; description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal"; homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3; license = licenses.gpl3;
# couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
broken = true;
maintainers = with maintainers; [ dtzWill worldofpeace ]; maintainers = with maintainers; [ dtzWill worldofpeace ];
}; };
} }

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "seaweedfs"; pname = "seaweedfs";
version = "2.31"; version = "2.32";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chrislusf"; owner = "chrislusf";
repo = "seaweedfs"; repo = "seaweedfs";
rev = version; rev = version;
sha256 = "sha256-0s/hcRUuskU4TZqk5h4A51mkEJ6uUZS42mKDQvSx3I4="; sha256 = "sha256-0VryhH0ELBLVZL2vLuAcjZ0a5otk/etr3riRyc+7YTk=";
}; };
vendorSha256 = "sha256-QpGRQQbNchj0T9USRnALjvOGd2cV+JUgJeRgfjK8n5o="; vendorSha256 = "sha256-besXzqlmhFbWfnlacGildBbNATVrtMthf+BA/pL7R5I=";
subPackages = [ "weed" ]; subPackages = [ "weed" ];

View file

@ -2,10 +2,10 @@
, libsoup, gnome3 }: , libsoup, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "homebank-5.5"; name = "homebank-5.5.1";
src = fetchurl { src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz"; url = "http://homebank.free.fr/public/${name}.tar.gz";
sha256 = "sha256-3tqmsCxQXNAsDsLdiyuk4MydH0WgHqsNpgqxvCp+bHU="; sha256 = "sha256-m7OeqtPExo0ry+IeL2xKUnTjo/OFr7Ky/3OuX9mY2gg=";
}; };
nativeBuildInputs = [ pkg-config wrapGAppsHook ]; nativeBuildInputs = [ pkg-config wrapGAppsHook ];

View file

@ -0,0 +1,26 @@
{ lib, buildPythonApplication, fetchFromGitHub, pyserial, halo }:
buildPythonApplication rec {
pname = "btlejack";
version = "2.0.0";
src = fetchFromGitHub {
owner = "virtualabs";
repo = "btlejack";
rev = "v${version}";
sha256 = "1r17079kx7dvsrbmw5sgvz3vj5m3pn2543gxj2xmw4s0lcihy378";
};
postPatch = ''
sed -i "s|^.*'argparse',$||" setup.py
'';
propagatedBuildInputs = [ pyserial halo ];
meta = with lib; {
homepage = "https://github.com/virtualabs/btlejack";
description = "Bluetooth Low Energy Swiss-army knife";
license = licenses.mit;
maintainers = with maintainers; [ oxzi ];
};
}

View file

@ -35,10 +35,10 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gwyddion"; pname = "gwyddion";
version = "2.56"; version = "2.57";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
sha256 = "0z83p3ifdkv5dds8s6fqqbycql1zmgppdc7ygqmm12z5zlrl9p12"; sha256 = "sha256-kx/WqtNDaJQyVehxZ3weddXyaM1knX+fCuv47A9GaH0=";
}; };
nativeBuildInputs = [ pkg-config file ]; nativeBuildInputs = [ pkg-config file ];

View file

@ -3,7 +3,7 @@
{ name ? "debian-build" { name ? "debian-build"
, diskImage , diskImage
, src, lib, stdenv, vmTools, checkinstall , src, stdenv, vmTools, checkinstall
, fsTranslation ? false , fsTranslation ? false
, # Features provided by this package. , # Features provided by this package.
debProvides ? [] debProvides ? []
@ -21,7 +21,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
prePhases = "installExtraDebsPhase sysInfoPhase"; prePhases = "installExtraDebsPhase sysInfoPhase";
} }
// removeAttrs args ["vmTools"] // // removeAttrs args ["vmTools" "lib"] //
{ {
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");

View file

@ -0,0 +1,40 @@
{ lib
, mkDerivation
, fetchFromGitHub
, extra-cmake-modules
, kwindowsystem
, plasma-framework
, qtx11extras
}:
mkDerivation rec {
pname = "plasma-applet-virtual-desktop-bar";
version = "unstable-2021-02-20";
src = fetchFromGitHub {
owner = "wsdfhjxc";
repo = "virtual-desktop-bar";
rev = "3e9bbddb8def8da65071a1c325eaa06598e8a473";
sha256 = "192ns6c2brzq46pg385n0v1ydbz52aaa8f5dgfw5251hrw9c7bxg";
};
buildInputs = [
kwindowsystem plasma-framework qtx11extras
];
nativeBuildInputs = [
extra-cmake-modules
];
cmakeFlags = [
"-Wno-dev"
];
meta = with lib; {
description = "Manage virtual desktops dynamically in a convenient way";
homepage = "https://github.com/wsdfhjxc/virtual-desktop-bar";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ peterhoeg ];
};
}

View file

@ -143,6 +143,7 @@ let
thirdParty = let inherit (libsForQt5) callPackage; in { thirdParty = let inherit (libsForQt5) callPackage; in {
plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { };
plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { };
kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { };
kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { };
krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { };

View file

@ -1,10 +1,34 @@
{ { mkDerivation
mkDerivation, lib, , lib
extra-cmake-modules, gettext, kdoctools, python, , extra-cmake-modules
appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux, , gettext
qtbase, qtquickcontrols2, , kdoctools
karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels, , python
knewstuff, kwindowsystem, kxmlgui, plasma-framework , appstream-qt
, discount
, flatpak
, fwupd
, ostree
, packagekit-qt
, pcre
, util-linux
, qtbase
, qtquickcontrols2
, qtx11extras
, karchive
, kcmutils
, kconfig
, kcrash
, kdbusaddons
, kdeclarative
, kidletime
, kio
, kirigami2
, kitemmodels
, knewstuff
, kwindowsystem
, kxmlgui
, plasma-framework
}: }:
mkDerivation { mkDerivation {
@ -13,9 +37,29 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [ buildInputs = [
# discount is needed for libmarkdown # discount is needed for libmarkdown
appstream-qt discount flatpak fwupd ostree packagekit-qt pcre util-linux appstream-qt
discount
flatpak
fwupd
ostree
packagekit-qt
pcre
util-linux
qtquickcontrols2 qtquickcontrols2
karchive kconfig kcrash kdbusaddons kdeclarative kio kirigami2 kitemmodels knewstuff kwindowsystem kxmlgui qtx11extras
karchive
kcmutils
kconfig
kcrash
kdbusaddons
kdeclarative
kidletime
kio
kirigami2
kitemmodels
knewstuff
kwindowsystem
kxmlgui
plasma-framework plasma-framework
]; ];
} }

View file

@ -1,8 +1,19 @@
{ { mkDerivation
mkDerivation, lib, extra-cmake-modules, shared-mime-info, , lib
libpthreadstubs, libXcursor, libXdmcp, , extra-cmake-modules
qtbase, qtquickcontrols2, qtx11extras, , shared-mime-info
karchive, ki18n, kio, knewstuff , libpthreadstubs
, libXcursor
, libXdmcp
, qtbase
, qtquickcontrols2
, qtx11extras
, karchive
, kcmutils
, kdeclarative
, ki18n
, kio
, knewstuff
}: }:
mkDerivation { mkDerivation {
@ -10,8 +21,16 @@ mkDerivation {
meta.broken = lib.versionOlder qtbase.version "5.15.0"; meta.broken = lib.versionOlder qtbase.version "5.15.0";
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ buildInputs = [
libpthreadstubs libXcursor libXdmcp libpthreadstubs
qtquickcontrols2 qtx11extras libXcursor
karchive ki18n kio knewstuff libXdmcp
qtquickcontrols2
qtx11extras
karchive
kcmutils
kdeclarative
ki18n
kio
knewstuff
]; ];
} }

View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rocksdb"; pname = "rocksdb";
version = "6.15.5"; version = "6.17.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8="; sha256 = "sha256-mfONfYMxZ3CT7Bk3OYSwg0UChmk4mQ1+cHN94gEDZcM=";
}; };
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];

View file

@ -3,13 +3,13 @@
buildDunePackage rec { buildDunePackage rec {
pname = "graphics"; pname = "graphics";
version = "5.1.0"; version = "5.1.1";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz"; url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz";
sha256 = "16z997mp0ccilaqqvmz3wp7vx0ghaf4ik9qklgd4piklcl1yv5n5"; sha256 = "sha256-KGyD497ZKHA2xeXHezmh3P1zoSlre1h5N9zjkAFmMo4=";
}; };
buildInputs = [ dune-configurator ]; buildInputs = [ dune-configurator ];

View file

@ -2,12 +2,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "avro-python3"; pname = "avro-python3";
version = "1.10.1"; version = "1.10.2";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9027abeab63dd9b66bd3c564fa0670c70f78027ecb1978d96c6af7ed415b626b"; sha256 = "3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab";
}; };
buildInputs = [ pycodestyle isort ]; buildInputs = [ pycodestyle isort ];

View file

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-marketplaceordering"; pname = "azure-mgmt-marketplaceordering";
version = "1.0.0"; version = "1.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "85103080f9e59215036bdfb8f806d91ea182d72c46a13f55c3acc479849351e3"; sha256 = "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -4,7 +4,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "bayespy"; pname = "bayespy";
version = "0.5.21"; version = "0.5.22";
# Python 2 not supported and not some old Python 3 because MPL doesn't support # Python 2 not supported and not some old Python 3 because MPL doesn't support
# them properly. # them properly.
@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0d86e9ae73e6472c26aeb4de7abd9bf99492fedcbb0485ed7fa23609d2673b42"; sha256 = "ed0057dc22bd392df4b3bba23536117e1b2866e3201b12c5a37428d23421a5ba";
}; };
checkInputs = [ pytest nose glibcLocales ]; checkInputs = [ pytest nose glibcLocales ];

View file

@ -16,14 +16,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "2.3.3"; version = "2.3.4";
pname = "beancount"; pname = "beancount";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0767ap2n9vk9dz40njndfhaprajr75fvzx7igbd1szc6x8wri8nr"; sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA=";
}; };
# Tests require files not included in the PyPI archive. # Tests require files not included in the PyPI archive.

View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "casbin"; pname = "casbin";
version = "0.18.4"; version = "0.19.1";
disabled = isPy27; disabled = isPy27;
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = "pycasbin"; repo = "pycasbin";
rev = "v${version}"; rev = "v${version}";
sha256 = "16yhl1xgrgkyqnmbw9in3y7ypcxvvy21h32v50cd73a3iw4x27d0"; sha256 = "0fkkz5k3h4pkxacrbacamnh4yfghxgajdzzmdlck7i4v5x06vz8f";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-simple-captcha"; pname = "django-simple-captcha";
version = "0.5.13"; version = "0.5.14";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5e43ba3b61daf690ac0319157837bb57e31df8bddbdc9a59ef42ef1a99e21fa2"; sha256 = "84b5c188e6ae50e9ecec5e5d734c5bc4d2a50fbbca7f59d2c12da9a3bbee5051";
extension = "zip"; extension = "zip";
}; };

View file

@ -12,12 +12,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jupyter_console"; pname = "jupyter_console";
version = "6.2.0"; version = "6.3.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "7f6194f4f4692d292da3f501c7f343ccd5e36c6a1becf7b7515e23e66d6bf1e9"; sha256 = "947f66bbdeee2221b4fb3a6b78225d337b8f10832f14cecf7932183635abe1d9";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, libcap , libcap
, pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -13,9 +14,25 @@ buildPythonPackage rec {
sha256 = "b4ca9a25a7d4f1ace4fffd1f3a2e64ef5208fe05f929f3edd5e27081ca7e67ce"; sha256 = "b4ca9a25a7d4f1ace4fffd1f3a2e64ef5208fe05f929f3edd5e27081ca7e67ce";
}; };
patches = [ ./skip_bad_tests.patch ];
buildInputs = [ libcap ]; buildInputs = [ libcap ];
checkInputs = [ pytestCheckHook ];
disabledTests = [
# Intel MPX support was removed in GCC 9.1 & Linux kernel 5.6
"test_mpx"
# The Nix build sandbox has no_new_privs already enabled
"test_no_new_privs"
# The Nix build sandbox has seccomp already enabled
"test_seccomp"
# This will fail if prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_FORCE_DISABLE)
# has been set system-wide, even outside the sandbox
"test_speculation_ctrl"
];
meta = { meta = {
description = "Python(ic) interface to the linux prctl syscall"; description = "Python(ic) interface to the linux prctl syscall";
homepage = "https://github.com/seveas/python-prctl"; homepage = "https://github.com/seveas/python-prctl";

View file

@ -1,34 +0,0 @@
--- ./test_prctl.py 2018-01-26 16:02:52.000000000 -0500
+++ ./test_prctl.py 2018-06-21 18:26:43.370065009 -0400
@@ -154,6 +154,7 @@
prctl.set_keepcaps(False)
self.assertEqual(prctl.get_keepcaps(), False)
+ @unittest.skip("No access to /proc in the Nix build sandbox")
@require('set_mce_kill')
def test_mce_kill(self):
"""Test the MCE_KILL setting"""
@@ -173,6 +174,7 @@
prctl.set_name(name)
self.assertEqual(prctl.get_name(), name[:15])
+ @unittest.skip("The Nix build sandbox has no_new_privs already enabled")
@require('get_no_new_privs')
def test_no_new_privs(self):
"""Test the no_new_privs function"""
@@ -189,6 +191,7 @@
self.assertNotEqual(sp.returncode, 0)
os._exit(0)
+ @unittest.skip("No access to /proc in the Nix build sandbox")
def test_proctitle(self):
"""Test setting the process title, including too long titles"""
title = "This is a test!"
@@ -225,6 +228,7 @@
os._exit(0)
self.assertRaises(OSError, prctl.set_ptracer, new_pid)
+ @unittest.skip("The Nix build sandbox has seccomp already enabled")
@require('get_seccomp')
def test_seccomp(self):
"""Test manipulation of the seccomp setting"""

View file

@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.67.1"; version = "0.67.3";
pname = "jbang"; pname = "jbang";
src = fetchzip { src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
sha256 = "sha256-ZwjgdOmpLl2kTpQU1mqfwq0nBLmK/Ej5ckDItQWeDKY="; sha256 = "sha256-/3kQnHshmf3ZnA4xQNJaXeThFvk/SKq0/B6BaTv5Yws=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'xcode-install'

View file

@ -0,0 +1,204 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.419.0)
aws-sdk-core (3.111.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.41.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.87.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.0.3)
colored (1.2)
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
declarative (0.0.20)
declarative-option (0.1.0)
digest-crc (0.6.3)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.6)
emoji_regex (3.2.1)
excon (0.78.1)
faraday (1.3.0)
faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-net_http (1.0.1)
faraday_middleware (1.0.0)
faraday (~> 1.0)
fastimage (2.2.1)
fastlane (2.172.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 1.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.37.0, < 0.39.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-api-client (0.38.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.12)
google-apis-core (0.2.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.14)
httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
rexml
signet (~> 0.14)
webrick
google-apis-iamcredentials_v1 (0.1.0)
google-apis-core (~> 0.1)
google-apis-storage_v1 (0.1.0)
google-apis-core (~> 0.1)
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.4.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.1)
google-cloud-storage (1.30.0)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.1)
google-cloud-core (~> 1.2)
googleauth (~> 0.9)
mini_mime (~> 1.0)
googleauth (0.15.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.14)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.4.0)
json (2.5.1)
jwt (2.2.2)
memoist (0.16.2)
mini_magick (4.11.0)
mini_mime (1.0.2)
multi_json (1.15.0)
multipart-post (2.0.0)
nanaimo (0.3.0)
naturally (2.2.1)
os (1.1.1)
plist (3.6.0)
public_suffix (4.0.6)
rake (13.0.3)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.4)
rouge (2.0.7)
ruby2_keywords (0.0.4)
rubyzip (2.3.0)
security (0.1.3)
signet (0.14.0)
addressable (~> 2.3)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.8)
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tty-cursor (0.7.1)
tty-screen (0.8.1)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
webrick (1.7.0)
word_wrap (1.0.0)
xcode-install (2.6.8)
claide (>= 0.9.1, < 1.1.0)
fastlane (>= 2.1.0, < 3.0.0)
xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
PLATFORMS
ruby
DEPENDENCIES
xcode-install
BUNDLED WITH
1.17.2

View file

@ -0,0 +1,17 @@
{ lib
, bundlerApp
}:
bundlerApp {
pname = "xcode-install";
gemdir = ./.;
exes = [ "xcversion" ];
meta = with lib; {
description = "Install and update your Xcodes automatically";
homepage = "https://github.com/xcpretty/xcode-install";
platforms = platforms.unix;
maintainers = with maintainers; [ q3k ];
license = with licenses; [ mit ];
};
}

View file

@ -0,0 +1,833 @@
{
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
version = "2.7.0";
};
artifactory = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls";
type = "gem";
};
version = "3.0.15";
};
atomos = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx";
type = "gem";
};
version = "0.1.3";
};
aws-eventstream = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5";
type = "gem";
};
version = "1.1.0";
};
aws-partitions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz0djj8w3ns0sz5gvkla5jml8xzx6skbcfj255m81fyww1x6ws8";
type = "gem";
};
version = "1.419.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4";
type = "gem";
};
version = "3.111.2";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm";
type = "gem";
};
version = "1.41.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7";
type = "gem";
};
version = "1.87.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5";
type = "gem";
};
version = "1.2.2";
};
babosa = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16dwqn33kmxkqkv51cwiikdkbrdjfsymlnc0rgbjwilmym8a9phq";
type = "gem";
};
version = "1.0.4";
};
CFPropertyList = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
type = "gem";
};
version = "3.0.3";
};
claide = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
type = "gem";
};
version = "1.0.3";
};
colored = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
type = "gem";
};
version = "1.2";
};
colored2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
type = "gem";
};
version = "3.1.2";
};
commander-fastlane = {
dependencies = ["highline"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65";
type = "gem";
};
version = "4.4.6";
};
declarative = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0";
type = "gem";
};
version = "0.0.20";
};
declarative-option = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
type = "gem";
};
version = "0.1.0";
};
digest-crc = {
dependencies = ["rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a";
type = "gem";
};
version = "0.6.3";
};
domain_name = {
dependencies = ["unf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
type = "gem";
};
version = "0.5.20190701";
};
dotenv = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
type = "gem";
};
version = "2.7.6";
};
emoji_regex = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s";
type = "gem";
};
version = "3.2.1";
};
excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r";
type = "gem";
};
version = "0.78.1";
};
faraday = {
dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
type = "gem";
};
version = "1.3.0";
};
faraday-cookie_jar = {
dependencies = ["faraday" "http-cookie"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk";
type = "gem";
};
version = "0.0.7";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
type = "gem";
};
version = "1.0.1";
};
faraday_middleware = {
dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r";
type = "gem";
};
version = "1.0.0";
};
fastimage = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j";
type = "gem";
};
version = "2.2.1";
};
fastlane = {
dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0crr42qdgy9l409pffpfs7nq8ha18lp1nxngny2dc9hiq1xx4r5d";
type = "gem";
};
version = "2.172.0";
};
gh_inspector = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
type = "gem";
};
version = "1.1.3";
};
google-api-client = {
dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1";
type = "gem";
};
version = "0.38.0";
};
google-apis-core = {
dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet" "webrick"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "184pqw7z7s8mc1r5gj8f76xvp8z650xq50vdfj5gjwsbmzd99z2f";
type = "gem";
};
version = "0.2.1";
};
google-apis-iamcredentials_v1 = {
dependencies = ["google-apis-core"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xjlzq2fxpwvp9b6ajs8cpyjv8vs2d2npg9v23yj181hj2fnn82c";
type = "gem";
};
version = "0.1.0";
};
google-apis-storage_v1 = {
dependencies = ["google-apis-core"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0axycds5q20fqm6vqxa5r922021p0f8jhwvlgw8r1vq600ljribi";
type = "gem";
};
version = "0.1.0";
};
google-cloud-core = {
dependencies = ["google-cloud-env" "google-cloud-errors"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1";
type = "gem";
};
version = "1.5.0";
};
google-cloud-env = {
dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i";
type = "gem";
};
version = "1.4.0";
};
google-cloud-errors = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67";
type = "gem";
};
version = "1.0.1";
};
google-cloud-storage = {
dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17axi5gmy0g04801v11lww5mvqzffqdc3w6k1j7f95v90hy4yn6m";
type = "gem";
};
version = "1.30.0";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pwm0mzb5zffhk6yw4v3n1yj8qr6jla6f78vsv4g0bxh9z0ikc2z";
type = "gem";
};
version = "0.15.0";
};
highline = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
type = "gem";
};
version = "1.7.10";
};
http-cookie = {
dependencies = ["domain_name"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
type = "gem";
};
version = "1.0.3";
};
httpclient = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
type = "gem";
};
version = "2.8.3";
};
jmespath = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
type = "gem";
};
version = "1.4.0";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
version = "2.5.1";
};
jwt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n";
type = "gem";
};
version = "2.2.2";
};
memoist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
type = "gem";
};
version = "0.16.2";
};
mini_magick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs";
type = "gem";
};
version = "4.11.0";
};
mini_mime = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
type = "gem";
};
version = "1.0.2";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
type = "gem";
};
version = "1.15.0";
};
multipart-post = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
type = "gem";
};
version = "2.0.0";
};
nanaimo = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
type = "gem";
};
version = "0.3.0";
};
naturally = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59";
type = "gem";
};
version = "2.2.1";
};
os = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
type = "gem";
};
version = "1.1.1";
};
plist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l";
type = "gem";
};
version = "3.6.0";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
type = "gem";
};
version = "4.0.6";
};
rake = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
type = "gem";
};
version = "13.0.3";
};
representable = {
dependencies = ["declarative" "declarative-option" "uber"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
type = "gem";
};
version = "3.0.4";
};
retriable = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
type = "gem";
};
version = "3.1.2";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
type = "gem";
};
version = "3.2.4";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
type = "gem";
};
version = "2.0.7";
};
ruby2_keywords = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
type = "gem";
};
version = "0.0.4";
};
rubyzip = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
type = "gem";
};
version = "2.3.0";
};
security = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa";
type = "gem";
};
version = "0.1.3";
};
signet = {
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp";
type = "gem";
};
version = "0.14.0";
};
simctl = {
dependencies = ["CFPropertyList" "naturally"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x";
type = "gem";
};
version = "1.6.8";
};
slack-notifier = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv";
type = "gem";
};
version = "2.3.2";
};
terminal-notifier = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs";
type = "gem";
};
version = "2.0.0";
};
terminal-table = {
dependencies = ["unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
type = "gem";
};
version = "1.8.0";
};
tty-cursor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
type = "gem";
};
version = "0.7.1";
};
tty-screen = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235";
type = "gem";
};
version = "0.8.1";
};
tty-spinner = {
dependencies = ["tty-cursor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf";
type = "gem";
};
version = "0.9.3";
};
uber = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
type = "gem";
};
version = "0.1.0";
};
unf = {
dependencies = ["unf_ext"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
type = "gem";
};
version = "0.1.4";
};
unf_ext = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
type = "gem";
};
version = "0.0.7.7";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
type = "gem";
};
version = "1.7.0";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
type = "gem";
};
version = "1.7.0";
};
word_wrap = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iyc5bc7dbgsd8j3yk1i99ral39f23l6wapi0083fbl19hid8mpm";
type = "gem";
};
version = "1.0.0";
};
xcode-install = {
dependencies = ["claide" "fastlane"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yhslanqw8r0mhls2hira05c8xjzzr7mnz1ab9p5qwg4z45ddjj8";
type = "gem";
};
version = "2.6.8";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
type = "gem";
};
version = "1.19.0";
};
xcpretty = {
dependencies = ["rouge"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm";
type = "gem";
};
version = "0.3.0";
};
xcpretty-travis-formatter = {
dependencies = ["xcpretty"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14rg4f70klrs910n7rsgfa4dn8s2qyny55194ax2qyyb2wpk7k5a";
type = "gem";
};
version = "1.0.1";
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jackett"; pname = "jackett";
version = "0.17.668"; version = "0.17.699";
src = fetchurl { src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "sha256-+cvUpWVpXEkW+d92aIOli+pNi+ZDHEbxDDQ67O6kOVA="; sha256 = "sha256-dftllucRemUdZjYDLKPJ4XJ031OZpsW4bpJDuWPyses=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "galene"; pname = "galene";
version = "0.2"; version = "0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jech"; owner = "jech";
repo = "galene"; repo = "galene";
rev = "galene-${version}"; rev = "galene-${version}";
sha256 = "0hpgqqv8mp1d3sk7dk49m3yv0cv4afa0v3vdd4w8mdnx6pcqdgy1"; sha256 = "1pl3mnkmfqykhq55q36kvvnvn9fgsk72pfa7nii3hywzad0bj0ar";
}; };
vendorSha256 = "12b7andpzsgzmd56gg4gc5ilkxvjrpwpmwbdmygfzgkd5jncmcgp"; vendorSha256 = "0jrc6y5chkj25bnpzn6blvfb0vd09h6fdcz75g54605z8nqd397p";
outputs = [ "out" "static" ]; outputs = [ "out" "static" ];

View file

@ -1,14 +1,16 @@
{ lib, stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitLab, libGL, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libstrangle"; pname = "libstrangle";
version = "2017-02-22"; version = "0.1.1";
src = fetchFromGitHub { buildInputs = [ libGL libX11 ];
owner = "milaq";
src = fetchFromGitLab {
owner = "torkel104";
repo = pname; repo = pname;
rev = "6020f9e375ba747c75eb7996b7d5f0214ac3221e"; rev = version;
sha256 = "04ikacbjcq9phdc8q5y1qjjpa1sxmzfm0idln9ys95prg289zp4h"; sha256 = "135icr544w5ynlxfnxqgjn794bsm9i703rh9jfnracjb7jgnha4w";
}; };
makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; makeFlags = [ "prefix=" "DESTDIR=$(out)" ];
@ -17,10 +19,11 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteAllInPlace src/strangle.sh substituteAllInPlace src/strangle.sh
substituteAllInPlace src/stranglevk.sh
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/milaq/libstrangle"; homepage = "https://gitlab.com/torkel104/libstrangle";
description = "Frame rate limiter for Linux/OpenGL"; description = "Frame rate limiter for Linux/OpenGL";
license = licenses.gpl3; license = licenses.gpl3;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];

View file

@ -1,29 +1,43 @@
diff --git a/makefile b/makefile diff --git a/makefile b/makefile
index eb13054..a3a1125 100644
--- a/makefile --- a/makefile
+++ b/makefile +++ b/makefile
@@ -27,12 +27,10 @@ $(BUILDDIR)libstrangle32.so: $(BUILDDIR) @@ -86,10 +86,6 @@ install-common:
$(CC) $(CFLAGS) $(LDFLAGS) -m32 -o $(BUILDDIR)libstrangle32.so $(SOURCES) install -m 0755 -D -T $(SOURCEDIR)/stranglevk.sh $(DESTDIR)$(bindir)/stranglevk
install -m 0644 -D -T $(SOURCEDIR)/vulkan/libstrangle_vk.json $(DESTDIR)$(datarootdir)/vulkan/implicit_layer.d/libstrangle_vk.json
install: all -install-ld: ld
- install -m 0644 -D -T $(BUILDDIR)libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf - install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf
install -m 0755 -D -T $(BUILDDIR)libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so
install -m 0755 -D -T $(BUILDDIR)libstrangle64.so $(DESTDIR)$(LIB64_PATH)/libstrangle.so
install -m 0755 -D -T $(SOURCEDIR)strangle.sh $(DESTDIR)$(bindir)/strangle
install -m 0644 -D -T COPYING $(DESTDIR)$(DOC_PATH)/LICENSE
- ldconfig - ldconfig
-
install-32: 32-bit
install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so
install -m 0755 -D -T $(BUILDDIR)/libstrangle32_nodlsym.so $(DESTDIR)$(LIB32_PATH)/libstrangle_nodlsym.so
@@ -109,8 +105,7 @@ install: \
all \
install-common \
install-32 \
- install-64 \
- install-ld
+ install-64
clean: clean:
rm -f $(BUILDDIR)libstrangle64.so rm -f $(BUILDDIR)/libstrangle64.so
diff --git a/src/strangle.sh b/src/strangle.sh diff --git a/src/strangle.sh b/src/strangle.sh
index e280e86..b2dd42b 100755
--- a/src/strangle.sh --- a/src/strangle.sh
+++ b/src/strangle.sh +++ b/src/strangle.sh
@@ -31,6 +31,5 @@ if [ "$#" -eq 0 ]; then @@ -130,6 +130,5 @@ if [ "$STRANGLE_VKONLY" != "1" ]; then
exit 1 fi
fi fi
-# Execute the strangled program under a clean environment -# Execute the strangled program under a clean environment
# pass through the FPS and overriden LD_PRELOAD environment variables # pass through the FPS and overriden LD_PRELOAD environment variables
-exec env FPS="${FPS}" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" "$@" -exec env ENABLE_VK_LAYER_TORKEL104_libstrangle=1 LD_PRELOAD="${LD_PRELOAD}" "$@"
+FPS="${FPS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" exec "$@" +ENABLE_VK_LAYER_TORKEL104_libstrangle=1 XDG_DATA_DIRS="${XDG_DATA_DIRS}${XDG_DATA_DIRS:+:}@out@/share" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}" exec "$@"
diff --git a/src/stranglevk.sh b/src/stranglevk.sh
--- a/src/stranglevk.sh
+++ b/src/stranglevk.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 strangle "$@"
+ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 @out@/bin/strangle "$@"

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "apfs-fuse-unstable"; pname = "apfs-fuse-unstable";
version = "2019-07-23"; version = "2020-09-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sgan81"; owner = "sgan81";
repo = "apfs-fuse"; repo = "apfs-fuse";
rev = "309ecb030f38edac4c10fa741a004c5eb7a23e15"; rev = "ee71aa5c87c0831c1ae17048951fe9cd7579c3db";
sha256 = "0wq6rlqi00m5dp5gbzy65i1plm40j6nsm7938zvfgx5laal4wzr2"; sha256 = "0wvsx708km1lnhghny5y69k694x0zy8vlbndswkb7sq81j1r6kwx";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/sgan81/apfs-fuse"; homepage = "https://github.com/sgan81/apfs-fuse";
description = "FUSE driver for APFS (Apple File System)"; description = "FUSE driver for APFS (Apple File System)";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; [ ealasu ]; maintainers = with maintainers; [ ealasu ];
platforms = platforms.linux; platforms = platforms.linux;
}; };

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "code-minimap"; pname = "code-minimap";
version = "0.5.0"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wfxr"; owner = "wfxr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8="; sha256 = "sha256-5YNY0MRlKKX6u32Id6J7bIPSHRi44TISoKqpAS9T8ow=";
}; };
cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s="; cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw=";
meta = with lib; { meta = with lib; {
description = "A high performance code minimap render"; description = "A high performance code minimap render";

View file

@ -4,24 +4,27 @@
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, zlib , zlib
, libiconv
, Security , Security
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "miniserve"; pname = "miniserve";
version = "0.11.0"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "svenstaro"; owner = "svenstaro";
repo = "miniserve"; repo = "miniserve";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/vtiHRHsbF7lfn9tfgfKhm5YwofjSJniNNnKahphHFg="; sha256 = "sha256-hTNwEspM1qlQkC6lD7N947tvS7O7RCIUYACvj4KYsAY=";
}; };
cargoSha256 = "sha256-gwy/LeVznZyawliXnkULyyVSXATk0sjSTUZPHO2K+9o="; cargoSha256 = "sha256-7G+h+g00T/aJ1cQ1SChxy8dq3CWWdHlx5DAH77xM9Oc=";
nativeBuildInputs = [ pkg-config zlib ]; nativeBuildInputs = [ pkg-config zlib ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
checkFlags = [ "--skip=cant_navigate_up_the_root" ];
meta = with lib; { meta = with lib; {
description = "For when you really just want to serve some files over HTTP right now!"; description = "For when you really just want to serve some files over HTTP right now!";

View file

@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "silicon"; pname = "silicon";
version = "0.4.0"; version = "0.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Aloxaf"; owner = "Aloxaf";
repo = "silicon"; repo = "silicon";
rev = "v${version}"; rev = "v${version}";
sha256 = "0cvzkfyljgxhmn456f2rn0vq2bhm1ishr4jg4dnwjjfgmjg3w908"; sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s=";
}; };
cargoSha256 = "1aymhbfzcncrbc5n8rf62bdgi95b4bjhw6p716vhca5p6c7wfxcb"; cargoSha256 = "sha256-1sekLS+jhMeFJcW7pH/X8t28//xA+L54u81uKOo1kHE=";
buildInputs = [ llvmPackages.libclang expat freetype ] buildInputs = [ llvmPackages.libclang expat freetype ]
++ lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isLinux [ libxcb ]

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "emplace"; pname = "emplace";
version = "1.3.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tversteeg"; owner = "tversteeg";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-02Pn5saPrw1PIFZXVSCgsnvo/78CdT17/rCtS9R9bvU="; sha256 = "sha256-6dmXWqkf8Z+cc4wnOuVCe4+Byfk3VTYXehTN1MCiFLE=";
}; };
cargoSha256 = "sha256-ety50v0jxm45fzzkR9c/rvpJn3mWQUvAOHcHSJTTSd4="; cargoSha256 = "sha256-uDoxMHSNoqH/AOixmkV6pwrDu/XSqXBCrAz4L7MMPU8=";
meta = with lib; { meta = with lib; {
description = "Mirror installed software on multiple machines"; description = "Mirror installed software on multiple machines";

View file

@ -13,7 +13,7 @@
buildGoModule rec { buildGoModule rec {
pname = "gopass"; pname = "gopass";
version = "1.12.2"; version = "1.12.4";
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 = "14ylvb7crx32h7inklvvxjc72jz9xq3dhzr5905i76kgx57h64w9"; sha256 = "1cwmka6shyycp9gq5js1hnbamdhqzpmzraxdaniz1cdqhxcvdkcb";
}; };
vendorSha256 = "0gjzghrykdw1vp873yi7k8piz3gshzndm12jm6dxgl0ph4335a54"; vendorSha256 = "1qnxdrqpav6ky6gs9w63l0hbhakh23rrc9197br1nmbg0slb8vcj";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -0,0 +1,32 @@
{ lib, stdenv, fetchgit, libgit2 }:
stdenv.mkDerivation rec {
pname = "l2md";
version = "unstable-2020-07-31";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git";
rev = "2b9fae141fc2129940e0337732a35a3fc1c33455";
sha256 = "PNNoD3a+rJwKH6wbOkvVU1IW4+xF7+zQaLFAlyLlYOI=";
};
buildInputs = [ libgit2 ];
installPhase = ''
mkdir -p $out/bin
cp l2md $out/bin
'';
meta = with lib; {
description = "Convert public-inbox archives to maildir messages";
longDescription = ''
Quick and dirty hack to import lore.kernel.org list archives via git,
to export them in maildir format or through a pipe, and to keep them
periodically synced.
'';
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git";
license = licenses.gpl2Only;
maintainers = with maintainers; [ yoctocell ];
platforms = platforms.unix;
};
}

View file

@ -953,6 +953,7 @@ mapAliases ({
; ;
inherit (plasma5Packages.thirdParty) inherit (plasma5Packages.thirdParty)
plasma-applet-caffeine-plus plasma-applet-caffeine-plus
plasma-applet-virtual-desktop-bar
kwin-dynamic-workspaces kwin-dynamic-workspaces
kwin-tiling kwin-tiling
krohnkite krohnkite

View file

@ -1808,6 +1808,8 @@ in
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
btlejack = python3Packages.callPackage ../applications/radio/btlejack { };
btrbk = callPackage ../tools/backup/btrbk { btrbk = callPackage ../tools/backup/btrbk {
asciidoc = asciidoc-full; asciidoc = asciidoc-full;
}; };
@ -5740,6 +5742,8 @@ in
k6 = callPackage ../development/tools/k6 { }; k6 = callPackage ../development/tools/k6 { };
l2md = callPackage ../tools/text/l2md { };
lab = callPackage ../applications/version-management/git-and-tools/lab { }; lab = callPackage ../applications/version-management/git-and-tools/lab { };
lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { };
@ -13294,6 +13298,8 @@ in
xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
xcode-install = callPackage ../development/tools/xcode-install { };
xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
}; };
@ -24852,6 +24858,8 @@ in
ponymix = callPackage ../applications/audio/ponymix { }; ponymix = callPackage ../applications/audio/ponymix { };
portfolio-filemanager = callPackage ../applications/misc/portfolio-filemanager { };
pothos = libsForQt5.callPackage ../applications/radio/pothos { }; pothos = libsForQt5.callPackage ../applications/radio/pothos { };
potrace = callPackage ../applications/graphics/potrace {}; potrace = callPackage ../applications/graphics/potrace {};
@ -29063,6 +29071,8 @@ in
dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {};
demjson = with python3Packages; toPythonApplication demjson;
dosbox = callPackage ../misc/emulators/dosbox { }; dosbox = callPackage ../misc/emulators/dosbox { };
emu2 = callPackage ../misc/emulators/emu2 { }; emu2 = callPackage ../misc/emulators/emu2 { };
@ -29194,6 +29204,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security CoreServices; inherit (darwin.apple_sdk.frameworks) Security CoreServices;
}; };
hjson = with python3Packages; toPythonApplication hjson;
epkowa = callPackage ../misc/drivers/epkowa { }; epkowa = callPackage ../misc/drivers/epkowa { };
utsushi = callPackage ../misc/drivers/utsushi { }; utsushi = callPackage ../misc/drivers/utsushi { };
@ -29221,6 +29233,8 @@ in
libjack2 = jack2.override { prefix = "lib"; }; libjack2 = jack2.override { prefix = "lib"; };
jack2Full = jack2; # TODO: move to aliases.nix jack2Full = jack2; # TODO: move to aliases.nix
j2cli = with python3Packages; toPythonApplication j2cli;
jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; jstest-gtk = callPackage ../tools/misc/jstest-gtk { };
keynav = callPackage ../tools/X11/keynav { }; keynav = callPackage ../tools/X11/keynav { };