diff options
Diffstat (limited to 'pkgs/applications')
30 files changed, 374 insertions, 315 deletions
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 2e63a3e8c7cda..9de70d83ee5ef 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, autoPatchelfHook, makeWrapper -, alsaLib, xorg +, alsaLib, xorg, libjack2 , gtk3, pango, gdk-pixbuf, cairo, glib, freetype , libpulseaudio, xdg_utils }: stdenv.mkDerivation rec { pname = "reaper"; - version = "5.987"; + version = "6.10"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "040k5inzj7mmi75fc6hr0ym18y5xss1675bl5rmhn4sq535m289k"; + sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { rm $out/opt/REAPER/uninstall-reaper.sh wrapProgram $out/opt/REAPER/reaper \ - --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpulseaudio libjack2 ]}" mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 33a321329341f..695a13eecabdd 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let - version = "3.32.0"; + version = "3.36.0"; pname = "gnome-latex"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jdca9yhm7mm1aijd1a5amphgn15142kngky3id2am379ixrq1hg"; + sha256 = "1869kr1zhcp04mzbi67lwgk497w840dbbc7427i9yh9b9s7j6mqn"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 9981e8a439ee3..d72d52f3c2ff3 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1ldvscxfvwpsir8vr1ca9ra0841m6xy331ys31dngcp77nwncjqc"; + sha256 = "1s8i82963fdx5q4wgh0cn211h0p1r1mzyss0g99bplp8d9ll40kw"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 3a8aea913cafd..ec4d71a0dce8e 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "1rrhll1i5ibxdchpdifajvsm697pilf82rbq7arn4f4pw5izrhy6"; + sha256 = "0indvycj972wng979mvia8mrb7bwdfay7wxq3lnj05qyxqafj5h2"; }; subPackages = [ "cmd/cheat" ]; @@ -17,6 +17,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' + installManPage doc/cheat.1 installShellCompletion scripts/cheat.{bash,fish,zsh} ''; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index bfa6f2ea8555b..c5083f2379c6d 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "0cskxy3xsy187in5vg8xcs3kwcx2s160qv009v0ahkcalp29ghz4"; + sha256 = "0pqnn52nn22k49f5cw4jcr8vcbff28n56i8fizg1mmfshy8pn891"; }; # dbus-1.pc has datadir=/etc diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 1515b4b0f99d3..0c2abbd9f588c 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -2,7 +2,7 @@ , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null -, bazaarSupport ? false, bazaar ? null +, bazaarSupport ? false, breezy ? null , cvsSupport ? false, cvs ? null, cvsps ? null , subversionSupport ? false, subversion ? null , mercurialSupport ? false, mercurial ? null @@ -12,7 +12,7 @@ assert docutilsSupport -> (python != null && docutils != null); assert gitSupport -> (git != null); assert monotoneSupport -> (monotone != null); -assert bazaarSupport -> (bazaar != null); +assert bazaarSupport -> (breezy != null); assert cvsSupport -> (cvs != null && cvsps != null && perlPackages.Filechdir != null); assert subversionSupport -> (subversion != null); assert mercurialSupport -> (mercurial != null); @@ -39,7 +39,7 @@ stdenv.mkDerivation { ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] - ++ lib.optionals bazaarSupport [bazaar] + ++ lib.optionals bazaarSupport [breezy] ++ lib.optionals cvsSupport [cvs cvsps perlPackages.Filechdir] ++ lib.optionals subversionSupport [subversion] ++ lib.optionals mercurialSupport [mercurial]; @@ -64,7 +64,7 @@ stdenv.mkDerivation { wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''} ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''} - ${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''} + ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''} diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index 0753045cc4be7..17c5ec9be2657 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, qt5, zlib, libGLU, libX11 }: +{ lib, stdenv, mkDerivation, fetchgit, zlib, libGLU, libX11, qtbase, qtwebkit, qtserialport, wrapQtAppsHook }: let name = "sleepyhead-${version}"; version = "1.0.0-beta-git"; -in stdenv.mkDerivation { +in mkDerivation { inherit name; src = fetchgit { @@ -13,21 +13,30 @@ in stdenv.mkDerivation { }; buildInputs = [ - qt5.qtbase qt5.qtwebkit qt5.qtserialport + qtbase qtwebkit qtserialport zlib libGLU libX11 ]; + nativeBuildInputs = [ wrapQtAppsHook ]; + patchPhase = '' patchShebangs configure ''; - - installPhase = '' + + installPhase = if stdenv.isDarwin then '' + mkdir -p $out/Applications + cp -r sleepyhead/SleepyHead.app $out/Applications + '' else '' mkdir -p $out/bin cp sleepyhead/SleepyHead $out/bin ''; + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + wrapQtApp "$out/Applications/SleepyHead.app/Contents/MacOS/SleepyHead" + ''; + meta = with stdenv.lib; { homepage = "https://sleepyhead.jedimark.net/"; description = "Review and explore data produced by CPAP and related machines"; @@ -37,7 +46,6 @@ in stdenv.mkDerivation { license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.krav ]; - broken = true; }; } diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix new file mode 100644 index 0000000000000..28c1be4219d68 --- /dev/null +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, systemd }: + +stdenv.mkDerivation rec { + pname = "systembus-notify"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "rfjakob"; + repo = "systembus-notify"; + rev = "v${version}"; + sha256 = "11zq84qfmbyl51d3r6294l2bjhlgwa9bx7d263g9fkqrwsg0si0y"; + }; + + buildInputs = [ systemd ]; + + installPhase = '' + runHook preInstall + install -Dm755 systembus-notify -t $out/bin + install -Dm644 systembus-notify.desktop -t $out/etc/xdg/autostart + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "System bus notification daemon"; + homepage = "https://github.com/rfjakob/systembus-notify"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; []; + }; +} diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 18a9bc0f42254..39ad9ef1d15fa 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "calls"; rev = "v${version}"; - sha256 = "0715cap3w8gppxlfaynhiqvc2ss512xgykjcpqq8f5syz2776skh"; + sha256 = "1wqkczl1fn4d2py00fsb6kh05avmc7c49gi49j3592fqsvi87j18"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 16cf7f5fc7791..f003bbec222f9 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "ripcord"; - version = "0.4.24"; + version = "0.4.25"; src = let appimage = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "0rscmnwxvbdl0vfx1pz7x5gxs9qsjk905zmcad4f330j5l5m227z"; + sha256 = "17s4fxqirmzdw0sn9s9zyk90gr00ivsmz4s6i6knsq354zhy5fda"; name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index fc5214f0d01fd..700ad011dff33 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lieer"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "gauteh"; repo = "lieer"; rev = "v${version}"; - sha256 = "19jx3sm925nrzl26km1bxbp6y5gk1mzwadd79vip2jl70b3xk9f8"; + sha256 = "0qp8sycclzagkiszqk1pw2fr8s8s195bzy8r27dj7f5zx350nxk5"; }; propagatedBuildInputs = with python3Packages; [ @@ -30,6 +30,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://lieer.gaute.vetsj.com/"; repositories.git = "https://github.com/gauteh/lieer.git"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kaiha ]; + maintainers = with maintainers; [ flokli kaiha ]; }; } diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 0e80e1397faf9..d59cdff34fd99 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,47 +1,81 @@ -{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook -, openssl, curl, libevent, inotify-tools, systemd, zlib -, enableGTK3 ? false, gtk3 +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkgconfig +, openssl +, curl +, libevent +, inotify-tools +, systemd +, zlib +, pcre + # Build options +, enableGTK3 ? false +, gnome3 +, xorg +, wrapGAppsHook +, enableQt ? false +, qt5 , enableSystemd ? stdenv.isLinux , enableDaemon ? true , enableCli ? true }: -let inherit (stdenv.lib) optional optionals optionalString; in +let + version = "3.00"; -stdenv.mkDerivation rec { - name = "transmission-" + optionalString enableGTK3 "gtk-" + version; - version = "2.94"; +in stdenv.mkDerivation { + pname = "transmission"; + inherit version; - src = fetchurl { - url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz"; - sha256 = "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m"; + src = fetchFromGitHub { + owner = "transmission"; + repo = "transmission"; + rev = version; + sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z"; + fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ] - ++ optionals enableGTK3 [ wrapGAppsHook ]; - buildInputs = [ intltool file openssl curl libevent zlib ] - ++ optionals enableGTK3 [ gtk3 ] - ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ]; - - postPatch = '' - substituteInPlace ./configure \ - --replace "libsystemd-daemon" "libsystemd" \ - --replace "/usr/bin/file" "${file}/bin/file" \ - --replace "test ! -d /Developer/SDKs/MacOSX10.5.sdk" "false" - ''; - - configureFlags = [ - ("--enable-cli=" + (if enableCli then "yes" else "no")) - ("--enable-daemon=" + (if enableDaemon then "yes" else "no")) - "--disable-mac" # requires xcodebuild - ] - ++ optional enableSystemd "--with-systemd-daemon" - ++ optional enableGTK3 "--with-gtk"; - - NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; - - meta = with stdenv.lib; { + cmakeFlags = + let + mkFlag = opt: if opt then "ON" else "OFF"; + in + [ + "-DENABLE_MAC=OFF" # requires xcodebuild + "-DENABLE_GTK=${mkFlag enableGTK3}" + "-DENABLE_QT=${mkFlag enableQt}" + "-DENABLE_DAEMON=${mkFlag enableDaemon}" + "-DENABLE_CLI=${mkFlag enableCli}" + ]; + + nativeBuildInputs = [ + pkgconfig + cmake + ] + ++ lib.optionals enableGTK3 [ wrapGAppsHook ] + ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] + ; + + buildInputs = [ + openssl + curl + libevent + zlib + pcre + ] + ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] + ++ lib.optionals enableGTK3 [ gnome3.gtk xorg.libpthreadstubs ] + ++ lib.optionals enableSystemd [ systemd ] + ++ lib.optionals stdenv.isLinux [ inotify-tools ] + ; + + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + + # Reduce the risk of collisions + postInstall = "rm -r $out/share/doc"; + + meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' Transmission is a BitTorrent client which features a simple interface @@ -55,9 +89,9 @@ stdenv.mkDerivation rec { * Full encryption, DHT, and PEX support ''; homepage = "http://www.transmissionbt.com/"; - license = licenses.gpl2; # parts are under MIT - maintainers = with maintainers; [ astsmtl vcunat wizeman ]; - platforms = platforms.unix; + license = lib.licenses.gpl2; # parts are under MIT + maintainers = with lib.maintainers; [ astsmtl vcunat wizeman ]; + platforms = lib.platforms.unix; }; -} +} diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 5c536b8aec232..b48edd69837a5 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "0fj13pim5bfm3a2nr05apspraf29klpmcnhmycklfmrlncq5xqdf"; + sha256 = "1dx5l48m4634y0zi6wjky412g80lfxqq1nphv7pi1kwvm1k5m5ri"; }; buildInputs = [ diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 67618e0e4f991..40351ba64a18f 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.46"; + version = "1.12.47"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "9fdc67377af52dfe69a7db4f533938024a75f454fc5d25ab43b8e6739be0b5e1"; + sha256 = "1khrf72kiq50y8b5prbj2207k9shn36h2b2i588cc4wa28s9y5a0"; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index ed077b039087e..2f5943dfa9b5a 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.13.1"; + version = "3.14.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1ak5l40h5yjlbzz92l724l6bm5q341cg6k1yk13sbwn42l8szsar"; + sha256 = "1dlzap3j26rh93ick1lqb7g3jkqjpd33gl4gqfcbx22v62258y5b"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 741330e4ad292..63a727f9c88ab 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.16.0"; + version = "5.17.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0jlf3y8b1gdv5xz37yk9b5g2b65zkk45p15x0ypvd2blpzy80537"; + sha256 = "0y652i3saqq2z61yvk0i6q3lnq2xfrygcxms5gygspj71q2n4f7k"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch b/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch deleted file mode 100644 index a34ab0c6eb10b..0000000000000 --- a/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff --git a/bzrlib/tests/test_ssh_transport.py b/bzrlib/tests/test_ssh_transport.py -index 9e37c3b..fe9f219 100644 ---- a/bzrlib/tests/test_ssh_transport.py -+++ b/bzrlib/tests/test_ssh_transport.py -@@ -22,6 +22,7 @@ from bzrlib.transport.ssh import ( - SSHCorpSubprocessVendor, - LSHSubprocessVendor, - SSHVendorManager, -+ StrangeHostname, - ) - - -@@ -161,6 +162,19 @@ class SSHVendorManagerTests(TestCase): - - class SubprocessVendorsTests(TestCase): - -+ def test_openssh_command_tricked(self): -+ vendor = OpenSSHSubprocessVendor() -+ self.assertEqual( -+ vendor._get_vendor_specific_argv( -+ "user", "-oProxyCommand=blah", 100, command=["bzr"]), -+ ["ssh", "-oForwardX11=no", "-oForwardAgent=no", -+ "-oClearAllForwardings=yes", -+ "-oNoHostAuthenticationForLocalhost=yes", -+ "-p", "100", -+ "-l", "user", -+ "--", -+ "-oProxyCommand=blah", "bzr"]) -+ - def test_openssh_command_arguments(self): - vendor = OpenSSHSubprocessVendor() - self.assertEqual( -@@ -171,6 +185,7 @@ class SubprocessVendorsTests(TestCase): - "-oNoHostAuthenticationForLocalhost=yes", - "-p", "100", - "-l", "user", -+ "--", - "host", "bzr"] - ) - -@@ -184,9 +199,16 @@ class SubprocessVendorsTests(TestCase): - "-oNoHostAuthenticationForLocalhost=yes", - "-p", "100", - "-l", "user", -- "-s", "host", "sftp"] -+ "-s", "--", "host", "sftp"] - ) - -+ def test_openssh_command_tricked(self): -+ vendor = SSHCorpSubprocessVendor() -+ self.assertRaises( -+ StrangeHostname, -+ vendor._get_vendor_specific_argv, -+ "user", "-oProxyCommand=host", 100, command=["bzr"]) -+ - def test_sshcorp_command_arguments(self): - vendor = SSHCorpSubprocessVendor() - self.assertEqual( -@@ -209,6 +231,13 @@ class SubprocessVendorsTests(TestCase): - "-s", "sftp", "host"] - ) - -+ def test_lsh_command_tricked(self): -+ vendor = LSHSubprocessVendor() -+ self.assertRaises( -+ StrangeHostname, -+ vendor._get_vendor_specific_argv, -+ "user", "-oProxyCommand=host", 100, command=["bzr"]) -+ - def test_lsh_command_arguments(self): - vendor = LSHSubprocessVendor() - self.assertEqual( -@@ -231,6 +260,13 @@ class SubprocessVendorsTests(TestCase): - "--subsystem", "sftp", "host"] - ) - -+ def test_plink_command_tricked(self): -+ vendor = PLinkSubprocessVendor() -+ self.assertRaises( -+ StrangeHostname, -+ vendor._get_vendor_specific_argv, -+ "user", "-oProxyCommand=host", 100, command=["bzr"]) -+ - def test_plink_command_arguments(self): - vendor = PLinkSubprocessVendor() - self.assertEqual( -diff --git a/bzrlib/transport/ssh.py b/bzrlib/transport/ssh.py -index eecaa26..6f22341 100644 ---- a/bzrlib/transport/ssh.py -+++ b/bzrlib/transport/ssh.py -@@ -46,6 +46,10 @@ else: - from paramiko.sftp_client import SFTPClient - - -+class StrangeHostname(errors.BzrError): -+ _fmt = "Refusing to connect to strange SSH hostname %(hostname)s" -+ -+ - SYSTEM_HOSTKEYS = {} - BZR_HOSTKEYS = {} - -@@ -360,6 +364,11 @@ class SubprocessVendor(SSHVendor): - # tests, but beware of using PIPE which may hang due to not being read. - _stderr_target = None - -+ @staticmethod -+ def _check_hostname(arg): -+ if arg.startswith('-'): -+ raise StrangeHostname(hostname=arg) -+ - def _connect(self, argv): - # Attempt to make a socketpair to use as stdin/stdout for the SSH - # subprocess. We prefer sockets to pipes because they support -@@ -424,9 +433,9 @@ class OpenSSHSubprocessVendor(SubprocessVendor): - if username is not None: - args.extend(['-l', username]) - if subsystem is not None: -- args.extend(['-s', host, subsystem]) -+ args.extend(['-s', '--', host, subsystem]) - else: -- args.extend([host] + command) -+ args.extend(['--', host] + command) - return args - - register_ssh_vendor('openssh', OpenSSHSubprocessVendor()) -@@ -439,6 +448,7 @@ class SSHCorpSubprocessVendor(SubprocessVendor): - - def _get_vendor_specific_argv(self, username, host, port, subsystem=None, - command=None): -+ self._check_hostname(host) - args = [self.executable_path, '-x'] - if port is not None: - args.extend(['-p', str(port)]) -@@ -460,6 +470,7 @@ class LSHSubprocessVendor(SubprocessVendor): - - def _get_vendor_specific_argv(self, username, host, port, subsystem=None, - command=None): -+ self._check_hostname(host) - args = [self.executable_path] - if port is not None: - args.extend(['-p', str(port)]) -@@ -481,6 +492,7 @@ class PLinkSubprocessVendor(SubprocessVendor): - - def _get_vendor_specific_argv(self, username, host, port, subsystem=None, - command=None): -+ self._check_hostname(host) - args = [self.executable_path, '-x', '-a', '-ssh', '-2', '-batch'] - if port is not None: - args.extend(['-P', str(port)]) diff --git a/pkgs/applications/version-management/bazaar/add_certificates.patch b/pkgs/applications/version-management/bazaar/add_certificates.patch deleted file mode 100644 index 18fac36daec5f..0000000000000 --- a/pkgs/applications/version-management/bazaar/add_certificates.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru orig/bzrlib/transport/http/_urllib2_wrappers.py bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py ---- orig/bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py 2016-02-01 20:49:17.000000000 +0100 -+++ bzr-2.7.0/bzrlib/transport/http/_urllib2_wrappers.py 2016-06-18 23:15:21.089511349 +0200 -@@ -95,6 +95,7 @@ - u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD - # XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25 - u'/etc/openssl/certs/ca-certificates.crt', # Solaris -+ u'@certPath@', - ] - - diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix deleted file mode 100644 index fa0009d3ef03b..0000000000000 --- a/pkgs/applications/version-management/bazaar/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, python2Packages -, withSFTP ? true - }: - -python2Packages.buildPythonApplication rec { - version = "2.7"; - release = ".0"; - name = "bazaar-${version}${release}"; - - src = fetchurl { - url = "https://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; - sha256 = "1cysix5k3wa6y7jjck3ckq3abls4gvz570s0v0hxv805nwki4i8d"; - }; - - doCheck = false; - - propagatedBuildInputs = [] - ++ stdenv.lib.optionals withSFTP [ python2Packages.paramiko ]; - - patches = [ - # Bazaar can't find the certificates alone - ./add_certificates.patch - ./CVE-2017-14176.patch - ]; - postPatch = '' - substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ - --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt - ''; - - meta = with stdenv.lib; { - homepage = "http://bazaar-vcs.org/"; - description = "A distributed version control system that Just Works"; - platforms = platforms.unix; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix deleted file mode 100644 index d76260ad4be7e..0000000000000 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, python2Packages }: - -python2Packages.buildPythonApplication rec { - pname = "bzr-tools"; - version = "2.6.0"; - - src = fetchurl { - url = "https://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; - sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb"; - }; - - doCheck = false; - - meta = with stdenv.lib; { - description = "Bazaar plugins"; - homepage = "http://wiki.bazaar.canonical.com/BzrTools"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 68c4e72e53192..ae1929565b6ef 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, makeWrapper , python2Packages -, cvs, subversion, git, bazaar +, cvs, subversion, git, breezy }: python2Packages.buildPythonApplication rec { @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ makeWrapper ]; - checkInputs = [ subversion git bazaar ]; + checkInputs = [ subversion git breezy ]; checkPhase = "python run-tests.py"; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c591ef554ee42..9c0e0d74d2215 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -171,6 +171,8 @@ let gitflow = callPackage ./gitflow { }; + gitin = callPackage ./gitin { }; + gitstatus = callPackage ./gitstatus { }; gitui = callPackage ./gitui { diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix new file mode 100644 index 0000000000000..5964af6c0f0cf --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildGoPackage +, fetchFromGitHub +, pkgconfig +, libgit2_0_27 +}: + +buildGoPackage rec { + version = "0.2.3"; + pname = "gitin"; + + goPackagePath = "github.com/isacikgoz/gitin"; + + src = fetchFromGitHub { + owner = "isacikgoz"; + repo = "gitin"; + rev = "v${version}"; + sha256 = "00z6i0bjk3hdxbc0cy12ss75b41yvzyl5pm6rdrvsjhzavry2fa3"; + }; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libgit2_0_27 ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/isacikgoz/gitin"; + description = "Text-based user interface for git"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = with maintainers; [ kimat ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gitin/deps.nix b/pkgs/applications/version-management/git-and-tools/gitin/deps.nix new file mode 100644 index 0000000000000..908665693b81d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitin/deps.nix @@ -0,0 +1,121 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; + sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "daf2830f2741ebb735b21709a520c5f37d642d85"; + sha256 = "086z8ssmr1fn9ba4mqnw7pnccfpys6l5yfhvycv1gdrsk7n27mvs"; + }; + } + { + goPackagePath = "github.com/isacikgoz/gia"; + fetch = { + type = "git"; + url = "https://github.com/isacikgoz/gia"; + rev = "00556493579ec25f4e199b85ee1e2a73c98d15bb"; + sha256 = "16nqi4z1pgybcw05wbp3qnbbq407smcr56hq7npnhkirngc5j822"; + }; + } + { + goPackagePath = "github.com/jroimartin/gocui"; + fetch = { + type = "git"; + url = "https://github.com/jroimartin/gocui"; + rev = "c055c87ae801372cd74a0839b972db4f7697ae5f"; + sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; + }; + } + { + goPackagePath = "github.com/justincampbell/timeago"; + fetch = { + type = "git"; + url = "https://github.com/justincampbell/timeago"; + rev = "027f40306f1dbe89d24087611680ef95543bf876"; + sha256 = "1p3va1cn9x5pyvq7k64mnvbxp5zy7h9z49syjyglixgg6avdbp1v"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/envconfig"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/envconfig"; + rev = "0b417c4ec4a8a82eecc22a1459a504aa55163d61"; + sha256 = "1a7b35njpqz94gbd7wvsl3wjzpd5y1fj1lrg2sdh00yq0nax1qj9"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "14e809f6d78fcf9f48ff9b70981472b64c05f754"; + sha256 = "1mvlxcdwr0vwp8b2wqs6y7hk72y28sqh03dz5x0xkg48d4y9cplj"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "38ba6e5628f1d70bac606cfd210b9ad1a16c3027"; + sha256 = "03xx5vbnavklsk6wykcc7qhmhvn2074sx0ql06b51vqsxwsa6zw2"; + }; + } + { + goPackagePath = "github.com/sahilm/fuzzy"; + fetch = { + type = "git"; + url = "https://github.com/sahilm/fuzzy"; + rev = "d88f8cb825ddd46a2ce86b60382e11645220ee33"; + sha256 = "0nl4l02s3961p11aj1vgajfy28rqlya2z6af2xjncra59gfhqvlq"; + }; + } + { + goPackagePath = "github.com/waigani/diffparser"; + fetch = { + type = "git"; + url = "https://github.com/waigani/diffparser"; + rev = "7391f219313d9175703f67561b222fd2a81bca30"; + sha256 = "0h3y3ivlghdvkyqsh5lcidqdajhc9g7m1xqm73j9a0ayby0sx1ql"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/libgit2/git2go.v27"; + fetch = { + type = "git"; + url = "https://gopkg.in/libgit2/git2go.v27"; + rev = "6cc7d3dc6aec2781fe0239315da215f49c76e2f8"; + sha256 = "0b2m4rjadngyd675bi1k21pyi9r91dsxngzd4mikacpd7yshgvaq"; + }; + } +] + diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 7c84acc8f05f6..298897d67017b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby, - bundlerEnv, pkgconfig, libgit2 }: + bundlerEnv, pkgconfig, libgit2_0_27 }: let rubyEnv = bundlerEnv rec { @@ -18,15 +18,6 @@ let }; }; }; - libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec { - version = "0.27.8"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9"; - }; - }); in buildGoPackage rec { version = "12.8.10"; pname = "gitaly"; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index fb5b72be4eb80..f52fd30d8391f 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, python27Packages, git , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy -, bazaar ? null, cvs ? null, darcs ? null, fossil ? null +, breezy ? null, cvs ? null, darcs ? null, fossil ? null , mercurial ? null, monotone ? null, rcs ? null , subversion ? null, cvs_fast_export ? null }: @@ -42,7 +42,7 @@ in mkDerivation rec { let binpath = makeBinPath ( filter (x: x != null) - [ out git bazaar cvs darcs fossil mercurial + [ out git breezy cvs darcs fossil mercurial monotone rcs src subversion cvs_fast_export ] ); pythonpath = makeSearchPathOutput "lib" python.sitePackages ( diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix new file mode 100644 index 0000000000000..1578eaf4f585c --- /dev/null +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -0,0 +1,53 @@ +{ cri-o-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, cri-o +, runc # Default container runtime +, crun # Container runtime (default with cgroups v2 for podman/buildah) +, conmon # Container runtime monitor +, utillinux # nsenter +, cni-plugins # not added to path +, iptables +, socat +}: + +let + cri-o = cri-o-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + utillinux + iptables + socat + ] ++ extraPackages); + +in runCommand cri-o.name { + name = "${cri-o.pname}-wrapper-${cri-o.version}"; + inherit (cri-o) pname version; + + meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + ln -s ${cri-o.man} $man + + mkdir -p $out/bin + ln -s ${cri-o-unwrapped}/share $out/share + + for p in ${cri-o-unwrapped}/bin/*; do + makeWrapper $p $out/bin/''${p##*/} \ + --prefix PATH : ${binPath} + done +'' diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index d7fb6fa1072fa..d97d182496a4e 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -5,12 +5,12 @@ , extraPackages ? [] , podman # Docker compat , runc # Default container runtime -, crun # Default container runtime (cgroups v2) +, crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor , slirp4netns # User-mode networking for unprivileged namespaces , fuse-overlayfs # CoW for images, much faster than default vfs , utillinux # nsenter -, cni-plugins +, cni-plugins # not added to path , iptables }: diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index d770308239f82..800d601c76e64 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, meson, ninja, fetchFromGitHub }: stdenv.mkDerivation { - name = "qboot-20170330"; + name = "qboot-20200423"; src = fetchFromGitHub { owner = "bonzini"; repo = "qboot"; - rev = "ac9488f26528394856b94bda0797f5bd9c69a26a"; - sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy"; + rev = "de50b5931c08f5fba7039ddccfb249a5b3b0b18d"; + sha256 = "1d0h29zz535m0pq18k3aya93q7lqm2858mlcp8mlfkbq54n8c5d8"; }; + nativeBuildInputs = [ meson ninja ]; + installPhase = '' mkdir -p $out - cp bios.bin* $out/. + cp bios.bin bios.bin.elf $out/. ''; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index ad5f73ab17394..8ea724aa694a9 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "7.5"; + version = "8"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "1l48fxl04vkzr4r94sl37nbbw7a621rn8sxmkbdv4252i1gjxd4z"; + sha256 = "04svbv7v73q8yn9la69451rda6l2pgxcphv2zlkdqaxxdbp69195"; fetchSubmodules = true; }; |