diff options
Diffstat (limited to 'pkgs/applications')
41 files changed, 313 insertions, 329 deletions
diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 35efe76cfb2e..72ef08107040 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.4.6"; + version = "5.5.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0p532r0ld6j6fpwqyf9m5m0d27y37chgbvcjp1x6g5jjvm7m77xk"; + sha256 = "1hd3ckayrwszda517zfvhihrfmzq4m3kcsrz4sqkbvib0giwsfkp"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 0f15a63be7a8..275aaba4f2eb 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.4.6"; + version = "5.5.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1xzk0zgbc4nnz8gjbhw5h6kwznzxsqrg19ggyb8ijpmgg0ncxk8l"; + sha256 = "0kna6vkxc6lrfzb3gzn11qvw8jpa86gi1k996hdk83gn0lhmkvx5"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index ed5017a0487c..51dfbbab61e8 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.4.6"; + version = "5.5.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "01jmrmwbc1hrvq7jdfcc7mxl03q2l6kz57yca2j26xwyvfcfv5sz"; + sha256 = "0438721v24pim5q0q54ivsws9a679fm7ymrm1nn9g1fv06qsm4d8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 76f8e03fa13f..65aa17e3b4ee 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , fetchFromGitHub , cmake @@ -23,13 +22,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "1bdmxxkcqpjvkckizmrz2839b4yspw4xv69bqkrrgkcyvxsr804w"; + sha256 = "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw"; }; nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; @@ -45,7 +44,9 @@ stdenv.mkDerivation rec { portaudio zlib ] - ++ lib.optional withLua lua; + ++ stdenv.lib.optional withLua lua; + + buildFlags = "translations"; hardeningDisable = [ "format" ]; @@ -53,9 +54,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; - homepage = https://github.com/xournalpp/xournalpp; + homepage = "https://github.com/xournalpp/xournalpp"; license = licenses.gpl2; - maintainers = with maintainers; [ andrew-d ]; + maintainers = with maintainers; [ andrew-d sikmir ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index f6236a301dba..98aebc32dba1 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "6.3.3"; + version = "6.3.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "08rf7igfzh5g40bapsj0f424jxfx62y97syr3fxmqv3ik7iav9k4"; + sha256 = "1b4ac7vsfz3c9vk7yv33pcfflcxl5fcnbzfdva1yfq63v28g38gk"; }; installPhase = '' diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 5f403c9b7b6f..fe7463491557 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.13.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "1s6s5rlzr917hq7370pmikbdvd6y468cyxw614ah65d4v105qfv7"; + sha256 = "1qh8nr6yvxiy8pxl5pkhzlfr7hanxxc8hd8h00gsdxa0vgmqz11q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a1015c880df4..6ab297c69700 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.63.2"; + version = "0.64.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1fylsx2isvims0xwcj831b1zcwsmd3igrnxjad44rhl2k3anq8vm"; + sha256 = "10zbi2414c9grqhi9vcj3sczjh7hf20dihvcsirj551fmiqxrvpy"; }; - modSha256 = "0h95r3m6ca60dn1bllnw127nbfnkdjld94c3nyrzlwdczl2iaiyf"; + modSha256 = "18wfsp3ypfxj5qljmb19kzyc5byf413nkabz5mfvq8srjhcq1ifl"; buildFlags = [ "-tags" "extended" ]; @@ -23,6 +23,6 @@ buildGoModule rec { description = "A fast and modern static website engine."; homepage = "https://gohugo.io"; license = licenses.asl20; - maintainers = with maintainers; [ schneefux filalex77 ]; + maintainers = with maintainers; [ schneefux filalex77 Frostman ]; }; } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index fd91a981e57b..4219851fc9d3 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.0.177"; + version = "1.0.179"; desktopItem = makeDesktopItem { name = "Joplin"; exec = "joplin-desktop"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "023q3yxqsv0vd76bvfhyhh0pnfia01rflfpyv0i6w6xnb5hm2jp7"; + sha256 = "0v7d5wzwiznl755pl6jfg33g6jxr1cbm9j13jpbmfi497hj8w82k"; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index ac46c48d4077..fd56830d17f6 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "josm"; - version = "15628"; + version = "15806"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "19yn311h9x1434832i0awpv2n9vhbhkk1j1mi9zggy9f256f80c6"; + sha256 = "03a1hw566z6jd232hjkxjxqs1ggd0ir12ndkz9swxkif6aqbrnvs"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index a5196811a6a5..48f369d30290 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,11 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.6.18626"; - src = - fetchzip { + version = "0.6.21799"; + src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "0v9bw0f2mcvmzp7v8gs6q4p1q54rflqnbjv5sw7h1kyfwznmflzj"; + sha256 = "19axrcfmycmdfgphkfwl9qgwd9xj8g37gmwi4ynb45w7nhfid5vm"; stripRoot = false; }; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index f7964e4e5c6d..675f0adfc7f8 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc, fetchpatch +{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: mkDerivation rec { - version = "2.3.0"; + version = "2.3.4"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri"; + sha256 = "0qgvc19flnf6ny3ffyj8civwaxrnwcdlw2v708hg49cbmg6f8igh"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs @@ -34,13 +34,6 @@ mkDerivation rec { " --prefix PATH : ${python}/bin" ]; - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch?id=07e82fd1fc07bf055c78b81eaa128f8f837da80d"; - sha256 = "1bnx0il2iv36lnrnyb370wyvww0rd8bphcy6z8d7zmvd3pwhyfql"; - }) - ]; - meta = with lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = http://www.lyx.org; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix new file mode 100644 index 000000000000..762d1d6d15cb --- /dev/null +++ b/pkgs/applications/misc/pueue/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "pueue"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "Nukesor"; + repo = pname; + rev = "v${version}"; + sha256 = "03aj4vw8kvwqk1i1a4kah5b574ahs930ij7xmqsvdy7f8c2g6pbq"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + cargoSha256 = "1y33n0dmrssv35l0apfq1mchyh92cfbzjarh0m8zb2nxwhvk7paw"; + + postInstall = '' + installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue + ''; + + meta = with lib; { + description = "A daemon for managing long running shell commands"; + homepage = "https://github.com/Nukesor/pueue"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 8c5a2e3d2db9..8946e83c94a2 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "xca"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${version}"; - sha256 = "0slfqmz0b01lwmrv4h78hmrsdrhcyc7sjzsxcw05ylgmhvdq3dw9"; + sha256 = "0na2816lkfkkvssh9kmf5vwy6x8kd4x7h138jzy61wrvs69vhnbi"; }; postPatch = '' diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix deleted file mode 100644 index d41f84404201..000000000000 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, cmake, fetchFromGitHub -, qtbase, qtmultimedia, qtwebengine, qtxmlpatterns -, version ? "1.0.01" -, sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb" -}: -stdenv.mkDerivation { - pname = "otter-browser"; - inherit version; - - src = fetchFromGitHub { - owner = "OtterBrowser"; - repo = "otter-browser"; - rev = "v${version}"; - sha256 = sourceSha; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qtbase qtmultimedia qtwebengine qtxmlpatterns ]; - - meta = with stdenv.lib; { - homepage = https://otter-browser.org; - license = licenses.gpl3Plus; - description = "Browser aiming to recreate the best aspects of the classic Opera (12.x) UI using Qt5"; - maintainers = with maintainers; [ lheckemann ]; - }; -} diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 80945fbc2bdb..4824e6aabdda 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.9.0"; + version = "1.10.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1y0yq1qfr6g1s7kf3w2crd0b025dv2dfknhlz3v0001ns3rgwj17"; + sha256 = "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch index 985f916b32c4..d54a37fe71fe 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch +++ b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch @@ -1,8 +1,8 @@ -diff --git a/qutebrowser/app.py b/qutebrowser/app.py -index a47b5d2f4..f23ee23ef 100644 ---- a/qutebrowser/app.py -+++ b/qutebrowser/app.py -@@ -573,13 +573,8 @@ class Quitter(QObject): +diff --git a/quitter.py b/quitterb.py +index a42b9d0..f544ccb 100644 +--- a/qutebrowser/misc/quitter.py ++++ b/qutebrowser/misc/quitter.py +@@ -112,13 +112,7 @@ class Quitter(QObject): Return: The commandline as a list of strings. """ @@ -14,7 +14,6 @@ index a47b5d2f4..f23ee23ef 100644 - else: - args = [sys.executable, '-m', 'qutebrowser'] + args = ['@qutebrowser@'] -+ cwd = None # Add all open pages so they get reopened. page_args = [] # type: typing.MutableSequence[str] diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8c381df122d8..2d29a409d375 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.13"; + version = "3.1.18"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "51215f71ed2d2666313c7965a2b22b5463b4a51f319d64db61f6a4fd221e124e"; + sha256 = "34be4ac61dbb5699cfbc9db8bf4f4be15a63164d9006d8ac7c488278d00baa62"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 4358ed8f2019..be1fe96526c3 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.30.0"; # Please backport all updates to the stable channel. + version = "1.30.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1gbvna40sc83s7mwip5281yn4bs0k19fj061y0xzwkvh0yk06x3i"; + sha256 = "08l51f1fq9jlnqb4j38lxdfwfbqfzb85zrim57wlgcj8azp2ash6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index f3d96a1b5c6b..632a485381d0 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "0544j6vqbvb2xshq7ma2a3apx2vvpgfg3jh5prg265wnh4991nsw"; + sha256 = "0h425ln5vv76zv41dccapyfbl8qmmflbpwmrd26knqyj8k24zfpr"; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 6915cfd79821..0fa30a85d1b6 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -3,15 +3,19 @@ , python3, perl, w3m, dante }: -buildGoModule rec { +let + rev = "ea0df7bee433fedae5716906ea56141f92b9ce53"; +in buildGoModule rec { pname = "aerc"; - version = "0.3.0"; + version = "unstable-2020-02-01"; src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; - sha256 = "188jln8hmgiqn5il5m54bns0wk4grj09di8y6mmid58ibw6spma4"; + url = "https://git.sr.ht/~sircmpwn/aerc/archive/${rev}.tar.gz"; + sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9"; }; + modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x"; + nativeBuildInputs = [ go scdoc @@ -51,8 +55,6 @@ buildGoModule rec { ${stdenv.lib.makeBinPath [ w3m dante ]} ''; - modSha256 = "0pxbv4zfhii0g41cy0ycfpkkxw6nnd4ibavic6zqw30j476jnm2x"; - meta = with stdenv.lib; { description = "aerc is an email client for your terminal"; homepage = https://aerc-mail.org/; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 68a454745c70..077e4157ef54 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.0.8397"; + version = "15.1.3937"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "0bidlwlpzqpba9c0zfasm08vp308hgfnq4pslj1b04v64mlci66s"; + sha256 = "0v7733g795b15l2fya26sq710p0mg3wqhkahrg4w84y69p9zz2pf"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index afc89fe78024..b0e53a054d28 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -3,7 +3,6 @@ let pname = "station"; version = "1.52.2"; -in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { @@ -11,6 +10,12 @@ in appimageTools.wrapType2 rec { sha256 = "0lhiwvnf94is9klvzrqv2wri53gj8nms9lg2678bs4y58pvjxwid"; }; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 rec { + inherit name src; + profile = '' export LC_ALL=C.UTF-8 export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS @@ -18,7 +23,14 @@ in appimageTools.wrapType2 rec { multiPkgs = null; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \ + $out/share/icons/hicolor/512x512/apps/browserx.png + substituteInPlace $out/share/applications/browserx.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; meta = with lib; { description = "A single place for all of your web applications"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 8a110c63929d..2d7624ed89cb 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,19 +3,19 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.3.3"; + version = "1.3.4"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0bcp8kbj8xsnly2dfafnfvj6vl27mbgvj84pjk0wxdjfnr2my9ic"; + sha256 = "076k06p2vqqz2r5bgvqkjipnhznbfbalp3pa2gjm2j9hy7nldr9f"; }; goPackagePath = "github.com/syncthing/syncthing"; - modSha256 = "0kv24bi3w3pvjyjng7ly67brq8wkc1xnhsyha1h7v3jbmj5fgb12"; + modSha256 = "10fgfjip5xr8lim2z0dh7399xpcnhxis9s9yd36fk934h1k1hwzd"; patches = [ ./add-stcli-target.patch diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix new file mode 100644 index 000000000000..abc227e9e394 --- /dev/null +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, meson, ninja, pkgconfig, desktop-file-utils +, python3, vala, wrapGAppsHook +, evolution-data-server +, libical +, libgee +, json-glib +, glib +, sqlite +, libsoup +, gtk3 +, pantheon /* granite, icons, maintainers */ +, webkitgtk +}: + +stdenv.mkDerivation rec { + pname = "elementary-planner"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "alainm23"; + repo = "planner"; + rev = version; + sha256 = "0swj94pqf00wwzsgjap8z19k33gg1wj2b78ba1aj9h791j8lmaim"; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + evolution-data-server + libical + libgee + json-glib + glib + sqlite + libsoup + gtk3 + pantheon.granite + webkitgtk + pantheon.elementary-icon-theme + ]; + + # Fix version string, remove in next update! + patches = [ + (fetchpatch { + url = "https://github.com/alainm23/planner/pull/194/commits/3d0a2197087b13fe90fa6f85f817ba56798d632c.patch"; + sha256 = "077q5jddi8jaw2ypc6szbd1c50i4x3b21jvmvi3w7g5zhjwpkmf5"; + }) + ]; + + postPatch = '' + chmod +x build-aux/meson/post_install.py + patchShebangs build-aux/meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Task and project manager designed to elementary OS"; + homepage = "https://planner-todo.web.app"; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers; + }; +} + diff --git a/pkgs/applications/office/ktimetracker/default.nix b/pkgs/applications/office/ktimetracker/default.nix new file mode 100644 index 000000000000..8a40a3f4f69d --- /dev/null +++ b/pkgs/applications/office/ktimetracker/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchurl, cmake, pkgconfig, extra-cmake-modules, +kconfig, kconfigwidgets, kdbusaddons, kdoctools, ki18n, kidletime, +kjobwidgets, kio, knotifications, kwindowsystem, kxmlgui, ktextwidgets, +kcalendarcore +}: + +mkDerivation rec { + pname = "ktimetracker"; + version = "5.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; + sha256 = "0jp63fby052rapjjaz413b1wjz4qsgpxh82y2d75jzimch0n5s02"; + }; + + nativeBuildInputs = [ + cmake pkgconfig extra-cmake-modules + ]; + + buildInputs = [ + kconfig kconfigwidgets kdbusaddons kdoctools ki18n kidletime kjobwidgets +kio knotifications kwindowsystem kxmlgui ktextwidgets + kcalendarcore + ]; + + meta = with lib; { + description = "Todo management and time tracking application"; + license = licenses.gpl2; + homepage = "https://userbase.kde.org/KTimeTracker"; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index b76e09d4d1d6..b4adc947c4d1 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,21 +1,19 @@ { mkDerivation, lib, - fetchFromGitHub, + fetchurl, extra-cmake-modules, qtbase, boost, akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap, - krunner, kwallet + krunner, kwallet, kcalendarcore }: -mkDerivation { +mkDerivation rec { pname = "zanshin"; - version = "2019-07-28"; + version = "0.5.71"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "zanshin"; - rev = "a8c223e745ed7e6aa3dd3cb0786a625a5c54e378"; - sha256 = "0jglwh30x7qrl41n3dhawn4c25dmrzscpvcajhgb6fwcl4w8cgfm"; + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh"; }; nativeBuildInputs = [ @@ -25,7 +23,7 @@ mkDerivation { buildInputs = [ qtbase boost akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap - krunner kwallet + krunner kwallet kcalendarcore ]; meta = with lib; { diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 900f0ed7c04a..48c53ccc59f6 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile, +{ stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0wki9d19q8rkjxcd3dz3k0a395gmbnji4fxlhw6dpcyqpfw88fcs"; }; - buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio + buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ]; meta = { diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 44b0f5d84b66..b8aef4bd53fe 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -18,14 +18,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.24"; + version = "3.25"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1r9zgfx5npjw4mk0ywxx07jyi1m1b1i06j0m60n3dsrz75492x6m"; + sha256 = "019fgryfwpcrkv1f3271v7qxk0mfw2w990vgnk1cqhmr9i1f17gs"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3a68f7903822..fc3af0a933bb 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -28,6 +28,8 @@ let diff-so-fancy = callPackage ./diff-so-fancy { }; + gh = callPackage ./gh { }; + ghq = callPackage ./ghq { }; git = appendToName "minimal" gitBase; @@ -103,7 +105,9 @@ let git-imerge = callPackage ./git-imerge { }; - git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool {}; + git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool { + inherit (darwin.apple_sdk.frameworks) Security; + }; git-machete = python3Packages.callPackage ./git-machete { }; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix new file mode 100644 index 000000000000..02f830a3f07e --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: + +buildGoModule rec { + pname = "gh"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "cli"; + repo = "cli"; + rev = "v${version}"; + sha256 = "033y9bwdaj8735nmj22k8lrgkgimji7hyly9i4jyp11iaa7cgd7a"; + }; + + modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h"; + + buildFlagsArray = [ + "-ldflags=-X github.com/cli/cli/command.Version=${version}" + ]; + + subPackages = [ "cmd/gh" ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + for shell in bash fish zsh; do + $out/bin/gh completion -s $shell > gh.$shell + installShellCompletion gh.$shell + done + ''; + + meta = with lib; { + description = "GitHub CLI tool"; + homepage = "https://github.com/cli/cli"; + license = licenses.mit; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch deleted file mode 100644 index 1bbae6dc01a7..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch +++ /dev/null @@ -1,169 +0,0 @@ ---- a/src/display/utils.rs -+++ b/src/display/utils.rs -@@ -53,166 +53,3 @@ - _ => ColorMode::TwoTone, - } - } -- --#[cfg(all(windows, test))] --mod tests { -- use crate::display::color_mode::ColorMode; -- use crate::display::utils::detect_color_mode; -- -- #[test] -- fn detect_color_mode_windows() { -- assert_eq!(detect_color_mode(2), ColorMode::ThreeBit); -- } --} -- --#[cfg(all(unix, test))] --mod tests { -- use crate::display::color_mode::ColorMode; -- use crate::display::utils::detect_color_mode; -- use std::env::{remove_var, set_var}; -- -- fn clear_env() { -- remove_var("COLORTERM"); -- remove_var("VTE_VERSION"); -- remove_var("TERM_PROGRAM"); -- remove_var("TERM"); -- } -- -- #[test] -- fn detect_color_mode_no_env_2_colors() { -- clear_env(); -- assert_eq!(detect_color_mode(2), ColorMode::TwoTone); -- } -- -- #[test] -- fn detect_color_mode_no_env_8_colors() { -- clear_env(); -- assert_eq!(detect_color_mode(8), ColorMode::ThreeBit); -- } -- -- #[test] -- fn detect_color_mode_no_env_less_8_colors() { -- clear_env(); -- assert_eq!(detect_color_mode(7), ColorMode::TwoTone); -- } -- -- #[test] -- fn detect_color_mode_no_env_16_colors() { -- clear_env(); -- assert_eq!(detect_color_mode(16), ColorMode::FourBit); -- } -- -- #[test] -- fn detect_color_mode_no_env_less_16_colors() { -- clear_env(); -- assert_eq!(detect_color_mode(15), ColorMode::ThreeBit); -- } -- -- #[test] -- fn detect_color_mode_no_env_256_colors() { -- clear_env(); -- assert_eq!(detect_color_mode(256), ColorMode::EightBit); -- } -- -- #[test] -- fn detect_color_mode_no_env_less_256_colors() { -- clear_env(); -- assert_eq!(detect_color_mode(255), ColorMode::FourBit); -- } -- -- #[test] -- fn detect_color_mode_no_env_more_256_colors() { -- clear_env(); -- assert_eq!(detect_color_mode(257), ColorMode::EightBit); -- } -- -- #[test] -- fn detect_color_mode_term_env_no_256() { -- clear_env(); -- set_var("TERM", "XTERM"); -- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); -- } -- -- #[test] -- fn detect_color_mode_term_env_with_256() { -- clear_env(); -- set_var("TERM", "XTERM-256"); -- assert_eq!(detect_color_mode(0), ColorMode::EightBit); -- } -- -- #[test] -- fn detect_color_mode_term_program_env_apple_terminal() { -- clear_env(); -- set_var("TERM_PROGRAM", "Apple_Terminal"); -- assert_eq!(detect_color_mode(0), ColorMode::EightBit); -- } -- -- #[test] -- fn detect_color_mode_term_program_env_iterm() { -- clear_env(); -- set_var("TERM_PROGRAM", "iTerm.app"); -- assert_eq!(detect_color_mode(0), ColorMode::EightBit); -- } -- -- #[test] -- fn detect_color_mode_term_program_env_other() { -- clear_env(); -- set_var("TERM_PROGRAM", "other"); -- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); -- } -- -- #[test] -- fn detect_color_mode_vte_version_0_36_00() { -- clear_env(); -- set_var("VTE_VERSION", "3600"); -- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); -- } -- -- #[test] -- fn detect_color_mode_vte_version_greater_0_36_00() { -- clear_env(); -- set_var("VTE_VERSION", "3601"); -- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); -- } -- -- #[test] -- fn detect_color_mode_vte_version_less_0_36_00() { -- clear_env(); -- set_var("VTE_VERSION", "1"); -- assert_eq!(detect_color_mode(0), ColorMode::EightBit); -- } -- -- #[test] -- fn detect_color_mode_vte_version_0() { -- clear_env(); -- set_var("VTE_VERSION", "0"); -- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); -- } -- #[test] -- fn detect_color_mode_vte_version_invalid() { -- clear_env(); -- set_var("VTE_VERSION", "invalid"); -- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); -- } -- -- #[test] -- fn detect_color_mode_colorterm_env_is_truecolor() { -- clear_env(); -- set_var("COLORTERM", "truecolor"); -- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); -- } -- -- #[test] -- fn detect_color_mode_colorterm_env_is_24bit() { -- clear_env(); -- set_var("COLORTERM", "24bit"); -- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); -- } -- -- #[test] -- fn detect_color_mode_colorterm_env_is_other() { -- clear_env(); -- set_var("COLORTERM", "other"); -- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); -- } --} diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 81b4486d569f..7635a96eca5e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, ncurses5, fetchFromGitHub, rustPlatform }: +{ stdenv, ncurses5, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q"; }; - patches = [ ./01-terminaltests.patch ]; - cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk"; - buildInputs = [ ncurses5 ]; + buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + checkFlagsArray = [ "--test-threads=1" ]; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 3a72f38903e6..2ceac55bf5ca 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "01qxm00c5wqpy1clrvjr44v7cg4nqawaf5a6qnvvgswvis4kakzr"; + sha256 = "0pl5z0gx2ypkrgq7vj1cxj5iwj06vcd06x3b3nh0g7w7q7nl8pr4"; }; - cargoSha256 = "16rkmk888alfvq8nsggi26vck1c7ya0fa5j7gv219g5py4gw2n34"; + cargoSha256 = "0jbsz7r9n3jcgb9sd6pdjwzjf1b35qpfqw8ba8fjjmzfvs9qn6ld"; verifyCargoDeps = true; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 9b77690868be..ca0c905874e3 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "gitstatus"; - version = "unstable-2019-12-18"; + version = "unstable-2020-01-28"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "8ae9c17a60158dcf91f56d9167493e3988a5e921"; - sha256 = "1czjwsgbmxd1d656srs3n6wj6bmqr8p3aw5gw61q4wdxw3mni2a6"; + rev = "edb99aa7b86d10ad0a1cfe25135b57c8031d82ad"; + sha256 = "1nys74qswwc7hn9cv0j7syvbpnw0f15chc9pi11him4d6lsflrfd"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; @@ -25,6 +25,6 @@ stdenv.mkDerivation { homepage = https://github.com/romkatv/gitstatus; license = [ licenses.gpl3 ]; - maintainers = [ maintainers.mmlb ]; + maintainers = with maintainers; [ mmlb hexa ]; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index d5abb6d004b0..077511a06607 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, makeWrapper -, python, git, gnupg, less, cacert +, python3, git, gnupg, less, cacert }: stdenv.mkDerivation rec { pname = "git-repo"; - version = "1.13.8"; + version = "1.13.9.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "1wmzgijmssgwkkw8g4zgmc4x64xkvz6nq1b3szcvawgv1ndwnb2j"; + sha256 = "0yns7n8gpac33cbkm85slslcnfdb55ax9c0vpvmmfbgcgkvqlknb"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python ]; + buildInputs = [ python3 ]; patchPhase = '' substituteInPlace repo --replace \ diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 3c5539189252..32222c12c7cc 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -20,6 +20,15 @@ in rustPlatform.buildRustPackage rec { sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; + postPatch = '' + pushd ../${pname}-${version}-vendor/thrussh/ + patch -p1 < ${./thrussh-build-fix.patch} + substituteInPlace .cargo-checksum.json --replace \ + 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ + a199f2bba520d56e11607b77be4dde0cfae576c90badb9fbd39af4784e8120d1 + popd + ''; + nativeBuildInputs = [ pkgconfig clang ]; postInstall = '' diff --git a/pkgs/applications/version-management/pijul/thrussh-build-fix.patch b/pkgs/applications/version-management/pijul/thrussh-build-fix.patch new file mode 100644 index 000000000000..3989639620bf --- /dev/null +++ b/pkgs/applications/version-management/pijul/thrussh-build-fix.patch @@ -0,0 +1,12 @@ +--- a/src/client/connection.rs 2020-02-04 12:48:43.845299096 +0100 ++++ b/src/client/connection.rs 2020-02-04 12:50:00.140329310 +0100 +@@ -546,8 +546,8 @@ + &[msg::NEWKEYS], + &mut session.0.write_buffer, + ); +- session.0.kex = Some(Kex::NewKeys(newkeys)); + newkeys.sent = true; ++ session.0.kex = Some(Kex::NewKeys(newkeys)); + } + Ok(()) + } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 6a8c3df0f35b..f7ac5ef58cdf 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper -, addOpenGLRunpath, docutils, perl, pkgconfig, python3, which +, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null, darwin @@ -93,14 +93,6 @@ assert youtubeSupport -> available youtube-dl; assert zimgSupport -> available zimg; let - # Purity: Waf is normally downloaded by bootstrap.py, but - # for purity reasons this behavior should be avoided. - wafVersion = "2.0.9"; - waf = fetchurl { - urls = [ "https://waf.io/waf-${wafVersion}" - "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; - sha256 = "0j7sbn3w6bgslvwwh5v9527w3gi2sd08kskrgxamx693y0b0i3ia"; - }; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); in stdenv.mkDerivation rec { @@ -121,7 +113,7 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext " + optionalString stdenv.isDarwin "-framework CoreFoundation"; - configureFlags = [ + wafConfigureFlags = [ "--enable-libmpv-shared" "--enable-manpage-build" "--disable-libmpv-static" @@ -140,12 +132,8 @@ in stdenv.mkDerivation rec { (enableFeature stdenv.isLinux "dvbin") ]; - configurePhase = '' - python3 ${waf} configure --prefix=$out $configureFlags - ''; - nativeBuildInputs = [ - addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 which + addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 wafHook which ]; buildInputs = [ @@ -189,9 +177,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - buildPhase = '' - python3 ${waf} build - '' + optionalString stdenv.isDarwin '' + postBuild = optionalString stdenv.isDarwin '' python3 TOOLS/osxbundle.py -s build/mpv ''; @@ -204,9 +190,7 @@ in stdenv.mkDerivation rec { --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" ''; - installPhase = '' - python3 ${waf} install - + postInstall = '' # Use a standard font mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 6fc60780ba7f..b49a62948324 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "crun"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0mn64hrgx4a7mhqjxn127i8yivhn1grp93wws1da1ffj4ap6ay76"; + sha256 = "0sxpdv3afh8hn39jdg06vwkyp7i6dsyf1gg8719vwiwmcbhzj8mx"; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 9fa06f5bf0b9..220d26c116f0 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,27 +1,27 @@ { fetchurl, stdenv }: let - version = "0.19.0"; + version = "0.20.0"; suffix = { - x86_64-linux = ""; - aarch64-linux = "-aarch64"; + x86_64-linux = "x86_64"; + aarch64-linux = "aarch64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; fetchbin = name: sha256: fetchurl { - url = "${baseurl}/v${version}/${name}-v${version}${suffix}"; + url = "${baseurl}/v${version}/${name}-v${version}-${suffix}"; sha256 = sha256."${stdenv.hostPlatform.system}"; }; firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "0yjhw77xc2nc96p36jhf0va95gf6hwi9n270g4iiwakycdy048mx"; - aarch64-linux = "165yca7pcwpqw3x6dihcjz1xcwjh37sdi9qrrjk9zasxx7xcniym"; + x86_64-linux = "073pp4q5dnyr126k8k7qdkqclqx18hj12app4gj2is0413gia8z9"; + aarch64-linux = "1w5f522imq5dnjrdidnrq7jlwcdrsiz32shv9bh66dhy336sd8qw"; }; jailer-bin = fetchbin "jailer" { - x86_64-linux = "1q792b4bl1q3ach8nc8l0fbcil44knv3wa542xrskndzdz28lhsp"; - aarch64-linux = "1cnwlpy5bswjprk7fcjgf6lxidhp7z00qx691nkwhzjkby80j490"; + x86_64-linux = "0falk6y9y0pimgav1yg6ydn6wsslz0my01qd9by8ipk3f3776531"; + aarch64-linux = "1j4x4p4zz1ydvpzbbmxszyqv28qbl4v3hiwdj2f67f1jn1cv9l7z"; }; in diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 80750ab61be4..2cafa57586e1 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "1banaiqj4gdsg886kb7l1fxhmf33vxnwwha46397s7gwfxkvxz4n"; + sha256 = "047ivrp70kwsm4792ing8dvgh161cmayzy9ij6ww61fbkb4slr1i"; }; - cargoSha256 = "1cbx2jll0bj547dvwzjprzidndbqn1c4c6hmbfgjgdkxmmrpb0r1"; + cargoSha256 = "16rgg0fy50n0z0kal52iaxiqwhw4qpjvzyqwaldm29fq9c0105d1"; nativeBuildInputs = [ pkgconfig ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { description = "Very resource-friendly and feature-rich replacement for i3status"; homepage = https://github.com/greshake/i3status-rust; license = licenses.gpl3; - maintainers = with maintainers; [ backuitist globin ]; + maintainers = with maintainers; [ backuitist globin ma27 ]; platforms = platforms.linux; }; } |