diff options
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/misc/truecrypt/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/themes/flat-plat/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/tools/misc/cpuminer/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
6 files changed, 41 insertions, 7 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4fc3dbf06e93..7f6c823d68b9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -259,6 +259,7 @@ moretea = "Maarten Hoogendoorn <maarten@moretea.nl>"; mornfall = "Petr Ročkai <me@mornfall.net>"; MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>"; + mounium = "Katona László <muoniurn@gmail.com>"; MP2E = "Cray Elliott <MP2E@archlinux.us>"; mpscholten = "Marc Scholten <marc@mpscholten.de>"; msackman = "Matthew Sackman <matthew@wellquite.org>"; diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 19fa85b279c6..bc15b084cd9f 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -49,8 +49,8 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://fossies.org/unix/misc/TrueCrypt-7.1a-Source.tar.gz; - sha1 = "d43e0dbe05c04e316447d87413c4f74c68f5de24"; + url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz; + sha256 = "e6214e911d0bbededba274a2f8f8d7b3f6f6951e20f1c3a598fc7a23af81c8dc"; }; pkcs11h = fetchurl { diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index cec8acb82ab4..c8a719b194ad 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,7 +2,7 @@ , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking, makeQtWrapper }: -let version = "0.8.1"; in +let version = "0.8.2"; in buildPythonApplication rec { name = "qutebrowser-${version}"; @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "18hj95pgybpavwwnyczh6s94spljfngz684y1jlhqnpbp14pkflh"; + sha256 = "1kfxjdn1dqla8d8gcggp55zcgf4zb77knkfshd213my0iw2yzgcf"; }; # Needs tox diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix new file mode 100644 index 000000000000..0956bc59b429 --- /dev/null +++ b/pkgs/misc/themes/flat-plat/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "flat-plat-gtk-theme-eba3be5"; + + src = fetchFromGitHub { + owner = "nana-4"; + repo = "Flat-Plat"; + rev = "eba3be5eafd1140e1edb8b02411edb2f6c78b0ca"; + sha256 = "0vfdnrxspdwg4jr025dwjmdcrqnblhlw666v5b7qhkxymibp5j7h"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/themes + rm .gitignore COPYING README.md + cp -r . $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "A Material Design-like flat theme for GTK3, GTK2, and GNOME Shell"; + homepage = https://github.com/nana-4/Flat-Plat; + licence = licenses.gpl2; + maintainers = [ maintainers.mounium ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 64657d7cd3b9..375aa999e3b9 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, curl, jansson }: +{ stdenv, fetchurl, curl, jansson, perl }: stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "0xdgz5qlx1yr3mw2h4bwlbj94y6v2ygjy334cnc87xgzxf1wgann"; + sha256 = "130ab6vcbm9azl9w8n97fzjnjbakm0k2n3wc1bcgy5y5c8s0220h"; }; + patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null; + buildInputs = [ curl jansson ]; configureFlags = [ "CFLAGS=-O3" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b353a5bf29be..212d975fb00e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17050,6 +17050,8 @@ in fceux = callPackage ../misc/emulators/fceux { }; + flat-plat = callPackage ../misc/themes/flat-plat { }; + foldingathome = callPackage ../misc/foldingathome { }; foo2zjs = callPackage ../misc/drivers/foo2zjs {}; |