From 49481e5a65a8bdec1d6a390ddaf7d48740fbbec1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 2 Jan 2019 22:22:06 +0100 Subject: pythonPackages.casttube: init at 0.2.0 --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0fe295de9731..e9743481a2e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5151,6 +5151,8 @@ in { pytado = callPackage ../development/python-modules/pytado { }; + casttube = callPackage ../development/python-modules/casttube { }; + }); in fix' (extends overrides packages) -- cgit 1.4.1 From 1ac1f2b59ab6d106ef8979913eff18303e53e9aa Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Wed, 2 Jan 2019 20:23:49 -0200 Subject: mojave-gtk-theme: init at 2019-01-02 (#53197) --- pkgs/data/themes/mojave/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/data/themes/mojave/default.nix (limited to 'pkgs/top-level') diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix new file mode 100644 index 000000000000..7c3c852e6afd --- /dev/null +++ b/pkgs/data/themes/mojave/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "mojave-gtk-theme"; + version = "2019-01-02"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "053bfc5pslwpqhn05dzznh236g1z4cnn2dzwvb914f6m855fbxfg"; + }; + + buildInputs = [ gtk_engines ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + patchShebangs . + mkdir -p $out/share/themes + name= ./install.sh -d $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "Mac OSX Mojave like theme for GTK based desktop environments"; + homepage = https://github.com/vinceliuice/Mojave-gtk-theme; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae595dc04261..2a7290ffb2ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15653,12 +15653,14 @@ in mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; + mojave-gtk-theme = callPackage ../data/themes/mojave { }; + + moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; + monoid = callPackage ../data/fonts/monoid { }; mononoki = callPackage ../data/fonts/mononoki { }; - moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; - montserrat = callPackage ../data/fonts/montserrat { }; mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; -- cgit 1.4.1 From 88a82a4dc9ea13b4159c80faf4336ff2da522e95 Mon Sep 17 00:00:00 2001 From: wedens Date: Wed, 2 Jan 2019 23:09:15 +0700 Subject: xkb-switch: 1.3.1 -> 1.5.0, rename from xkb_switch --- pkgs/misc/vim-plugins/overrides.nix | 6 +++--- pkgs/tools/X11/xkb-switch/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 307681111ac2..febdd94e1198 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,7 +1,7 @@ { lib, stdenv , python, cmake, vim, ruby , which, fetchgit, llvmPackages, rustPlatform -, xkb_switch, fzf, skim +, xkb-switch, fzf, skim , python3, boost, icu, ncurses , ycmd, rake , substituteAll @@ -308,9 +308,9 @@ self: super: { vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: { patchPhase = '' substituteInPlace plugin/xkbswitch.vim \ - --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so + --replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so ''; - buildInputs = [ xkb_switch ]; + buildInputs = [ xkb-switch ]; }); vim-yapf = super.vim-yapf.overrideAttrs(old: { diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix index 4afa56f7fe27..e3bbd5990757 100644 --- a/pkgs/tools/X11/xkb-switch/default.nix +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchgit, cmake, libX11 }: +{ stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }: stdenv.mkDerivation rec { name = "xkb-switch-${version}"; - version = "1.3.1"; + version = "1.5.0"; - src = fetchgit { - url = https://github.com/ierton/xkb-switch.git; - rev = "351c84370ad0fa4aaaab9a32817859b1d5fb2a11"; - sha256 = "0ilj3amwidi7imjvi8hr62y7j8zl809r5xhs7kv816773x32gpxq"; + src = fetchFromGitHub { + owner = "ierton"; + repo = "xkb-switch"; + rev = version; + sha256 = "03wk2gg3py97kx0kjzbjrikld1sa55i6mgi398jbcbiyx2gjna78"; }; - buildInputs = [ cmake libX11 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libX11 libxkbfile ]; meta = with stdenv.lib; { description = "Switch your X keyboard layouts from the command line"; - homepage = https://github.com/ierton/xkb-switch; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; platforms = platforms.linux; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a7290ffb2ce..2bcb2803c0eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20240,7 +20240,7 @@ in xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {}; - xkb_switch = callPackage ../tools/X11/xkb-switch { }; + xkb-switch = callPackage ../tools/X11/xkb-switch { }; xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; -- cgit 1.4.1 From 0bb53c3e8a8ed9464e910c381b8e9d74fb415644 Mon Sep 17 00:00:00 2001 From: Jorge Acereda Date: Thu, 3 Jan 2019 16:13:12 +0100 Subject: sfml: comment the cf-private workaround --- pkgs/development/libraries/sfml/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 435a9e030a0a..ff59bdcdf92e 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage -, darwin, IOKit, Foundation, AppKit, OpenAL +, cf-private, IOKit, Foundation, AppKit, OpenAL }: let @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ freetype libjpeg openal flac libvorbis glew ] ++ stdenv.lib.optional stdenv.isLinux udev ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL + # Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate + cf-private + ]; cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8f8cb564bd9..8ba097478135 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12491,6 +12491,7 @@ in sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; + inherit (darwin) cf-private; }; csfml = callPackage ../development/libraries/csfml { }; -- cgit 1.4.1 From daf3d7d49f6c966aa4e06dc6f8477b9f41c78d09 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Thu, 3 Jan 2019 17:04:35 +0100 Subject: websocketd: init at 0.3.0 --- .../applications/networking/websocketd/default.nix | 24 ++++++++++++++++++++++ pkgs/applications/networking/websocketd/deps.nix | 12 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/applications/networking/websocketd/default.nix create mode 100644 pkgs/applications/networking/websocketd/deps.nix (limited to 'pkgs/top-level') diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix new file mode 100644 index 000000000000..050358e4dcaa --- /dev/null +++ b/pkgs/applications/networking/websocketd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "websocketd-${version}"; + version = "0.3.0"; + rev = "729c67f052f8f16a0a0aa032816a57649c0ebed3"; + + goPackagePath = "github.com/joewalnes/websocketd"; + + src = fetchgit { + inherit rev; + url = "https://github.com/joewalnes/websocketd"; + sha256 = "1n4fag75lpfxg1pm1pr5v0p44dijrxj59s6dn4aqxirhxkq91lzb"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Turn any program that uses STDIN/STDOUT into a WebSocket server"; + homepage = "http://websocketd.com/"; + maintainers = [ maintainers.bjornfor ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/applications/networking/websocketd/deps.nix b/pkgs/applications/networking/websocketd/deps.nix new file mode 100644 index 000000000000..1e610691f52a --- /dev/null +++ b/pkgs/applications/networking/websocketd/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b"; + sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bcb2803c0eb..bd63744fd979 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22967,6 +22967,8 @@ in webfs = callPackage ../servers/http/webfs { }; + websocketd = callPackage ../applications/networking/websocketd { }; + wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; }; -- cgit 1.4.1