diff options
Diffstat (limited to 'pkgs')
28 files changed, 224 insertions, 72 deletions
diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 02c18109abc2..67e6ed3fa9ce 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.7.5"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q"; + sha256 = "1b4fz9vs0aihg9nj9aj6d2jmykpa9nxi9rvz06v50wwk515plpmc"; }; makeFlags=["PREFIX=\${out}"]; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix new file mode 100644 index 000000000000..c567a7903b81 --- /dev/null +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: + +pythonPackages.buildPythonApplication rec { + name = "pdf-quench-${version}"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "linuxerwang"; + repo = "pdf-quench"; + rev = "b72b3970b371026f9a7ebe6003581e8a63af98f6"; + sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = with pkgs; [ + gtk3 + gobjectIntrospection + goocanvas2 + poppler_gi + ]; + propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; + + format = "other"; + doCheck = false; + + installPhase = '' + install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/linuxerwang/pdf-quench; + description = "A visual tool for cropping pdf files"; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 37d7aeb88e61..40a399247e90 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Visual Interactive Taskwarrior"; maintainers = with pkgs.lib.maintainers; [ ]; - platforms = pkgs.lib.platforms.linux; + platforms = pkgs.lib.platforms.all; license = pkgs.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 768ab24c2f39..6c716cc3e1c0 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,24 +2,21 @@ stdenv.mkDerivation rec { name = "quaternion-${version}"; - version = "0.0.5"; - - # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source + version = "0.0.9"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = "v${version}"; - sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd"; + sha256 = "0zdpll953a7biwnklhgmgg3k2vz7j58lc1nmfkmvsfcj1fmdf408"; }; buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - # take the source from libqmatrixclient + # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet + # https://github.com/QMatrixClient/Quaternion/issues/239 postPatch = '' rm -rf lib ln -s ${libqmatrixclient.src} lib diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 0d3342e66687..ce558130a6ce 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0san8d3dghjkqqv0ypampgl7837mxk9w64ci6fzy1k5d5dmdgvsi"; + sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf"; }; installPhase = '' diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index d89219cce5f3..13add2690db3 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26.1"; + version = "0.26.2"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"; + sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 026f58079f6d..ef36a9c076fb 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -13,11 +13,13 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; - buildInputs = [ gtk3 cairo glib ]; + buildInputs = [ gtk3 cairo glib gobjectIntrospection ]; configureFlags = [ "--disable-python" ]; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; meta = with stdenv.lib; { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f537013d2fec..7d8ec42700c5 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -1,40 +1,26 @@ { stdenv, fetchFromGitHub, cmake , qtbase }: -# This doesn't actually do anything really yet as it doesn't support dynamic building -# When it does, quaternion and tensor should use it - stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; - rev = "v${version}-q0.0.5"; - sha256 = "1m53yxsqjxv2jq0h1xipwsgaj5rca4fk4cl3azgvmf19l9yn00ck"; + rev = "v${version}"; + sha256 = "0sv5hhdsffq7092n6hggfz9a78qn3jfmbvw2flmc4ippzz563akv"; }; buildInputs = [ qtbase ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - install -Dm644 -t $out/lib *.a - - runHook postInstall - ''; - meta = with stdenv.lib; { description= "A Qt5 library to write cross-platfrom clients for Matrix"; homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ peterhoeg ]; - hydraPlatforms = [ ]; }; } diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 042b338b2b14..31bc1848d580 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -4,14 +4,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.70.0"; + version = "0.71.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1pydmfs7xxrqjdnidp2nagwpk2d0vf5nx3m821plld3vbyh22b76"; + sha256 = "1z9qf3kahaincy3i3ynqx7gr1sf470ym8h690a0kc7ah5fwsyr5w"; }; installPhase = '' diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 58ee7699b459..da8f90cd9406 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "gllvm-${version}"; - version = "2018-02-09"; + version = "2018-04-28"; # ~= 1.0.2, but no release tags yet goPackagePath = "github.com/SRI-CSL/gllvm"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "gllvm"; - rev = "ef83222afd22452dd1277329df227a326db9f84f"; - sha256 = "068mc8q7jmpjzh6pr0ygvv39mh4k7vz0dmiacxf3pdsigy3d1y1a"; + rev = "7755cdabb9bd2c5115059c13dce986e4e38f624e"; + sha256 = "0a7mzmshyl4m216cxnar0pzjq98n2678x0czqfxgfdga55xp5frl"; }; meta = with stdenv.lib; { diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index f64bbe4c1255..8080c9596388 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { owner = "OpenMW"; repo = "openmw"; rev = name; - sha256 = "0lj8v81hk807dy0wcdhfp0iyn4l5yag53hx1a6xm44gh2dpyil43"; + sha256 = "1nybxwp77qswjayf0g9xayp4x1xxq799681rhjlggch127r07ifi"; }; enableParallelBuilding = true; diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix new file mode 100644 index 000000000000..ddf0782b210d --- /dev/null +++ b/pkgs/games/tuxpaint/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, + cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf }: + +stdenv.mkDerivation rec { + version = "0.9.22"; + name = "tuxpaint-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz"; + sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca"; + }; + + nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo + librsvg gettext libpaper fribidi pkgconfig gperf ]; + hardeningDisable = [ "format" ]; + makeFlags = [ "GPERF=${gperf}/bin/gperf" + "PREFIX=$$out" + "COMPLETIONDIR=$$out/share/bash-completion/completions" + ]; + + patches = [ ./tuxpaint-completion.diff ]; + postPatch = '' + grep -Zlr include.*SDL . | xargs -0 sed -i -e 's,"SDL,"SDL/SDL,' + ''; + + # stamps + stamps = fetchurl { + url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2014-08-23/tuxpaint-stamps-2014.08.23.tar.gz"; + sha256 = "0rhlwrjz44wp269v3rid4p8pi0i615pzifm1ym6va64gn1bms06q"; + }; + + postInstall = '' + tar xzf $stamps + cd tuxpaint-stamps-2014.08.23 + make install-all PREFIX=$out + rm -rf $out/share/tuxpaint/stamps/military + ''; + + meta = { + description = "Open Source Drawing Software for Children"; + homepage = http://www.tuxpaint.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ woffs ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/tuxpaint/tuxpaint-completion.diff b/pkgs/games/tuxpaint/tuxpaint-completion.diff new file mode 100644 index 000000000000..0824b2becf49 --- /dev/null +++ b/pkgs/games/tuxpaint/tuxpaint-completion.diff @@ -0,0 +1,16 @@ +--- tuxpaint-0.9.22/src/tuxpaint-completion.bash~ 1970-01-01 01:00:01.000000000 +0100 ++++ tuxpaint-0.9.22/src/tuxpaint-completion.bash 2018-03-06 10:54:03.437560921 +0100 +@@ -8,7 +8,6 @@ + # FIXME: See http://www.debian-administration.org/articles/316 for an intro + # to how we should be doing this... -bjk 2009.09.09 + +-have tuxpaint && + _tuxpaint() + { + local cur +@@ -96,4 +95,4 @@ + fi + + } +-[ "${have:-}" ] && complete -F _tuxpaint $filenames tuxpaint ++complete -F _tuxpaint $filenames tuxpaint diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b18ae7762df2..91be6cf743a4 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -11,16 +11,16 @@ let name = "hplip-${version}"; - version = "3.17.11"; + version = "3.18.3"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0xda7x7xxjvzn1l0adlvbwcw21crq1r3r79bkf94q3m5i6abx49g"; + sha256 = "0x5xs86v18w46rxz5whc15bl4fb7p4km6xqjpwzclp83nl7rl01y"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "0vqhwqc33vxncdhbzdchbgrcrxvkwnp7rc2hkswwn9da112s0c9w"; + sha256 = "11nc3cifhd2h2c7p0dr2jjzrg3fd5j43ih1wy0m186l6wcgdjssw"; }; hplipState = substituteAll { diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d9aef3a21930..177a5c878f65 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.37"; + version = "4.14.38"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14lfj2vfxw36k8cbmzs280w4h81yz5xhlhq5550kww906vnyg5w1"; + sha256 = "00ibrl633d4cqnn4i0z7kj1ddj1243dh7ap783bwlicw9hkddwzg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 3da2cda30e22..46bdcff66a10 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.5"; + version = "4.16.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0f1a8ggjb2jxc8n3hvypc81xbwylwkqi0mnynd9q316ay152zb1r"; + sha256 = "0jwa2r3gpn4ahy38730b7g4xzavfqwxxwgyfhpn5ssvzsc4934gs"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index fe8633ed0da7..ccc8b4ba2dc2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.129"; + version = "4.4.130"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0aviyky8f73l6jpi1d4by947rj78d5vckxkyf9aj73bavaxc8rd1"; + sha256 = "1rad8fa25hzifpxqxsc7wzhcssbbv32rc03nvljygvlxcn8dz6xj"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 63fe3db3b577..cc4609676d4e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.96"; + version = "4.9.97"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zw7x86c8qa2kzkwlxlhqzsnddyp1ncw4ja660bqnzqrnmp5jvw2"; + sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 0f0b6ebb37a6..5cc235c3104a 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pam_u2f-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz"; - sha256 = "0bbwy9k3002anhkv67zwck3dry7blqnnp291dc4qsjrca0blw217"; + sha256 = "0fpdb49596zywnbx1cfcx1k83rbs1ylhi1cnn25pq9d3b92hj50h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index b88646424be5..6e3e444240ac 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20180413"; + version = "0.0.20180420"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0lbjx62ihc8prqfhvmi0v1xq1q3ayzj5rfy2p5149nr9qx3z37j1"; + sha256 = "05nsn5pkzvkfsc8z0mm4fdb1znklpmb00v608j8gxlz8z6nd535m"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index c1f3fbea8e5c..cbf849494b75 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -24,10 +24,9 @@ buildPhase = ":"; installPhase = '' - mkdir -p $out/lib $out/bin $out/share/sweep-visualizer + mkdir -p $out/bin $out/share/sweep-visualizer mv usr/share/* $out/share mv opt/Sweep\ Visualizer\ BETA/* $out/share/sweep-visualizer/ - mv $out/share/sweep-visualizer/*.so $out/lib/ ln -s $out/share/sweep-visualizer/sweep_visualizer $out/bin/sweep_visualizer ''; @@ -40,12 +39,12 @@ ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; in '' - for lib in $out/lib/*.so; do - patchelf --set-rpath "$out/lib:${libPath}" $lib + for lib in $out/share/sweep-visualizer/*.so; do + patchelf --set-rpath "$out/share/sweep-visualizer:${libPath}" $lib done patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${libPath}" \ + --set-rpath "$out/share/sweep-visualizer:${libPath}" \ $out/share/sweep-visualizer/sweep_visualizer wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs} ''; diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix new file mode 100644 index 000000000000..fe0aa6cc3089 --- /dev/null +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -0,0 +1,34 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }: + +rustPlatform.buildRustPackage rec { + name = "tealdeer-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "dbrgn"; + repo = "tealdeer"; + rev = "v${version}"; + sha256 = "0mkcja9agkbj2i93hx01r77w66ca805v4wvivcnrqmzid001717v"; + }; + + cargoSha256 = "1qrvic7b6g3f3gjzx7x97ipp7ppa79c0aawn0lsav0c9xxzl44jq"; + + buildInputs = [ openssl cacert curl ]; + + nativeBuildInputs = [ pkgconfig ]; + + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + # disable tests for now since one needs network + # what is unavailable in sandbox build + # and i can't disable just this one + doCheck = false; + + meta = with stdenv.lib; { + description = "An implementation of tldr in Rust"; + homepage = "https://github.com/dbrgn/tealdeer"; + maintainers = with maintainers; [ davidak ]; + license = with licenses; [ asl20 mit ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 129db56dc554..99e12084ccb5 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180410"; + name = "miniupnpd-2.0.20180422"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1w4crmsmrygagh0v9phx8aicbyh6nypfjh2fdmknijngvx05biaq"; + sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 042f8bea3d62..eb466745ef84 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -3,11 +3,15 @@ , gmp, python, iptables, ldns, unbound, openssl, pcsclite , openresolv , systemd, pam - -, enableTNC ? false, curl, trousers, sqlite, libxml2 +, curl +, enableTNC ? false, trousers, sqlite, libxml2 , enableNetworkManager ? false, networkmanager }: +# Note on curl support: If curl is built with gnutls as its backend, the +# strongswan curl plugin may break. +# See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info. + with stdenv.lib; stdenv.mkDerivation rec { @@ -23,8 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = - [ gmp python iptables ldns unbound openssl pcsclite ] - ++ optionals enableTNC [ curl trousers sqlite libxml2 ] + [ curl gmp python iptables ldns unbound openssl pcsclite ] + ++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals stdenv.isLinux [ systemd.dev pam ] ++ optionals enableNetworkManager [ networkmanager ]; @@ -61,12 +65,12 @@ stdenv.mkDerivation rec { "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth" "--enable-forecast" "--enable-connmark" "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" - "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] + "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" + "--enable-curl" ] ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] ++ optional (stdenv.system == "i686-linux") "--enable-padlock" ++ optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" - "--enable-curl" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" "--enable-tnc-imv" "--enable-imv-attestation" diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix new file mode 100644 index 000000000000..178e08938fea --- /dev/null +++ b/pkgs/tools/system/psstop/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "psstop-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "clearlinux"; + repo = "psstop"; + rev = "v${version}"; + sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ glib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/clearlinux/psstop; + description = "Show processes' memory usage by looking into pss"; # upstream summary + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 1fcfdd85e7ae..c2fe3fcd5761 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.42"; + version = "3.43"; src = fetchFromGitHub { owner = "andre-simon"; repo = "highlight"; - rev = "${version}"; - sha256 = "1fxx827igzqjn5rri57b8980hnd3ixz3j7smfxwi1ivfhlfznzgr"; + rev = "v${version}"; + sha256 = "126nsf4cjxflg2kiv72qf1xl5fsilk0jqcncs6qqgm72cpjfmlsy"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 987d192bafcd..f681ae62aeaa 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "html-xml-utils-${version}"; - version = "7.6"; + version = "7.7"; src = fetchurl { url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; - sha256 = "0l97ps089byy62838wf2jwvvc465iw29z9r5kwmwcq7f3bn11y3m"; + sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr"; }; buildInputs = [curl libiconv]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 719a5c66db7f..7fea71173109 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1358,6 +1358,8 @@ with pkgs; ps_mem = callPackage ../tools/system/ps_mem { }; + psstop = callPackage ../tools/system/psstop { }; + parallel-rust = callPackage ../tools/misc/parallel-rust { }; socklog = callPackage ../tools/system/socklog { }; @@ -2105,6 +2107,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + tealdeer = callPackage ../tools/misc/tealdeer/default.nix { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { @@ -4284,6 +4288,8 @@ with pkgs; pdfmod = callPackage ../applications/misc/pdfmod { }; + pdf-quench = callPackage ../applications/misc/pdf-quench { }; + jbig2enc = callPackage ../tools/graphics/jbig2enc { }; pdfread = callPackage ../tools/graphics/pdfread { @@ -19458,6 +19464,8 @@ with pkgs; tremulous = callPackage ../games/tremulous { }; + tuxpaint = callPackage ../games/tuxpaint { }; + speed_dreams = callPackage ../games/speed-dreams { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC @@ -20639,7 +20647,7 @@ with pkgs; hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { }; - hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; }; + hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; }; hyperfine = callPackage ../tools/misc/hyperfine { }; |