From 306a0d32dfb668f697e962206284f8df75964d0d Mon Sep 17 00:00:00 2001 From: xd1le Date: Fri, 22 Sep 2017 23:12:49 +1000 Subject: [PATCH 001/106] CONTRIBUTING.md: mention that the meta.license and meta.maintainers attributes must be set --- .github/CONTRIBUTING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f7fac647f41..99c5e0e429b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -32,11 +32,13 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). * `meta.description` should: - * Be capitalized - * Not start with the package name - * Not have a dot at the end + * Be capitalized. + * Not start with the package name. + * Not have a period at the end. +* `meta.license` must be set and fit the upstream license. +* `meta.maintainers` must be set. -See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). +See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). ## Writing good commit messages From 4b25ecc7b8142155728422cbab4a68592e63f35d Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Oct 2017 20:37:02 +1100 Subject: [PATCH 002/106] CONTRIBUTING.md: license should default to unfree if there is no upstream license --- .github/CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 99c5e0e429b..41e85bd5ac4 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -36,6 +36,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * Not start with the package name. * Not have a period at the end. * `meta.license` must be set and fit the upstream license. + * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`. * `meta.maintainers` must be set. See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). From df5691d6770e2a8b2955ed0da2d48a01b00e4eaa Mon Sep 17 00:00:00 2001 From: xd1le Date: Sun, 1 Oct 2017 00:36:10 +1000 Subject: [PATCH 003/106] buildLuaPackage: set makeFlags directly instead of through preBuild So that lua packages can override it without having to resort to setting makeFlagsArray in preBuild. --- pkgs/development/lua-modules/generic/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 2a44cdfca0b..7152d0b9e36 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -5,14 +5,13 @@ lua: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else - lua.stdenv.mkDerivation ({ - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua.luaversion}" - LUA_INC="-I${lua}/include"); - ''; + lua.stdenv.mkDerivation ( + { + makeFlags = [ + "PREFIX=$(out)" + "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}" + "LUA_INC=-I${lua}/include" + ]; } // attrs From b83c89b6b488653d935e038a4d1763e0f814caa5 Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Oct 2017 23:21:48 +1100 Subject: [PATCH 004/106] luajitPackages.mpack: disable with new isLuaJIT function insead of marking it as broken --- pkgs/top-level/lua-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ff1108471bd..bea78a4c7df 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -14,6 +14,7 @@ let isLua51 = lua.luaversion == "5.1"; isLua52 = lua.luaversion == "5.2"; + isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit"; platformString = if stdenv.isDarwin then "macosx" @@ -534,13 +535,13 @@ let "LUA_VERSION_MAJ_MIN=" "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}" ]; + # gcc -llua fails with luajit. + disabled = isLuaJIT; meta = { description = "Simple implementation of msgpack in C Lua 5.1"; homepage = "https://github.com/tarruda/libmpack"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.mit; - # gcc -llua fails with luajit - broken = (builtins.parseDrvName lua.name).name != "lua"; }; }; From 152d294479a5fa7ddfb6c59d58719777ea2cb11c Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Oct 2017 23:27:42 +1100 Subject: [PATCH 005/106] luajitPackages: disable luaexpat, luazip and cjson as their builds fail --- pkgs/top-level/lua-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index bea78a4c7df..164b8258162 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -151,6 +151,8 @@ let EXPAT_INC="-I${expat.dev}/include"); ''; + disabled = isLuaJIT; + meta = { homepage = "http://matthewwild.co.uk/projects/luaexpat"; platforms = stdenv.lib.platforms.unix; @@ -333,7 +335,7 @@ let buildInputs = [ unzip zziplib ]; patches = [ ../development/lua-modules/zip.patch ]; # does not currently work under lua 5.2 - disabled = isLua52; + disabled = isLua52 || isLuaJIT; meta = { homepage = "https://github.com/luaforge/luazip"; platforms = stdenv.lib.platforms.linux; @@ -484,6 +486,7 @@ let rm -rf $out/share/lua/${lua.luaversion}/cjson/tests ''; installTargets = "install install-extra"; + disabled = isLuaJIT; meta = { description = "Lua C extension module for JSON support"; license = stdenv.lib.licenses.mit; From b584c46623eba3985686ae41b9318694a6cb59ac Mon Sep 17 00:00:00 2001 From: xd1le Date: Mon, 9 Oct 2017 23:29:56 +1100 Subject: [PATCH 006/106] luaPackages.luacheck: skip buildPhase --- pkgs/top-level/lua-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 164b8258162..9bbb5a7c0c0 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -86,6 +86,9 @@ let propagatedBuildInputs = [ lua ]; + # No Makefile. + dontBuild = true; + installPhase = '' ${lua}/bin/lua install.lua $out ''; From 2227d3586e1f0ed38b14bbd946738551a9d88329 Mon Sep 17 00:00:00 2001 From: Tom Saeger Date: Mon, 9 Oct 2017 21:22:16 -0500 Subject: [PATCH 007/106] pythonPackages.ofxclient: 1.3.8 -> 2.0.3 --- .../python-modules/ofxclient/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +---------- 2 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/ofxclient/default.nix diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix new file mode 100644 index 00000000000..c7877675530 --- /dev/null +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, + ofxhome, ofxparse, beautifulsoup, lxml, keyring +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + version = "2.0.3"; + pname = "ofxclient"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jdhqsbl34yn3n0x6mwsnl58c25v5lp6vr910c2hk7l74l5y7538"; + }; + + patchPhase = '' + substituteInPlace setup.py --replace '"argparse",' "" + ''; + + # ImportError: No module named tests + doCheck = false; + + propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup lxml keyring ]; + + meta = with stdenv.lib; { + homepage = https://github.com/captin411/ofxclient; + description = "OFX client for dowloading transactions from banks"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a34b22482e..75a2c8d077d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24776,22 +24776,7 @@ EOF }; }; - ofxclient = buildPythonPackage rec { - name = "ofxclient-1.3.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxclient/${name}.tar.gz"; - sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; - }; - - patchPhase = '' - substituteInPlace setup.py --replace '"argparse",' "" - ''; - - # ImportError: No module named tests - doCheck = false; - - propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring ]; - }; + ofxclient = callPackage ../development/python-modules/ofxclient {}; ofxhome = buildPythonPackage rec { name = "ofxhome-0.3.1"; From 0946e304705414dd9f01e01f792293338fd37caf Mon Sep 17 00:00:00 2001 From: xd1le Date: Fri, 13 Oct 2017 14:46:51 +1100 Subject: [PATCH 008/106] luaPackages: use consistent multiline strings for luafilsystem and luazlib --- pkgs/top-level/lua-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 9bbb5a7c0c0..e4f18258aff 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -169,7 +169,10 @@ let url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1"; }; - preConfigure = "substituteInPlace config --replace 'CC= gcc' '';" + + preConfigure = '' + substituteInPlace config --replace "CC= gcc" ""; + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace config \ --replace 'LIB_OPTION= -shared' '###' \ @@ -357,7 +360,9 @@ let buildInputs = [ zlib ]; - preConfigure = "substituteInPlace Makefile --replace gcc cc --replace '-llua' ''"; + preConfigure = '' + substituteInPlace Makefile --replace gcc cc --replace "-llua" "" + ''; preBuild = '' makeFlagsArray=( From acc076d51fb367ec900c026ab64513f62d997258 Mon Sep 17 00:00:00 2001 From: xd1le Date: Fri, 13 Oct 2017 14:48:17 +1100 Subject: [PATCH 009/106] luaPackages: various cosmetic fixes These involve: - Formatting and spacing. - Switching to using fetchFromGitHub where possible. - Adding missing meta attributes. - Correcting license values or adding missing license values. - Adding vyp as maintainer for unmaintained packages. None of these changes should affect the build result. A different revision is used for luasqlite3, however, the source code between these revisions is actually the same. (And the advantage is that the new revision is a tagged release.) --- pkgs/top-level/lua-packages.nix | 297 +++++++++++++++++++++----------- 1 file changed, 194 insertions(+), 103 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e4f18258aff..c94a401db0f 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -43,6 +43,7 @@ let luabitop = buildLuaPackage rec { version = "1.0.2"; name = "bitop-${version}"; + src = fetchurl { url = "http://bitop.luajit.org/download/LuaBitOp-${version}.tar.gz"; sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj"; @@ -66,8 +67,10 @@ let install -p bit.so $out/lib/lua/${lua.luaversion} ''; - meta = { + meta = with stdenv.lib; { + description = "C extension module for Lua which adds bitwise operations on numbers"; homepage = "http://bitop.luajit.org"; + license = licenses.mit; maintainers = with maintainers; [ flosse ]; }; }; @@ -75,7 +78,7 @@ let luacheck = buildLuaPackage rec { pname = "luacheck"; version = "0.20.0"; - name = "${pname}${version}"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mpeterv"; @@ -91,12 +94,13 @@ let installPhase = '' ${lua}/bin/lua install.lua $out - ''; + ''; meta = with stdenv.lib; { description = "A tool for linting and static analysis of Lua code"; homepage = https://github.com/mpeterv/luacheck; license = licenses.mit; + maintainers = with maintainers; [ vyp ]; platforms = platforms.unix; }; }; @@ -106,8 +110,10 @@ let name = "luaevent-${version}"; disabled = isLua52; - src = fetchzip { - url = "https://github.com/harningt/luaevent/archive/v${version}.tar.gz"; + src = fetchFromGitHub { + owner = "harningt"; + repo = "luaevent"; + rev = "v${version}"; sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik"; }; @@ -127,7 +133,7 @@ let homepage = http://luaforge.net/projects/luaevent/; description = "Binding of libevent to Lua"; license = licenses.mit; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; }; }; @@ -135,6 +141,7 @@ let version = "1.3.0"; name = "expat-${version}"; isLibrary = true; + src = fetchurl { url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz"; sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h"; @@ -156,17 +163,22 @@ let disabled = isLuaJIT; - meta = { + meta = with stdenv.lib; { + description = "SAX XML parser based on the Expat library"; homepage = "http://matthewwild.co.uk/projects/luaexpat"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.flosse ]; + license = licenses.mit; + maintainers = with maintainers; [ flosse ]; + platforms = platforms.unix; }; }; luafilesystem = buildLuaPackage rec { name = "filesystem-1.6.2"; - src = fetchzip { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; + + src = fetchFromGitHub { + owner = "keplerproject"; + repo = "luafilesystem"; + rev = "v1_6_2"; sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1"; }; @@ -179,40 +191,47 @@ let --replace '#LIB_OPTION= -bundle' 'LIB_OPTION= -bundle' substituteInPlace Makefile --replace '10.3' '10.5' ''; - meta = { + + meta = with stdenv.lib; { + description = "Lua library complementing filesystem-related functions"; homepage = "https://github.com/keplerproject/luafilesystem"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; maintainers = with maintainers; [ flosse ]; + platforms = platforms.unix; }; }; luaposix = buildLuaPackage rec { name = "posix-${version}"; version = "33.4.0"; - src = fetchurl { - url = "https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz"; - sha256 = "e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21"; + + src = fetchFromGitHub { + owner = "luaposix"; + repo = "luaposix"; + rev = "release-v${version}"; + sha256 = "0y531p54lx2yf243bcsyp6sv8fvbqidp20yry0xvb85p8zw9dlrq"; }; + buildInputs = [ perl ]; - meta = { + + meta = with stdenv.lib; { description = "Lua bindings for POSIX API"; homepage = "https://github.com/luaposix/luaposix"; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.unix; }; }; lpty = buildLuaPackage rec { name = "lpty-${version}"; version = "1.1.1"; + src = fetchurl { url = "http://www.tset.de/downloads/lpty-1.1-1.tar.gz"; sha256 = "0d4ffda654dcf37dd8c99bcd100d0ee0dde7782cbd0ba9200ef8711c5cab02f1"; }; - meta = { - homepage = "http://www.tset.de/lpty"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; - }; + preBuild = '' makeFlagsArray=( INST_LIBDIR="$out/lib/lua/${lua.luaversion}" @@ -222,15 +241,24 @@ let LUA_LIBDIR="-L${lua}/lib" ); ''; + + meta = with stdenv.lib; { + description = "PTY control for Lua"; + homepage = "http://www.tset.de/lpty"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; + }; }; lua-iconv = buildLuaPackage rec { name = "lua-iconv-${version}"; version = "7"; + src = fetchFromGitHub { owner = "ittner"; repo = "lua-iconv"; - rev = "e8d34024a6b185a759733915f116cc5588550261"; + rev = name; sha256 = "0rd76966qlxfp8ypkyrbif76nxnm1acclqwfs45wz3972jsk654i"; }; @@ -240,17 +268,18 @@ let ); ''; - meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + meta = with stdenv.lib; { description = "Lua bindings for POSIX iconv"; - maintainers = [ maintainers.richardipsum ]; homepage = "https://ittner.github.io/lua-iconv/"; + license = licenses.mit; + maintainers = with maintainers; [ richardipsum ]; + platforms = platforms.unix; }; }; luasec = buildLuaPackage rec { name = "sec-0.6"; + src = fetchFromGitHub { owner = "brunoos"; repo = "luasec"; @@ -269,19 +298,24 @@ let LIB_PATH="-L$out/lib"); ''; - meta = { + meta = with stdenv.lib; { + description = "Lua binding for OpenSSL library to provide TLS/SSL communication"; homepage = "https://github.com/brunoos/luasec"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.flosse ]; + license = licenses.mit; + maintainers = with maintainers; [ flosse ]; + platforms = platforms.unix; }; }; luasocket = buildLuaPackage rec { name = "socket-${version}"; version = "3.0-rc1"; - src = fetchurl { - url = "https://github.com/diegonehab/luasocket/archive/v${version}.tar.gz"; - sha256 = "0j8jx8bjicvp9khs26xjya8c495wrpb7parxfnabdqa5nnsxjrwb"; + + src = fetchFromGitHub { + owner = "diegonehab"; + repo = "luasocket"; + rev = "v${version}"; + sha256 = "1chs7z7a3i3lck4x7rz60ziwbf793gw169hpjdfca8y4yf1hzsxk"; }; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' @@ -298,29 +332,29 @@ let ''; meta = with stdenv.lib; { + description = "Network support for Lua"; homepage = "http://w3.impa.br/~diego/software/luasocket/"; - platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos; + license = licenses.mit; maintainers = with maintainers; [ mornfall ]; + platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos; }; }; luxio = buildLuaPackage rec { name = "luxio-${version}"; version = "13"; + src = fetchurl { url = "https://git.gitano.org.uk/luxio.git/snapshot/luxio-luxio-13.tar.bz2"; sha256 = "1hvwslc25q7k82rxk461zr1a2041nxg7sn3sw3w0y5jxf0giz2pz"; }; + nativeBuildInputs = [ which pkgconfig ]; + postPatch = '' patchShebangs . ''; - meta = { - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; - description = "Lightweight UNIX I/O and POSIX binding for Lua"; - maintainers = [ maintainers.richardipsum ]; - }; + preBuild = '' makeFlagsArray=( INST_LIBDIR="$out/lib/lua/${lua.luaversion}" @@ -329,23 +363,40 @@ let INSTALL=install ); ''; + + meta = with stdenv.lib; { + description = "Lightweight UNIX I/O and POSIX binding for Lua"; + homepage = "https://www.gitano.org.uk/luxio/"; + license = licenses.mit; + maintainers = with maintainers; [ richardipsum ]; + platforms = platforms.unix; + }; }; luazip = buildLuaPackage rec { name = "zip-${version}"; - version = "1.2.3"; - src = fetchzip { - url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip"; + version = "2007-10-30"; + + src = fetchFromGitHub { + owner = "luaforge"; + repo = "luazip"; + rev = "0b8f5c958e170b1b49f05bc267bc0351ad4dfc44"; sha256 = "0zrrwhmzny5zbpx91bjbl77gzkvvdi3qhhviliggp0aj8w3faxsr"; }; - buildInputs = [ unzip zziplib ]; + + buildInputs = [ zziplib ]; + patches = [ ../development/lua-modules/zip.patch ]; - # does not currently work under lua 5.2 + + # Does not currently work under Lua 5.2 or LuaJIT. disabled = isLua52 || isLuaJIT; - meta = { + + meta = with stdenv.lib; { + description = "Lua library to read files stored inside zip files"; homepage = "https://github.com/luaforge/luazip"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; }; @@ -353,8 +404,10 @@ let name = "zlib-${version}"; version = "1.1"; - src = fetchzip { - url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz"; + src = fetchFromGitHub { + owner = "brimworks"; + repo = "lua-zlib"; + rev = "v${version}"; sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy"; }; @@ -376,40 +429,49 @@ let preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}"; meta = with stdenv.lib; { + description = "Simple streaming interface to zlib for Lua"; homepage = https://github.com/brimworks/lua-zlib; - platforms = platforms.unix; license = licenses.mit; - maintainers = [ maintainers.koral ]; + maintainers = with maintainers; [ koral ]; + platforms = platforms.unix; }; }; luastdlib = buildLuaPackage { name = "stdlib"; + src = fetchzip { url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; }; + nativeBuildInputs = [ autoreconfHook unzip ]; - meta = { - homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + + meta = with stdenv.lib; { + description = "General Lua libraries"; + homepage = "https://github.com/lua-stdlib/lua-stdlib"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; }; lrexlib = buildLuaPackage rec { name = "lrexlib-${version}"; version = "2.8.0"; - src = fetchzip { - url = "https://github.com/rrthomas/lrexlib/archive/rel-2-8-0.zip"; + + src = fetchFromGitHub { + owner = "rrthomas"; + repo = "lrexlib"; + rev = "rel-2-8-0"; sha256 = "1c62ny41b1ih6iddw5qn81gr6dqwfffzdp7q6m8x09zzcdz78zhr"; }; - buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ]; + + buildInputs = [ luastdlib pcre luarocks oniguruma gnulib tre glibc ]; buildPhase = let luaVariable = ''LUA_PATH="${luastdlib}/share/lua/${lua.luaversion}/?/init.lua;${luastdlib}/share/lua/${lua.luaversion}/?.lua"''; - pcreVariable = "PCRE_DIR=${pcre.out} PCRE_INCDIR=${pcre.dev}/include"; onigVariable = "ONIG_DIR=${oniguruma}"; gnuVariable = "GNU_INCDIR=${gnulib}/lib"; @@ -425,40 +487,47 @@ let cp -r luarocks/lib $out; ''; - meta = { - homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + meta = with stdenv.lib; { + description = "Lua bindings of various regex library APIs"; + homepage = "https://github.com/rrthomas/lrexlib"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; }; luasqlite3 = buildLuaPackage rec { name = "sqlite3-${version}"; - version = "2.1.1"; - src = fetchzip { - url = "https://github.com/LuaDist/luasql-sqlite3/archive/2acdb6cb256e63e5b5a0ddd72c4639d8c0feb52d.zip"; - sha256 = "17zsa0jzciildil9k4lb0rjn9s1nj80dy16pzx9bxqyi75pjf2d4"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "LuaDist"; + repo = "luasql-sqlite3"; + rev = version; + sha256 = "05k8zs8nsdmlwja3hdhckwknf7ww5cvbp3sxhk2xd1i3ij6aa10b"; }; - buildInputs = [ unzip sqlite ]; + buildInputs = [ sqlite ]; patches = [ ../development/lua-modules/luasql.patch ]; - meta = { + meta = with stdenv.lib; { + description = "Database connectivity for Lua"; homepage = "https://github.com/LuaDist/luasql-sqlite3"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.linux; }; }; lpeg = buildLuaPackage rec { name = "lpeg-${version}"; version = "0.12"; + src = fetchurl { url = "http://www.inf.puc-rio.br/~roberto/lpeg/${name}.tar.gz"; sha256 = "0xlbfw1w7l65a5qhnx5sfw327hkq1zcj8xmg4glfw6fj9ha4b9gg"; }; - buildInputs = [ unzip ]; preBuild = '' makeFlagsArray=(CC=$CC); @@ -472,32 +541,43 @@ let install -p re.lua $out/lib/lua/${lua.luaversion} ''; - meta = { + meta = with stdenv.lib; { + description = "Parsing Expression Grammars For Lua"; homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = platforms.all; }; }; cjson = buildLuaPackage rec { name = "cjson-${version}"; version = "2.1.0"; + src = fetchurl { - url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.1.0.tar.gz"; + url = "http://www.kyne.com.au/~mark/software/download/lua-${name}.tar.gz"; sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i"; }; + preBuild = '' sed -i "s|/usr/local|$out|" Makefile ''; + makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; + postInstall = '' rm -rf $out/share/lua/${lua.luaversion}/cjson/tests ''; + installTargets = "install install-extra"; + disabled = isLuaJIT; - meta = { + + meta = with stdenv.lib; { description = "Lua C extension module for JSON support"; - license = stdenv.lib.licenses.mit; + homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; }; }; @@ -512,15 +592,7 @@ let sha256 = "09pbapjhyc3sn0jgx747shqr9286wqfzw02h43p4pk8fv2b766b9"; }; - meta = with stdenv.lib; { - description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; - homepage = https://github.com/pavouk/lgi; - license = "custom"; - maintainers = with maintainers; [ lovek323 rasendubi ]; - platforms = platforms.unix; - }; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gobjectIntrospection lua ]; makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; @@ -528,31 +600,49 @@ let preBuild = '' sed -i "s|/usr/local|$out|" lgi/Makefile ''; + + meta = with stdenv.lib; { + description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; + homepage = https://github.com/pavouk/lgi; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 rasendubi ]; + platforms = platforms.unix; + }; }; mpack = buildLuaPackage rec { name = "lua-mpack-${libmpack.version}"; + + # NOTE: For updating, new Lua mpack bindings live at: + # https://github.com/libmpack/libmpack-lua. src = libmpack.src; sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libmpack ]; #libtool lua ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmpack ]; # ++ [ libtool lua ]; dontBuild = true; + preInstall = '' mkdir -p $out/lib/lua/${lua.luaversion} ''; + NIX_CFLAGS_COMPILE = "-Wno-error -fpic"; + installFlags = [ "USE_SYSTEM_LUA=yes" "LUA_VERSION_MAJ_MIN=" "LUA_CMOD_INSTALLDIR=$$out/lib/lua/${lua.luaversion}" ]; + # gcc -llua fails with luajit. disabled = isLuaJIT; - meta = { - description = "Simple implementation of msgpack in C Lua 5.1"; - homepage = "https://github.com/tarruda/libmpack"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - license = stdenv.lib.licenses.mit; + + meta = with stdenv.lib; { + description = "Lua bindings for libmpack"; + homepage = "https://github.com/libmpack/libmpack-lua"; + license = licenses.mit; + maintainers = with maintainers; [ vyp ]; + platforms = with platforms; linux ++ darwin; }; }; @@ -567,6 +657,14 @@ let sha256 = "0dhy0vklrhqrnmxb9pyqbfvkwwy86lwysk93pzg1j1zwprx366fj"; }; + buildInputs = [ lua ]; + + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion}/ + cp -r . $out/lib/lua/${lua.luaversion}/vicious/ + printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua + ''; + meta = with stdenv.lib; { description = "Vicious widgets for window managers"; homepage = https://github.com/Mic92/vicious; @@ -574,13 +672,6 @@ let maintainers = with maintainers; [ makefu mic92 ]; platforms = platforms.linux; }; - - buildInputs = [ lua ]; - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion}/ - cp -r . $out/lib/lua/${lua.luaversion}/vicious/ - printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua - ''; }; }; in self From e333df225e0cbeda543b577f3a7dee57741dec47 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 15 Oct 2017 18:07:27 -0500 Subject: [PATCH 010/106] robotfindskitten: install req'd data and put bin in $out/bin --- pkgs/games/robotfindskitten/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index 16e36a03dce..00d73f95bdb 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; + makeFlags = [ "execgamesdir=$(out)/bin" ]; + + postInstall = '' + install -Dm644 {nki,$out/share/games/robotfindskitten}/vanilla.nki + ''; + meta = { description = "Yet another zen simulation; A simple find-the-kitten game"; homepage = http://robotfindskitten.org/; From c62686fb4340462c2d8957f8598025f0d034d984 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Oct 2017 16:20:27 +0800 Subject: [PATCH 011/106] kde-frameworks: 5.38 -> 5.39 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 608 +++++++++--------- 2 files changed, 309 insertions(+), 301 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9f212c422f4..0e0372ad7ac 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.38/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.39/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 0672e48aba2..3a8ed594655 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,603 +3,611 @@ { attica = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/attica-5.38.0.tar.xz"; - sha256 = "12smdcd7lcyjqiw0bsk3lwivrl6cvmiqv5cqaw0gz8flhvk29w96"; - name = "attica-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/attica-5.39.0.tar.xz"; + sha256 = "15972518n4g65k391imkcsjikfsfhx8livdm6n0whag0aiz55haf"; + name = "attica-5.39.0.tar.xz"; }; }; baloo = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/baloo-5.38.0.tar.xz"; - sha256 = "14522akyxg36lclfblp65xai95i9hiydqjhkmfkadjbq82wm9s9i"; - name = "baloo-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/baloo-5.39.0.tar.xz"; + sha256 = "06y8mv7v9y7syz04x0zicdm628k6za3p366xrzwafc43m159wyms"; + name = "baloo-5.39.0.tar.xz"; }; }; bluez-qt = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/bluez-qt-5.38.0.tar.xz"; - sha256 = "0hanmygp4smbvczxn4dj997z3bln32p017z0r26z89m2p0b2ylwv"; - name = "bluez-qt-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/bluez-qt-5.39.0.tar.xz"; + sha256 = "0j0072q0zc9hdpjbkqciqv18pwpdij74qrjph7whh66csjkr5ad1"; + name = "bluez-qt-5.39.0.tar.xz"; }; }; breeze-icons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/breeze-icons-5.38.0.tar.xz"; - sha256 = "09afi6c4h31ycs6aa85lqbmn392zi532zf8fp7ll43xxjv9isac9"; - name = "breeze-icons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/breeze-icons-5.39.0.tar.xz"; + sha256 = "132bpgma1lqhrly48zz1f8jyg5z5pvnn1wnqxz6psvqhipw7fh5x"; + name = "breeze-icons-5.39.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/extra-cmake-modules-5.38.0.tar.xz"; - sha256 = "0ci3vdzdbcrbnxpqvf4hcwcrzz1ijhifp8b99wh3k53rinnai231"; - name = "extra-cmake-modules-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/extra-cmake-modules-5.39.0.tar.xz"; + sha256 = "1ldwzx2bzlzw7r31w8zy08j4cn9q7d1kszc5jb22zhfqpvbkc1dq"; + name = "extra-cmake-modules-5.39.0.tar.xz"; }; }; frameworkintegration = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/frameworkintegration-5.38.0.tar.xz"; - sha256 = "0w1n3czgsnnmaqwypy3mpci8s4ppv9030zxw7ka7rsvwgkpqijq8"; - name = "frameworkintegration-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/frameworkintegration-5.39.0.tar.xz"; + sha256 = "136s8chyiac30czicqgkrc4abgm7c8b2ppnqwv9ngxpx7nsjgd2h"; + name = "frameworkintegration-5.39.0.tar.xz"; }; }; kactivities = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kactivities-5.38.0.tar.xz"; - sha256 = "0grm0cilc80g5ih2hqhwgwm35mlfnrs343j6ixkd9s0mflv2b798"; - name = "kactivities-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kactivities-5.39.0.tar.xz"; + sha256 = "0nkc1p7n6yvybcib6aqmnz08hwn3ryj1f9wbkiimgs0svr00sslq"; + name = "kactivities-5.39.0.tar.xz"; }; }; kactivities-stats = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kactivities-stats-5.38.0.tar.xz"; - sha256 = "0s57iz04n3m4fpqrqflda6vpk4l1mnf0nyz1iyza382fb375afd2"; - name = "kactivities-stats-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kactivities-stats-5.39.0.tar.xz"; + sha256 = "18ghfqggwf38rmb1lkbv8ggxx71cp6ba3882kp5ccb7wwih51qcy"; + name = "kactivities-stats-5.39.0.tar.xz"; }; }; kapidox = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kapidox-5.38.0.tar.xz"; - sha256 = "1j4k75lhqdnsxmgyvblla0627qvgabxivw6limfdb3rdpmqdxj76"; - name = "kapidox-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kapidox-5.39.0.tar.xz"; + sha256 = "12nmsa1cg5amyawfxywlg8qsl01idi0jacrd8jzmvdj5m8sisw6n"; + name = "kapidox-5.39.0.tar.xz"; }; }; karchive = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/karchive-5.38.0.tar.xz"; - sha256 = "0n5nxd3v9ljjff0r6k4xrvy5hj057b7c7jzcq258harl359d8m4k"; - name = "karchive-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/karchive-5.39.0.tar.xz"; + sha256 = "0rb8vr6lg8vx4f07swvlsyrxy4gj21aqfffk0cvhlsdz94j1phrw"; + name = "karchive-5.39.0.tar.xz"; }; }; kauth = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kauth-5.38.0.tar.xz"; - sha256 = "12nyfbilz4v4b2i5x191iph3jj4lcpw7z1rh0xrv5y1v7dczk6i7"; - name = "kauth-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kauth-5.39.0.tar.xz"; + sha256 = "08bjxvv22y199skx4l9m8az165wz7inqqx7s8b7p5cjms4bvi15i"; + name = "kauth-5.39.0.tar.xz"; }; }; kbookmarks = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kbookmarks-5.38.0.tar.xz"; - sha256 = "0s230mcwmrg0qpz42sg804m96j2xpnwj4bdp0mfv08x3jasqpbrq"; - name = "kbookmarks-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kbookmarks-5.39.0.tar.xz"; + sha256 = "1xfabyc7hxmi1p0wqld0va5pl6bfwh50px4mvpxbnjdna6anw6z5"; + name = "kbookmarks-5.39.0.tar.xz"; }; }; kcmutils = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcmutils-5.38.0.tar.xz"; - sha256 = "0n6f2xvl5v8fwfxpdl6la1hb01dh4h1pcdrf05nn60v0rqg9f58b"; - name = "kcmutils-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcmutils-5.39.0.tar.xz"; + sha256 = "1cz4haj83j59szl16r0mfh4zx93szrwkmb9mq2r21v46c8k5ldw0"; + name = "kcmutils-5.39.0.tar.xz"; }; }; kcodecs = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcodecs-5.38.0.tar.xz"; - sha256 = "0cnxhaj5jk7f3j9q4hzphc3nm3vdaqwy9xab5d4nvn1kv8vjv8ii"; - name = "kcodecs-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcodecs-5.39.0.tar.xz"; + sha256 = "1q0l88nfbxgdy5lpm5xbcs749n9jyxhq7xsgqpf9c8irc7c1gw7f"; + name = "kcodecs-5.39.0.tar.xz"; }; }; kcompletion = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcompletion-5.38.0.tar.xz"; - sha256 = "0f955w67wrk15rdmglrk7k0xc5i6kah12bpb078xhzlyfackg52w"; - name = "kcompletion-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcompletion-5.39.0.tar.xz"; + sha256 = "09jdc4pn7yjb7nagic38xiqdpv9fy4f2f4c1a5ynbli7x1r6l7ms"; + name = "kcompletion-5.39.0.tar.xz"; }; }; kconfig = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kconfig-5.38.0.tar.xz"; - sha256 = "0fi428dsr6qpa9336wcfic6hyix6l2p9s135w00qzdwhdkr4lx3r"; - name = "kconfig-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kconfig-5.39.0.tar.xz"; + sha256 = "011i48f07470igqqcz4hychbw0q85p0bh5dykpla4zwdldllsl1w"; + name = "kconfig-5.39.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kconfigwidgets-5.38.0.tar.xz"; - sha256 = "0w319d94wxn90dbbdfw5zrn2ddnv9vb7wldkpvvycq7yxrhsfw0x"; - name = "kconfigwidgets-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kconfigwidgets-5.39.0.tar.xz"; + sha256 = "1i6cniqsmn9sds8nj7bcsnbmlkq9m1yjwvr45mhal9rkhaas4xzw"; + name = "kconfigwidgets-5.39.0.tar.xz"; }; }; kcoreaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcoreaddons-5.38.0.tar.xz"; - sha256 = "1m3mn9fhllwcidzji2l26k5yxzrqkbyjdly04nh3s5rf823dvqwv"; - name = "kcoreaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcoreaddons-5.39.0.tar.xz"; + sha256 = "0qskv44siykyn8iiq99llibw3bk499ry7r3i8abx4ljjl717cvlz"; + name = "kcoreaddons-5.39.0.tar.xz"; }; }; kcrash = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kcrash-5.38.0.tar.xz"; - sha256 = "1a8hvyhwa112wx4ldadlrxpyda6qpial387j07dr1jq1cnzr0p11"; - name = "kcrash-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kcrash-5.39.0.tar.xz"; + sha256 = "1fv32l50h9rlc5s9iplyljcsrscivgdy2baghq7hbcs58xrjf1ws"; + name = "kcrash-5.39.0.tar.xz"; }; }; kdbusaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdbusaddons-5.38.0.tar.xz"; - sha256 = "1mw9sl82y2aj7l2xj1skrbxbyv55br60h6f61r4f1mqcaxaqj7qw"; - name = "kdbusaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdbusaddons-5.39.0.tar.xz"; + sha256 = "0hp85995n3193dvvdv48hv59b66dzd9p4iwnx2dmj797lghpnir3"; + name = "kdbusaddons-5.39.0.tar.xz"; }; }; kdeclarative = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdeclarative-5.38.0.tar.xz"; - sha256 = "1966sxzhdkzi2lwg5ixhrx0yg10plbvn9lsjgnj9crghaajsnf4b"; - name = "kdeclarative-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdeclarative-5.39.0.tar.xz"; + sha256 = "1l8wnyfz6qjqmcpdzavsb6m1r3ay1b2r186myymsyknr80yr2d7p"; + name = "kdeclarative-5.39.0.tar.xz"; }; }; kded = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kded-5.38.0.tar.xz"; - sha256 = "0xsjzj5jx4wsrq5fnbv6raqlr11shz20p2mvypf5wfvq2c1vb5lb"; - name = "kded-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kded-5.39.0.tar.xz"; + sha256 = "0jv4ghl2gzfdkhk1in3vx39kigvpprvcb9xlzc5506mpfjc38ga5"; + name = "kded-5.39.0.tar.xz"; }; }; kdelibs4support = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kdelibs4support-5.38.0.tar.xz"; - sha256 = "06vlgziy212pwm4z9r8rbfa9ziwx3nkihy9b25m13gbh60baqapp"; - name = "kdelibs4support-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kdelibs4support-5.39.0.tar.xz"; + sha256 = "03xjzhdvs497sk9bpz79crxlzwff198ivj4n5f0mwmnqc0100dfp"; + name = "kdelibs4support-5.39.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdesignerplugin-5.38.0.tar.xz"; - sha256 = "0rivjxgsxvsgk24lnzsqpzqr7m1i1faqnbby3rnkw2059z28l0y6"; - name = "kdesignerplugin-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdesignerplugin-5.39.0.tar.xz"; + sha256 = "1b7rn66wsyn9aipgvfmn2pq18g0zdjxb469126dj18fahg2k777f"; + name = "kdesignerplugin-5.39.0.tar.xz"; }; }; kdesu = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdesu-5.38.0.tar.xz"; - sha256 = "1c9j2zih7r0jph41kzxnxpri9snphm1k4w4rs1q6zawwz8a5kcr5"; - name = "kdesu-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdesu-5.39.0.tar.xz"; + sha256 = "03avzhs6a0p3cjv4kk9vavf6f64ffgs3pzhbdkfr76fh58h1v6wx"; + name = "kdesu-5.39.0.tar.xz"; }; }; kdewebkit = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdewebkit-5.38.0.tar.xz"; - sha256 = "1cncbjkgrbrnvwx3izjqh9hqiw9bg6aqaq09f8bdryvr8537b0zf"; - name = "kdewebkit-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdewebkit-5.39.0.tar.xz"; + sha256 = "05f0l3zw8cnvyavwwijwy5jx8dairhdbvg6ynpn7r5l10vawcf6x"; + name = "kdewebkit-5.39.0.tar.xz"; }; }; kdnssd = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdnssd-5.38.0.tar.xz"; - sha256 = "101gygxrq2m3yfz6j0ldspib3pm3jjvqz505j3h15zj59qcwqw0x"; - name = "kdnssd-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdnssd-5.39.0.tar.xz"; + sha256 = "1c8d1wwr0hkdkgnq4k7lgkqwm1pj676i09l1kas256rzz6dcyl75"; + name = "kdnssd-5.39.0.tar.xz"; }; }; kdoctools = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kdoctools-5.38.0.tar.xz"; - sha256 = "0fbv7i1930rl496psny7nfiixvsnaq535h1zggwkwv6i9dh7wpy9"; - name = "kdoctools-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kdoctools-5.39.0.tar.xz"; + sha256 = "17g4kf7mbjjxhii4nbhfpmhjs1q23mlh0d3fqyxxhm3pp02jg8ap"; + name = "kdoctools-5.39.0.tar.xz"; }; }; kemoticons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kemoticons-5.38.0.tar.xz"; - sha256 = "1c0991yd8jx2diy5ynl11h5qqyapn1dsir2gy04y8m90h944vdd5"; - name = "kemoticons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kemoticons-5.39.0.tar.xz"; + sha256 = "132gs69v43ms117ibdqmnhbyzzs5by76pfz7bd2zqwl4mq94hpgh"; + name = "kemoticons-5.39.0.tar.xz"; }; }; kfilemetadata = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kfilemetadata-5.38.0.tar.xz"; - sha256 = "1815r9lx99h9kzbk67bfk41jya3y2hsi112fsgpv3m4mg028pklm"; - name = "kfilemetadata-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kfilemetadata-5.39.0.tar.xz"; + sha256 = "1mcxphjpayyq7v16b6c3zhb6c9vn67495xywfb9y8ysma1cdpshg"; + name = "kfilemetadata-5.39.0.tar.xz"; }; }; kglobalaccel = { - version = "5.38.1"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kglobalaccel-5.38.1.tar.xz"; - sha256 = "0si3bxxa6wj008j6rr6a1ljnsbmim4z0pqyx1z48ih4qamcfpkin"; - name = "kglobalaccel-5.38.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kglobalaccel-5.39.0.tar.xz"; + sha256 = "0wcbnwfi98cx8f99a2mcz2kg7mggz3hipfxv9s8ks6c80865kar1"; + name = "kglobalaccel-5.39.0.tar.xz"; }; }; kguiaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kguiaddons-5.38.0.tar.xz"; - sha256 = "1jks0hwn665hlypl0qfhi5r0prqzrg1gv4skc88zp1kgx05kb9h1"; - name = "kguiaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kguiaddons-5.39.0.tar.xz"; + sha256 = "1az9i5bg7xd7kv7ajq8j8jab7zly683gyi90rmk54vfnn6igbq3f"; + name = "kguiaddons-5.39.0.tar.xz"; }; }; khtml = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/khtml-5.38.0.tar.xz"; - sha256 = "0fa61va3dbwml40y4scxks223swlb8vf5730wr7rijl91lz1adgy"; - name = "khtml-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/khtml-5.39.0.tar.xz"; + sha256 = "097nbwv8ba48xmrga62j1irlkkc0l0f3971fp7225pzh1g3cg152"; + name = "khtml-5.39.0.tar.xz"; }; }; ki18n = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/ki18n-5.38.0.tar.xz"; - sha256 = "0z9arj2s4fn04vavl6ad3avl1p5yr3mgr2n802lmvy2wlqicy314"; - name = "ki18n-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/ki18n-5.39.0.tar.xz"; + sha256 = "1985qgihrch37b5gf7qw33bazahm3xb5v2nj43k6vdjxfg1clcay"; + name = "ki18n-5.39.0.tar.xz"; }; }; kiconthemes = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kiconthemes-5.38.0.tar.xz"; - sha256 = "01xa30r2cx312vbmz2c3x8vvna1cqb6fx91cjp4aivp9q4jwaz9a"; - name = "kiconthemes-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kiconthemes-5.39.0.tar.xz"; + sha256 = "1k4r263zz54497dgqaw9a74wqdklq4w353mc0g905k2g8arh7p9f"; + name = "kiconthemes-5.39.0.tar.xz"; }; }; kidletime = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kidletime-5.38.0.tar.xz"; - sha256 = "1i91w9hcb2k5n9qz8q7k2z44z9ss7r9i2zsg9vnl8am7dqqhmlsv"; - name = "kidletime-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kidletime-5.39.0.tar.xz"; + sha256 = "01h5pcr5kn11jby0zsz6igiwzf31hzip7h63dcsa8h67li4sibd8"; + name = "kidletime-5.39.0.tar.xz"; }; }; kimageformats = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kimageformats-5.38.0.tar.xz"; - sha256 = "0q78shcwgczdm5ylhbp9fnq70w3hqzkbynp2vpyyg5pjaam8xjlp"; - name = "kimageformats-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kimageformats-5.39.0.tar.xz"; + sha256 = "1mnfdsxqnqdzhw3as77n1f1ddxpmab4slqlpwi4ih55xmgl85455"; + name = "kimageformats-5.39.0.tar.xz"; }; }; kinit = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kinit-5.38.0.tar.xz"; - sha256 = "0k4i0zrwkz088vjkk7d7whwhkrjvqqhdigspzf58d1laryiy0jdf"; - name = "kinit-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kinit-5.39.0.tar.xz"; + sha256 = "0a2wl1vhsbb2x1cjd3wz7j3bp9kz1pxfc6mml7gpnq70qgk8hsn2"; + name = "kinit-5.39.0.tar.xz"; }; }; kio = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kio-5.38.0.tar.xz"; - sha256 = "15qmr2ghrj7pgqxrgpvhdp9g5vaap9mzlmry6ayph75m1afb4fpl"; - name = "kio-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kio-5.39.0.tar.xz"; + sha256 = "091g4dbnals6c5wrj3xh3ws29wszysmb9ksyvyqf3d1lp9dfmjwn"; + name = "kio-5.39.0.tar.xz"; }; }; kirigami2 = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kirigami2-5.38.0.tar.xz"; - sha256 = "18k41j5ijmgmzgl2rv4ac0bnxlax3505zi1nmqm8bkdpznhfr13c"; - name = "kirigami2-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kirigami2-5.39.0.tar.xz"; + sha256 = "0spgylk4yjy74rs5d5b28qv72qz5ra9j3wfmk6vx2b6cvf1fw517"; + name = "kirigami2-5.39.0.tar.xz"; }; }; kitemmodels = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kitemmodels-5.38.0.tar.xz"; - sha256 = "0s20in4jjd2pvv9bn79lvgqqlf806hw014icp51f5hfknrhpdyjc"; - name = "kitemmodels-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kitemmodels-5.39.0.tar.xz"; + sha256 = "1bn0k0ya2phix6fyv8ax800ahncrkdzikz0sa3xrw5bq3iz1x6k9"; + name = "kitemmodels-5.39.0.tar.xz"; }; }; kitemviews = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kitemviews-5.38.0.tar.xz"; - sha256 = "0ldi8qzs2sbhz8l57nshjrnwhjl9mhw90kcqw71cldp41wm0pps6"; - name = "kitemviews-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kitemviews-5.39.0.tar.xz"; + sha256 = "0pl899d1lz1dymdbq70485a8332z9i3s38dxnxv3cdwbla3xlsfh"; + name = "kitemviews-5.39.0.tar.xz"; }; }; kjobwidgets = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kjobwidgets-5.38.0.tar.xz"; - sha256 = "0vp6nc73c9788nrib742k9nzqbx4m8m77ipqh9dnnkx4ggrhsd55"; - name = "kjobwidgets-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kjobwidgets-5.39.0.tar.xz"; + sha256 = "1z26555pkirdkfw8c9j1a863pqybklryfa30v3a59a0m9v2jdzfc"; + name = "kjobwidgets-5.39.0.tar.xz"; }; }; kjs = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kjs-5.38.0.tar.xz"; - sha256 = "0diw580k5kyv60bqhnxhqinlrn0b3p3n89iy0kdgjgnr6197fwy1"; - name = "kjs-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kjs-5.39.0.tar.xz"; + sha256 = "0fkn308l6drj7pa94niqhcn2pqv7da7da5lq1nk8q6zlyg4nbcrn"; + name = "kjs-5.39.0.tar.xz"; }; }; kjsembed = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kjsembed-5.38.0.tar.xz"; - sha256 = "0nb07n54208gnmag7h3dhc8hri2s83ln1c9wq6c0xw7jchaz9z8a"; - name = "kjsembed-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kjsembed-5.39.0.tar.xz"; + sha256 = "1i3qyxr409x82nqyck4qva63maxa2vvi07i0yxm6zqx5lvm9gkgb"; + name = "kjsembed-5.39.0.tar.xz"; }; }; kmediaplayer = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kmediaplayer-5.38.0.tar.xz"; - sha256 = "1qb2g8j871gf38i2dk2j9ags848fa3kqdjl3l4924hf28az0g736"; - name = "kmediaplayer-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kmediaplayer-5.39.0.tar.xz"; + sha256 = "09ysw11br4k26bq6rvzcws2g565336p3gjkz4fxc8w2g3ma527p1"; + name = "kmediaplayer-5.39.0.tar.xz"; }; }; knewstuff = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/knewstuff-5.38.0.tar.xz"; - sha256 = "1l4cmfcsljg7v5l6341fxcp7c7i615l8351l941dwcmw4yng0lj0"; - name = "knewstuff-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/knewstuff-5.39.0.tar.xz"; + sha256 = "1amflv96ybd6dqkc1chmz6d5crrl4dcq07fwsalxzx9mgr0z499r"; + name = "knewstuff-5.39.0.tar.xz"; }; }; knotifications = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/knotifications-5.38.0.tar.xz"; - sha256 = "1jvmv2hi3dbf0bd2b61l9s5lb1dx2rjl9z7pw1fb5j20910k6zgd"; - name = "knotifications-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/knotifications-5.39.0.tar.xz"; + sha256 = "0f38ca090p291d114fg3jz25lhwz7vad7s60ql4x3xwmdgaaw7dj"; + name = "knotifications-5.39.0.tar.xz"; }; }; knotifyconfig = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/knotifyconfig-5.38.0.tar.xz"; - sha256 = "05hgglm6ypbaplxr43632zh5fmgsz6543110169k9fbjnczyhcyk"; - name = "knotifyconfig-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/knotifyconfig-5.39.0.tar.xz"; + sha256 = "09nk6sr6sp9a85lj4x9ac0ir4s5ac08835927b95d7m4ap2dbxrb"; + name = "knotifyconfig-5.39.0.tar.xz"; }; }; kpackage = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kpackage-5.38.0.tar.xz"; - sha256 = "0v4j3kqgg52rlmdxmd98aqw0hk7i2xqsw9mhhxfs9c7vm1x05sxn"; - name = "kpackage-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kpackage-5.39.0.tar.xz"; + sha256 = "1ibppkg9m77p0dcpfshcd891vlxcfgx6rk205gq6d5qxyqizygki"; + name = "kpackage-5.39.0.tar.xz"; }; }; kparts = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kparts-5.38.0.tar.xz"; - sha256 = "19ba749pwnb7xvmr7lryn6z53zb49hqn0xq4j9fmbic95nh039zp"; - name = "kparts-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kparts-5.39.0.tar.xz"; + sha256 = "1r32jf2qbhqdjih9ff4n0ajd6s1cdncpq367mp5am31fz1jv3sr6"; + name = "kparts-5.39.0.tar.xz"; }; }; kpeople = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kpeople-5.38.0.tar.xz"; - sha256 = "0yd29436bgfw6jjjr9n38hx8561mrlgl5vynci6ng9bx1jflay0x"; - name = "kpeople-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kpeople-5.39.0.tar.xz"; + sha256 = "1s78dld3zlldhpk66s08v34zwi1k5ghivzbi7ab290sgrjc9afar"; + name = "kpeople-5.39.0.tar.xz"; }; }; kplotting = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kplotting-5.38.0.tar.xz"; - sha256 = "1hvfqm6i5fsyssb51w3yybsil8h9cbqgd2n8k0wnz99m8xifzn72"; - name = "kplotting-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kplotting-5.39.0.tar.xz"; + sha256 = "1diy1f23n6pih0s91kv1bp4mnnypnjl3pmi1xqni1v2cfwy0mnba"; + name = "kplotting-5.39.0.tar.xz"; }; }; kpty = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kpty-5.38.0.tar.xz"; - sha256 = "0cgh8hixrplgc280652jlvk8ibcddmjvflwb0gjawd9iq7lcb66y"; - name = "kpty-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kpty-5.39.0.tar.xz"; + sha256 = "02h6dg3w3k58d1ydzyz6mhd1y5gds3k64wdsb84fnpxvlw46dlhn"; + name = "kpty-5.39.0.tar.xz"; }; }; kross = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/portingAids/kross-5.38.0.tar.xz"; - sha256 = "1dccg214cqpyn3nninalpknglfmchz2k1fk4rlgq53wf4n6w23b7"; - name = "kross-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/portingAids/kross-5.39.0.tar.xz"; + sha256 = "1gh9gicr7ba8y3c0r7qpw2fj651fbbrhsy8gps8yll71axhxqvfh"; + name = "kross-5.39.0.tar.xz"; }; }; krunner = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/krunner-5.38.0.tar.xz"; - sha256 = "16fhl5zm8scyxk83mpkavvzkn23qgzcblg315jy6klr5bz9jxgcm"; - name = "krunner-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/krunner-5.39.0.tar.xz"; + sha256 = "0gxs9z8mlb3s615ccrgkwyxww4jly48d8fkay33zwjaanqhkhgfl"; + name = "krunner-5.39.0.tar.xz"; }; }; kservice = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kservice-5.38.0.tar.xz"; - sha256 = "0zaamvxhfx4xdy2m8spyhi0hdv6p0fn5hqn9pyi5l8xdixnwjc9d"; - name = "kservice-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kservice-5.39.0.tar.xz"; + sha256 = "0abz878yc8yir7iv5scn55d0g2nljnzhr9c81wa6ggjsw0h077hl"; + name = "kservice-5.39.0.tar.xz"; }; }; ktexteditor = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/ktexteditor-5.38.0.tar.xz"; - sha256 = "195ygv1j4wfvly31g22wxz9sshhqyi1yyf2mv1v63d9ci88v7rri"; - name = "ktexteditor-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/ktexteditor-5.39.0.tar.xz"; + sha256 = "1bk5wlvzjmfv7g9ab77asn055jp647zj69mfx2z3lvxb69swdnf5"; + name = "ktexteditor-5.39.0.tar.xz"; }; }; ktextwidgets = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/ktextwidgets-5.38.0.tar.xz"; - sha256 = "120jxab8w1vhqcckda51r0x2pmfb2qd2h6inhivl72c4m5x89w7f"; - name = "ktextwidgets-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/ktextwidgets-5.39.0.tar.xz"; + sha256 = "0p6h165y03ir7qdf50kc77iq9plgvx39c8pz9dalvscvx42d2jaq"; + name = "ktextwidgets-5.39.0.tar.xz"; }; }; kunitconversion = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kunitconversion-5.38.0.tar.xz"; - sha256 = "10k0xfb11r7l1bdnlanqgdwwx8wrs8bmnswb2y85xxr7wwsqnlvc"; - name = "kunitconversion-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kunitconversion-5.39.0.tar.xz"; + sha256 = "04r1b2nc6vi56nfh6glhhd3d9v0ywxn2waibryjbszwrr39yhlzv"; + name = "kunitconversion-5.39.0.tar.xz"; }; }; kwallet = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwallet-5.38.0.tar.xz"; - sha256 = "1qysdj4nmkxywj7bzqdc78ifnqjnkrz9qbp4a49acpng2y4zw1nw"; - name = "kwallet-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwallet-5.39.0.tar.xz"; + sha256 = "1vlz9y3r1n6w7q9is60jsl9f7bm1djckdi9ibgzanwsp4k5ab0sz"; + name = "kwallet-5.39.0.tar.xz"; }; }; kwayland = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwayland-5.38.0.tar.xz"; - sha256 = "0gd58nvyc39waj7vv2c68r59qqpv0jppm95548j2p924w48syjj0"; - name = "kwayland-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwayland-5.39.0.tar.xz"; + sha256 = "0a9hi47nrsspkak88c9f6ind2i7q69zjmrgr5n7xsa4zxznwhx6x"; + name = "kwayland-5.39.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwidgetsaddons-5.38.0.tar.xz"; - sha256 = "1yh48qxdqz3rk020wr897vkzsi4nhh37lxbg6211xrlirn0lzvj5"; - name = "kwidgetsaddons-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwidgetsaddons-5.39.0.tar.xz"; + sha256 = "1d0d3ags15vr7ck031m6n5n3hw347siskzhb8rsgzghn6xnmbfdb"; + name = "kwidgetsaddons-5.39.0.tar.xz"; }; }; kwindowsystem = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kwindowsystem-5.38.0.tar.xz"; - sha256 = "02xrin8lshvqkw12d0692z40h3g61f4crh28jcmi5zqlaxiyn5ic"; - name = "kwindowsystem-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kwindowsystem-5.39.0.tar.xz"; + sha256 = "1dys70va4h00ixxgxv52wbg8wi3jgsqckaikjqr34fzrmjh1lxqp"; + name = "kwindowsystem-5.39.0.tar.xz"; }; }; kxmlgui = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kxmlgui-5.38.0.tar.xz"; - sha256 = "12cmyhm05nkr9xj7cpnqihrlndfqn1kjkzhcn1ywj20y1gd3mxv4"; - name = "kxmlgui-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kxmlgui-5.39.0.tar.xz"; + sha256 = "0zwy11rh3yphl2346hmcahajxkgmrnfz1m8pd3vlnjs175dwz115"; + name = "kxmlgui-5.39.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/kxmlrpcclient-5.38.0.tar.xz"; - sha256 = "0g9ah59h8vq68yg4pfdbqx44xrs856wrr181rsdbsizj0qj3hyaa"; - name = "kxmlrpcclient-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/kxmlrpcclient-5.39.0.tar.xz"; + sha256 = "1j4a1n3ydln62m98h5p5lxlg1i7k5vzxb4f9kxkvzhw5gfpy78zs"; + name = "kxmlrpcclient-5.39.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/modemmanager-qt-5.38.0.tar.xz"; - sha256 = "18ham8lrxblywc634n49237js5y5k6qgjf5zrjc8gzapn934l89w"; - name = "modemmanager-qt-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/modemmanager-qt-5.39.0.tar.xz"; + sha256 = "0gdsp1017yjcfbq2jny7jz5rv7y4cavps5pfvg7zmylx0v057zk7"; + name = "modemmanager-qt-5.39.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/networkmanager-qt-5.38.0.tar.xz"; - sha256 = "10d28nrkppmmfl9pwq2hkrvi461acf29djdzala4l37mp4dwvbf8"; - name = "networkmanager-qt-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/networkmanager-qt-5.39.0.tar.xz"; + sha256 = "1jksv0zsdmkrid2f1m92fxw3gl6crcjaw43v5zra8h2m394iyr81"; + name = "networkmanager-qt-5.39.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/oxygen-icons5-5.38.0.tar.xz"; - sha256 = "0fk97r3br5myqpnfalz67l5hkamxc5vc5swa68wpg1xih6jc3iid"; - name = "oxygen-icons5-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/oxygen-icons5-5.39.0.tar.xz"; + sha256 = "1k1rns0fz5gvfnfwg60lrcw885cqmn814nzql9jvk07340w29s98"; + name = "oxygen-icons5-5.39.0.tar.xz"; }; }; plasma-framework = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/plasma-framework-5.38.0.tar.xz"; - sha256 = "1dvhqfi34v44h0wj0m68k477hmx53x9zsf4mh03xq164w1yz68sg"; - name = "plasma-framework-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/plasma-framework-5.39.0.tar.xz"; + sha256 = "1gaxk9mzwlyld09gqk29y3shvi6a1g1q3l849a9kl1hd07gr53x3"; + name = "plasma-framework-5.39.0.tar.xz"; }; }; prison = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/prison-5.38.0.tar.xz"; - sha256 = "0prj3z6s3aighmk4qarfljca7j9cy7ypvgh8rv5di3jb2v4nbg4m"; - name = "prison-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/prison-5.39.0.tar.xz"; + sha256 = "1b0ji341xcamrd19z54r2nkm8cglbr4qfxyxmqzn8yc6icfl61nv"; + name = "prison-5.39.0.tar.xz"; + }; + }; + qqc2-desktop-style = { + version = "5.39.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.39/qqc2-desktop-style-5.39.0.tar.xz"; + sha256 = "1q8ihhrnk2dh6bbmwkz822l5vv15y11qaj7gig1lf7xw5nr1i27v"; + name = "qqc2-desktop-style-5.39.0.tar.xz"; }; }; solid = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/solid-5.38.0.tar.xz"; - sha256 = "1b3c5drx4m1x4ai0ziz0yan16a5s3ghf0py37mb92qyimq586lhh"; - name = "solid-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/solid-5.39.0.tar.xz"; + sha256 = "19bl7hzg1fya613vqhdxllh09csm6amrndnhfqnx90w4gb31p36r"; + name = "solid-5.39.0.tar.xz"; }; }; sonnet = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/sonnet-5.38.0.tar.xz"; - sha256 = "1355p88swnk828gsbnm3v4gryffnwbzjcdq49k8jwywzb65bnwxa"; - name = "sonnet-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/sonnet-5.39.0.tar.xz"; + sha256 = "1b5bfjbpb6l3c9j9k42shhnz9lqqxk2g607qx9ni0n2pr7w2p7w1"; + name = "sonnet-5.39.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/syntax-highlighting-5.38.0.tar.xz"; - sha256 = "101ng0l3jfg8x9bns9z38jk3iayijwcb299kf860vfy0nki8gf6l"; - name = "syntax-highlighting-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/syntax-highlighting-5.39.0.tar.xz"; + sha256 = "0b8sdkh9dqmqk3x48d25v4qhrqph0mv76v47skhvls9jspw7kzdc"; + name = "syntax-highlighting-5.39.0.tar.xz"; }; }; threadweaver = { - version = "5.38.0"; + version = "5.39.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.38/threadweaver-5.38.0.tar.xz"; - sha256 = "1d89l9lknc1q25cz9r8iwc1a102q788mj01ghnl6ydss65rclvfv"; - name = "threadweaver-5.38.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.39/threadweaver-5.39.0.tar.xz"; + sha256 = "101bk8rzdysb3vi3vbbkh2s7sb1dhnsa8ncdvdsxqyyaya9ns4aw"; + name = "threadweaver-5.39.0.tar.xz"; }; }; } From 6aeaadfb8a83cf318521af224a7fb60366c9db85 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Oct 2017 16:20:40 +0800 Subject: [PATCH 012/106] kwindowsystem: add missing dependencies --- .../libraries/kde-frameworks/kwindowsystem/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index ffad3b1a7fd..c075adf0294 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, copyPathsToStore, extra-cmake-modules, + libpthreadstubs, libXdmcp, qtbase, qttools, qtx11extras }: @@ -11,7 +12,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools qtx11extras ]; + buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); preConfigure = '' From 70b3fbde6e32d781c160156feffddbed6e6240d0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Oct 2017 10:28:01 +0800 Subject: [PATCH 013/106] falkon: broken for now --- pkgs/applications/networking/browsers/falkon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index b2067effb96..9356794bb5d 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + broken = true; }; } From c41d794ecbdb56c9c576a1a7f59386d63ec48aed Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 21 Oct 2017 14:42:00 +0800 Subject: [PATCH 014/106] digikam: minor cleanups --- pkgs/applications/graphics/digikam/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 44ee807fe98..a62940ff703 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -33,8 +33,8 @@ , liblqr1 , libqtav , libusb1 -, mesa , marble +, mesa , mysql , opencv3 , pcre @@ -53,11 +53,11 @@ mkDerivation rec { version = "5.7.0"; src = fetchurl { - url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; + url = "mirror://kde/stable/digikam/${name}.tar.xz"; sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; }; - nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ bison diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab2d1dd75c0..13de557985c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17613,7 +17613,6 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) kcalcore; - boost = boost160; }; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; From cf90441dea468632d640dc5e9c1fbdce397e53b5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 22 Oct 2017 12:31:26 +0800 Subject: [PATCH 015/106] ktexteditor: fix indenters --- pkgs/development/libraries/kde-frameworks/ktexteditor.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 9e88c0a99fc..7fc11b1505c 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, fetchpatch, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols @@ -14,4 +14,9 @@ mkDerivation { qtxmlpatterns sonnet syntax-highlighting qtquickcontrols ]; propagatedBuildInputs = [ kparts ]; + patches = [ (fetchpatch { + url = "https://cgit.kde.org/ktexteditor.git/patch/?id=aeebeadb5f5955995c17de56cf83ba7166a132dd"; + sha256 = "10a61w1qyw3czffl06xgccgd3yycz7s0hpg2vj0a24v05jhqiigf"; + name = "ktextedtor_fix_indenters.patch"; + })]; } From 30c739f7a1ba0b176cf6805f97248c804012a046 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Tue, 24 Oct 2017 13:32:34 +0200 Subject: [PATCH 016/106] pptp: correct reference to ${iproute}/bin/ip A reference to /bin/ip was left hanging, causing failure when establishing a connection caused pptp to try and manipulate roots. --- pkgs/tools/networking/pptp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index c2c41d92acb..6185f66b80e 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { patchPhase = '' sed -e 's/install -o root/install/' -i Makefile - sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c ''; preConfigure = '' - makeFlagsArray=( PPPD=${ppp}/sbin/pppd BINDIR=$out/sbin \ - MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp ) + makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ + PPPDIR=$out/etc/ppp ) ''; nativeBuildInputs = [ perl which ]; From f402c3aa78f0d6ad21fac8ef9dea288dcccabc3e Mon Sep 17 00:00:00 2001 From: Emanuele Peruffo Date: Tue, 24 Oct 2017 21:12:01 +0200 Subject: [PATCH 017/106] robo3t: change .desktop name Gnome does not permit to add the application to favorites if the .desktop name is different than the binary name. See https://unix.stackexchange.com/questions/58824/how-do-i-add-eclipse-to-my-gnome-shell-favorites. --- pkgs/applications/misc/robo3t/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 5ebb2b1189a..fc7ff484239 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; desktopItem = makeDesktopItem { - name = "Robo3T"; + name = "robo3t"; exec = "robo3t"; icon = icon; comment = "Query GUI for mongodb"; From 0ddc8a303bec3df0e0a6c8f4e47d49134dedd72a Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 25 Oct 2017 10:08:37 +0100 Subject: [PATCH 018/106] nixos manual: suggest nixos-help as well Part of improving #30760: users on a serial console can't switch ttys, so providing another method to access the manual is useful. --- nixos/doc/manual/installation/installing.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 8c37643c08f..94d8e9d2e1a 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -16,7 +16,8 @@ hardware. The NixOS manual is available on virtual console 8 - (press Alt+F8 to access). + (press Alt+F8 to access) or by running nixos-help. + You get logged in as root (with empty password). From b2c5075e8ad442a8a2b42979ea9351e35dc647fe Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 25 Oct 2017 10:13:33 +0100 Subject: [PATCH 019/106] nixos-manual service: show nixos-help option Part of improving accessibility (#30760). Makes the manual easier to access e.g. on serial consoles. --- nixos/modules/services/misc/nixos-manual.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 515864ec2e2..41cadb4a6de 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -135,8 +135,9 @@ in }; }; - services.mingetty.helpLine = mkIf cfg.showManual - "\nPress for the NixOS manual."; + services.mingetty.helpLine = "\nRun `nixos-help` " + + lib.optionalString cfg.showManual "or press " + + "for the NixOS manual."; }; From 8f3a2d699121461a2b359b12e792d32b6083bc2c Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 26 Oct 2017 17:12:42 +0200 Subject: [PATCH 020/106] borgbackup: 1.1.0 -> 1.1.1 --- pkgs/tools/backup/borg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4ff61d1ac95..219283de4cc 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.1.0"; + version = "1.1.1"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "0vwyg0b4kxb0rspqwhvgi5c78dzimgkydf03wif27a40qhh1235l"; + sha256 = "0iik5lq349cl87imlwra2pp0j36wjhpn8r1d3778azvvqpyjq2d5"; }; nativeBuildInputs = with python3Packages; [ From e61ef03c0203b3230ad2a21e5652cbd820a452d5 Mon Sep 17 00:00:00 2001 From: dywedir Date: Fri, 27 Oct 2017 00:08:49 +0300 Subject: [PATCH 021/106] fd: 4.0.0 -> 5.0.0 --- pkgs/tools/misc/fd/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 54d17e6f64c..09debd461dc 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,18 +2,23 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1aw4pgsmvzzqlvbxzv5jnw42nf316qfhvr50b58iqi2dxy8z8cmv"; + sha256 = "17y2fr3faaf32lv171ppkgi55v5zxq97jiilsgmjcn00rd9i6v0j"; }; - cargoSha256 = "1v9wg4dq4c7i85bkdhd79bj8gx7200z6np05wsyj2ycbv97p095j"; + cargoSha256 = "17f4plyj6mnz0d9f4ykgbmddsdp6c3f6q4kmgj406p49xsf0jjkc"; - meta = { + preFixup = '' + mkdir -p "$out/man/man1" + cp "$src/doc/fd.1" "$out/man/man1" + ''; + + meta = with stdenv.lib; { description = "A simple, fast and user-friendly alternative to find"; longDescription = '' `fd` is a simple, fast and user-friendly alternative to `find`. @@ -22,7 +27,7 @@ rustPlatform.buildRustPackage rec { it provides sensible (opinionated) defaults for 80% of the use cases. ''; homepage = "https://github.com/sharkdp/fd"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ asl20 /* or */ mit ]; + platforms = platforms.all; }; } From 21ad5f0ab6e22fc3bf651fcb21b3cb1066ba3e36 Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Fri, 27 Oct 2017 11:09:44 +0800 Subject: [PATCH 022/106] fastlane: 2.61.0 -> 2.62.1 --- pkgs/tools/admin/fastlane/Gemfile.lock | 14 +++++++------- pkgs/tools/admin/fastlane/gemset.nix | 24 ++++++++++++------------ pkgs/tools/admin/fastlane/update | 10 ++++++++++ 3 files changed, 29 insertions(+), 19 deletions(-) create mode 100755 pkgs/tools/admin/fastlane/update diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 8f10ee22ddc..93cf658719c 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.61.0) + fastlane (2.62.1) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -65,9 +65,9 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - googleauth (0.5.3) + googleauth (0.6.1) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) @@ -78,7 +78,7 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) json (2.1.0) - jwt (1.5.6) + jwt (2.1.0) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -112,21 +112,21 @@ GEM terminal-notifier (1.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-screen (0.5.0) + tty-screen (0.5.1) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.4) unicode-display_width (1.3.0) word_wrap (1.0.0) - xcodeproj (1.5.2) + xcodeproj (1.5.3) CFPropertyList (~> 2.3.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.2.3) xcpretty (0.2.8) rouge (~> 2.0.7) - xcpretty-travis-formatter (0.0.4) + xcpretty-travis-formatter (1.0.0) xcpretty (~> 0.2, >= 0.0.7) PLATFORMS diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index c1285e43496..8e75f76ec35 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -137,10 +137,10 @@ dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n73748vw7y29ycx0rjdg9zvn8xhncq07zq1l4a16n5s82rb14iy"; + sha256 = "1r6ci3rkrzsdk8cbxidzcjv94hbwq7ljwvm5whgxb8lcxcfl696k"; type = "gem"; }; - version = "2.61.0"; + version = "2.62.1"; }; gh_inspector = { source = { @@ -163,10 +163,10 @@ dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + sha256 = "13laklpf99m3qzq9n3vnc9dblgw7q05n1r16jlxsh4lxlaijr0sf"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.1"; }; highline = { source = { @@ -204,10 +204,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; type = "gem"; }; - version = "1.5.6"; + version = "2.1.0"; }; little-plugger = { source = { @@ -393,10 +393,10 @@ tty-screen = { source = { remotes = ["https://rubygems.org"]; - sha256 = "005rpl9l1r9i7wypb4kv057y01fxqvanznx62msx6z451cfjsfn3"; + sha256 = "12qkjwpkgznvhwbywq2y7l5mcq2f4z404b0ip7xm4byg3827lh4h"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.1"; }; uber = { source = { @@ -443,10 +443,10 @@ dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v40167wxhjfczjqp7axvblivrzgbmqldaj9vb15pw45qh6xly51"; + sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.3"; }; xcpretty = { dependencies = ["rouge"]; @@ -461,9 +461,9 @@ dependencies = ["xcpretty"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wn5pcxja1jkc8y5b6s3pks5inc1vmjkq7fqmlbkl39z8l1vdis2"; + sha256 = "15b5c0lxz2blmichfdlabzlbyw5nlh1ci898pxwb661m9bahz3ml"; type = "gem"; }; - version = "0.0.4"; + version = "1.0.0"; }; } \ No newline at end of file diff --git a/pkgs/tools/admin/fastlane/update b/pkgs/tools/admin/fastlane/update new file mode 100755 index 00000000000..22d1e52e297 --- /dev/null +++ b/pkgs/tools/admin/fastlane/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -r ~/.gem +fi From 3fa77a19efd1a0b2cfaaf064a428c421cf98d2d1 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 27 Oct 2017 15:28:51 +0100 Subject: [PATCH 023/106] kanboard: 1.0.46 -> 1.0.48 --- pkgs/applications/misc/kanboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index b37d12c362f..7995c8875b8 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "kanboard-${version}"; - version = "1.0.46"; + version = "1.0.48"; src = fetchzip { - url = "https://kanboard.net/${name}.zip"; - sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a"; + url = "https://github.com/kanboard/kanboard/releases/download/v${version}/${name}.zip"; + sha256 = "0ipyijlfcnfqlz9n20wcnaf9pw404a675x404pm9h2n4ld8x6m5v"; }; dontBuild = true; From 41ba309136a0fecb684a5732a22a8f228263a56e Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 27 Oct 2017 18:06:34 +0200 Subject: [PATCH 024/106] gitlab-runner: 10.0.2 -> 10.1.0 --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 430e46f2303..44e4f494ff2 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.0.2"; + version = "10.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "14lrc9frigym93ppphmdhwnbhk7xz5drpai3d29gyi1z4xsm1jaq"; + sha256 = "0h8fwqsr8ibd82jxq4pc9p8x7af0i8jyrrsj13p4daqhla0srxr4"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "013bly0xswzkf2kwi2pr2ryd880h63n8pya2ccv4z77hxs80cfmp"; + sha256 = "0bzj8zr6d5ab5bjlbw7q3iwn19ha8fksymrvw6cyzs4qacfsj54w"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0hr964r7bcff74sna0b8w3d2ip0hs441ijlhplh2xzqnzpbvx2jq"; + sha256 = "0knvjmxcscyr6v5b9vvyvm8w6p58a1h6nfcvf13dxp59psm71q00"; }; patches = [ ./fix-shell-path.patch ]; From 0c6afc94bc331a155228dc374b041e2cd5e7c04c Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 27 Oct 2017 22:22:33 +0200 Subject: [PATCH 025/106] datefudge: 1.21 => 1.22 --- pkgs/tools/system/datefudge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 13c2938f63b..2c2d778697a 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "datefudge"; - version = "1.2.1"; + version = "1.22"; name = "${pname}-${version}"; src = fetchgit { - sha256 = "0l83kn6c3jr3wzs880zfa64rw81cqjjk55gjxz71rjf2balp64ps"; + sha256 = "1fmd05r00wx4zc90lbi804jl7xwdl11jq2a1kp5lqimk3yyvfw4c"; url = "git://anonscm.debian.org/users/robert/datefudge.git"; - rev = "cd141c63bebe9b579109b2232b5e83db18f222c2"; + rev = "fe27db47a0f250fb56164114fff8ae8d5af47ab6"; }; patchPhase = '' From e0d83c66cf8a188854965d21cd08137570e72f1f Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 27 Oct 2017 22:26:09 +0200 Subject: [PATCH 026/106] duckmarines: 1.0b => 1.0c --- pkgs/games/duckmarines/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index fc4a006a6a9..b4dca34b11f 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -2,7 +2,7 @@ let pname = "duckmarines"; - version = "1.0b"; + version = "1.0c"; icon = fetchurl { url = "http://tangramgames.dk/img/thumb/duckmarines.png"; From 51babe0fa88ecaec80917ece4e84d9cef39c7eb5 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 27 Oct 2017 23:11:50 +0200 Subject: [PATCH 027/106] shotwell: 0.27.0 -> 0.27.1 --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a3be867d6ed..b0a6f7caf88 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { version = "${major}.${minor}"; major = "0.27"; - minor = "0"; + minor = "1"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "03vwp314kckr67p7shrysqpr95hc3326lk3bv40g11i9clsik1a2"; + sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; From 9754285f5bf1ea96397a7ff6acd3c9059f235fd3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 28 Oct 2017 11:20:47 +0800 Subject: [PATCH 028/106] neomutt: 20171013 -> 20171027 --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index d9d2f201fdc..4b522518e3f 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -14,14 +14,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20171013"; + version = "20171027"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1"; + sha256 = "0pwc5zdxc9h23658dfkzndfj1ld3ijyvcxmsiv793y3i4dig0s3n"; }; buildInputs = [ From e6061d737b088733ab443e38cf97b6420b1970b7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 28 Oct 2017 03:58:21 +0200 Subject: [PATCH 029/106] python.pkgs.nbmerge: init at unstable-2017-10-23 --- .../python-modules/nbmerge/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/nbmerge/default.nix diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix new file mode 100644 index 00000000000..df6c774bfbe --- /dev/null +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nbformat +, nose +}: + +buildPythonPackage rec { + pname = "nbmerge"; + version = "unstable-2017-10-23"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jbn"; + repo = pname; + rev = "fc0ba95e8422340317358ffec4404235defbc06a"; + sha256 = "1cn550kjadnxc1sx2xy814248fpzrj3lgvrmsbrwmk03vwaa2hmi"; + }; + + propagatedBuildInputs = [ nbformat ]; + checkInputs = [ nose ]; + + checkPhase = '' + patchShebangs . + nosetests -v + PATH=$PATH:$out/bin ./cli_tests.sh + ''; + + meta = { + description = "A tool to merge/concatenate Jupyter (IPython) notebooks"; + inherit (src.meta) homepage; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0a8553dc38..8df85f143bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12702,6 +12702,8 @@ in { nbformat = callPackage ../development/python-modules/nbformat { }; + nbmerge = callPackage ../development/python-modules/nbmerge { }; + nbxmpp = buildPythonPackage rec { name = "nbxmpp-${version}"; version = "0.5.5"; From b972139a59f5647c399afcb71db9929edaec7768 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 17:07:43 +0800 Subject: [PATCH 030/106] dpkg: 1.18.24 -> 1.19.0.4 (#30854) * dpkg: 1.18.24 -> 1.19.0.4 * dpkg: just use one substituteInPlace call --- .../tools/package-management/dpkg/default.nix | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 53c39003483..63431e29fac 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: +{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper, coreutils }: stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.24"; + version = "1.19.0.4"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1d6p22vk1b9v16q96mwaz9w2xr4ly28yamkh49md9gq67qfhhlyq"; + sha256 = "02lrwrkl2g1jwj71088rwswx07a1zq1jkq7193lbvy8jj2qnp9lq"; }; configureFlags = [ @@ -31,6 +31,24 @@ stdenv.mkDerivation rec { done ''; + patchPhase = '' + patchShebangs . + + # Dpkg commands sometimes calls out to shell commands + substituteInPlace lib/dpkg/dpkg.h \ + --replace '"dpkg-deb"' \"$out/bin/dpkg-deb\" \ + --replace '"dpkg-split"' \"$out/bin/dpkg-split\" \ + --replace '"dpkg-query"' \"$out/bin/dpkg-query\" \ + --replace '"dpkg-divert"' \"$out/bin/dpkg-divert\" \ + --replace '"dpkg-statoverride"' \"$out/bin/dpkg-statoverride\" \ + --replace '"dpkg-trigger"' \"$out/bin/dpkg-trigger\" \ + --replace '"dpkg"' \"$out/bin/dpkg\" \ + --replace '"debsig-verify"' \"$out/bin/debsig-verify\" \ + --replace '"rm"' \"${coreutils}/bin/rm\" \ + --replace '"cat"' \"${coreutils}/bin/cat\" \ + --replace '"diff"' \"${coreutils}/bin/diff\" + ''; + buildInputs = [ perl zlib bzip2 xz ]; nativeBuildInputs = [ makeWrapper ]; From 9f28f2dd38bbc6b156a4f1798a47b32588611535 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sat, 28 Oct 2017 00:16:39 +0200 Subject: [PATCH 031/106] sshlatex: init at 0.7 --- lib/maintainers.nix | 1 + pkgs/tools/typesetting/sshlatex/default.nix | 38 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/tools/typesetting/sshlatex/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b71b5d7aa54..5a9a9428c4e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -268,6 +268,7 @@ htr = "Hugo Tavares Reis "; iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; + iblech = "Ingo Blechschmidt "; igsha = "Igor Sharonov "; ikervagyok = "Balázs Lengyel "; infinisil = "Silvan Mosberger "; diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix new file mode 100644 index 00000000000..bfc1a8eb162 --- /dev/null +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }: + +stdenv.mkDerivation rec { + name = "sshlatex-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "iblech"; + repo = "sshlatex"; + rev = "${version}"; + sha256 = "02h81i8n3skg9jnlfrisyg5bhqicrn6svq64kp20f70p64s3d7ix"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = let + binPath = stdenv.lib.makeBinPath [ openssh perl gnutar bash inotify-tools ]; + in '' + mkdir -p $out/bin + cp sshlatex $out/bin + wrapProgram $out/bin/sshlatex --prefix PATH : "${binPath}" + ''; + + meta = with stdenv.lib; { + description = "A collection of hacks to efficiently run LaTeX via ssh"; + longDescription = '' + sshlatex is a tool which uploads LaTeX source files to a remote, runs + LaTeX there, and streams the resulting PDF file to the local host. + Because sshlatex prestarts LaTeX with the previous run's preamble, + thereby preloading the required LaTeX packages, it is also useful in a + purely local setting. + ''; + homepage = https://github.com/iblech/sshlatex; + license = stdenv.lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus + platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.iblech ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ca4b33ecf3..be0f18ca106 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4486,6 +4486,8 @@ with pkgs; sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; + sshlatex = callPackage ../tools/typesetting/sshlatex { }; + sshuttle = callPackage ../tools/security/sshuttle { }; ssldump = callPackage ../tools/networking/ssldump { }; From 436c8fd28739b20ab3f4448c249c528ba3267034 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:42:06 +0200 Subject: [PATCH 032/106] 389-ds-base: fix homepage url --- pkgs/servers/ldap/389/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 637b7dd8b92..5ef909a6d09 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { passthru.version = version; meta = with stdenv.lib; { - homepage = https://directory.fedoraproject.org/; + homepage = http://www.port389.org/; description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl2; platforms = platforms.linux; From 817d51aa8f0a4810c15b4b16461e1d3ebca9e6e9 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:39:33 +0200 Subject: [PATCH 033/106] a2ps: fix homepage url --- pkgs/tools/text/a2ps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index 2535354aa22..f423bd7ea1c 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { (page number, printing date, file name or supplied header), line numbering, symbol substitution as well as pretty printing for a wide range of programming languages. ''; - homepage = http://www.inf.enst.fr/~demaille/a2ps/index.html; + homepage = https://www.gnu.org/software/a2ps/; license = licenses.gpl3Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; From 6fc47b0c58bd631fcdc27b31e8565d8dba6a87fd Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:30:19 +0200 Subject: [PATCH 034/106] amdapp-sdk: fix homepage url --- pkgs/development/misc/amdapp-sdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index fc2981f7f1f..7775716a712 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; - homepage = http://developer.amd.com/tools/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/; + homepage = http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/; license = licenses.amd; maintainers = [ maintainers.offline ]; platforms = [ "i686-linux" "x86_64-linux" ]; From 19828e85b13b9ab738305b4eee4c4a5472c5d39a Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:26:26 +0200 Subject: [PATCH 035/106] appstream: fix homepage url --- pkgs/development/libraries/appstream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index d2b605c4f19..b79f274b9c3 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { cmakeFlags = '' -DSTEMMING=off ''; - + meta = with stdenv.lib; { description = "Software metadata handling library"; - homepage = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/"; + homepage = https://www.freedesktop.org/wiki/Distributions/AppStream/; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications From 01e47d6bb5379cf78c5c72276a88e8219dd829e9 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Thu, 26 Oct 2017 23:40:38 +0200 Subject: [PATCH 036/106] arp-scan: fix homepage url --- pkgs/tools/misc/arp-scan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index f8adedc7c24..760757190c3 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { Arp-scan is a command-line tool that uses the ARP protocol to discover and fingerprint IP hosts on the local network. ''; - homepage = http://www.nta-monitor.com/tools-resources/security-tools/arp-scan; + homepage = http://www.nta-monitor.com/wiki/index.php/Arp-scan_Documentation; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; From 06c154386ee245597f6b32c5063bdf3e21720e14 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 12:22:26 +0300 Subject: [PATCH 037/106] claws-mail: Split dev output Closure goes 484M -> 469M. --- pkgs/applications/networking/mailreaders/claws-mail/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 01978a4da7e..cccfdbc7560 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { sha256 = "0hlm2jipyr4z6izlrpvabpz4ivh49i13avnm848kr1nv68pkq2cd"; }; + outputs = [ "out" "dev" ]; + patches = [ ./mime.patch ]; hardeningDisable = [ "format" ]; From abf222ad384304ce7477c8556571bc893c8f5a75 Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Sat, 21 Oct 2017 13:33:08 +0200 Subject: [PATCH 038/106] libtbb: init at 2018_U1 --- pkgs/development/libraries/libtbb/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/libtbb/default.nix diff --git a/pkgs/development/libraries/libtbb/default.nix b/pkgs/development/libraries/libtbb/default.nix new file mode 100644 index 00000000000..1422f6c5ceb --- /dev/null +++ b/pkgs/development/libraries/libtbb/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, tree }: + +stdenv.mkDerivation rec { + name = "libtbb-${version}"; + version = "2018_U1"; + + src = fetchFromGitHub { + owner = "01org"; + repo = "tbb"; + rev = "${version}"; + sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; + }; + + buildInputs = [ tree ]; + + installPhase = '' + mkdir -p "$out"/usr/include "$out"/lib + install -m755 build/linux_*/*.so* "$out"/lib/ + cp -a include/tbb "$out"/usr/include/ + ''; + + meta = with stdenv.lib; { + homepage = "https://www.threadingbuildingblocks.org/"; + description = "High level abstract threading library"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ dizfer ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0a2fe24a30..8b219f6be7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3119,6 +3119,8 @@ with pkgs; libsrs2 = callPackage ../development/libraries/libsrs2 { }; + libtbb = callPackage ../development/libraries/libtbb { }; + libtermkey = callPackage ../development/libraries/libtermkey { }; libtelnet = callPackage ../development/libraries/libtelnet { }; From 301fc3a33dd02dad3ff2d96f13b0b0b727df72fe Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Sun, 22 Oct 2017 19:05:11 +0200 Subject: [PATCH 039/106] maintainers: add dizfer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 5a9a9428c4e..9fb5a64540a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -161,6 +161,7 @@ dgonyeo = "Derek Gonyeo "; dipinhora = "Dipin Hora "; disassembler = "Samuel Leathers "; + dizfer = "David Izquierdo "; dmalikov = "Dmitry Malikov "; DmitryTsygankov = "Dmitry Tsygankov "; dmjio = "David Johnson "; From 38368c42fc06129b7efcb804e25fee16da0319dc Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Sat, 28 Oct 2017 11:17:09 +0200 Subject: [PATCH 040/106] steam-runtime-wrapped: add libtbb --- pkgs/games/steam/runtime-wrapped.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 1ec9fc7d5d9..4c3faa07418 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -57,6 +57,7 @@ let glew110 openssl libidn + libtbb # Other things from runtime xlibs.libXinerama From 7dff2c53d4c346df8febf2006c6143097b473236 Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Sat, 28 Oct 2017 11:18:26 +0200 Subject: [PATCH 041/106] steam-runtime-wrapped: switch curl to use gnutls --- pkgs/games/steam/runtime-wrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 4c3faa07418..73c010d645f 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -26,7 +26,7 @@ let xlibs.libICE gnome2.GConf freetype - curl + (curl.override { gnutlsSupport = true; sslSupport = false; }) nspr nss fontconfig From b2f199404f84f30dd42e464707e48274a649c9b6 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 26 Oct 2017 17:21:57 +0200 Subject: [PATCH 042/106] buku: 3.3.1 -> 3.4 --- pkgs/applications/misc/buku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index a0955dceced..8aa191c0f3c 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "3.3.1"; + version = "3.4"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3"; + sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0"; }; nativeBuildInputs = [ From da3c404e58fad73763b34e1e4a1d798edc15b46b Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Sun, 22 Oct 2017 23:36:30 +0400 Subject: [PATCH 043/106] chromium: 62.0.3202.62 -> 62.0.3202.75 also fix beta/dev build - use harfbuzz from sources Unfortunatelly after [0] chromium doesn't support using harfbuzz provided by system while using vendored version of freetype. Disabling usage of separate harfbuzz for now. [0] https://chromium-review.googlesource.com/c/chromium/src/+/696241 --- .../networking/browsers/chromium/common.nix | 10 ++++++++-- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 63483b4da71..42d606ae224 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -60,10 +60,13 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" + "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* # "re2" # fails with linker errors # "ffmpeg" # https://crbug.com/731766 + ] ++ optionals (versionRange "62" "63") [ + "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; opusWithCustomModes = libopus.override { @@ -76,7 +79,10 @@ let libpng libcap xdg_utils yasm minizip libwebp libusb1 re2 zlib - ffmpeg harfbuzz-icu libxslt libxml2 + ffmpeg libxslt libxml2 + ] ++ optionals (versionRange "62" "63") [ + harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source ]; # build paths and release info diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5fe20b9a981..0cf6df0e5cc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; - sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq"; - version = "62.0.3202.62"; + sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; + sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q"; + version = "63.0.3239.18"; }; dev = { - sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb"; - sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv"; - version = "63.0.3239.9"; + sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; + sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k"; + version = "63.0.3239.18"; }; stable = { - sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8"; - sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq"; - version = "62.0.3202.62"; + sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9"; + sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x"; + version = "62.0.3202.75"; }; } From 1adcef7caff0386060d895a31b98a6f610e7b237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 28 Oct 2017 07:48:15 -0200 Subject: [PATCH 044/106] e17gtk: 3.22.1 -> 3.22.2 --- pkgs/misc/themes/e17gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix index 3fbb77816d3..f0bb2bf729d 100644 --- a/pkgs/misc/themes/e17gtk/default.nix +++ b/pkgs/misc/themes/e17gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "e17gtk-${version}"; - version = "3.22.1"; + version = "3.22.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "E17gtk"; rev = "V${version}"; - sha256 = "0y1v5hamssgzgcmwbr60iz7wipb9yzzj3ypzkc6i65mp4pyazrv8"; + sha256 = "1qwj1hmdlk8sdqhkrh60p2xg4av1rl0lmipdg5j0i40318pmiml1"; }; installPhase = '' From e730815e38eee3da61bd81e99837c165f9cc529c Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Fri, 27 Oct 2017 21:41:18 +0200 Subject: [PATCH 045/106] nodejs: 8.8.0 -> 8.8.1 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 427de79b33e..49cc205c024 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.8.0"; + version = "8.8.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "1ksfj6h6vwaws52055mg80pm2bslw23kpx3a7ahraa6ngk934kw5"; + sha256 = "0ymmhw41n5a81qkxvq7lrssis4y53jh5gxs2k6s2v6brnxxc9qjw"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; From 632b071279c12c4d3e06f1edeaec4e196c1fa425 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Thu, 26 Oct 2017 10:53:23 +0200 Subject: [PATCH 046/106] nullmailer: 2.0 -> 2.1 --- pkgs/servers/mail/nullmailer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index be923ff2305..f17f3ed2de7 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -4,12 +4,12 @@ assert tls -> gnutls != null; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "nullmailer-${version}"; src = fetchurl { url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; - sha256 = "112ghdln8q9yljc8kp9mc3843mh0fyb4rig2v4q2dzy1l324q3yp"; + sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild"; }; buildInputs = stdenv.lib.optional tls gnutls; From ad1bf413911d732b0677188bb77808ce0d7fe6f4 Mon Sep 17 00:00:00 2001 From: Yuri Aisaka Date: Sat, 28 Oct 2017 20:23:42 +0900 Subject: [PATCH 047/106] skktools: init at 1.3.3 (#30778) --- .../inputmethods/skk/skktools/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/inputmethods/skk/skktools/default.nix diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix new file mode 100644 index 00000000000..8661da66b92 --- /dev/null +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }: + +# Note (2017-10-24, yuriaisaka): +# - Version 1.3.3 dates from Jul. 19, 2013. +# - The latest commit to the github repo dates from Mar. 05, 2017 +# - The repo since appears to have become a kitchen sink place to keep +# misc tools to handle SKK dictionaries, and these tools have runtime +# dependencies on a Ruby interpreter etc. +# - We for the moment do not package them to keep the dependencies slim. +# Probably, shall package the newer tools as skktools-extra in the future. +stdenv.mkDerivation rec { + name = "skktools-${version}"; + version = "1.3.3"; + src = fetchFromGitHub { + owner = "skk-dev"; + repo = "skktools"; + rev = "c8816fe720604d4fd79f3552e99e0430ca6f2769"; + sha256 = "11v1i5gkxvfsipigc1w1m16ijzh85drpl694kg6ih4jfam1q4vdh"; + }; + # # See "12.2. Package naming" + # name = "skktools-unstable-${version}"; + # version = "2017-03-05"; + # src = fetchFromGitHub { + # owner = "skk-dev"; + # repo = "skktools"; + # rev = "e14d98e734d2fdff611385c7df65826e94d929db"; + # sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2"; + # }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gdbm glib ]; + + meta = { + description = "A collection of tools to edit SKK dictionaries"; + longDescription = '' + This package provides a collection of tools to manipulate + (merge, sort etc.) the dictionaries formatted for SKK Japanese + input method. + ''; + homepage = https://github.com/skk-dev/skktools; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b219f6be7c..27a494a1315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1476,6 +1476,8 @@ with pkgs; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; + skktools = callPackage ../tools/inputmethods/skk/skktools { }; + ibus = callPackage ../tools/inputmethods/ibus { inherit (gnome3) dconf glib; }; From 288740ad69526df10cb328cbdde89d23b2f66b1c Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 21 Sep 2017 02:36:39 +0200 Subject: [PATCH 048/106] webkitgtk: 2.16.6 -> 2.18.2 remove references to 216x CVE-2017-7087 CVE-2017-7089 CVE-2017-7090 CVE-2017-7091 CVE-2017-7092 CVE-2017-7093 CVE-2017-7095 CVE-2017-7096 CVE-2017-7098 CVE-2017-7100 CVE-2017-7102 CVE-2017-7104 CVE-2017-7107 CVE-2017-7109 CVE-2017-7111 CVE-2017-7117 CVE-2017-7120 closes #29796 --- pkgs/desktops/gnome-3/default.nix | 3 +-- .../libraries/webkitgtk/{2.16.nix => 2.18.nix} | 14 +++++++------- .../libraries/wxwidgets/3.0/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) rename pkgs/development/libraries/webkitgtk/{2.16.nix => 2.18.nix} (89%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 10e5f97c38f..585f79ddea6 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,7 +56,6 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.18.nix similarity index 89% rename from pkgs/development/libraries/webkitgtk/2.16.nix rename to pkgs/development/libraries/webkitgtk/2.18.nix index d6999353414..036dc8f0a54 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -4,7 +4,7 @@ , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base +, gst-plugins-base, gst-plugins-bad }: assert enableGeoLocation -> geoclue2 != null; @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.16.6"; + version = "2.18.2"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,12 +42,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; + sha256 = "1ry8zvv6k01g9p7agg326n0ziqpqjxd49h5w1b2is6rjnpqv6k5i"; }; # see if we can clean this up.... - patches = [ ./finding-harfbuzz-icu.patch ] + patches = [ ./finding-harfbuzz-icu.patch ./gstreamergl-2.17.patch ] ++ optionals stdenv.isDarwin [ ./PR-152650-2.patch ./PR-153138.patch @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # XXX: WebKit2 missing include path for gst-plugins-base. # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0" + (optionalString stdenv.isDarwin " -lintl"); nativeBuildInputs = [ @@ -88,9 +88,9 @@ stdenv.mkDerivation rec { ]; buildInputs = libintlOrEmpty ++ [ - gtk2 libwebp enchant libnotify gnutls pcre nettle libidn + gtk2 libwebp enchant libnotify gnutls pcre nettle libidn sqlite libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core + gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 35300ed9419..0a4350ed81d 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -3,13 +3,13 @@ , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null; with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27a494a1315..925e0f7eac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10968,7 +10968,7 @@ with pkgs; wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = webkitgtk216x; + webkitgtk = webkitgtk218x; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu-58; @@ -10976,7 +10976,7 @@ with pkgs; inherit (darwin) libobjc; }; - webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix { + webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; From 43e020ac2fef1376270da1664091b5c493b81bb4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 14:42:47 +0300 Subject: [PATCH 049/106] giblib: Split into multiple outputs Or it propagates imlib2.dev. --- pkgs/development/libraries/giblib/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 17847695f97..b166a69043e 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -8,9 +8,25 @@ stdenv.mkDerivation rec { sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray+=( + --includedir=$dev/include + ) + ''; + buildInputs = [ xlibsWrapper ]; propagatedBuildInputs = [ imlib2 ]; + postFixup = '' + moveToOutput bin/giblib-config "$dev" + + # Doesn't contain useful stuff + rm -rf $out/share/doc + ''; + meta = { homepage = http://linuxbrit.co.uk/giblib/; description = "wrapper library for imlib2, and other stuff"; From 0d6822be2bcb3898f6686eb232a8fc0a87e97348 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 28 Oct 2017 13:52:25 +0200 Subject: [PATCH 050/106] Revert "webkitgtk: 2.16.6 -> 2.18.2" This already went to staging, sorry This reverts commit 288740ad69526df10cb328cbdde89d23b2f66b1c. --- pkgs/desktops/gnome-3/default.nix | 3 ++- .../libraries/webkitgtk/{2.18.nix => 2.16.nix} | 14 +++++++------- .../libraries/wxwidgets/3.0/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) rename pkgs/development/libraries/webkitgtk/{2.18.nix => 2.16.nix} (89%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 585f79ddea6..10e5f97c38f 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,6 +56,7 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; + webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.16.nix similarity index 89% rename from pkgs/development/libraries/webkitgtk/2.18.nix rename to pkgs/development/libraries/webkitgtk/2.16.nix index 036dc8f0a54..d6999353414 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -4,7 +4,7 @@ , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base, gst-plugins-bad +, gst-plugins-base }: assert enableGeoLocation -> geoclue2 != null; @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.18.2"; + version = "2.16.6"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,12 +42,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "1ry8zvv6k01g9p7agg326n0ziqpqjxd49h5w1b2is6rjnpqv6k5i"; + sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; }; # see if we can clean this up.... - patches = [ ./finding-harfbuzz-icu.patch ./gstreamergl-2.17.patch ] + patches = [ ./finding-harfbuzz-icu.patch ] ++ optionals stdenv.isDarwin [ ./PR-152650-2.patch ./PR-153138.patch @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # XXX: WebKit2 missing include path for gst-plugins-base. # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0" + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" + (optionalString stdenv.isDarwin " -lintl"); nativeBuildInputs = [ @@ -88,9 +88,9 @@ stdenv.mkDerivation rec { ]; buildInputs = libintlOrEmpty ++ [ - gtk2 libwebp enchant libnotify gnutls pcre nettle libidn sqlite + gtk2 libwebp enchant libnotify gnutls pcre nettle libidn libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core + sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 0a4350ed81d..35300ed9419 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -3,13 +3,13 @@ , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 925e0f7eac8..27a494a1315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10968,7 +10968,7 @@ with pkgs; wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = webkitgtk218x; + webkitgtk = webkitgtk216x; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu-58; @@ -10976,7 +10976,7 @@ with pkgs; inherit (darwin) libobjc; }; - webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix { + webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; From 9812babaef0cc71098568fbb12c6968b726f8cce Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 14:52:52 +0300 Subject: [PATCH 051/106] xorg.xf86inputlibinput: Split dev output Closure goes from 160M -> 42M --- pkgs/servers/x11/xorg/overrides.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fa22717b035..87dfeb3cfa7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -321,8 +321,9 @@ in url = "mirror://xorg/individual/driver/${name}.tar.bz2"; sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; }; + outputs = [ "out" "dev" ]; buildInputs = attrs.buildInputs ++ [ args.libinput ]; - installFlags = "sdkdir=\${out}/include/xorg"; + installFlags = "sdkdir=\${dev}/include/xorg"; }; xf86inputsynaptics = attrs: attrs // { From ea8a4a2e431fca881c17cbe57df044cd8e5e8dfc Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 13 Dec 2016 01:38:56 +0100 Subject: [PATCH 052/106] dropbox: comment update commands --- pkgs/applications/networking/dropbox/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 89a473f0cd0..06ac05da36d 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -22,6 +22,11 @@ # them with our own. let + ## Prefetch commands to run after update, from this directory: + ## e.g. with Emacs: C-u M-x shell-command + # nix-prefetch-url ../../../../ -A dropbox.src + # nix-prefetch-url ../../../../ -A pkgsi686Linux.dropbox.src + # NOTE: When updating, please also update in current stable, # as older versions stop working version = "37.4.29"; From 5eccf40eb4c0aefab11de880c91f6f3ab12a9c0f Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Wed, 16 Aug 2017 09:10:46 +0200 Subject: [PATCH 053/106] i2p: 0.9.30 -> 0.9.31 --- pkgs/tools/networking/i2p/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index e13ada5994c..cf26ec61139 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.30"; + name = "i2p-0.9.31"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "03hrirmah3ba9ygql487jy233nsxkfjyz82mmyppazi0mcgiass1"; + sha256 = "1v2my5jqcj8zidxij34h0lpa533rr6ianzz8yld01sxi6gg41w28"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; From 59b35013bcf22cb9f32372c0019d7b1a0f91b0d8 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 29 Sep 2017 20:40:15 +0200 Subject: [PATCH 054/106] imlib2: enable libid3tag support --- pkgs/development/libraries/imlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 8d26cabc9b5..54c70197af4 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig -, freetype +, freetype, libid3tag , x11Support ? true, xlibsWrapper ? null }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z"; }; - buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ] + buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ] ++ optional x11Support xlibsWrapper; nativeBuildInputs = [ pkgconfig ]; From d6ee81e912c5dbfb7db23387c31996b258d0193f Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 28 Jul 2017 12:08:32 +0200 Subject: [PATCH 055/106] dwarf-fortress-packages.dwarf-therapist: update for df 43.05 Similar to the LNP, we use Hello71's fork, which features support for the (first 64bit) version 43.05 of Dwarf Fortress. http://dffd.bay12games.com/file.php?id=12762 --- .../dwarf-therapist/default.nix | 33 +++++++++++-------- .../dwarf-therapist/wrapper.nix | 2 +- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index bfdedcdd133..e7ef9a02eb7 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,29 +1,34 @@ -{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }: +{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, cmake, texlive, ninja }: stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "37.0.0"; + version = "37.0.0-Hello71"; src = fetchFromGitHub { - owner = "splintermind"; + ## We use `Hello71`'s fork for 43.05 support + # owner = "splintermind"; + owner = "Hello71"; repo = "Dwarf-Therapist"; - rev = "v${version}"; - sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d"; + rev = "42ccaa71f6077ebdd41543255a360c3470812b97"; + sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz"; }; outputs = [ "out" "layouts" ]; buildInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ texlive qmake ]; + nativeBuildInputs = [ texlive cmake ninja ]; - enableParallelBuilding = false; + configurePhase = '' + cmake -GNinja + ''; - # Move layout files so they cannot be found by Therapist - postInstall = '' - mkdir -p $layouts - mv $out/share/dwarftherapist/memory_layouts/* $layouts - rmdir $out/share/dwarftherapist/memory_layouts - # Useless symlink - rm $out/bin/dwarftherapist + buildPhase = '' + ninja -j$NIX_BUILD_CORES + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./DwarfTherapist $out/bin/DwarfTherapist + cp -r ./share/memory_layouts $layouts ''; meta = with stdenv.lib; { diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index cbc8d31e675..3a1a52d44cd 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -3,7 +3,7 @@ let df = dwarf-fortress-original; dt = dwarf-therapist-original; - inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini"; + inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini"; dfHashFile = "${df}/hash.md5"; in symlinkJoin { From 24ea0938066d53e4f43fb208a5f2ce506c682b38 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 19 Jun 2017 02:48:02 +0200 Subject: [PATCH 056/106] dwarf-fortress-packages.soundSense: init 2016-1_196 --- pkgs/games/dwarf-fortress/default.nix | 2 ++ pkgs/games/dwarf-fortress/soundsense.nix | 35 +++++++++++++++++++ pkgs/games/dwarf-fortress/wrapper/default.nix | 11 +++++- .../dwarf-fortress/wrapper/soundSense.in | 10 ++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/dwarf-fortress/soundsense.nix create mode 100644 pkgs/games/dwarf-fortress/wrapper/soundSense.in diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index d26258081fc..c759c4c60da 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -11,6 +11,8 @@ let inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; }; + soundSense = callPackage ./soundsense.nix { }; + dwarf-fortress-unfuck = callPackage ./unfuck.nix { }; dwarf-fortress = callPackage ./wrapper { diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix new file mode 100644 index 00000000000..c87f42d58c0 --- /dev/null +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchzip, dos2unix +, soundPack ? stdenv.mkDerivation { + name = "soundsense-soundpack"; + src = fetchzip { + url = "http://df.zweistein.cz/soundsense/soundpack.zip"; + sha256 = "0qz0mjkp7wp0gxk3ws2x760awv8c9lkacj2fn9bz3gqqnq262ffa"; + }; + installPhase = '' + cp -r . $out + ''; +}}: + +stdenv.mkDerivation rec { + version = "2016-1_196"; + dfVersion = "0.43.05"; + inherit soundPack; + name = "soundsense-${version}"; + src = fetchzip { + url = "http://df.zweistein.cz/soundsense/soundSense_${version}.zip"; + sha256 = "1gkrs69l3xsh858yjp204ddp29m668j630akm7arssc9359wxqkk"; + }; + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + nativeBuildInputs = [ dos2unix ]; + buildPhase = '' + dos2unix soundSense.sh + chmod +x soundSense.sh + ''; + installPhase = '' + mkdir $out + cp -R . $out/soundsense + ln -s $out/soundsense/dfhack $out/hack + ln -s $soundPack $out/soundsense/packs + ''; + passthru = { inherit version dfVersion; }; +} diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 15b51631b33..232e0b7b3b5 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll , enableDFHack ? false, dfhack +, enableSoundSense ? false, soundSense, jdk , themes ? {} , theme ? null }: @@ -13,13 +14,14 @@ let # These are in inverse order for first packages to override the next ones. pkgs = lib.optional (theme != null) ptheme ++ lib.optional enableDFHack dfhack + ++ lib.optional enableSoundSense soundSense ++ [ dwarf-fortress-original ]; env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}"; paths = pkgs; - pathsToLink = [ "/" "/hack" ]; + pathsToLink = [ "/" "/hack" "/hack/scripts" ]; ignoreCollisions = true; postBuild = lib.optionalString enableDFHack '' @@ -44,6 +46,7 @@ stdenv.mkDerivation rec { runDF = ./dwarf-fortress.in; runDFHack = ./dfhack.in; + runSoundSense = ./soundSense.in; buildCommand = '' mkdir -p $out/bin @@ -57,6 +60,12 @@ stdenv.mkDerivation rec { --subst-var-by stdenv_shell ${stdenv.shell} \ --subst-var dfInit chmod 755 $out/bin/dfhack + '' + lib.optionalString enableSoundSense '' + substitute $runSoundSense $out/bin/soundsense \ + --subst-var-by stdenv_shell ${stdenv.shell} \ + --subst-var-by jre ${jdk.jre} \ + --subst-var dfInit + chmod 755 $out/bin/soundsense ''; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/wrapper/soundSense.in b/pkgs/games/dwarf-fortress/wrapper/soundSense.in new file mode 100644 index 00000000000..28357ed7579 --- /dev/null +++ b/pkgs/games/dwarf-fortress/wrapper/soundSense.in @@ -0,0 +1,10 @@ +#!@stdenv_shell@ -e + +source @dfInit@ + +for p in soundsense/*; do + update_path "$p" +done + +cd "$DF_DIR" +PATH=@jre@/bin exec $DF_DIR/soundsense/soundSense.sh From 85056ee698bdf85dc0db9ca0865dc2b0a2c16ed4 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 1 Oct 2017 21:26:51 +0200 Subject: [PATCH 057/106] dwarf-fortress-packages.dfhack: add stoneSense support --- pkgs/games/dwarf-fortress/default.nix | 1 + pkgs/games/dwarf-fortress/dfhack/default.nix | 14 ++++++----- .../dfhack/fix-stonesense.patch | 23 +++++++++++++++++++ .../dwarf-fortress/dfhack/skip-ruby.patch | 10 -------- pkgs/games/dwarf-fortress/stonesense.nix | 15 ++++++++++++ pkgs/games/dwarf-fortress/wrapper/default.nix | 9 ++++++-- pkgs/games/dwarf-fortress/wrapper/dfhack.in | 2 +- 7 files changed, 55 insertions(+), 19 deletions(-) create mode 100644 pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch delete mode 100644 pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch create mode 100644 pkgs/games/dwarf-fortress/stonesense.nix diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index c759c4c60da..bdd55b5aeda 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -12,6 +12,7 @@ let }; soundSense = callPackage ./soundsense.nix { }; + stoneSense = callPackage ./stonesense.nix { }; dwarf-fortress-unfuck = callPackage ./unfuck.nix { }; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 0df91bb8df0..dbb3e7c32e2 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, cmake, writeScriptBin -, perl, XMLLibXML, XMLLibXSLT -, zlib +{ stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage +, perl, XMLLibXML, XMLLibXSLT, zlib +, enableStoneSense ? false, allegro5, mesa }: let @@ -43,11 +43,12 @@ in stdenv.mkDerivation rec { inherit rev sha256; }; - patches = [ ./skip-ruby.patch ]; + patches = [ ./fix-stonesense.patch ]; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ lib.optionals enableStoneSense [ allegro5 mesa ]; preConfigure = '' # Trick build system into believing we have .git @@ -59,7 +60,8 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" ''; - cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" ]; + cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] + ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; enableParallelBuilding = true; diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch new file mode 100644 index 00000000000..da860cd5562 --- /dev/null +++ b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch @@ -0,0 +1,23 @@ +From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001 +From: Herwig Hochleitner +Date: Sun, 1 Oct 2017 18:01:43 +0200 +Subject: [PATCH] include + +this fixes `GLhandleARB` not being defined +--- + plugins/stonesense/common.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h +index eb36691..ef45389 100644 +--- a/plugins/stonesense/common.h ++++ b/plugins/stonesense/common.h +@@ -31,6 +31,8 @@ using namespace df::enums; + #include + #include + ++#include ++ + // allegro leaks X headers, undef some of it here: + #undef TileShape + #undef None \ No newline at end of file diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch deleted file mode 100644 index 877f6c3d215..00000000000 --- a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt -index f1ef12ac..0976e18a 100644 ---- a/plugins/ruby/CMakeLists.txt -+++ b/plugins/ruby/CMakeLists.txt -@@ -1,5 +1,5 @@ - # Allow build system to turn off downloading of libruby.so. --OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." ON) -+OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." OFF) - - IF (DOWNLOAD_RUBY) diff --git a/pkgs/games/dwarf-fortress/stonesense.nix b/pkgs/games/dwarf-fortress/stonesense.nix new file mode 100644 index 00000000000..52de513ac8f --- /dev/null +++ b/pkgs/games/dwarf-fortress/stonesense.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "stonesense"; + src = fetchFromGitHub { + owner = "DFHack"; + repo = "stonesense"; + rev = "be793a080e66db1ff79ac284070632ec1a896708"; + sha256 = "1kibqblxp16z75zm48kk59w483933rkg4w339f28fcrbpg4sn92s"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DDFHACK_BUILD_ARCH=64" ]; +} diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 232e0b7b3b5..05e851db6f8 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,11 +1,16 @@ { stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll , enableDFHack ? false, dfhack , enableSoundSense ? false, soundSense, jdk +, enableStoneSense ? false , themes ? {} , theme ? null }: let + dfhack_ = dfhack.override { + inherit enableStoneSense; + }; + ptheme = if builtins.isString theme then builtins.getAttr theme themes @@ -13,7 +18,7 @@ let # These are in inverse order for first packages to override the next ones. pkgs = lib.optional (theme != null) ptheme - ++ lib.optional enableDFHack dfhack + ++ lib.optional enableDFHack dfhack_ ++ lib.optional enableSoundSense soundSense ++ [ dwarf-fortress-original ]; @@ -26,7 +31,7 @@ let postBuild = lib.optionalString enableDFHack '' rm $out/hack/symbols.xml - substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \ + substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \ --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \ $(cat ${dwarf-fortress-original}/hash.md5) ''; diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in index c8d8d287403..4cf884ebed2 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in @@ -2,7 +2,7 @@ source @dfInit@ -for i in dfhack.init-example dfhack-config/default hack/*; do +for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do update_path "$i" done From c7bd01c0c927ce7eecc2035c163e16d7d73975f1 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 4 Feb 2017 22:18:59 +0100 Subject: [PATCH 058/106] stumpwm-git: 20160617 -> 20170203 --- pkgs/applications/window-managers/stumpwm/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 6d5e53b7088..215b8c38ece 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -23,9 +23,9 @@ let patches = [ ./fix-module-path.patch ]; }; "git" = { - name = "git-20160617"; - rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a"; - sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb"; + name = "git-20170203"; + rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97"; + sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70"; patches = []; }; }.${version}; @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { sbcl lispPackages.clx lispPackages.cl-ppcre + lispPackages.alexandria xdpyinfo ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27a494a1315..b0b88968c82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16624,6 +16624,7 @@ with pkgs; stumpwm-git = stumpwm.override { version = "git"; + inherit sbcl lispPackages; }; sublime = callPackage ../applications/editors/sublime { }; From e05135d80e8cfd34c44ccfae78ab9b765c8af75f Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 1 Apr 2017 04:23:23 +0200 Subject: [PATCH 059/106] virtualbox: expose extensionPack in meta This way it can be added to system.extraDependencies to save it from gc --- pkgs/applications/virtualization/virtualbox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index fbc0cc5ded0..97d3b3c49b5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -197,5 +197,6 @@ in stdenv.mkDerivation { homepage = http://www.virtualbox.org/; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; + inherit extensionPack; }; } From eb3f736afdc3c288a33f35c18d08ad289009b876 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 14 Oct 2016 18:35:18 +0200 Subject: [PATCH 060/106] emacsPackages.gn: init 2017-09-21 --- .../editors/emacs-modes/gn/default.nix | 20 +++++++++++++++++++ pkgs/top-level/emacs-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/gn/default.nix diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/pkgs/applications/editors/emacs-modes/gn/default.nix new file mode 100644 index 00000000000..39e7d1abf38 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/gn/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation { + name = "gn-mode-2017-09-21"; + src = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/tools/gn"; + rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36"; + sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866"; + }; + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp/ + cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/ + ''; +} diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index e7c98cc3869..dbddc05a23e 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -307,6 +307,8 @@ let inherit lib; }; + gn = callPackage ../applications/editors/emacs-modes/gn { }; + shorten = melpaBuild rec { pname = "shorten"; version = circe.version; From 4a180dac60e066f52268b69820bafa89dc4ba0d3 Mon Sep 17 00:00:00 2001 From: Jonas Schwabe Date: Sat, 28 Oct 2017 15:35:57 +0200 Subject: [PATCH 061/106] gdm: fix restart of display-manager after nixos-rebuild - fix restart of display-manager due to a conflict with getty@tty1 - fixes #21439 --- nixos/modules/services/x11/display-managers/gdm.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 83c5c95dae7..45a67ac040b 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -125,7 +125,6 @@ in "getty@tty1.service" ]; - systemd.services.display-manager.conflicts = [ "getty@tty1.service" ]; systemd.services.display-manager.serviceConfig = { # Restart = "always"; - already defined in xserver.nix KillMode = "mixed"; From 77046bed8a0946dbaace1d38ca49e3d85e3c6894 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 28 Oct 2017 17:39:59 +0300 Subject: [PATCH 062/106] cudnn7: 7.0 -> 7.0.3 --- pkgs/development/libraries/science/math/cudnn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index db66d854588..574899d3a89 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -30,16 +30,16 @@ in }; cudnn_cudatoolkit8 = generic rec { - version = "7.0"; + version = "7.0.3"; cudatoolkit = cudatoolkit8; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398"; + sha256 = "0gzwadxcyirr2zgiikdapnm860x3gcfwfxh5xn3s47zaa03x4kg4"; }; cudnn_cudatoolkit9 = generic rec { - version = "7.0"; + version = "7.0.3"; cudatoolkit = cudatoolkit9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc"; + sha256 = "1ycy413cq9y9yxj20djqv05aarn3qzcy2md3dvvjpvhc269kwn09"; }; } From 6ce41476599a8a0c06a9d9617767a8536b538d5f Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sat, 28 Oct 2017 21:04:44 +0700 Subject: [PATCH 063/106] ahoviewer: 1.4.8 -> 1.4.9 - Add xzfc to maintainers --- pkgs/applications/graphics/ahoviewer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 986e16834f7..2d42a479999 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ahoviewer-${version}"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; rev = version; - sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4"; + sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx"; }; enableParallelBuilding = true; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/ahodesuka/ahoviewer; description = "A GTK2 image viewer, manga reader, and booru browser"; - maintainers = [ maintainers.skrzyp ]; + maintainers = with maintainers; [ skrzyp xzfc ]; license = licenses.mit; platforms = platforms.allBut [ "darwin" "cygwin" ]; }; From 036f9ec235da9a7d96d2032e140dfc891c99278d Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 28 Oct 2017 17:39:56 +0200 Subject: [PATCH 064/106] ecdsautils: init 0.4.0 --- pkgs/tools/security/ecdsautils/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/security/ecdsautils/default.nix diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix new file mode 100644 index 00000000000..2766c2c07a4 --- /dev/null +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -0,0 +1,24 @@ +{ stdenv, pkgs }: + +stdenv.mkDerivation rec { + version = "0.4.0"; + name = "ecdsautils-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "tcatm"; + repo = "ecdsautils"; + rev = "07538893fb6c2a9539678c45f9dbbf1e4f222b46"; + sha256 = "18sr8x3qiw8s9l5pfi7r9i3ayplz4jqdml75ga9y933vj7vs0k4d"; + }; + + nativeBuildInputs = with pkgs; [ cmake pkgconfig doxygen ]; + buildInputs = with pkgs; [ libuecc ]; + + meta = with stdenv.lib; { + description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; + homepage = https://github.com/tcatm/ecdsautils/; + license = with licenses; [ mit bsd2 ]; + maintainers = with maintainers; [ andir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0b88968c82..a45a9a756e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -574,6 +574,8 @@ with pkgs; dkimpy = pythonPackages.dkimpy; + ecdsautils = callPackage ../tools/security/ecdsautils { }; + elvish = callPackage ../shells/elvish { }; encryptr = callPackage ../tools/security/encryptr { From e76d8af3752bff3b8e0967e9b90601fd04229dff Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Oct 2017 13:42:32 -0400 Subject: [PATCH 065/106] linux-copperhead: 4.13.9.a -> 4.13.10.a --- pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index a93e4a96119..6ab59a497b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13.9"; + version = "4.13.10"; revision = "a"; - sha256 = "0v2ki1vgmg8yifnflbhryrv7pxvyf0157ysngc1n1hcqyypq4sji"; + sha256 = "0m4yxdcll1zvvvagpjf9s7vw7dmad22qbakhc50as3ixyd7w5ah6"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 5ac01066f20c0dc649eaaf4a64ddca9bcd761a50 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Thu, 26 Oct 2017 14:53:39 +1100 Subject: [PATCH 066/106] gradio: init at 6.0.2 --- lib/maintainers.nix | 1 + ...-install-script-that-hardcodes-paths.patch | 23 ++++++ pkgs/applications/audio/gradio/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 98 insertions(+) create mode 100644 pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch create mode 100644 pkgs/applications/audio/gradio/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9fb5a64540a..1bddc33c1d1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -550,6 +550,7 @@ ryneeverett = "Ryne Everett "; rzetterberg = "Richard Zetterberg "; s1lvester = "Markus Silvester "; + samdroid-apps = "Sam Parkinson "; samuelrivas = "Samuel Rivas "; sander = "Sander van der Burg "; sargon = "Daniel Ehlers "; diff --git a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch new file mode 100644 index 00000000000..3a6296baaa6 --- /dev/null +++ b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch @@ -0,0 +1,23 @@ +From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001 +From: Sam Parkinson +Date: Thu, 26 Oct 2017 14:50:13 +1100 +Subject: [PATCH] Remove post-install script that hardcodes paths + +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 25f3e1a..18b43bd 100644 +--- a/meson.build ++++ b/meson.build +@@ -21,4 +21,5 @@ subdir('src') + # subdir('tests') + # TODO: unit tests + +-meson.add_install_script('meson_post_install.sh') ++# This does not work for nixos; it hard-codes paths ++# meson.add_install_script('meson_post_install.sh') +-- +2.14.2 + diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix new file mode 100644 index 00000000000..2f4bde92167 --- /dev/null +++ b/pkgs/applications/audio/gradio/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchFromGitHub, pkgconfig +, gcc +, python3 +, gsettings_desktop_schemas +, desktop_file_utils +, glib +, gtk3 +, intltool +, libsoup +, json_glib +, wrapGAppsHook +, meson +, ninja +, vala +, sqlite +, gst_all_1 +, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] +}: +let + version = "6.0.2"; + +in stdenv.mkDerivation rec { + name = "gradio-${version}"; + + src = fetchFromGitHub { + owner = "haecker-felix"; + repo = "gradio"; + rev = "v${version}"; + sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s"; + }; + + nativeBuildInputs = [ + pkgconfig + + meson + ninja + vala + + python3 + ]; + buildInputs = [ + sqlite + + glib + intltool + libsoup + json_glib + + gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + + wrapGAppsHook + desktop_file_utils + gsettings_desktop_schemas + ] ++ gst_plugins; + + enableParallelBuilding = true; + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/haecker-felix/gradio; + description = "A GTK3 app for finding and listening to internet radio stations"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.samdroid-apps ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0b88968c82..98bd9178624 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14617,6 +14617,8 @@ with pkgs; rhythmbox = callPackage ../applications/audio/rhythmbox { }; + gradio = callPackage ../applications/audio/gradio { }; + puddletag = callPackage ../applications/audio/puddletag { }; w_scan = callPackage ../applications/video/w_scan { }; From 08e06e7d223d89a9dee247daab7c505b0e0513ee Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 28 Oct 2017 16:30:48 +0200 Subject: [PATCH 067/106] borgbackup: add flokli as maintainer --- pkgs/tools/backup/borg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 4ff61d1ac95..acd75941524 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -45,6 +45,6 @@ python3Packages.buildPythonApplication rec { homepage = https://borgbackup.github.io/; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx flokli ]; }; } From f3b311af44bee935912f58a38a2344011e3ce78c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 28 Oct 2017 14:13:48 +0200 Subject: [PATCH 068/106] borgbackup: fix ssh binary location Otherwise, borg might be unable to find its location --- pkgs/tools/backup/borg/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index acd75941524..7dc6299ef47 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }: +{ stdenv, fetchurl, python3Packages, acl, lz4, openssl, openssh }: python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; @@ -27,6 +27,10 @@ python3Packages.buildPythonApplication rec { export BORG_LZ4_PREFIX="${lz4.dev}" ''; + makeWrapperArgs = [ + ''--prefix PATH ':' "${openssh}/bin"'' + ]; + postInstall = '' make -C docs singlehtml mkdir -p $out/share/doc/borg From 443e7bf5f49faebebb7469ead93660b5596fad4d Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sat, 28 Oct 2017 22:42:18 +0200 Subject: [PATCH 069/106] maintainers.nix: fix tiny typo --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9fb5a64540a..a68891b0a0e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -66,7 +66,7 @@ aycanirican = "Aycan iRiCAN "; bachp = "Pascal Bach "; badi = "Badi' Abdul-Wahid "; - balajisivaraman = "Balaji Sivaraman"; + balajisivaraman = "Balaji Sivaraman "; barrucadu = "Michael Walker "; basvandijk = "Bas van Dijk "; Baughn = "Svein Ove Aas "; From 8ac360ed953c2557bd9b7676a1a932d0c878f1dc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 19:15:58 +0300 Subject: [PATCH 070/106] libid3tag: Split into multiple outputs --- .../libraries/libid3tag/default.nix | 19 ++++++++++++++----- .../development/libraries/libid3tag/id3tag.pc | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index b03d7643f0f..a153001a960 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,24 +1,33 @@ {stdenv, fetchurl, writeText, zlib, gperf}: stdenv.mkDerivation rec { - version = "0.15.1b"; - name = "libid3tag-${version}"; + version = "0.15.1b"; src = fetchurl { url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz; sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; + propagatedBuildInputs = [ zlib gperf ]; patches = [ ./debian-patches.patch ]; + preConfigure = '' + configureFlagsArray+=( + --includedir=$dev/include + ) + ''; + postInstall = '' - mkdir -p $out/lib/pkgconfig - cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc - substituteInPlace $out/lib/pkgconfig/id3tag.pc \ + mkdir -p $dev/lib/pkgconfig + cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc + substituteInPlace $dev/lib/pkgconfig/id3tag.pc \ --subst-var-by out $out \ + --subst-var-by dev $dev \ --subst-var-by version "${version}" ''; diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc index 854f1783cae..e3df7b3f9df 100644 --- a/pkgs/development/libraries/libid3tag/id3tag.pc +++ b/pkgs/development/libraries/libid3tag/id3tag.pc @@ -1,7 +1,7 @@ prefix=@out@ exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${exec_prefix}/include +includedir=@dev@/include Name: libid3tag Description: ID3 tag manipulation library From e5144470632d704778c56a2acc3394ef548d09e6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 19:17:42 +0300 Subject: [PATCH 071/106] geoclue2: Split into multiple outputs --- pkgs/development/libraries/geoclue/2.0.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 64d61d64bb6..483ee39c2da 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; @@ -21,6 +23,8 @@ stdenv.mkDerivation rec { dbus dbus_glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; + propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + preConfigure = '' substituteInPlace configure --replace "-Werror" "" ''; @@ -35,7 +39,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + postInstall = '' + sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" + ''; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; From 90e8e0b782ef3bfeb0d75782302612fe0ee63dff Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 28 Oct 2017 19:17:54 +0300 Subject: [PATCH 072/106] geoclue: Split into multiple outputs --- pkgs/development/libraries/geoclue/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index f7529000539..ff65ca97eb7 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; From b676aa045fc446e9fd49749ef6c3de68401db02b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 29 Oct 2017 01:36:59 +0300 Subject: [PATCH 073/106] eaglemode: Mark broken The build just endlessly spams: Say yes, no or always: Use of uninitialized value $ln in pattern match (m//) at make.pl line 626. Use of uninitialized value $ln in pattern match (m//) at make.pl line 629. Use of uninitialized value $ln in pattern match (m//) at make.pl line 632. Use of uninitialized value $ln in pattern match (m//) at make.pl line 636. --- pkgs/applications/misc/eaglemode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 1e5bf8a48ed..d83eb1ed86a 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ viric ]; platforms = platforms.linux; - hydraPlatforms = []; + broken = true; }; } From c9ac187c3c2c6da622578d9168ab9152c7d457c9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Oct 2017 01:48:47 +0300 Subject: [PATCH 074/106] tbb: 4.4-u2 -> 2018_U1, merge with libtbb Remove libtbb derivation as a duplicate. --- pkgs/development/libraries/libtbb/default.nix | 30 ------------------- pkgs/development/libraries/tbb/default.nix | 28 ++++++++--------- pkgs/games/steam/runtime-wrapped.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 pkgs/development/libraries/libtbb/default.nix diff --git a/pkgs/development/libraries/libtbb/default.nix b/pkgs/development/libraries/libtbb/default.nix deleted file mode 100644 index 1422f6c5ceb..00000000000 --- a/pkgs/development/libraries/libtbb/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, tree }: - -stdenv.mkDerivation rec { - name = "libtbb-${version}"; - version = "2018_U1"; - - src = fetchFromGitHub { - owner = "01org"; - repo = "tbb"; - rev = "${version}"; - sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; - }; - - buildInputs = [ tree ]; - - installPhase = '' - mkdir -p "$out"/usr/include "$out"/lib - install -m755 build/linux_*/*.so* "$out"/lib/ - cp -a include/tbb "$out"/usr/include/ - ''; - - meta = with stdenv.lib; { - homepage = "https://www.threadingbuildingblocks.org/"; - description = "High level abstract threading library"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = with maintainers; [ dizfer ]; - }; -} - diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index a8a0d5dc2b3..b8aedd46096 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "tbb-4.4-u2"; +stdenv.mkDerivation rec { + name = "tbb-${version}"; + version = "2018_U1"; - src = fetchurl { - url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20151115oss_src.tgz"; - sha256 = "1fvprkjdxj7529hr1qkzkxkk18mx6zllrpiwglq4k3y1hpyc9m9x"; + src = fetchFromGitHub { + owner = "01org"; + repo = "tbb"; + rev = version; + sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; }; - checkTarget = "test"; - doCheck = false; - installPhase = '' mkdir -p $out/{lib,share/doc} cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ @@ -21,10 +21,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Intel Thread Building Blocks C++ Library"; - homepage = http://threadingbuildingblocks.org/; - license = stdenv.lib.licenses.lgpl3Plus; + homepage = "http://threadingbuildingblocks.org/"; + license = licenses.asl20; longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to expressing parallelism in a C++ program. It is a library that helps you @@ -33,7 +33,7 @@ stdenv.mkDerivation { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ]; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ peti thoughtpolice dizfer ]; }; } diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 73c010d645f..388e5cc3a6c 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -57,7 +57,7 @@ let glew110 openssl libidn - libtbb + tbb # Other things from runtime xlibs.libXinerama diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98bd9178624..eb25d0296c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3121,8 +3121,6 @@ with pkgs; libsrs2 = callPackage ../development/libraries/libsrs2 { }; - libtbb = callPackage ../development/libraries/libtbb { }; - libtermkey = callPackage ../development/libraries/libtermkey { }; libtelnet = callPackage ../development/libraries/libtelnet { }; From a9e5a846db5f4e57a86ace6dccde22944da8af8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= Date: Sun, 29 Oct 2017 01:39:03 +0200 Subject: [PATCH 075/106] python: pwntools 3.7.1 -> 3.10.0 Also moved to a seperate module --- .../python-modules/pwntools/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pwntools/default.nix diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix new file mode 100644 index 00000000000..57f7c2c317d --- /dev/null +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, Mako, packaging, pysocks, pygments, ROPGadget +, capstone, paramiko, pip, psutil +, pyelftools, pypandoc, pyserial, dateutil +, requests, tox, pandoc, unicorn, intervaltree }: + +buildPythonPackage rec { + version = "3.10.0"; + pname = "pwntools"; + name = "pwntools-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l8hb30mwxqd1y7r5ihd7kzmjm2mz6m5aiphd3hwzmxkmxbxj8zk"; + }; + + propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ]; + + disabled = isPy3k; + + meta = with stdenv.lib; { + homepage = "http://pwntools.com"; + description = "CTF framework and exploit development library"; + license = licenses.mit; + maintainers = with maintainers; [ bennofs kristoff3r ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30ffa523cbf..e81063a6169 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26396,25 +26396,7 @@ EOF }; }; - pwntools = buildPythonPackage rec { - name = "pwntools-${version}"; - version = "3.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pwntools/${name}.tar.gz"; - sha256 = "1c0n97cf3nql3n6sxpbp43x1byhkgfbpbl2b22h8nllgb8n0z9l0"; - }; - propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc unicorn intervaltree ]; - - disabled = isPy3k; - - meta = { - homepage = "http://pwntools.com"; - description = "CTF framework and exploit development library"; - license = licenses.mit; - maintainers = with maintainers; [ bennofs ]; - }; - }; + pwntools = callPackage ../development/python-modules/pwntools { }; ROPGadget = callPackage ../development/python-modules/ROPGadget { }; From 7efd5abe4888d6270acd4b2cf6b736d24438cd0f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 29 Oct 2017 01:47:46 +0200 Subject: [PATCH 076/106] python-cffi: fix clang build --- pkgs/development/python-modules/cffi/clang.patch | 13 +++++++++++++ pkgs/development/python-modules/cffi/default.nix | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/cffi/clang.patch diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch new file mode 100644 index 00000000000..27674edb58b --- /dev/null +++ b/pkgs/development/python-modules/cffi/clang.patch @@ -0,0 +1,13 @@ +diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py +index a3277b0..0d6e2c3 100644 +--- a/testing/cffi1/test_recompiler.py ++++ b/testing/cffi1/test_recompiler.py +@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): + char32_t foo_4bytes(char32_t); + """) + lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ +- #if !defined(__cplusplus) || __cplusplus < 201103L ++ #if !defined(__cplusplus) + typedef uint_least16_t char16_t; + typedef uint_least32_t char32_t; + #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 5c99e77af56..3389a6fd705 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -10,13 +10,15 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; + patches = stdenv.lib.optional isPy27 ./clang.patch; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; checkPhase = '' py.test From 2ede55a37b1b6c93cd776ec4032458e656dfd70a Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 29 Oct 2017 02:03:12 +0200 Subject: [PATCH 077/106] virtualbox: move extensionPack from meta to passthru --- pkgs/applications/virtualization/virtualbox/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 97d3b3c49b5..4f6da3c7cd9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -190,13 +190,15 @@ in stdenv.mkDerivation { cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; - passthru = { inherit version; /* for guest additions */ }; + passthru = { + inherit version; # for guest additions + inherit extensionPack; # for inclusion in profile to prevent gc + }; meta = { description = "PC emulator"; homepage = http://www.virtualbox.org/; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; - inherit extensionPack; }; } From 376f7aa7612d9c63dede4ddd15078f49e9c67eb5 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 29 Oct 2017 12:02:26 +0800 Subject: [PATCH 078/106] Update nix-prefetch-git s/understand/understood/ --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index a180509a326..17962d08acc 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -39,7 +39,7 @@ usage(){ Options: --out path Path where the output would be stored. - --url url Any url understand by 'git clone'. + --url url Any url understood by 'git clone'. --rev ref Any sha1 or references (such as refs/heads/master) --hash h Expected hash. --deepClone Clone the entire repository. From 49e66285b2795433dcf91f05ff884e6cd78bf2f7 Mon Sep 17 00:00:00 2001 From: Evan Wallace Date: Sun, 29 Oct 2017 05:21:30 +0000 Subject: [PATCH 079/106] tbb: clang support Added compiler and stdver parameters, to support non-gcc compilers, and enable perfect exception forwarding (std::exception_ptr) on platforms where C++11 is not enabled by default --- pkgs/development/libraries/tbb/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index b8aedd46096..13b1970866e 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: -stdenv.mkDerivation rec { +with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; version = "2018_U1"; @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; }; + makeFlags = concatStringsSep " " ( + optional (compiler != null) "compiler=${compiler}" ++ + optional (stdver != null) "stdver=${stdver}" + ); + installPhase = '' mkdir -p $out/{lib,share/doc} cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; license = licenses.asl20; From 94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 10:12:24 +0100 Subject: [PATCH 080/106] Revert "Merge pull request #30913 from LnL7/darwin-cffi" This reverts commit f20a36fcd8feed3671b4c1591dbf4a018eef4cd3, reversing changes made to 15350df8d925a335e9004b6ce7219a6215df41d0. I accidentally pressed the Merge button. --- pkgs/development/python-modules/cffi/clang.patch | 13 ------------- pkgs/development/python-modules/cffi/default.nix | 6 ++---- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/python-modules/cffi/clang.patch diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch deleted file mode 100644 index 27674edb58b..00000000000 --- a/pkgs/development/python-modules/cffi/clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py -index a3277b0..0d6e2c3 100644 ---- a/testing/cffi1/test_recompiler.py -+++ b/testing/cffi1/test_recompiler.py -@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): - char32_t foo_4bytes(char32_t); - """) - lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ -- #if !defined(__cplusplus) || __cplusplus < 201103L -+ #if !defined(__cplusplus) - typedef uint_least16_t char16_t; - typedef uint_least32_t char32_t; - #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 3389a6fd705..5c99e77af56 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -10,15 +10,13 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; - patches = stdenv.lib.optional isPy27 ./clang.patch; - outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code"; checkPhase = '' py.test From 77d3869f27cca4b47507cb5e1341838cb5575170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 29 Oct 2017 10:18:18 +0100 Subject: [PATCH 081/106] colpack: init at 1.0.10 --- .../science/math/colpack/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/math/colpack/default.nix diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix new file mode 100644 index 00000000000..29785363b04 --- /dev/null +++ b/pkgs/applications/science/math/colpack/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }: + +stdenv.mkDerivation rec { + + pname = "ColPack"; + version = "1.0.10"; + name = pname + "-" + version; + + src = fetchFromGitHub { + owner = "CSCsw"; + repo = pname; + rev = "v" + version; + sha256 = "1p05vry940mrjp6236c0z83yizmw9pk6ly2lb7d8rpb7j9h03glr"; + }; + + buildInputs = [ autoconf automake gettext libtool ]; + + configurePhase = '' + autoreconf -vif + ./configure --prefix=$out --enable-openmp + ''; + + meta = with stdenv.lib; { + description = "A package comprising of implementations of algorithms for + vertex coloring and derivative computation"; + homepage = "http://cscapes.cs.purdue.edu/coloringpage/software.htm#functionalities"; + license = licenses.lgpl3; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8027db8bfde..042c3888022 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -892,6 +892,8 @@ with pkgs; colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; + colpack = callPackage ../applications/science/math/colpack { }; + consul = callPackage ../servers/consul { }; consul-ui = callPackage ../servers/consul/ui.nix { }; From 9acbfbc7b72f3dbf1afcb64f77602c475a47bd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 29 Oct 2017 10:20:12 +0100 Subject: [PATCH 082/106] shogun: init at 6.0.0 --- .../machine-learning/shogun/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/shogun/default.nix diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix new file mode 100644 index 00000000000..9d736694cbd --- /dev/null +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, fetchFromGitHub, ccache, cmake, ctags, swig +# data, compression +, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy +# maths +, blas, eigen, nlopt, lp_solve, colpack +# libraries +, libarchive, liblapack, libxml2 +# extra support +, pythonSupport ? true, pythonPackages ? null +, opencvSupport ? false, opencv ? null +}: + +assert pythonSupport -> pythonPackages != null; +assert opencvSupport -> opencv != null; + +stdenv.mkDerivation rec { + + pname = "shogun"; + version = "6.0.0"; + name = pname + "-" + version; + + src = fetchFromGitHub { + owner = pname + "-toolbox"; + repo = pname; + rev = pname + "_" + version; + sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf"; + fetchSubmodules = true; + }; + + CCACHE_DIR=".ccache"; + + buildInputs = with lib; [ + blas bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + protobuf nlopt snappy swig (libarchive.dev) liblapack libxml2 + ] + ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) + ++ optional (opencvSupport) opencv; + + cmakeFlags = with lib; [] + ++ (optional (pythonSupport) "-DPythonModular=ON") + ++ (optional (opencvSupport) "-DOpenCV=ON") + ; + + meta = with stdenv.lib; { + description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; + homepage = "http://shogun-toolbox.org/"; + license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 042c3888022..596051f4ea7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15808,6 +15808,8 @@ with pkgs; libmlt = mlt; }; + shogun = callPackage ../applications/science/machine-learning/shogun { }; + smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; smtube = libsForQt56.callPackage ../applications/video/smtube {}; From 0767d2984bcfd61e49af8d849e022c33cfb6aad8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 29 Oct 2017 10:23:00 +0100 Subject: [PATCH 083/106] nixops: update to 1.5.2 (cherry picked from commit c291a107760888106cf50aa1e54ee4e7c8dd5eb1) --- pkgs/tools/package-management/nixops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 1467faac8e3..daecb8746ea 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0pba9c8ya4hvqmg458p74g69hb06lh0f5bsgw7dsi8pjrcb0624g"; + sha256 = "00y2arc5rffvy6xmx4p6ibpjyc61k8dkiabq7ccwwjgckz1d2dpb"; }; }) From 3f3eb6ca64534c1bfcafe23a78e6cc7a711e7137 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 29 Oct 2017 01:47:46 +0200 Subject: [PATCH 084/106] python-cffi: fix clang build --- pkgs/development/python-modules/cffi/clang.patch | 13 +++++++++++++ pkgs/development/python-modules/cffi/default.nix | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/cffi/clang.patch diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch new file mode 100644 index 00000000000..27674edb58b --- /dev/null +++ b/pkgs/development/python-modules/cffi/clang.patch @@ -0,0 +1,13 @@ +diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py +index a3277b0..0d6e2c3 100644 +--- a/testing/cffi1/test_recompiler.py ++++ b/testing/cffi1/test_recompiler.py +@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): + char32_t foo_4bytes(char32_t); + """) + lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ +- #if !defined(__cplusplus) || __cplusplus < 201103L ++ #if !defined(__cplusplus) + typedef uint_least16_t char16_t; + typedef uint_least32_t char32_t; + #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 5c99e77af56..b0524b4121a 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -10,13 +10,15 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; + patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; checkPhase = '' py.test From f6b0aa8ad5263998ad252f451f80240c89b9f8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 10:59:03 +0100 Subject: [PATCH 085/106] pythonPackages.bitstring: 3.1.2 -> 3.1.5 * fetchurl -> fetchPypi * Tests work now * Update homepage --- pkgs/top-level/python-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e81063a6169..c7192b0a415 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1942,19 +1942,19 @@ in { bitstring = buildPythonPackage rec { - name = "bitstring-3.1.2"; + pname = "bitstring"; + version = "3.1.5"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "https://python-bitstring.googlecode.com/files/${name}.zip"; - sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p"; + src = fetchPypi { + inherit pname version; + sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1"; + extension = "zip"; }; - # error: invalid command 'test' - doCheck = false; - meta = { description = "Module for binary data manipulation"; - homepage = https://code.google.com/p/python-bitstring/; + homepage = "https://github.com/scott-griffiths/bitstring"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; From 2e44d576fd5789ca945799e622992ca8afedabce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:05:52 +0100 Subject: [PATCH 086/106] pythonPackages.demjson: 1.6 -> 2.2.4 * fetchurl -> fetchPypi * Tests work now. * jsonlint is installed for us by package buildsys. * Disable for python3.6 (build/test error). --- pkgs/top-level/python-packages.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7192b0a415..4cafeab8d40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4853,20 +4853,16 @@ in { demjson = buildPythonPackage rec { - name = "demjson-1.6"; + pname = "demjson"; + version = "2.2.4"; + name = "${pname}-${version}"; + disabled = isPy36; - src = pkgs.fetchurl { - url = "mirror://pypi/d/demjson/${name}.tar.gz"; - sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x"; + src = fetchPypi { + inherit pname version; + sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; }; - doCheck = false; # there are no tests - - preFixup = '' - mkdir -p "$out/bin" - cp jsonlint "$out/bin/" - ''; - meta = { description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; homepage = http://deron.meranda.us/python/demjson/; From 235a31b79fdde8b265eca804f4e6f652f710516b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:10:26 +0100 Subject: [PATCH 087/106] pythonPackages.pyodbc: 3.0.7 -> 4.0.19 * fetchurl -> fetchPypi * Update homepage (old page still works, but tells user to got to github). --- pkgs/top-level/python-packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4cafeab8d40..c5a9ca660ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17079,19 +17079,21 @@ in { pyodbc = buildPythonPackage rec { - name = "pyodbc-3.0.7"; + pname = "pyodbc"; + version = "4.0.19"; + name = "${pname}-${version}"; disabled = isPyPy; # use pypypdbc instead - src = pkgs.fetchurl { - url = "https://pyodbc.googlecode.com/files/${name}.zip"; - sha256 = "0ldkm8xws91j7zbvpqb413hvdz8r66bslr451q3qc0xi8cnmydfq"; + src = fetchPypi { + inherit pname version; + sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg"; }; buildInputs = with self; [ pkgs.libiodbc ]; meta = { description = "Python ODBC module to connect to almost any database"; - homepage = https://code.google.com/p/pyodbc/; + homepage = "https://github.com/mkleehammer/pyodbc"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; From 0b93dbe9d63895e1ba845bc15dcd5f107958097a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:13:57 +0100 Subject: [PATCH 088/106] pythonPackages.robotsuite: 1.4.2 -> 2.0.0 * fetchurl -> fetchPypi * Remove commented out doCheck --- pkgs/top-level/python-packages.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5a9ca660ec..b1cc38f5bf7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18807,17 +18807,15 @@ in { robotsuite = buildPythonPackage rec { - version = "1.4.2"; - name = "robotsuite-${version}"; + pname = "robotsuite"; + version = "2.0.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/r/robotsuite/${name}.zip"; - sha256 = "0sw09vrvwv3gzqb6jvhbrz09l6nzzj3i9av34qjddqfwq7cr1bla"; + src = fetchPypi { + inherit pname version; + sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z"; }; - # error: invalid command 'test' - #doCheck = false; - buildInputs = with self; [ unittest2 ]; propagatedBuildInputs = with self; [ robotframework lxml ]; From b1e23a87b18be0077292eefffe660a233fa33123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:40:45 +0100 Subject: [PATCH 089/106] pythonPackages.bitstring: move to python-modules/ Easier maintenance when expressions are in separate files. --- .../python-modules/bitstring/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------------ 2 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/bitstring/default.nix diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix new file mode 100644 index 00000000000..f6c56646dcb --- /dev/null +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "bitstring"; + version = "3.1.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1"; + extension = "zip"; + }; + + meta = with stdenv.lib; { + description = "Module for binary data manipulation"; + homepage = "https://github.com/scott-griffiths/bitstring"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1cc38f5bf7..2759ec20121 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1940,26 +1940,7 @@ in { }; }; - - bitstring = buildPythonPackage rec { - pname = "bitstring"; - version = "3.1.5"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1"; - extension = "zip"; - }; - - meta = { - description = "Module for binary data manipulation"; - homepage = "https://github.com/scott-griffiths/bitstring"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + bitstring = callPackage ../development/python-modules/bitstring { }; blaze = callPackage ../development/python-modules/blaze { }; From 013da4ef669359ee0f5e8605870cb618e3579f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:43:27 +0100 Subject: [PATCH 090/106] pythonPackages.demjson: move to python-modules/ Easier maintenance when expressions are in separate files. --- .../python-modules/demjson/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------------ 2 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/demjson/default.nix diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix new file mode 100644 index 00000000000..4f5d7a11bd8 --- /dev/null +++ b/pkgs/development/python-modules/demjson/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: + +buildPythonPackage rec { + pname = "demjson"; + version = "2.2.4"; + name = "${pname}-${version}"; + disabled = isPy36; + + src = fetchPypi { + inherit pname version; + sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; + }; + + meta = with stdenv.lib; { + description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; + homepage = http://deron.meranda.us/python/demjson/; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2759ec20121..b7624cef55e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4832,26 +4832,7 @@ in { }; }; - - demjson = buildPythonPackage rec { - pname = "demjson"; - version = "2.2.4"; - name = "${pname}-${version}"; - disabled = isPy36; - - src = fetchPypi { - inherit pname version; - sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; - }; - - meta = { - description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; - homepage = http://deron.meranda.us/python/demjson/; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; - }; + demjson = callPackage ../development/python-modules/demjson { }; derpconf = self.buildPythonPackage rec { name = "derpconf-0.4.9"; From 7357b369d51dee7e9eadf60d0da88ffb6f1ed6a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:45:46 +0100 Subject: [PATCH 091/106] pythonPackages.pyodbc: move to python-modules/ Easier maintenance when expressions are in separate files. --- .../python-modules/pyodbc/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +------------------ 2 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/pyodbc/default.nix diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix new file mode 100644 index 00000000000..c09e15f4bfb --- /dev/null +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, libiodbc }: + +buildPythonPackage rec { + pname = "pyodbc"; + version = "4.0.19"; + name = "${pname}-${version}"; + disabled = isPyPy; # use pypypdbc instead + + src = fetchPypi { + inherit pname version; + sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg"; + }; + + buildInputs = [ libiodbc ]; + + meta = with stdenv.lib; { + description = "Python ODBC module to connect to almost any database"; + homepage = "https://github.com/mkleehammer/pyodbc"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7624cef55e..da15c8f0073 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17039,28 +17039,7 @@ in { }; }; - - pyodbc = buildPythonPackage rec { - pname = "pyodbc"; - version = "4.0.19"; - name = "${pname}-${version}"; - disabled = isPyPy; # use pypypdbc instead - - src = fetchPypi { - inherit pname version; - sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg"; - }; - - buildInputs = with self; [ pkgs.libiodbc ]; - - meta = { - description = "Python ODBC module to connect to almost any database"; - homepage = "https://github.com/mkleehammer/pyodbc"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + pyodbc = callPackage ../development/python-modules/pyodbc { }; pyocr = callPackage ../development/python-modules/pyocr { }; From 489cdc23fca3562d757295bf9a9b4ee01e45aee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 29 Oct 2017 11:47:54 +0100 Subject: [PATCH 092/106] pythonPackages.robotsuite: move to python-modules/ Easier maintenance when expressions are in separate files. --- .../python-modules/robotsuite/default.nix | 21 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +------------------ 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/robotsuite/default.nix diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix new file mode 100644 index 00000000000..2dd672c0109 --- /dev/null +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, unittest2, robotframework, lxml }: + +buildPythonPackage rec { + pname = "robotsuite"; + version = "2.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z"; + }; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ robotframework lxml ]; + + meta = with stdenv.lib; { + description = "Python unittest test suite for Robot Framework"; + homepage = http://github.com/collective/robotsuite/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da15c8f0073..e3e0d78cb80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18746,27 +18746,7 @@ in { }; }; - - robotsuite = buildPythonPackage rec { - pname = "robotsuite"; - version = "2.0.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z"; - }; - - buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ robotframework lxml ]; - - meta = { - description = "Python unittest test suite for Robot Framework"; - homepage = http://github.com/collective/robotsuite/; - license = licenses.gpl3; - }; - }; - + robotsuite = callPackage ../development/python-modules/robotsuite { }; robotframework-ride = buildPythonPackage rec { version = "1.2.3"; From dde8ded1efa87b1284bff9301b58ebf771d025f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:24:45 +0100 Subject: [PATCH 093/106] python.pkgs.ipython_genutils: move expression --- .../ipython_genutils/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/ipython_genutils/default.nix diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix new file mode 100644 index 00000000000..503ccb37d57 --- /dev/null +++ b/pkgs/development/python-modules/ipython_genutils/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, glibcLocales +}: + +buildPythonPackage rec { + pname = "ipython_genutils"; + version = "0.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; + }; + + checkInputs = [ nose glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests + ''; + + meta = { + description = "Vestigial utilities from IPython"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3e0d78cb80..8caf6aaaff9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10503,30 +10503,7 @@ in { ipython_6 = callPackage ../development/python-modules/ipython { }; - ipython_genutils = buildPythonPackage rec { - version = "0.2.0"; - name = "ipython_genutils-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipython_genutils/${name}.tar.gz"; - sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ nose pkgs.glibcLocales ]; - - checkPhase = '' - nosetests -v ipython_genutils/tests - ''; - - meta = { - description = "Vestigial utilities from IPython"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; - + ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; ipywidgets = callPackage ../development/python-modules/ipywidgets { }; From 6e5276f0abd34fde52e6750cb041a7fc8fac9365 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:27:47 +0100 Subject: [PATCH 094/106] python.pkgs.multipledispatch: move expression --- .../multipledispatch/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/multipledispatch/default.nix diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix new file mode 100644 index 00000000000..d1c39210607 --- /dev/null +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "multipledispatch"; + version = "0.4.9"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; + }; + + # No tests in archive + doCheck = false; + + meta = { + homepage = http://github.com/mrocklin/multipledispatch/; + description = "A relatively sane approach to multiple dispatch in Python"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8caf6aaaff9..b1fb4958eea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12163,25 +12163,7 @@ in { propagatedBuildInputs = with self; [ eventlib application gnutls ]; }; - multipledispatch = buildPythonPackage rec { - name = "multipledispatch-${version}"; - version = "0.4.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/multipledispatch/${name}.tar.gz"; - sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; - }; - - # No tests in archive - doCheck = false; - - meta = { - homepage = http://github.com/mrocklin/multipledispatch/; - description = "A relatively sane approach to multiple dispatch in Python"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + multipledispatch = callPackage ../development/python-modules/multipledispatch { }; multiprocess = buildPythonPackage rec { name = "multiprocess-${version}"; From 59d1dc6c58d56af53f388e3b5542603a0889ebd4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:31:48 +0100 Subject: [PATCH 095/106] python.pkgs.toolz: move expression --- .../python-modules/toolz/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +-------------- 2 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/toolz/default.nix diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix new file mode 100644 index 00000000000..36b85bce3ac --- /dev/null +++ b/pkgs/development/python-modules/toolz/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec{ + pname = "toolz"; + version = "0.8.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + # https://github.com/pytoolz/toolz/issues/357 + rm toolz/tests/test_serialization.py + nosetests toolz/tests + ''; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1fb4958eea..7245b37c51b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21303,30 +21303,7 @@ in { }; }; - toolz = buildPythonPackage rec{ - name = "toolz-${version}"; - version = "0.8.2"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; - sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; - }; - - buildInputs = with self; [ nose ]; - - checkPhase = '' - # https://github.com/pytoolz/toolz/issues/357 - rm toolz/tests/test_serialization.py - nosetests toolz/tests - ''; - - meta = { - homepage = "http://github.com/pytoolz/toolz/"; - description = "List processing tools and functional utilities"; - license = "licenses.bsd3"; - maintainers = with maintainers; [ fridh ]; - }; - }; + toolz = callPackage ../development/python-modules/toolz { }; tox = buildPythonPackage rec { name = "tox-${version}"; From b4b62e6e65f42e1d5999eb12b4da04817c92b0cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:43:45 +0100 Subject: [PATCH 096/106] python.pkgs.cytoolz: move expression --- .../python-modules/cytoolz/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 28 +------------- 2 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/python-modules/cytoolz/default.nix diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix new file mode 100644 index 00000000000..dcb4e9474c3 --- /dev/null +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, nose +, toolz +, python +}: + +buildPythonPackage rec { + pname = "cytoolz"; + version = "0.8.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; + }; + + # Extension types + disabled = isPyPy; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ toolz ]; + + # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 + checkPhase = '' + NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} + ''; + + meta = { + homepage = "http://github.com/pytoolz/cytoolz/"; + description = "Cython implementation of Toolz: High performance functional utilities"; + license = "licenses.bsd3"; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7245b37c51b..868f156ce82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3243,33 +3243,7 @@ in { cython = callPackage ../development/python-modules/Cython { }; - cytoolz = buildPythonPackage rec { - name = "cytoolz-${version}"; - version = "0.8.2"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz"; - sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; - }; - - # Extension types - disabled = isPyPy; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ toolz ]; - - # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 - checkPhase = '' - NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} - ''; - - meta = { - homepage = "http://github.com/pytoolz/cytoolz/"; - description = "Cython implementation of Toolz: High performance functional utilities"; - license = "licenses.bsd3"; - maintainers = with maintainers; [ fridh ]; - }; - }; + cytoolz = callPackage ../development/python-modules/cytoolz { }; cryptacular = buildPythonPackage rec { name = "cryptacular-1.4.1"; From 119a58abbe274750dd1ed088626a09e8aaf426a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 12:48:07 +0100 Subject: [PATCH 097/106] python.pkgs.datashape: move expression --- .../python-modules/datashape/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------ 2 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/datashape/default.nix diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix new file mode 100644 index 00000000000..81ead843169 --- /dev/null +++ b/pkgs/development/python-modules/datashape/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, mock +, numpy +, multipledispatch +, dateutil +}: + +buildPythonPackage rec { + pname = "datashape"; + version = "0.5.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; + }; + + checkInputs = [ pytest mock ]; + propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + + checkPhase = '' + py.test datashape/tests + ''; + + meta = { + homepage = https://github.com/ContinuumIO/datashape; + description = "A data description language"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 868f156ce82..89cb098e9a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4523,29 +4523,7 @@ in { }; }; - datashape = buildPythonPackage rec { - name = "datashape-${version}"; - version = "0.5.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/D/DataShape/${name}.tar.gz"; - sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; - }; - - buildInputs = with self; [ pytest mock ]; - propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; - - checkPhase = '' - py.test datashape/tests - ''; - - meta = { - homepage = https://github.com/ContinuumIO/datashape; - description = "A data description language"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - }; - }; + datashape = callPackage ../development/python-modules/datashape { }; requests-cache = buildPythonPackage (rec { name = "requests-cache-${version}"; From d4bf9684b78141f7310e22dafabbfdbb6fae4f81 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:20:02 +0100 Subject: [PATCH 098/106] python.pkgs.odo: move expression --- .../python-modules/odo/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------ 2 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/odo/default.nix diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix new file mode 100644 index 00000000000..73b3f0be150 --- /dev/null +++ b/pkgs/development/python-modules/odo/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, datashape +, numpy +, pandas +, toolz +, multipledispatch +, networkx +}: + +buildPythonPackage rec { + pname = "odo"; + version= "0.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ]; + + checkPhase = '' + py.test odo/tests + ''; + + meta = { + homepage = https://github.com/ContinuumIO/odo; + description = "Data migration utilities"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89cb098e9a5..39234f5b969 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13453,29 +13453,7 @@ in { }; }; - odo = buildPythonPackage rec { - name = "odo-${version}"; - version= "0.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/odo/${name}.tar.gz"; - sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ datashape numpy pandas toolz multipledispatch networkx ]; - - checkPhase = '' - py.test odo/tests - ''; - - meta = { - homepage = https://github.com/ContinuumIO/odo; - description = "Data migration utilities"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ fridh ]; - }; - }; + odo = callPackage ../development/python-modules/odo { }; offtrac = buildPythonPackage rec { name = "offtrac-0.1.0"; From 16d0a334c86cb580afcca2b13c0c7714c5158bbd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:23:55 +0100 Subject: [PATCH 099/106] python.pkgs.pysoundfile: move expression --- .../python-modules/pysoundfile/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------ 2 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/pysoundfile/default.nix diff --git a/pkgs/development/python-modules/pysoundfile/default.nix b/pkgs/development/python-modules/pysoundfile/default.nix new file mode 100644 index 00000000000..fe24f0203f0 --- /dev/null +++ b/pkgs/development/python-modules/pysoundfile/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, numpy +, libsndfile +, cffi +, isPyPy +, stdenv +}: + +buildPythonPackage rec { + pname = "PySoundFile"; + name = "PySoundFile-${version}"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy libsndfile cffi ]; + + meta = { + description = "An audio library based on libsndfile, CFFI and NumPy"; + license = lib.licenses.bsd3; + homepage = https://github.com/bastibe/PySoundFile; + maintainers = with lib.maintainers; [ fridh ]; + }; + + prePatch = '' + substituteInPlace soundfile.py --replace "'sndfile'" "'${libsndfile.out}/lib/libsndfile.so'" + ''; + + # https://github.com/bastibe/PySoundFile/issues/157 + disabled = isPyPy || stdenv.isi686; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39234f5b969..124dc0c3885 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15491,32 +15491,7 @@ in { }; }; - pysoundfile = buildPythonPackage rec { - name = "pysoundfile-${version}"; - version = "0.8.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PySoundFile/PySoundFile-${version}.tar.gz"; - sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ numpy pkgs.libsndfile cffi ]; - - meta = { - description = "An audio library based on libsndfile, CFFI and NumPy"; - license = licenses.bsd3; - homepage = https://github.com/bastibe/PySoundFile; - maintainers = with maintainers; [ fridh ]; - }; - - prePatch = '' - substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile.out}/lib/libsndfile.so'" - ''; - - # https://github.com/bastibe/PySoundFile/issues/157 - disabled = isPyPy || stdenv.isi686; - }; + pysoundfile = callPackage ../development/python-modules/pysoundfile { }; python3pika = buildPythonPackage { name = "python3-pika-0.9.14"; From 7c4c7cde6ef692bce10f1bc11e3ce75efe1076c0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:30:54 +0100 Subject: [PATCH 100/106] python.pkgs.seaborn: move expression --- .../python-modules/seaborn/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------- 2 files changed, 35 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/seaborn/default.nix diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix new file mode 100644 index 00000000000..1647e6cfc14 --- /dev/null +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pandas +, matplotlib +}: + +buildPythonPackage rec { + pname = "seaborn"; + version = "0.7.1"; + name = "${pname}-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ pandas matplotlib ]; + + checkPhase = '' + nosetests -v + ''; + + # Computationally very demanding tests + doCheck = false; + + meta = { + description = "Statisitical data visualization"; + homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 124dc0c3885..0be000b4a8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19133,30 +19133,7 @@ in { }; }; - seaborn = buildPythonPackage rec { - name = "seaborn-0.7.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/seaborn/${name}.tar.gz"; - sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; - }; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pandas matplotlib ]; - - checkPhase = '' - nosetests -v - ''; - - # Computationally very demanding tests - doCheck = false; - - meta = { - description = "Statisitical data visualization"; - homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; - license = "BSD"; - maintainers = with maintainers; [ fridh ]; - }; - }; + seaborn = callPackage ../development/python-modules/seaborn { }; selenium = buildPythonPackage rec { name = "selenium-2.52.0"; From bd941043b8656001e927861648639d2caebcd44b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:31:17 +0100 Subject: [PATCH 101/106] python.pkgs.traitlets: move expression --- .../python-modules/traitlets/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------- 2 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/traitlets/default.nix diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix new file mode 100644 index 00000000000..c34bb09b794 --- /dev/null +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, pytest +, mock +, ipython_genutils +, decorator +, enum34 +}: + +buildPythonPackage rec { + pname = "traitlets"; + version = "4.3.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; + }; + + checkInputs = [ glibcLocales pytest mock ]; + propagatedBuildInputs = [ ipython_genutils decorator enum34 ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test $out + ''; + + meta = { + description = "Traitlets Python config system"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0be000b4a8d..de491248c45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21026,32 +21026,7 @@ in { testtools = callPackage ../development/python-modules/testtools { }; - traitlets = buildPythonPackage rec { - pname = "traitlets"; - version = "4.3.2"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; - }; - - LC_ALL = "en_US.UTF-8"; - - buildInputs = with self; [ pkgs.glibcLocales pytest mock ]; - propagatedBuildInputs = with self; [ipython_genutils decorator enum34]; - - checkPhase = '' - py.test $out - ''; - - meta = { - description = "Traitlets Python config system"; - homepage = http://ipython.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + traitlets = callPackage ../development/python-modules/traitlets { }; python_mimeparse = buildPythonPackage rec { name = "python-mimeparse-${version}"; From b35a257dfd0118d9e018c14cea074c4a04da6497 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:33:54 +0100 Subject: [PATCH 102/106] python.pkgs.zipfile36: move expression --- .../python-modules/zipfile36/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +-------------- 2 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/zipfile36/default.nix diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix new file mode 100644 index 00000000000..0915eb002b7 --- /dev/null +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy3k +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zipfile36"; + version = "0.1.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest test_zipfile.py + ''; + + # Only works with Python 3.x. + # Not supposed to be used with 3.6 and up. + disabled = !(isPy3k && (pythonOlder "3.6")); + + meta = { + description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; + homepage = https://gitlab.com/takluyver/zipfile36; + license = lib.licenses.psfl; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de491248c45..6ac34955c2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26190,31 +26190,7 @@ EOF zeroconf = callPackage ../development/python-modules/zeroconf { }; - zipfile36 = buildPythonPackage rec { - pname = "zipfile36"; - version = "0.1.3"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest test_zipfile.py - ''; - - # Only works with Python 3.x. - # Not supposed to be used with 3.6 and up. - disabled = !(isPy3k && (pythonOlder "3.6")); - - meta = { - description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; - homepage = https://gitlab.com/takluyver/zipfile36; - license = licenses.psfl; - maintainer = maintainers.fridh; - }; - }; + zipfile36 = callPackage ../development/python-modules/zipfile36 { }; todoist = callPackage ../development/python-modules/todoist { }; From 4ad0e0da320d1281d1a7e2c98ecc139d08396471 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:38:37 +0100 Subject: [PATCH 103/106] python.pkgs.nose-exclude: move expression --- .../python-modules/nose-exclude/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/nose-exclude/default.nix diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix new file mode 100644 index 00000000000..d9ec2f85fa2 --- /dev/null +++ b/pkgs/development/python-modules/nose-exclude/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + pname = "nose-exclude"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = { + license = lib.licenses.lgpl21; + description = "Exclude specific directories from nosetests runs"; + homepage = https://github.com/kgrandis/nose-exclude; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ac34955c2f..9d27d091e93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12862,25 +12862,7 @@ in { }; }; - nose-exclude = buildPythonPackage rec { - name = "nose-exclude-${version}"; - version = "0.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nose-exclude/${name}.tar.gz"; - sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - meta = { - license = licenses.lgpl21; - description = "Exclude specific directories from nosetests runs"; - homepage = https://github.com/kgrandis/nose-exclude; - maintainers = with maintainers; [ fridh ]; - }; - - }; + nose-exclude = callPackage ../development/python-modules/nose-exclude { }; nose-selecttests = buildPythonPackage rec { version = "0.4"; From 5c2d2cbff321387bbada44ba86f7d422f53b88b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:41:46 +0100 Subject: [PATCH 104/106] python.pkgs.numtraits: move expression --- .../python-modules/numtraits/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------- 2 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/numtraits/default.nix diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix new file mode 100644 index 00000000000..858b5ae594a --- /dev/null +++ b/pkgs/development/python-modules/numtraits/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, six +, numpy +, traitlets +}: + +buildPythonPackage rec { + pname = "numtraits"; + version = "0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six numpy traitlets]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Numerical traits for Python objects"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; + homepage = https://github.com/astrofrog/numtraits; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d27d091e93..a80df277045 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13168,30 +13168,7 @@ in { numpy-stl = callPackage ../development/python-modules/numpy-stl { }; - numtraits = buildPythonPackage rec { - pname = "numtraits"; - version = "0.2"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ six numpy traitlets]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Numerical traits for Python objects"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; - homepage = https://github.com/astrofrog/numtraits; - }; - }; + numtraits = callPackage ../development/python-modules/numtraits { }; nwdiag = buildPythonPackage rec { name = "nwdiag-1.0.3"; From 416a975f74b965425831e829047f45f7e1502a11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:44:43 +0100 Subject: [PATCH 105/106] python.pkgs.tabulate: move expression --- .../python-modules/tabulate/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +--------------- 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/tabulate/default.nix diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix new file mode 100644 index 00000000000..9ddc2a0e08b --- /dev/null +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + version = "0.7.7"; + pname = "tabulate"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; + }; + + checkInputs = [ nose ]; + + # Tests: cannot import common (relative import). + doCheck = false; + + meta = { + description = "Pretty-print tabular data"; + homepage = https://bitbucket.org/astanin/python-tabulate; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a80df277045..3377c8c4fbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20714,29 +20714,7 @@ in { inherit (pkgs) pkgconfig systemd; }; - tabulate = buildPythonPackage rec { - version = "0.7.7"; - pname = "tabulate"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; - }; - - buildInputs = with self; [ nose ]; - - # Tests: cannot import common (relative import). - doCheck = false; - - meta = { - description = "Pretty-print tabular data"; - homepage = https://bitbucket.org/astanin/python-tabulate; - license = licenses.mit; - maintainers = with maintainers; [ fridh ]; - }; - - }; + tabulate = callPackage ../development/python-modules/tabulate { }; targetcli_fb = buildPythonPackage rec { version = "2.1.fb33"; From 67bee16731a5d26fa7d1edf3b922a554b30bbea1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Oct 2017 13:54:56 +0100 Subject: [PATCH 106/106] python.pkgs.recommonmark: move expression --- .../python-modules/recommonmark/default.nix | 32 ++++++++++++++ pkgs/top-level/python-packages.nix | 43 +------------------ 2 files changed, 34 insertions(+), 41 deletions(-) create mode 100644 pkgs/development/python-modules/recommonmark/default.nix diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix new file mode 100644 index 00000000000..e03bd353627 --- /dev/null +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, sphinx +, CommonMark_54 +, docutils +}: + +buildPythonPackage rec { + pname = "recommonmark"; + name = "${pname}-${version}"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d"; + }; + + checkInputs = [ pytest sphinx ]; + propagatedBuildInputs = [ CommonMark_54 docutils ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "A docutils-compatibility bridge to CommonMark"; + homepage = https://github.com/rtfd/recommonmark; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3377c8c4fbb..a6c3e163f83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18049,27 +18049,7 @@ in { # use requests, not requests_2 requests = callPackage ../development/python-modules/requests { }; - requests_download = buildPythonPackage rec { - pname = "requests_download"; - version = "0.1.1"; - name = "${pname}-${version}"; - - format = "wheel"; - - src = pkgs.fetchurl { - url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; - sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; - }; - - propagatedBuildInputs = with self; [ requests ]; - - meta = { - description = "Download files using requests and save them to a target path"; - homepage = https://www.github.com/takluyver/requests_download; - license = licenses.mit; - maintainer = maintainers.fridh; - }; - }; + requests_download = callPackage ../development/python-modules/requests_download { }; requestsexceptions = callPackage ../development/python-modules/requestsexceptions {}; @@ -18194,26 +18174,7 @@ in { rcssmin = callPackage ../development/python-modules/rcssmin { }; - recommonmark = buildPythonPackage rec { - name = "recommonmark-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/recommonmark/${name}.tar.gz"; - sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d"; - }; - - buildInputs = with self; [ pytest sphinx ]; - propagatedBuildInputs = with self; [ CommonMark_54 docutils ]; - - meta = { - description = "A docutils-compatibility bridge to CommonMark"; - homepage = https://github.com/rtfd/recommonmark; - license = licenses.mit; - maintainers = with maintainers; [ fridh ]; - }; - - }; + recommonmark = callPackage ../development/python-modules/recommonmark { }; redis = callPackage ../development/python-modules/redis { };