diff options
Diffstat (limited to 'pkgs/applications')
50 files changed, 765 insertions, 218 deletions
diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix new file mode 100644 index 00000000000..6bb21b5edaa --- /dev/null +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "ashuffle"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "joshkunz"; + repo = "ashuffle"; + rev = "v${version}"; + sha256 = "09q6lwgc1dc8bg1mb9js9qz3xcsxph3548nxzvyb4v8111gixrp7"; + fetchSubmodules = true; + }; + + dontUseCmakeConfigure = true; + nativeBuildInputs = [ cmake pkg-config meson ninja ]; + buildInputs = [ mpd_clientlib ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/joshkunz/ashuffle"; + description = "Automatic library-wide shuffle for mpd"; + maintainers = [ maintainers.tcbravo ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 4b426609fea..944a2d189d7 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. - version = "6.13.0"; + version = "6.14.0"; enableParallelBuilding = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh"; + sha256 = "1sr9knfhbm2m0wpkjq2l5n471vnl51wy4p6j4m95zqybimzb4s2j"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 60040119d64..1db5644fc32 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.26"; + version = "1.28"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv"; + sha256 = "1hbcl89cpx9bsafxrjyfx6vrbs4h3lnzmqm12smcvdg8ksfgzj0d"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/applications/audio/lv2-cpp-tools/default.nix new file mode 100644 index 00000000000..d98135fb014 --- /dev/null +++ b/pkgs/applications/audio/lv2-cpp-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }: + +stdenv.mkDerivation rec { + pname = "lv2-cpp-tools"; + version = "1.0.5"; + + src = fetchzip { + url = "http://deb.debian.org/debian/pool/main/l/lv2-c++-tools/lv2-c++-tools_${version}.orig.tar.bz2"; + sha256 = "039bq7d7s2bhfcnlsfq0mqxr9a9iqwg5bwcpxfi24c6yl6krydsi"; + }; + + preConfigure = '' + sed -r 's,/bin/bash,${stdenv.shell},g' -i ./configure + sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template + ''; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 gtkmm2 boost ]; + + meta = with stdenv.lib; { + homepage = "http://ll-plugins.nongnu.org/hacking.html"; + description = "Tools and libraries that may come in handy when writing LV2 plugins in C++"; + license = licenses.gpl3; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 9bc8fcb6694..76ea4efeace 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-20.2"; + name = "snd-20.3"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0ip4sfyxqlbghlggipmvvqjqs1a7qas0zcmzw8d1nwg6krjkfj0r"; + sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/applications/audio/talentedhack/default.nix new file mode 100644 index 00000000000..b30cf59f7b3 --- /dev/null +++ b/pkgs/applications/audio/talentedhack/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "talentedhack"; + version = "1.86"; + + src = fetchFromGitHub { + owner = "jeremysalwen"; + repo = "talentedhack"; + rev = "v${version}"; + sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 fftwFloat ]; + + # To avoid name clashes, plugins should be compiled with symbols hidden, except for `lv2_descriptor`: + preConfigure = '' + sed -r 's/^CFLAGS.*$/\0 -fvisibility=hidden/' -i Makefile + ''; + + installPhase = '' + d=$out/lib/lv2/talentedhack.lv2 + mkdir -p $d + cp *.so *.ttl $d + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jeremysalwen/TalentedHack"; + description = "LV2 port of Autotalent pitch correction plugin"; + license = licenses.gpl3; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix new file mode 100644 index 00000000000..24e112aff2b --- /dev/null +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, fetchzip +, libX11 +, libXi +, libGL +, alsaLib +, SDL2 +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "virtual-ans"; + version = "3.0.2c"; + + src = fetchzip { + url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip"; + sha256 = "03r1v3l7rd59dakr7ndvgsqchv00ppkvi6sslgf1ng07r3rsvb1n"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + libX11 + libXi + libGL + alsaLib + SDL2 + ]; + + installPhase = '' + mkdir -p $out + cp -R ./* $out/ + + # Remove all executables except for current architecture + ls -1d $out/START* | grep -v ${startScript} | xargs rm -rf + ls -1d $out/bin/pixilang_linux* | grep -v ${linuxExecutable} | xargs rm -rf + + # Start script performs relative search for resources, so it cannot be moved + # to bin directory + ln -s $out/${startScript} $out/bin/virtual-ans + ''; + + startScript = if stdenv.isx86_32 then "START_LINUX_X86" + else if stdenv.isx86_64 then "START_LINUX_X86_64" + #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin + else abort "Unsupported platform: ${stdenv.platform.kernelArch}."; + + linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86" + else if stdenv.isx86_64 then "pixilang_linux_x86_64" + else ""; + + meta = with stdenv.lib; { + description = "Photoelectronic microtonal/spectral musical instrument"; + longDescription = '' + Virtual ANS is a software simulator of the unique Russian synthesizer ANS + - photoelectronic musical instrument created by Evgeny Murzin from 1938 to + 1958. The ANS made it possible to draw music in the form of a spectrogram + (sonogram), without live instruments and performers. It was used by + Stanislav Kreichi, Alfred Schnittke, Edward Artemiev and other Soviet + composers in their experimental works. You can also hear the sound of the + ANS in Andrei Tarkovsky's movies Solaris, The Mirror, Stalker. + + The simulator extends the capabilities of the original instrument. Now + it's a full-featured graphics editor where you can convert sound into an + image, load and play pictures, draw microtonal/spectral music and create + some unusual deep atmospheric sounds. This app is for everyone who loves + experiments and is looking for something new. + + Key features: + + + unlimited number of pure tone generators; + + powerful sonogram editor - you can draw the spectrum and play it at the same time; + + any sound (from a WAV file or a Microphone/Line-in) can be converted to image (sonogram) and vice versa; + + support for MIDI devices; + + polyphonic synth mode with MIDI mapping; + + supported file formats: WAV, AIFF, PNG, JPEG, GIF; + + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA. + ''; + homepage = "https://warmplace.ru/soft/ans/"; + license = licenses.free; + # I cannot test the Darwin version, so I'll leave it disabled + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ jacg ]; + }; + +} diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix new file mode 100644 index 00000000000..ddaa5b790e2 --- /dev/null +++ b/pkgs/applications/audio/vocproc/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: + +stdenv.mkDerivation rec { + pname = "vocproc"; + version = "0.2.1"; + + src = fetchzip { + url = "https://hyperglitch.com/files/vocproc/${pname}-${version}.default.tar.gz"; + sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ]; + + makeFlags = [ + "INSTALL_DIR=$(out)/lib/lv2" + ]; + + meta = with stdenv.lib; { + homepage = "https://hyperglitch.com/dev/VocProc"; + description = "An LV2 plugin for pitch shifting (with or without formant correction), vocoding, automatic pitch correction and harmonizing of singing voice (harmonizer)"; + license = licenses.gpl2; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 420e267aa82..1596ed2d357 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.12"; + version = "0.21.13"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1mad3aqfwrxi06135nf8hv13d67nilmxpx4dw5vjcy1zi3lljj1j"; + sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index cfd72db7f46..83a6cfaf05b 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1lja4ba6bm1jk0lh2ra5v8i5g3f1gy7mk2b3yrx1w7x02ll9gr06"; + sha256 = "1qr1vfb6mhm2hxl2ksydkhadm7phadn93lwm3f9zni01plk56bb5"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 569a9b17045..f1186564119 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -10,13 +10,13 @@ assert stdenv.isDarwin -> IOKit != null; stdenv.mkDerivation rec { pname = "monero"; - version = "0.16.0.1"; + version = "0.16.0.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0n2cviqm8radpynx70fc0819k1xknjc58cvb4whlc49ilyvh8ky6"; + sha256 = "1r9x3712vhb24dxxirfiwj5f9x0h4m7x0ngiiavf5983dfdlgz33"; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 25d9eaabef4..0bf0435d2fc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0rrs2v97xhlxyjvipss5dmk88j7b03kyszwyhy46755954nzm85j"; - x86_64-darwin = "1vmr78wf6cpib6j0f5gxs8683n27jk96lm4mwg6ji1np6b00m8nx"; + x86_64-linux = "1yar8j6h39gpnq4givxh5cvi336p56sgc8pg32j6sasqk6mxv02c"; + x86_64-darwin = "1d68xkqkd49z7v4y3230l2v77aw34d7jkdbgj0wnc04kv6n8wx88"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.0"; + version = "1.48.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index aa63bce7b53..edb55264354 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1zf2z6rbm18cib4crnn8r6ggx3cc2irwqjhbka2zmq38z7l3qv6c"; - x86_64-darwin = "1rgbr1q35q0q64kzap6g72nyvcp5wjmyzi8701536az7mxjfvjz4"; + x86_64-linux = "0f8p25963i7bbm2zxb4ra935maxk3sxims6j873wqwqnzn701diq"; + x86_64-darwin = "0k8ylcbiqvb0cnvbz3059rbyjqxmvig8zf7bfqgln1w591i411c4"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.0"; + version = "1.48.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix new file mode 100644 index 00000000000..96823441b6e --- /dev/null +++ b/pkgs/applications/graphics/qosmic/default.nix @@ -0,0 +1,70 @@ +{ mkDerivation +, fetchFromGitHub +, fetchpatch +, qmake +, wrapQtAppsHook +, qtbase +, pkg-config +, lua +, flam3 +, libxml2 +, libpng +, libjpeg +, lib +}: + +mkDerivation rec { + pname = "qosmic"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "bitsed"; + repo = "qosmic"; + rev = "v${version}"; + sha256 = "13nw1mkdib14430r21mj352v62vi546vf184vyhxm7yjjygyra1w"; + }; + + patches = [ + # Allow overriding PREFIX (to install to $out, + # written while creating this derivation) + # https://github.com/bitsed/qosmic/pull/39 + (fetchpatch { + name = "allow-overriding-PREFIX.patch"; + url = "https://github.com/bitsed/qosmic/commit/77fb3a577b0710efae2a1d9ed97c26ae16f3a5ba.patch"; + sha256 = "0v9hj9s78cb6bg8ca0wjkbr3c7ml1n51n8h4a70zpzzgzz7rli5b"; + }) + # Fix QButtonGroup include errors with Qt 5.11: + # Will be part of the next post-1.6.0 release + (fetchpatch { + name = "fix-class-QButtonGroup-include-errors-with-Qt-5.11.patch"; + url = "https://github.com/bitsed/qosmic/commit/3f6e1ea8d384a124dbc2d568171a4da798480752.patch"; + sha256 = "0bp6b759plkqs32nvfpkfvf3qqzc9716k3ycwnjvwabbvpg1xwbl"; + }) + ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; + + buildInputs = [ + qtbase + lua + flam3 + libxml2 + libpng + libjpeg + ]; + + qmakeFlags = [ + # Use pkg-config to correctly locate library paths + "-config" "link_pkgconfig" + ]; + + meta = with lib; { + description = "A cosmic recursive flame fractal editor"; + homepage = "https://github.com/bitsed/qosmic"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.raboof ]; + # It might be possible to make it work on OSX, + # but this has not been tested. + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix index eb8ecc34b8f..9366276ebf8 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -6,20 +6,19 @@ let pname = "runwayml"; - version = "0.10.20"; + version = "0.14.3"; name = "${pname}-${version}"; src = fetchurl { - url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage"; - sha256 = "1wi94xi8nrwfc4v2j1crlmwr0nxg95ffp5h4hxd84crvya8ibxgz"; - name="${pname}-${version}.AppImage"; + url = "https://runway-releases.s3.amazonaws.com/Runway-${version}.AppImage"; + sha256 = "1bx8j39wd2z6f32hdvmk9z77bivnizzdhn296kin2nnqgq6v6y93"; }; binary = appimageTools.wrapType2 { name = pname; inherit src; }; - # we only use this to extract the icon + # we only use this to extract the icon and desktop file appimage-contents = appimageTools.extractType2 { inherit name src; }; diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix new file mode 100644 index 00000000000..c3efed72cb0 --- /dev/null +++ b/pkgs/applications/misc/coolreader/default.nix @@ -0,0 +1,26 @@ +{ mkDerivation, fetchFromGitHub, cmake, pkg-config, lib, + qttools, fribidi, libunibreak }: + +mkDerivation rec { + pname = "coolreader"; + version = "3.2.45"; + + src = fetchFromGitHub { + owner = "buggins"; + repo = pname; + rev = "cr${version}"; + sha256 = "0nkk4d0j04yjwanjszq8h8hvx87rnwax2k6akm4bpjxwpcs4icws"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ qttools fribidi libunibreak ]; + + meta = with lib; { + homepage = "https://github.com/buggins/coolreader"; + description = "Cross platform open source e-book reader"; + license = licenses.gpl2Plus; # see https://github.com/buggins/coolreader/issues/80 + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/foot/default.nix b/pkgs/applications/misc/foot/default.nix new file mode 100644 index 00000000000..02909ee1f2f --- /dev/null +++ b/pkgs/applications/misc/foot/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit +, fcft, freetype, pixman, libxkbcommon, fontconfig, wayland +, meson, ninja, ncurses, scdoc, tllist, wayland-protocols, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "foot"; + version = "1.4.4"; + + src = fetchgit { + url = "https://codeberg.org/dnkl/foot.git"; + rev = "${version}"; + sha256 = "1cr4sz075v18clh8nlvgyxlbvfkhbsg0qrqgnclip5rwa24ry1lg"; + }; + + nativeBuildInputs = [ + meson ninja ncurses scdoc tllist wayland-protocols pkg-config + ]; + buildInputs = [ + fontconfig freetype pixman wayland libxkbcommon fcft + ]; + + # recommended build flags for foot as per INSTALL.md + # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#user-content-release-build + preConfigure = '' + export CFLAGS+="-O3 -fno-plt" + ''; + + mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; + + meta = with stdenv.lib; { + homepage = "https://codeberg.org/dnkl/foot/"; + description = "A fast, lightweight and minimalistic Wayland terminal emulator"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/imag/default.nix b/pkgs/applications/misc/imag/default.nix new file mode 100644 index 00000000000..bb6956aaa59 --- /dev/null +++ b/pkgs/applications/misc/imag/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, llvmPackages +, openssl +, pkg-config +, installShellFiles +, Security +, gitMinimal +, utillinuxMinimal +}: + +rustPlatform.buildRustPackage rec { + pname = "imag"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "matthiasbeyer"; + repo = pname; + rev = "v${version}"; + sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq"; + }; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + checkInputs = [ gitMinimal utillinuxMinimal ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + cargoSha256 = "0n8cw70qh8g4hfwfaxwwxbrrx5hm2z037z8kdhvdpqkxljl9189x"; + + checkPhase = '' + export HOME=$TMPDIR + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" + + # UI tests uses executables directly, so we need to build them before + # launching the tests + cargo build + '' + ( + # CLI uses the presence of a controlling TTY to check if arguments are + # passed in stdin, or in the command-line, so we use script to create + # a PTY for us. + if !stdenv.isDarwin then '' + script -qfec "cargo test --workspace" + '' else '' + script -q "cargo test --workspace" + '' + ); + + postInstall = '' + installShellCompletion target/imag.{bash,fish} --zsh target/_imag + ''; + + meta = with stdenv.lib; { + description = "Commandline personal information management suite"; + homepage = "https://imag-pim.org/"; + license = licenses.lgpl21; + maintainers = with maintainers; [ filalex77 minijackson ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 86ea1d6d504..f0131712b23 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -40,13 +40,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "0yi6kxnsrqirjn6hxhwym2krzf86qxf3kc6bfpkmiaggnd2kqpkp"; + sha256 = "0wgn0glmcxaa670bpxh7n7abjlxcx4h1rl1169cmah0ddxnxnxpq"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index f58fb13e61f..7c7906fc841 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -3,6 +3,8 @@ , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding , openssl, libssh2 #build-in ssh +, fcitx, ibus, uim #IME +, wrapGAppsHook #color picker in mlconfig }: stdenv.mkDerivation rec { @@ -14,10 +16,11 @@ stdenv.mkDerivation rec { sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf wrapGAppsHook ]; buildInputs = [ libX11 gdk-pixbuf.dev cairo libXft gtk3 vte harfbuzz fribidi m17n_lib openssl libssh2 + fcitx ibus uim ]; #bad configure.ac and Makefile.in everywhere diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index efd9cc4c021..c815a74e019 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.43.19"; + version = "0.44.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1rpkiyhy7z5zq0rmn0kj2kva57bnhkhvaplrlhfczv99h1kwsixg"; + sha256 = "1xlbhx6f1ysx8gka8g67271whzhkzsnkavpq3x58hdxr8v88khby"; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 837e30ee8f2..6b28b52dcf0 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,19 +1,21 @@ { stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }: let + version = "2.16.3.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; - url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "157yg4n5ppgnrd5wrz06qfx391vggp3wifla39rvcaaysvvisl8v"; + url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb"; + sha256 = "1374nmj6g6w24cv604kzac0v57gcl1pwpw0nxpr7kv2786x1aqg2"; } else fetchurl { name = "rescuetime-installer.deb"; - url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "17gjiwf0qbh1zbrxxsilnpg0qxy5kdpqxlnl28namp671rv0aic8"; + url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb"; + sha256 = "05qs6wbc3705z8w9c3n83m4j8xfmzm673lyh5j95x1ak5czkrphk"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.16.2.1"; + inherit version; + pname = "rescuetime"; inherit src; nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 6c55c3157f5..883b3eec03d 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.10.2"; + version = "0.10.11"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "1vfxn4gx5b138gj6nk4w3jlp2l56cqpb8hq2kn5mrf4dhjii8n88"; + sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix deleted file mode 100644 index dd1218282d8..00000000000 --- a/pkgs/applications/misc/super_user_spark/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, fetchgit, aeson, aeson-pretty, base, bytestring, directory -, filepath, hspec, hspec-core, HUnit, mtl, optparse-applicative -, parsec, process, pureMD5, QuickCheck, shelly, stdenv, text -, transformers, unix -}: -mkDerivation { - pname = "super-user-spark"; - version = "0.3.2.0-dev"; - src = fetchgit { - url = "https://github.com/NorfairKing/super-user-spark"; - sha256 = "0akyc51bghzkk8j75n0i8v8rrsklidwvljhx3aibxfbkqp33372g"; - rev = "ab8635682d67842b9e6d909cf3c618014e4157f2"; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath mtl - optparse-applicative parsec process pureMD5 shelly text - transformers unix - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - hspec-core HUnit mtl optparse-applicative parsec process pureMD5 - QuickCheck shelly text transformers unix - ]; - jailbreak = true; - description = "Configure your dotfile deployment with a DSL"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/NorfairKing/super-user-spark"; - maintainers = [ stdenv.lib.maintainers.badi ]; -} diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix deleted file mode 100644 index c8974c5c275..00000000000 --- a/pkgs/applications/misc/taskell/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, haskellPackages, fetchFromGitHub }: - -let - version = "1.10.0"; - sha256 = "102iwn6011rypdlx07fzbdll3r5cd204qf96lzwkadvjb7h8clil"; - -in (haskellPackages.mkDerivation { - pname = "taskell"; - inherit version; - - src = fetchFromGitHub { - owner = "smallhadroncollider"; - repo = "taskell"; - rev = version; - inherit sha256; - }; - - postPatch = ''${haskellPackages.hpack}/bin/hpack''; - - # basically justStaticExecutables; TODO: use justStaticExecutables - enableSharedExecutables = false; - enableLibraryProfiling = false; - isExecutable = true; - doHaddock = false; - postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - - # copied from packages.yaml - libraryHaskellDepends = with haskellPackages; [ - classy-prelude - # base <=5 - aeson - brick - # bytestring - config-ini - # containers - # directory - file-embed - fold-debounce - http-conduit - http-client - http-types - lens - raw-strings-qq - # mtl - # template-haskell - # text - time - vty - tz - ]; - - executableHaskellDepends = []; - - testHaskellDepends = with haskellPackages; [ - tasty - tasty-discover - tasty-expected-failure - tasty-hunit - ]; - - description = "Command-line Kanban board/task manager with support for Trello boards and GitHub projects"; - homepage = "https://taskell.app"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ matthiasbeyer ]; - platforms = [ "x86_64-linux" ]; -}) diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 69ec8fffaa1..4aeff6c9ec8 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; buildInputs = [ wayland gtk3 ]; + patches = [ + # https://todo.sr.ht/~scoopta/wofi/121 + ./do_not_follow_symlinks.patch + ]; + postInstall = '' installManPage man/wofi* ''; diff --git a/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch b/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch new file mode 100644 index 00000000000..f917c4c1685 --- /dev/null +++ b/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch @@ -0,0 +1,39 @@ +diff -r 3414ab984249 modes/run.c +--- a/modes/run.c Tue Aug 11 19:07:49 2020 -0700 ++++ b/modes/run.c Sat Aug 22 13:39:52 2020 +0200 +@@ -91,23 +91,10 @@ + + char* path = strdup(getenv("PATH")); + +- struct map* paths = map_init(); +- + char* save_ptr; + char* str = strtok_r(path, ":", &save_ptr); + do { + +- str = realpath(str, NULL); +- if(str == NULL) { +- continue; +- } +- if(map_contains(paths, str)) { +- free(str); +- continue; +- } +- +- map_put(paths, str, "true"); +- + DIR* dir = opendir(str); + if(dir == NULL) { + continue; +@@ -132,11 +119,9 @@ + } + free(full_path); + } +- free(str); + closedir(dir); + } while((str = strtok_r(NULL, ":", &save_ptr)) != NULL); + free(path); +- map_free(paths); + map_free(cached); + map_free(entries); + } diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index ca868a08077..a16beb65208 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script -, python3, gtk3, libsecret, gst_all_1, webkitgtk +, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook }: +, gobject-introspection, wrapGAppsHook, gnome3 }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; - version = "0.9.63"; + version = "0.9.99"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/eolie"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0z8gcfg7i842rr5p8r3vqa31kf7nnj1yv3afax3jzf4zbnhb8wm0"; + sha256 = "077jww5mqg6bbqbj0j1gss2j3dxlfr2xw8bc43k8vg52drqg6g8w"; }; nativeBuildInputs = [ @@ -33,18 +33,23 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer + gnome3.gnome-settings-daemon gtk3 gtkspell3 hunspell libsecret - webkitgtk + (webkitgtk.override {enableGLES = false;}) + glib ]; propagatedBuildInputs = with python3.pkgs; [ + pyfxa beautifulsoup4 + cryptography pycairo pygobject3 python-dateutil + pycrypto ]; postPatch = '' @@ -52,9 +57,11 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_post_install.py ''; + dontWrapGApps = true; preFixup = '' buildPythonPath "$out $propagatedBuildInputs" patchPythonScript "$out/libexec/eolie-sp" + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; passthru = { @@ -63,6 +70,7 @@ python3.pkgs.buildPythonApplication rec { }; }; + strictDeps = false; meta = with stdenv.lib; { description = "A new GNOME web browser"; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 8d711b6de2f..fa19c4efa9d 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -119,9 +119,13 @@ in stdenv.mkDerivation { --replace /opt $out/share \ --replace $out/share/google/$appname/google-$appname $exe - for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do + for icon_file in $out/share/google/chrome*/product_logo_[0-9]*.png; do num_and_suffix="''${icon_file##*logo_}" - icon_size="''${num_and_suffix%.*}" + if [ $dist = "stable" ]; then + icon_size="''${num_and_suffix%.*}" + else + icon_size="''${num_and_suffix%_*}" + fi logo_output_prefix="$out/share/icons/hicolor" logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" mkdir -p "$logo_output_path" diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 86d1b80d061..d3e18ce691f 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atlantis"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "1g1bh1v3yd3dz80ckjrhspmsf78nw8hc907hh9jzbq62psqg4459"; + sha256 = "0nb0dm4yn6f5pw7clgb2d1khcwcxiidqyc0sdh38wwqg0zyil0cz"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 865a892efb7..44e21de0a03 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "1l514rf7rg05prq9548ygj6z284sy85ddzrwiiqr74vz4kilg3vb"; + sha256 = "1a44lmrvi5f9jr04rblhcsg3zvqzvdp9wyw4m4h4scsqp5g7dfb7"; }; - vendorSha256 = "00qm45vfz4afj8f9hikrlk96w0rdzxqq2azhzrnzfymyiwc6jk5c"; + vendorSha256 = "1yzh6iglrzd43yqs1b6qh1i62b6qaz3232lgxyg3gmc81p0i5kr0"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 634fa22fe77..c370d122703 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,22 +2,18 @@ buildGoModule rec { pname = "kpt"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1pgv15zgv30dpv148bn6x0anv9q6x78y6ldmzarb9fbjpk6j0wxl"; + sha256 = "1lvfbpxxddm1pk4mb4sm0chw15dalsfyhgy86npz94xjf1jssyh8"; }; - vendorSha256 = "0l8xdnv2m6byd5dwvs3zgcj1lsci7ax4xvx178a8a78sgkqalvmq"; + vendorSha256 = "1xkjgzy9z7v5z4kl1769dgrrr0ljr0fdxfdj7xbic9hl6nm94kif"; - doCheck = false; - - postInstall = '' - rm $out/bin/{mdtogo,formula} - ''; + subPackages = [ "." ]; meta = with lib; { description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files"; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index decbdbd1fbc..0c1f452ea5b 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "3.0.0"; + version = "3.0.1"; k3sVersion = "1.18.6-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "1p4rqzi67cr8vf1ih7zqxkpssqq0vy4pb5crvkxbbf5ad5mwrjri"; + sha256 = "1l6mh0dpf2bw9sxpn14iivv3pr8mj4favzx2hhn8k1j71cm1w4rj"; }; buildFlagsArray = '' diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index 0835d268cd7..c6f9217b35b 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -1,22 +1,56 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ stdenv, fetchFromGitHub, buildGoPackage, bash, makeWrapper }: buildGoPackage rec { pname = "amazon-ssm-agent"; - version = "2.0.633.0"; + version = "2.3.1319.0"; goPackagePath = "github.com/aws/${pname}"; - subPackages = [ "agent" ]; + subPackages = [ + "agent" + "agent/framework/processor/executer/outofproc/worker" + "agent/framework/processor/executer/outofproc/worker" + "agent/framework/processor/executer/outofproc/sessionworker" + "agent/session/logging" + "agent/cli-main" + ]; + + buildInputs = [ makeWrapper ]; src = fetchFromGitHub { - rev = "v${version}"; + rev = version; owner = "aws"; repo = pname; - sha256 = "10arshfn2k3m3zzgw8b3xc6ywd0ss73746nq5srh2jir7mjzi4xv"; + sha256 = "1yiyhj7ckqa32b1rnbwn7zx89rsj00m5imn1xlpsw002ywxsxbnv"; }; preBuild = '' mv go/src/${goPackagePath}/vendor strange-vendor mv strange-vendor/src go/src/${goPackagePath}/vendor + + cd go/src/${goPackagePath} + echo ${version} > VERSION + + substituteInPlace agent/plugins/inventory/gatherers/application/dataProvider.go \ + --replace '"github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"' "" + + go run agent/version/versiongenerator/version-gen.go + substituteInPlace agent/appconfig/constants_unix.go \ + --replace /usr/bin/ssm-document-worker $bin/bin/ssm-document-worker \ + --replace /usr/bin/ssm-session-worker $bin/bin/ssm-session-worker \ + --replace /usr/bin/ssm-session-logger $bin/bin/ssm-session-logger + cd - + ''; + + postBuild = '' + mv go/bin/agent go/bin/amazon-ssm-agent + mv go/bin/worker go/bin/ssm-document-worker + mv go/bin/sessionworker go/bin/ssm-session-worker + mv go/bin/logging go/bin/ssm-session-logger + mv go/bin/cli-main go/bin/ssm-cli + ''; + + postInstall = '' + wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bash}/bin ''; meta = with stdenv.lib; { @@ -24,7 +58,6 @@ buildGoPackage rec { homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = with maintainers; [ copumpkin manveru ]; }; } - diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 2a7899f2fed..1793af1085a 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "tanka"; @@ -17,6 +17,13 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + echo "complete -C $out/bin/tk tk" > tk.bash + installShellCompletion tk.bash + ''; + meta = with lib; { description = "Flexible, reusable and concise configuration for Kubernetes"; homepage = "https://github.com/grafana/tanka/"; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 2f5316c9fe2..5d9963956ed 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -54,6 +54,11 @@ mkDerivation rec { qtquickcontrols2 qtgraphicaleffects ] ++ lib.optional stdenv.isDarwin qtmacextras; + # Quick and dirty fix to https://github.com/NixOS/nixpkgs/issues/94952 + # and/or: https://github.com/NixOS/nixpkgs/issues/94905 + cmakeFlags = [ + "-DCMAKE_OSX_ARCHITECTURES=" + ]; meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 8928cafa74e..dbc6dc97ef2 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -26,8 +26,6 @@ buildGoModule rec { vendorSha256 = null; - doCheck = false; - postInstall = '' install -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service install -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index f15e4b5fbbf..84c81ecff64 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200814"; + version = "20200821"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "00i2xbadw7rq2b30yjla54m0df4jbh22g6phby41albw2wc2hn72"; + sha256 = "0l66xf6qp2fdhm5h2v58bbc73pwj72c80mriqac9pfyjh5padir5"; }; buildInputs = [ diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index db33e7e6bb2..7bc5563d470 100644 --- a/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.17.7"; + version = "3.18.0"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "1xj2aqy7daf4r3ypch6hkvk1s0jnx70qwh0p63c7rzm16vh8kb2f"; + sha256 = "1sb9q1qj5mj4cf8d9dsc498mg8a1ri2y0p9qbh44i8ykby8jkgjc"; }; binary = appimageTools.wrapType2 { @@ -40,14 +40,14 @@ in cp ${desktopItem}/share/applications/* $out/share/applications/ ''; - meta = with lib; { - description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)"; - longDescription = '' - sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. - ''; - homepage = "https://www.scuttlebutt.nz/"; - license = licenses.agpl3; - maintainers = with maintainers; [ asymmetric ninjatrappeur thedavidmeister ]; - platforms = [ "x86_64-linux" ]; - }; -} + meta = with lib; { + description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)"; + longDescription = '' + sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. + ''; + homepage = "https://www.scuttlebutt.nz/"; + license = licenses.agpl3; + maintainers = with maintainers; [ asymmetric ninjatrappeur ]; + platforms = [ "x86_64-linux" ]; + }; + } diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 6f4211d0c0d..3f362e6d46a 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.3a"; + version = "2.7.4a"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "1hgiqw5qhs0pc1xazzihcfd92na02xyq2kb469z04y1v51kpvvjq"; + sha256 = "1y4g7h6f95pa9g8kv1aihrfglavqymdx4mnqh6ascs50ibm7zdmz"; }; sourceRoot = "source/source"; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index f55dd2f0528..0fcf4d25e2d 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -2,14 +2,14 @@ libxml2, perl, perlPackages, gd }: stdenv.mkDerivation rec { - version = "2.3.6"; + version = "2.3.7"; pname = "adms"; src = fetchFromGitHub { owner = "Qucs"; repo = "adms"; rev = "release-${version}"; - sha256 = "1pcwq5khzdq4x33lid9hq967gv78dr5i4f2sk8m8rwkfqb9vdzrg"; + sha256 = "0i37c9k6q1iglmzp9736rrgsnx7sw8xn3djqbbjw29zsyl3pf62c"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/applications/science/electronics/hyp2mat/default.nix index 1fa2c23b569..154b68dd5aa 100644 --- a/pkgs/applications/science/electronics/hyp2mat/default.nix +++ b/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "hyp2mat"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "koendv"; repo = "hyp2mat"; rev = "v${version}"; - sha256 = "04bd2vrn8y1izir7pwl34a60cg2v05baqcrmpfdx5fvf33bbflaj"; + sha256 = "03ibk51swxfl7pfrhcrfiffdi4mnf8kla0g1xj1lsrvrjwapfx03"; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Import Hyperlynx Boardsim files to openEMS, an open source 3D full-wave electromagnetic field solver"; - homepage = https://github.com/koendv/hyp2mat; + homepage = "https://github.com/koendv/hyp2mat"; license = licenses.gpl3Plus; maintainers = with maintainers; [ matthuszagh ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix new file mode 100644 index 00000000000..43dfdcabd02 --- /dev/null +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, bison +, flex +, verilog +}: + +stdenv.mkDerivation rec { + pname = "vhd2vl"; + version = "unstable-2018-09-01"; + + src = fetchFromGitHub { + owner = "ldoolitt"; + repo = pname; + rev = "37e3143395ce4e7d2f2e301e12a538caf52b983c"; + sha256 = "17va2pil4938j8c93anhy45zzgnvq3k71a7glj02synfrsv6fs8n"; + }; + + nativeBuildInputs = [ + bison + flex + ]; + + buildInputs = [ + verilog + ]; + + installPhase = '' + mkdir -p $out/bin + cp src/vhd2vl $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "VHDL to Verilog converter"; + homepage = "https://github.com/ldoolitt/vhd2vl"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 53dfb84760e..350a4f99af8 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "z3"; - version = "4.8.7"; + version = "4.8.8"; src = fetchFromGitHub { owner = "Z3Prover"; repo = pname; rev = "z3-${version}"; - sha256 = "0hprcdwhhyjigmhhk6514m71bnmvqci9r8gglrqilgx424r6ff7q"; + sha256 = "1rn538ghqwxq0v8i6578j8mflk6fyv0cp4hjfqynzvinjbps56da"; }; buildInputs = [ python fixDarwinDylibNames ] ++ optional javaBindings jdk; @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Z3Prover/z3"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.x86_64; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; }; } diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch index 5b8f492a8e7..2334d54711e 100644 --- a/pkgs/applications/science/math/calculix/calculix.patch +++ b/pkgs/applications/science/math/calculix/calculix.patch @@ -1,16 +1,7 @@ -diff --git a/ccx_2.15/src/Makefile b/ccx_2.15/src/Makefile -index 9cab2fc..6e977b8 100755 ---- a/ccx_2.15/src/Makefile -+++ b/ccx_2.15/src/Makefile -@@ -1,6 +1,6 @@ - - CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT --FFLAGS = -Wall -O3 -+FFLAGS = -Wall -O3 - - CC=cc - FC=gfortran -@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o) +diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile +--- a/ccx_2.17/src/Makefile 2020-07-23 21:41:38.507761972 +0200 ++++ b/ccx_2.17/src/Makefile 2020-08-22 16:53:50.004938281 +0200 +@@ -18,15 +18,10 @@ OCCXC = $(SCCXC:.c=.o) OCCXMAIN = $(SCCXMAIN:.c=.o) @@ -22,10 +13,10 @@ index 9cab2fc..6e977b8 100755 - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc - --ccx_2.15: $(OCCXMAIN) ccx_2.15.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) -+ccx_2.15: $(OCCXMAIN) ccx_2.15.a -+ $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) +-ccx_2.17: $(OCCXMAIN) ccx_2.17.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) ++ccx_2.17: $(OCCXMAIN) ccx_2.17.a ++ $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) - ccx_2.15.a: $(OCCXF) $(OCCXC) + ccx_2.17.a: $(OCCXF) $(OCCXC) ar vr $@ $? diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 44882594550..e37e9d0910c 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calculix"; - version = "2.15"; + version = "2.17"; src = fetchurl { url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; - sha256 = "0d4axfxgm3ag4p2vx9rjcky7c122k99a2nhv1jv53brm35rblzdw"; + sha256 = "0l3fizxfdj2mpdp62wnk9v47q2yc3cy39fpsm629z7bjmba8lw6a"; }; nativeBuildInputs = [ gfortran ]; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 213530b60a9..d1ab05d4cde 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.8.0a"; + version = "3.12.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0bjd61bbc5b2i09kz3ss01c0xmxrhmiv5wpbhhplkp3yhw2qrf3m"; + sha256 = "0ylsxj9rn3dc1grn9w6jisci3ak0hxgbwzqp54azs3aj5cmvkfgg"; }; patchPhase = '' - substituteInPlace src/main.cc --replace 'getPackageDataDir().c_str()' \"$out/share\" + # https://github.com/Qalculate/qalculate-gtk/pull/178 + substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0' + + # https://github.com/Qalculate/qalculate-gtk/pull/179 + echo searchprovider.o: gnome-search-provider2.c >>src/Makefile.am ''; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index c073edaee7d..ffdb788745a 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -11,12 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; }; - # Perl is needed here for patchShebangs - nativeBuildInputs = [ perl makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; - buildPhase = null; + buildInputs = [ + perl # needed for patchShebangs + ]; + + dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/lib/diff-so-fancy # diff-so-fancy executable searches for it's library relative to @@ -32,6 +39,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${git}/bin" \ --prefix PATH : "${coreutils}/bin" \ --prefix PATH : "${ncurses.out}/bin" + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix new file mode 100644 index 00000000000..251f495b7e1 --- /dev/null +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -0,0 +1,100 @@ +{ autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook +, at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped +, gdk-pixbuf, glib, gnome2, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg +, streamlink }: + +let + basename = "streamlink-twitch-gui"; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; + arch = + if stdenv.hostPlatform.system == "x86_64-linux" + then + "linux64" + else + "linux32"; + +in +stdenv.mkDerivation rec { + pname = "${basename}-bin"; + version = "1.10.0"; + + src = fetchurl { + url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz"; + sha256 = + if arch == "linux64" + then + "17s9zbzj4pgz9mxxwjbp3788afkddc9s3p7xp28y5084z9wwzph2" + else + "1pww05hr48m6v0g1sz48g1c7p615lig3s12l21xgyz4gkjzmjy22"; + }; + + nativeBuildInputs = with xorg; [ + at-spi2-core + atk + alsaLib + autoPatchelfHook + cairo + cups.lib + dbus.daemon.lib + expat + gcc-unwrapped + gdk-pixbuf + glib + gnome2.pango + gtk3-x11 + nss + nspr + libuuid + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXScrnSaver + libXtst + makeWrapper + wrapGAppsHook + ]; + + buildInputs = [ streamlink ]; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + mkdir -p $out/{bin,opt/${basename},share} + + # Install all files, remove unnecessary ones + cp -a . $out/opt/${basename}/ + rm -r $out/opt/${basename}/{{add,remove}-menuitem.sh,credits.html,icons/} + + wrapProgram $out/opt/${basename}/${basename} --add-flags "--no-version-check" --prefix LD_LIBRARY_PATH : ${runtimeLibs} + + ln -s "$out/opt/${basename}/${basename}" $out/bin/ + ln -s "${desktopItem}/share/applications" $out/share/ + ''; + + desktopItem = makeDesktopItem { + name = basename; + exec = basename; + icon = basename; + desktopName = "Streamlink Twitch GUI"; + genericName = meta.description; + categories = "AudioVideo;Network;"; + }; + + meta = with stdenv.lib; { + description = "Twitch.tv browser for Streamlink"; + longDescription = "Browse Twitch.tv and watch streams in your videoplayer of choice"; + homepage = "https://streamlink.github.io/streamlink-twitch-gui/"; + downloadPage = https://github.com/streamlink/streamlink-twitch-gui/releases; + license = licenses.mit; + maintainers = with maintainers; [ rileyinman ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 6e5ba4abf37..c68c0d47e39 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.30.0"; + version = "1.31.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "10w5v0qqj8yqd81hpz65pq1lx0j9pl112s7hl6y9p3i3f0m0931f"; + sha256 = "0kj97kwyjs9hksaas0zic4m7w8b17c1d7c8vhiq2862w97ngxrsk"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; |