diff options
-rw-r--r-- | nixos/modules/services/x11/compton.nix | 32 | ||||
-rw-r--r-- | pkgs/applications/editors/jetbrains/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/nnn/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/window-managers/compton/default.nix | 157 | ||||
-rw-r--r-- | pkgs/build-support/writers/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/tools/doctl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/uwsgi/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 54 | ||||
-rw-r--r-- | pkgs/tools/networking/tridactyl-native/default.nix | 44 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
14 files changed, 185 insertions, 142 deletions
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index cafd8d88ec4d3..11db0a133d6dd 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -37,7 +37,12 @@ let # opacity active-opacity = ${cfg.activeOpacity}; inactive-opacity = ${cfg.inactiveOpacity}; - menu-opacity = ${cfg.menuOpacity}; + + wintypes: + { + popup_menu = { opacity = ${cfg.menuOpacity}; } + dropdown_menu = { opacity = ${cfg.menuOpacity}; } + }; opacity-rule = [ ${opacityRules} @@ -45,7 +50,7 @@ let # other options backend = ${toJSON cfg.backend}; - vsync = ${toJSON cfg.vSync}; + vsync = ${lib.boolToString cfg.vSync}; refresh-rate = ${toString cfg.refreshRate}; '' + cfg.extraOptions); @@ -189,15 +194,22 @@ in { }; vSync = mkOption { - type = types.enum [ - "none" "drm" "opengl" - "opengl-oml" "opengl-swc" "opengl-mswc" - ]; - default = "none"; - example = "opengl-swc"; + type = with types; either bool + (enum [ "none" "drm" "opengl" "opengl-oml" "opengl-swc" "opengl-mswc" ]); + default = false; + apply = x: + let + res = x != "none"; + msg = "The type of services.compton.vSync has changed to bool:" + + " interpreting ${x} as ${lib.boolToString res}"; + in + if isBool x then x + else warn msg res; + description = '' - Enable vertical synchronization using the specified method. - See <literal>compton(1)</literal> man page an explanation. + Enable vertical synchronization. Chooses the best method + (drm, opengl, opengl-oml, opengl-swc, opengl-mswc) automatically. + The bool value should be used, the others are just for backwards compatibility. ''; }; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 7bc25ceed7fcc..d4a65e083a6f8 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "198rbvhqjaix6qw36rlfafbv5aj0i6zr93adzgkilrn2l9v1jf07"; /* updated by script */ + sha256 = "1bhx2p40r15zvfr6q10bj5y8jaa3i9x9adchczp0irkd3w2jgvy3"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 5367ef5330212..c38a27d55e630 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "nnn-${version}"; - version = "2.4"; + pname = "nnn"; + version = "2.5"; src = fetchFromGitHub { owner = "jarun"; - repo = "nnn"; + repo = pname; rev = "v${version}"; - sha256 = "0y55h5pxd20qw2ajhz8fsk45aynx0xzgr9kfr545hyhmfkg2nc49"; + sha256 = "0hvb0q6jg2nmvb40q43jj7v45afkjgcq6q9ldmmrh5558d0n65cw"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 61484478e4de9..6982f82a816d2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,6 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow +, tridactyl-native , udev , kerberos }: @@ -67,6 +68,7 @@ let ([ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow + ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 2c388c941e6ce..60607ea89d15c 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -3,110 +3,67 @@ , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage , libXinerama, libXrandr, libXrender, libXext, xwininfo, libxdg_basedir }: +stdenv.mkDerivation rec { + pname = "compton"; + version = "6.2"; -let - common = source: stdenv.mkDerivation (source // rec { - name = "${source.pname}-${source.version}"; + COMPTON_VERSION = "v${version}"; - nativeBuildInputs = (source.nativeBuildInputs or []) ++ [ - pkgconfig - asciidoc - docbook_xml_dtd_45 - docbook_xsl - makeWrapper - ]; - - installFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/compton-trans \ - --prefix PATH : ${lib.makeBinPath [ xwininfo ]} - ''; - - meta = with lib; { - description = "A fork of XCompMgr, a sample compositing manager for X servers"; - longDescription = '' - A fork of XCompMgr, which is a sample compositing manager for X - servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE - extensions. It enables basic eye-candy effects. This fork adds - additional features, such as additional effects, and a fork at a - well-defined and proper place. - ''; - license = licenses.mit; - maintainers = with maintainers; [ ertes enzime twey ]; - platforms = platforms.linux; - }; - }); - - stableSource = rec { - pname = "compton"; - version = "0.1_beta2.5"; - - COMPTON_VERSION = version; - - buildInputs = [ - dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext - libXinerama libdrm pcre libxml2 libxslt libconfig libGL - ]; - - src = fetchFromGitHub { - owner = "chjj"; - repo = "compton"; - rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; - sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; - }; - - meta = { - homepage = https://github.com/chjj/compton/; - }; + src = fetchFromGitHub { + owner = "yshui"; + repo = "compton"; + rev = COMPTON_VERSION; + sha256 = "03fi9q8zw2qrwpkmy1bnavgfh91ci9in5fdi17g4s5s0n2l7yil7"; }; - gitSource = rec { - pname = "compton-git"; - version = "5.1-rc2"; - - COMPTON_VERSION = "v${version}"; - - nativeBuildInputs = [ meson ninja ]; - - src = fetchFromGitHub { - owner = "yshui"; - repo = "compton"; - rev = COMPTON_VERSION; - sha256 = "1qpy76kkhz8gfby842ry7lanvxkjxh4ckclkcjk4xi2wsmbhyp08"; - }; - - buildInputs = [ - dbus libX11 libXext - xorgproto - libXinerama libdrm pcre libxml2 libxslt libconfig libGL - # Removed: - # libXcomposite libXdamage libXrender libXrandr - - # New: - libxcb xcbutilrenderutil xcbutilimage - pixman libev - libxdg_basedir - ]; - - preBuild = '' - git() { echo "v${version}"; } - export -f git + nativeBuildInputs = [ + meson ninja + pkgconfig + asciidoc + docbook_xml_dtd_45 + docbook_xsl + makeWrapper + ]; + + buildInputs = [ + dbus libX11 libXext + xorgproto + libXinerama libdrm pcre libxml2 libxslt libconfig libGL + libxcb xcbutilrenderutil xcbutilimage + pixman libev + libxdg_basedir + ]; + + NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ]; + + mesonFlags = [ + "-Dbuild_docs=true" + ]; + + preBuild = '' + git() { echo "v${version}"; } + export -f git + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/compton-trans \ + --prefix PATH : ${lib.makeBinPath [ xwininfo ]} + ''; + + meta = with lib; { + description = "A fork of XCompMgr, a sample compositing manager for X servers"; + longDescription = '' + A fork of XCompMgr, which is a sample compositing manager for X + servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE + extensions. It enables basic eye-candy effects. This fork adds + additional features, such as additional effects, and a fork at a + well-defined and proper place. ''; - - NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ]; - - mesonFlags = [ - "-Dvsync_drm=true" - "-Dnew_backends=true" - "-Dbuild_docs=true" - ]; - - meta = { - homepage = https://github.com/yshui/compton/; - }; + license = licenses.mit; + homepage = "https://github.com/yshui/compton"; + maintainers = with maintainers; [ ertes enzime twey ]; + platforms = platforms.linux; }; -in { - compton = common stableSource; - compton-git = common gitSource; } diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 29a4bbad703ea..ae7b42449fb34 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -24,6 +24,9 @@ rec { }) '' echo "#! $interpreter" > $out cat "$contentPath" >> $out + ${optionalString (check != "") '' + ${check} $out + ''} chmod +x $out ${optionalString (types.path.check nameOrPath) '' mv $out tmp diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 7762dc2f372a8..d7604f4de9d7e 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "doctl-${version}"; version = "${major}.${minor}.${patch}"; major = "1"; - minor = "16"; + minor = "18"; patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; @@ -21,7 +21,7 @@ buildGoPackage rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "041fqanlk8px4nhxaxxs27gbqh8571szxfrcp0zmihdbr4nc70dv"; + sha256 = "1p43q1iyjj597gr47hn589fv7n26mny9niq7yb9hlmslkplsrb0a"; }; meta = { diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index e9cc370f4e7bb..1ebc7240d20f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.2-rc1"; - modDirVersion = "5.2.0-rc1"; + version = "5.2-rc2"; + modDirVersion = "5.2.0-rc2"; extraMeta.branch = "5.2"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "169gjmciijgmwwfyz3n7pvf2x18pmfvgdk73s8jlx30ggwzgac1l"; + sha256 = "0fd6z6zx9a3ax5jyvxm7gmfzain26la5gf18fccxip7bfn72bj4f"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 1deba4e12aff4..1e84648747276 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar schneefux ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 5de2730989158..6046e9c24bd2d 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-26"; + version = "2019-05-27"; name = "oh-my-zsh-${version}"; - rev = "1343ab67edd8a81b75aceca77ddb526be87a20c1"; + rev = "7f66a070a4be1ae797151e761f9eaaf3ef8549a8"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1932vwzbxd0i76hsjxn6ww3ydpwyk0w1k51xsps5m1q86m19jn5b"; + sha256 = "1k2yfyl7cpcnl0z2zay3i6ahfj90km9km4srsprkyy6fg00gfcgs"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index f63c1d474c05f..fe9a5695a4b34 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,29 +1,51 @@ -{ stdenv, fetchurl, bison, pkgconfig -, glib, gtk2, libxml2, gettext, zlib, binutils, gnutls }: +{ stdenv, fetchurl, fetchpatch, bison, pkgconfig, gettext, desktop-file-utils +, glib, gtk2, libxml2, libbfd, zlib, binutils, gnutls +}: -let - name = "gtk-gnutella"; - version = "1.1.9"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; +stdenv.mkDerivation rec { + pname = "gtk-gnutella"; + version = "1.1.14"; src = fetchurl { - url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "1zvadgsskmpm82id9mbj24a2lyq38qv768ixv7nmfjl3d4wr2biv"; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "0sljjha4anfz1r1xq1c6qnnkjv62ld56p7xgj4bsi6lqmq1azvii"; }; - nativeBuildInputs = [ bison gettext pkgconfig ]; - buildInputs = [ binutils glib gnutls gtk2 libxml2 zlib ]; + patches = [ + (fetchpatch { + # Avoid namespace conflict with glibc 2.28 'statx' struct / remove after v1.1.14 + url = "https://github.com/gtk-gnutella/gtk-gnutella/commit/e4205a082eb32161e28de81f5cba8095eea8ecc7.patch"; + sha256 = "0ffkw2cw2b2yhydii8jm40vd40p4xl224l8jvhimg02lgs3zfbca"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gtk-gnutella/raw/f30/f/gtk-gnutella-1.1.14-endian.patch"; + sha256 = "19q4lq8msknfz4mkbjdqmmgld16p30j2yx371p8spmr19q5i0sfn"; + }) + ]; + + postPatch = '' + substituteInPlace Makefile.SH --replace "@exit 0" "@echo done" + ''; + + nativeBuildInputs = [ bison desktop-file-utils gettext pkgconfig ]; + buildInputs = [ binutils glib gnutls gtk2 libbfd libxml2 zlib ]; + + configureScript = "./build.sh"; + configureFlags = [ "--configure-only" ]; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; - configureScript = "./build.sh --configure-only"; + enableParallelBuilding = true; + + postInstall = '' + install -Dm0444 src/${pname}.man $out/share/man/man1/${pname}.1 + ''; meta = with stdenv.lib; { - homepage = http://gtk-gnutella.sourceforge.net/; - description = "Server/client for Gnutella"; - license = licenses.gpl2; + description = "A GTK+ Gnutella client, optimized for speed and scalability"; + homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella + changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix new file mode 100644 index 0000000000000..687dae2ea6fe8 --- /dev/null +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation rec { + pname = "tridactyl-native"; + # this is actually the version of tridactyl itself; the native messenger will + # probably not change with every tridactyl version + version = "1.14.9"; + + src = fetchFromGitHub { + owner = "tridactyl"; + repo = "tridactyl"; + rev = version; + sha256 = "0d80c744qfv6jd03cmdp3p71xaj8lq8jzsa2m24jxv9q4ks2dcmj"; + }; + sourceRoot = "source/native"; + + nativeBuildInputs = [ + python3.pkgs.wrapPython + ]; + + buildPhase = '' + sed -i -e "s|REPLACE_ME_WITH_SED|$out/share/tridactyl/native_main.py|" "tridactyl.json" + ''; + + installPhase = '' + mkdir -p "$out/lib/mozilla/native-messaging-hosts" + cp tridactyl.json "$out/lib/mozilla/native-messaging-hosts/" + + mkdir -p "$out/share/tridactyl" + cp native_main.py "$out/share/tridactyl" + wrapPythonProgramsIn "$out/share/tridactyl" + ''; + + meta = with stdenv.lib; { + description = "Tridactyl native messaging host application"; + homepage = https://github.com/tridactyl/tridactyl; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 992f8a4d4c303..91286b4bc0654 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -59,6 +59,7 @@ mapAliases ({ clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 conkerorWrapper = conkeror; # added 2015-01 + compton-git = compton; # added 2019-05-20 conntrack_tools = conntrack-tools; # added 2018-05 cool-old-term = cool-retro-term; # added 2015-01-31 cupsBjnp = cups-bjnp; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cd29f0cbd444..858b634681ce7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2637,6 +2637,8 @@ in teamocil = callPackage ../tools/misc/teamocil { }; + tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -20951,7 +20953,7 @@ in inherit (xorg) xcompmgr; - inherit (callPackage ../applications/window-managers/compton {}) compton compton-git; + compton = callPackage ../applications/window-managers/compton {}; xdaliclock = callPackage ../tools/misc/xdaliclock {}; |