update nixpkgs
parent
77682d7b8f
commit
99b6d412bd
|
@ -1,23 +1,11 @@
|
||||||
self: super:
|
self: super:
|
||||||
let
|
let
|
||||||
pkgold = super;
|
overrideOlder = original: override: with self.lib; let
|
||||||
overrideOlder = original: override: let
|
newpkgver = getVersion (override original);
|
||||||
lib = super.lib;
|
oldpkgver = getVersion original;
|
||||||
newpkgver = lib.getVersion (override original);
|
in if (versionOlder oldpkgver newpkgver) then original.overrideDerivation override else original;
|
||||||
oldpkgver = lib.getVersion original;
|
|
||||||
in if (lib.versionOlder oldpkgver newpkgver) then original.overrideDerivation override else original;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
i3lock-color = overrideOlder super.i3lock-color (attrs: rec {
|
|
||||||
version = "2.9.1-2017-09-10";
|
|
||||||
name = "i3lock-color-${version}";
|
|
||||||
src = super.fetchFromGitHub {
|
|
||||||
owner = "chrjguill";
|
|
||||||
repo = "i3lock-color";
|
|
||||||
rev = "d03fbe70c92505627af61a1464f2eaafe9fcbfd5";
|
|
||||||
sha256 = "12vw90n6pmz1fxqv55nlwpbfzj9wap6b7rcrxjgfl0snqx3nijlg";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
# spotify = overrideOlder pkgs.spotify (attrs: rec {
|
# spotify = overrideOlder pkgs.spotify (attrs: rec {
|
||||||
# version = "1.0.48.103.g15edf1ec-94";
|
# version = "1.0.48.103.g15edf1ec-94";
|
||||||
# name = "spotify-${version}";
|
# name = "spotify-${version}";
|
||||||
|
@ -27,9 +15,9 @@ in
|
||||||
# };
|
# };
|
||||||
#});
|
#});
|
||||||
|
|
||||||
haskellPackages = with super.haskell.lib; super.haskellPackages.extend (self: super:{
|
haskellPackages = with super.haskell.lib; super.haskellPackages.extend (hself: hsuper:{
|
||||||
X11 = overrideCabal super.X11 (drv: {
|
X11 = overrideCabal hsuper.X11 (drv: {
|
||||||
librarySystemDepends = drv.librarySystemDepends ++ [ pkgold.xorg.libXScrnSaver ];
|
librarySystemDepends = drv.librarySystemDepends ++ [ self.xorg.libXScrnSaver ];
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
self: super: {
|
self: super: {
|
||||||
|
|
||||||
ftb = super.callPackage ../pkgs/ftb.nix {};
|
ftb = self.callPackage ../pkgs/ftb.nix {};
|
||||||
pyroscope = super.callPackage ../pkgs/pyroscope {};
|
pyroscope = self.callPackage ../pkgs/pyroscope {};
|
||||||
peageprint = super.callPackage ../pkgs/peageprint.nix {};
|
peageprint = self.callPackage ../pkgs/peageprint.nix {};
|
||||||
nottetris2 = super.callPackage ../pkgs/nottetris2.nix {};
|
nottetris2 = self.callPackage ../pkgs/nottetris2.nix {};
|
||||||
mailpile = super.callPackage ../pkgs/mailpile.nix {};
|
mailpile = self.callPackage ../pkgs/mailpile.nix {};
|
||||||
lejos = super.callPackage ../pkgs/lejos.nix {};
|
lejos = self.callPackage ../pkgs/lejos.nix {};
|
||||||
libinput-gestures = super.callPackage ../pkgs/libinput-gestures.nix {};
|
libinput-gestures = super.libinput-gestures.override { extraUtilsPath = [
|
||||||
|
self.xdotool self.python3
|
||||||
|
];};
|
||||||
gitFire = super.stdenv.mkDerivation {
|
gitFire = super.stdenv.mkDerivation {
|
||||||
src = super.fetchFromGitHub {
|
src = super.fetchFromGitHub {
|
||||||
owner = "qw3rtman";
|
owner = "qw3rtman";
|
||||||
|
@ -21,18 +23,11 @@ self: super: {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
weiightminder = super.callPackage (super.fetchgit {
|
weiightminder = self.callPackage (builtins.fetchGit {
|
||||||
url = https://gist.github.com/yorickvP/229d21a7da13c9c514dbd26147822641;
|
url = https://gist.github.com/yorickvP/229d21a7da13c9c514dbd26147822641;
|
||||||
rev = "9749ef4d83c0078bc0248215ee882d7124827cf3";
|
rev = "9749ef4d83c0078bc0248215ee882d7124827cf3";
|
||||||
sha256 = "0kxi20ss2k22sv3ndplnklc6r7ja0lcgklw6mz43qcj7vmgxxllf";
|
|
||||||
}) {};
|
}) {};
|
||||||
|
|
||||||
node2nix_git = (super.callPackage (super.fetchFromGitHub {
|
|
||||||
owner = "svanderburg";
|
|
||||||
repo = "node2nix";
|
|
||||||
rev = "b6545937592e7e54a14a2df315598570480fee9f";
|
|
||||||
sha256 = "1y50gs5mk2sdzqx68lr3qb71lh7jp4c38ynybf8ikx7kfkzxvasb";
|
|
||||||
}) {}).package;
|
|
||||||
|
|
||||||
yscripts = super.callPackage /home/yorick/dotfiles/bin {};
|
yscripts = self.callPackage /home/yorick/dotfiles/bin {};
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,22 +7,15 @@ self: super: {
|
||||||
});
|
});
|
||||||
|
|
||||||
mpv = super.mpv.override { vaapiSupport = true; };
|
mpv = super.mpv.override { vaapiSupport = true; };
|
||||||
polybar = super.polybar.override {i3GapsSupport = true; githubSupport = false;};
|
polybar = super.polybar.override { i3GapsSupport = true; };
|
||||||
|
python36Packages = super.python36Packages.override { overrides = (self: super: {
|
||||||
python36Packages = let py3 = super.python36Packages; in (py3 // {
|
|
||||||
# pycrypto runs slow tests by default
|
# pycrypto runs slow tests by default
|
||||||
pycrypto = py3.pycrypto.overrideDerivation (attrs: {
|
pycrypto = super.pycrypto.overrideDerivation (attrs: {
|
||||||
installCheckPhase = ''
|
installCheckPhase = ''
|
||||||
${py3.python.interpreter} nix_run_setup.py test --skip-slow-tests
|
${self.python.interpreter} nix_run_setup.py test --skip-slow-tests
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
});
|
}); };
|
||||||
i3-gaps = super.i3-gaps.overrideDerivation (attrs: {
|
|
||||||
patches = [(super.fetchpatch {
|
|
||||||
url = "https://github.com/Lucus16/i3/commit/65a5afda81ddd1618b4a62b7188173c82ee5f985.patch";
|
|
||||||
sha256 = "1s943069afamizrz5pmll6cmrzgnlv3v93bmnykifhr0mnavbhph";
|
|
||||||
})];
|
|
||||||
});
|
|
||||||
|
|
||||||
# wine = pkgs.wine.override { wineRelease = "staging"; wineBuild = "wineWow"; };
|
# wine = pkgs.wine.override { wineRelease = "staging"; wineBuild = "wineWow"; };
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,12 +31,10 @@ self: super: {
|
||||||
src = super.fetchFromGitHub {
|
src = super.fetchFromGitHub {
|
||||||
owner = "matthewbauer";
|
owner = "matthewbauer";
|
||||||
repo = "nix-mode";
|
repo = "nix-mode";
|
||||||
rev = "v1.2.1";
|
rev = "f24abeb736a028deb283d51a859e7e34aba5e42b";
|
||||||
sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz";
|
sha256 = "06kznwa5qbl3vzvvdh6lqdgzjzkvkvayvv3bjx3p2j275fxy1kfw";
|
||||||
};
|
};
|
||||||
preConfigure = ''
|
preConfigure = "rm nix-company.el nix-mode-mmm.el";
|
||||||
rm nix-company.el nix-mode-mmm.el
|
|
||||||
'';
|
|
||||||
})
|
})
|
||||||
nix-buffer
|
nix-buffer
|
||||||
which-key
|
which-key
|
||||||
|
|
|
@ -19,6 +19,7 @@ in {
|
||||||
dropbox # really?
|
dropbox # really?
|
||||||
# wpa_supplicant_gui
|
# wpa_supplicant_gui
|
||||||
xclip siji fira-mono playerctl font-awesome-ttf
|
xclip siji fira-mono playerctl font-awesome-ttf
|
||||||
|
hs.arbtt
|
||||||
];
|
];
|
||||||
scripts = mkEnv "y-scripts" [
|
scripts = mkEnv "y-scripts" [
|
||||||
peageprint
|
peageprint
|
||||||
|
@ -35,7 +36,6 @@ in {
|
||||||
tdesktop
|
tdesktop
|
||||||
#hexchat
|
#hexchat
|
||||||
#inkscape
|
#inkscape
|
||||||
keepassx
|
|
||||||
# libreoffice
|
# libreoffice
|
||||||
# skype
|
# skype
|
||||||
spotify
|
spotify
|
||||||
|
@ -44,7 +44,7 @@ in {
|
||||||
calibre
|
calibre
|
||||||
wpa_supplicant_gui
|
wpa_supplicant_gui
|
||||||
#py2.plover
|
#py2.plover
|
||||||
wireshark meld
|
wireshark # meld
|
||||||
discord
|
discord
|
||||||
fanficfare
|
fanficfare
|
||||||
hledger hledger-web
|
hledger hledger-web
|
||||||
|
@ -64,7 +64,7 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
nix = mkEnv "y-nix" [
|
nix = mkEnv "y-nix" [
|
||||||
patchelf nix nix-prefetch-git nix-repl nixopsUnstable nox
|
patchelf nix-prefetch-git nixopsUnstable nox
|
||||||
];
|
];
|
||||||
|
|
||||||
c = mkEnv "y-cdev" [
|
c = mkEnv "y-cdev" [
|
||||||
|
@ -81,6 +81,7 @@ in {
|
||||||
wakelan x2x pass
|
wakelan x2x pass
|
||||||
abduco dvtm w3m
|
abduco dvtm w3m
|
||||||
jq jo
|
jq jo
|
||||||
|
thefuck
|
||||||
];
|
];
|
||||||
|
|
||||||
code = mkEnv "y-code" [
|
code = mkEnv "y-code" [
|
||||||
|
@ -94,7 +95,7 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
js = mkEnv "y-jsdev" [
|
js = mkEnv "y-jsdev" [
|
||||||
js.jshint nodejs-6_x electron node2nix_git
|
js.jshint nodejs-6_x electron js.node2nix
|
||||||
];
|
];
|
||||||
|
|
||||||
pdf = mkEnv "y-pdf" [
|
pdf = mkEnv "y-pdf" [
|
||||||
|
@ -109,7 +110,7 @@ in {
|
||||||
# will remove all your previously installed nix-env stuff
|
# will remove all your previously installed nix-env stuff
|
||||||
# so check with nix-env -q first
|
# so check with nix-env -q first
|
||||||
hosts = with self; with self.envs; {
|
hosts = with self; with self.envs; {
|
||||||
ascanius = [apps code de games envs.js pdf nix media gcc misc scripts coins];
|
ascanius = [apps code de games envs.js pdf nix media gcc misc scripts coins myEmacs];
|
||||||
jarvis = [apps code de games envs.js pdf nix media gcc misc scripts myEmacs];
|
jarvis = [apps code de games envs.js pdf nix media gcc misc scripts myEmacs];
|
||||||
woodhouse = [de media misc kodi chromium spotify];
|
woodhouse = [de media misc kodi chromium spotify];
|
||||||
pennyworth = [];
|
pennyworth = [];
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
{ pkgs ? (import <nixpkgs> {})
|
|
||||||
, stdenv ? pkgs.stdenv
|
|
||||||
, xdotool ? pkgs.xdotool
|
|
||||||
, makeWrapper ? pkgs.makeWrapper
|
|
||||||
, wmctrl ? pkgs.wmctrl
|
|
||||||
, fetchFromGitHub ? pkgs.fetchFromGitHub
|
|
||||||
, bash ? pkgs.bash
|
|
||||||
, python3 ? pkgs.python3
|
|
||||||
, libinput ? pkgs.libinput
|
|
||||||
, procps ? pkgs.procps
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
version = "2.16";
|
|
||||||
name = "libinput-gestures-${version}";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "bulletmark";
|
|
||||||
repo = "libinput-gestures";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "0ix1ygbrwjvabxpq8g4xcfdjrcc6jq79vxpbv6msaxmjxp6dv17w";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [./paths.diff];
|
|
||||||
|
|
||||||
buildInputs = with pkgs; [ makeWrapper ];
|
|
||||||
|
|
||||||
installFlags = "DESTDIR=$(out)";
|
|
||||||
preInstall = ''
|
|
||||||
substituteAllInPlace libinput-gestures.desktop
|
|
||||||
'';
|
|
||||||
postInstall = ''
|
|
||||||
wrapProgram $out/bin/libinput-gestures \
|
|
||||||
--prefix PATH : "${python3}/bin:${xdotool}/bin:${wmctrl}/bin:${libinput}/bin"
|
|
||||||
substituteInPlace $out/bin/libinput-gestures-setup \
|
|
||||||
--replace "DIR=\"/" "DIR=\"$out/"
|
|
||||||
wrapProgram $out/bin/libinput-gestures-setup \
|
|
||||||
--prefix PATH : "${procps}/bin:${libinput}/bin"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
description = "libinput gesture recognition";
|
|
||||||
license = licenses.gpl3;
|
|
||||||
maintainers = with maintainers; [ yorickvp ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,52 +0,0 @@
|
||||||
diff --git a/libinput-gestures b/libinput-gestures
|
|
||||||
index 7c7418e..db8326e 100755
|
|
||||||
--- a/libinput-gestures
|
|
||||||
+++ b/libinput-gestures
|
|
||||||
@@ -4,13 +4,13 @@
|
|
||||||
import os, sys, argparse, subprocess, shlex, re, getpass, fcntl
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
-PROG = Path(sys.argv[0]).name
|
|
||||||
+PROG = "libinput-gestures"
|
|
||||||
|
|
||||||
# Conf file containing gesture commands.
|
|
||||||
# Search first for user file then system file.
|
|
||||||
CONFNAME = '{}.conf'.format(PROG)
|
|
||||||
USERDIR = os.getenv('XDG_CONFIG_DIR', os.path.expanduser('~/.config'))
|
|
||||||
-CONFDIRS = (USERDIR, '/etc')
|
|
||||||
+CONFDIRS = (USERDIR, str(Path(os.path.abspath(__file__)).parent / '../etc'), '/etc')
|
|
||||||
|
|
||||||
# Set up command line arguments
|
|
||||||
opt = argparse.ArgumentParser(description=__doc__)
|
|
||||||
diff --git a/libinput-gestures-setup b/libinput-gestures-setup
|
|
||||||
index 22be217..03ff39b 100755
|
|
||||||
--- a/libinput-gestures-setup
|
|
||||||
+++ b/libinput-gestures-setup
|
|
||||||
@@ -1,11 +1,11 @@
|
|
||||||
-#!/bin/bash
|
|
||||||
+#!/usr/bin/env bash
|
|
||||||
# User setup script.
|
|
||||||
# (C) Mark Blakeney, markb@berlios.de, Aug 2016.
|
|
||||||
|
|
||||||
-PROG="$(basename $0)"
|
|
||||||
+PROG="libinput-gestures-setup"
|
|
||||||
NAME=${PROG%-*}
|
|
||||||
|
|
||||||
-BINDIR="/usr/bin"
|
|
||||||
+BINDIR="/bin"
|
|
||||||
APPDIR="/usr/share/applications"
|
|
||||||
ICOBAS="/usr/share/icons/hicolor"
|
|
||||||
ICODIR="$ICOBAS/128x128/apps"
|
|
||||||
diff --git a/libinput-gestures.desktop b/libinput-gestures.desktop
|
|
||||||
index 903c14c..13d71f3 100644
|
|
||||||
--- a/libinput-gestures.desktop
|
|
||||||
+++ b/libinput-gestures.desktop
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
Type=Application
|
|
||||||
Terminal=false
|
|
||||||
Name=Libinput Gestures
|
|
||||||
-Exec=/usr/bin/libinput-gestures
|
|
||||||
+Exec=@out@/bin/libinput-gestures
|
|
||||||
Icon=libinput-gestures
|
|
||||||
Comment=Background application to intercept and action libinput gestures from touchpad.
|
|
||||||
Categories=GNOME;GTK;System;
|
|
Loading…
Reference in New Issue