diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/misc')
232 files changed, 1769 insertions, 3750 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 86947c0bd661..8e55090e4c17 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.3.0.6"; + version = "4.3.1.0"; src = fetchurl { url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "1i8cb9j1dk2ikrdr11gah48wrsmw52gj70pv7yml1pzb435madm8"; + sha256 = "1q28byshh4wkfsfdb0sfdqq9a5da9k7i4nagsfpk0fzyajvzd4lx"; }; nativeBuildInputs = [ unzip makeWrapper jq ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/OSCAR/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/OSCAR/default.nix new file mode 100644 index 000000000000..e619ad8c6971 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/OSCAR/default.nix @@ -0,0 +1,46 @@ +{ stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: +mkDerivation rec { + pname = "OSCAR"; + version = "1.2.0"; + + src = fetchFromGitLab { + owner = "pholy"; + repo = "OSCAR-code"; + rev = "v${version}"; + sha256 = "10r37d8c2avr167n2s9lhld1c9hmckm444fq163z1jsy9jpid6mg"; + }; + + buildInputs = [ qtbase qttools qtserialport libGLU ]; + nativeBuildInputs = [ qmake ]; + postPatch = '' + substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}" + ''; + + qmakeFlags = [ "OSCAR_QT.pro" ]; + + installPhase = '' + install -d $out/bin + install -d $out/share/OSCAR/Help + install -d $out/share/OSCAR/Html + install -d $out/share/OSCAR/Translations + install -d $out/share/icons/OSCAR + install -d $out/share/applications + install -T oscar/OSCAR $out/bin/OSCAR + # help browser was removed 'temporarily' in https://gitlab.com/pholy/OSCAR-code/-/commit/57c3e4c33ccdd2d0eddedbc24c0e4f2969da3841 + # install oscar/Help/* $out/share/OSCAR/Help + install oscar/Html/* $out/share/OSCAR/Html + install oscar/Translations/* $out/share/OSCAR/Translations + install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png + install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop + ''; + + meta = with stdenv.lib; { + homepage = "https://www.sleepfiles.com/OSCAR/"; + description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; + license = licenses.gpl3; + maintainers = [ maintainers.roconnor ]; + # Someone needs to create a suitable installPhase for Darwin and Windows. + # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building. + broken = !stdenv.hostPlatform.isLinux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/alacritty/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/alacritty/default.nix deleted file mode 100644 index 72e00cb15a70..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/alacritty/default.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, rustPlatform - -, cmake -, gzip -, installShellFiles -, makeWrapper -, ncurses -, pkgconfig -, python3 - -, expat -, fontconfig -, freetype -, libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, libXxf86vm -, libxcb -, libxkbcommon -, wayland -, xdg_utils - - # Darwin Frameworks -, AppKit -, CoreGraphics -, CoreServices -, CoreText -, Foundation -, OpenGL -}: -let - rpathLibs = [ - expat - fontconfig - freetype - libGL - libX11 - libXcursor - libXi - libXrandr - libXxf86vm - libxcb - ] ++ lib.optionals stdenv.isLinux [ - libxkbcommon - wayland - ]; -in -rustPlatform.buildRustPackage rec { - pname = "alacritty"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "alacritty"; - repo = pname; - rev = "v${version}"; - sha256 = "1948j57xhqvc5y876s929x9rhd6j0xnw5c91g1zqw2rfncn602g2"; - }; - - cargoSha256 = "17lyzcj07f0vyki3091vgjd0w8ki11sw5m8gb3bxdph1dl04rria"; - - nativeBuildInputs = [ - cmake - gzip - installShellFiles - makeWrapper - ncurses - pkgconfig - python3 - ]; - - buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin [ - AppKit - CoreGraphics - CoreServices - CoreText - Foundation - OpenGL - ]; - - outputs = [ "out" "terminfo" ]; - - postPatch = '' - substituteInPlace alacritty/src/config/mouse.rs \ - --replace xdg-open ${xdg_utils}/bin/xdg-open - ''; - - installPhase = '' - runHook preInstall - - install -D $releaseDir/alacritty $out/bin/alacritty - - '' + ( - if stdenv.isDarwin then '' - mkdir $out/Applications - cp -r extra/osx/Alacritty.app $out/Applications - ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS - '' else '' - install -D extra/linux/Alacritty.desktop -t $out/share/applications/ - install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg - - # patchelf generates an ELF that binutils' "strip" doesn't like: - # strip: not enough room for program headers, try linking with -N - # As a workaround, strip manually before running patchelf. - strip -S $out/bin/alacritty - - patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty - '' - ) + '' - - installShellCompletion --zsh extra/completions/_alacritty - installShellCompletion --bash extra/completions/alacritty.bash - installShellCompletion --fish extra/completions/alacritty.fish - - install -dm 755 "$out/share/man/man1" - gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz" - - install -Dm 644 alacritty.yml $out/share/doc/alacritty.yml - - install -dm 755 "$terminfo/share/terminfo/a/" - tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - - runHook postInstall - ''; - - dontPatchELF = true; - - meta = with lib; { - description = "A cross-platform, GPU-accelerated terminal emulator"; - homepage = "https://github.com/alacritty/alacritty"; - license = licenses.asl20; - maintainers = with maintainers; [ filalex77 mic92 cole-h ma27 ]; - platforms = platforms.unix; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/aminal/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/aminal/default.nix deleted file mode 100644 index 7f04a93d6a32..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/aminal/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ buildGoPackage -, Carbon -, Cocoa -, Kernel -, fetchFromGitHub -, lib -, mesa_glu -, stdenv -, xorg -}: - -buildGoPackage rec { - pname = "aminal"; - version = "0.9.0"; - - goPackagePath = "github.com/liamg/aminal"; - - buildInputs = - lib.optionals stdenv.isLinux [ - mesa_glu - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ]; - - src = fetchFromGitHub { - owner = "liamg"; - repo = "aminal"; - rev = "v${version}"; - sha256 = "0syv9md7blnl6i19zf8s1xjx5vfz6s755fxyg2ply0qc1pwhsj8n"; - }; - - preBuild = '' - buildFlagsArray=("-ldflags=-X ${goPackagePath}/version.Version=${version}") - ''; - - meta = with lib; { - description = "Golang terminal emulator from scratch"; - longDescription = '' - Aminal is a modern terminal emulator for Mac/Linux implemented in Golang - and utilising OpenGL. - - The project is experimental at the moment, so you probably won't want to - rely on Aminal as your main terminal for a while. - - Features: - - Unicode support - - OpenGL rendering - - Customisation options - - True colour support - - Support for common ANSI escape sequences a la xterm - - Scrollback buffer - - Clipboard access - - Clickable URLs - - Multi platform support (Windows coming soon...) - - Sixel support - - Hints/overlays - - Built-in patched fonts for powerline - - Retina display support - ''; - homepage = "https://github.com/liamg/aminal"; - license = licenses.gpl3; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/archiver/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/archiver/default.nix index fed1dc48470e..1691ab073610 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/archiver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/archiver/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "archiver"; - version = "3.3.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "1fi86g27c660g3mv9c5rfm0mmvh5q08704c19xnvrpwlg65glqrz"; + sha256 = "0fdkqfs87svpijccz8m11gvby8pvmznq6fs9k94vbzak0kxhw1wg"; }; - vendorSha256 = "1rqhra3rfarq8f750zszkrm0jcsxa4sjbfpmcdlj5z000df699zq"; + vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/archivy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/archivy/default.nix new file mode 100644 index 000000000000..09779f8876f8 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/archivy/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, python3, fetchPypi, appdirs, attrs, requests, +beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf, +pypandoc, python-dotenv, python-frontmatter, tinydb, validators, +watchdog, wtforms }: + +python3.pkgs.buildPythonApplication rec { + pname = "archivy"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "5cb760da57dc9dcdd62c0af824993d1715ec7035915629b4046d8bf50442756c"; + }; + + # Relax some dependencies + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'validators ==' 'validators >=' \ + --replace 'elasticsearch ==' 'elasticsearch >=' \ + --replace 'python-dotenv ==' 'python-dotenv >=' \ + --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \ + --replace 'WTForms ==' 'WTForms >=' \ + --replace 'python_dotenv ==' 'python_dotenv >=' \ + --replace 'attrs == 20.2.0' 'attrs' \ + --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ + --replace 'requests ==' 'requests >=' + ''; + + propagatedBuildInputs = [ + appdirs + attrs + beautifulsoup4 + click-plugins + elasticsearch + flask_login + flask_wtf + pypandoc + python-dotenv + python-frontmatter + tinydb + requests + validators + watchdog + wtforms + ]; + + # __init__.py attempts to mkdir in read-only file system + doCheck = false; + + meta = with stdenv.lib; { + description = "Self-hosted knowledge repository"; + homepage = "https://archivy.github.io"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index 9f157798a7d2..dc46edc070fd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.20.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; - rev = "${version}"; - sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb"; + rev = version; + sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/barrier/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/barrier/default.nix index 28b65d2b58b6..f08b33f09859 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/barrier/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/barrier/default.nix @@ -5,13 +5,14 @@ mkDerivation rec { pname = "barrier"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "debauchee"; repo = pname; rev = "v${version}"; - sha256 = "1gbg3p7c0vcsdzsjj1ssx6k8xpj3rpyvais12266f0xvnbvihczd"; + sha256 = "11vqkzpcjiv3pq6ps022223j6skgm1d23dj18n4a5nsf53wsvvp4"; + fetchSubmodules = true; }; buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/batsignal/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/batsignal/default.nix index 56c508eaca92..90fca4ce28ce 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/batsignal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; - rev = "${version}"; - sha256 = "0ss5dw7wpqsf96dig6r7x4fhf6brmjdy54jyyf5nk1h9kzw4d69r"; + rev = version; + sha256 = "0yc7xgwb3i4m8m9kg2xspqig3s2qgh2i9bkalvnkziayjb7y59qn"; }; buildInputs = [ libnotify glib ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/birdtray/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/birdtray/default.nix index 8eb6a168721c..df12d2b9f8f6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/birdtray/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/birdtray/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "birdtray"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "gyunaev"; repo = pname; - rev = version; - sha256 = "15l8drdmamq1dpqpj0h9ajj2r5vcs23cx421drvhfgs6bqlzd1hl"; + rev = "v${version}"; + sha256 = "1469ng6zk0qx0qfsihrnlz1j9i1wk0hx4vqdaplz9mdpyxvmlryk"; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/darwin.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/darwin.patch index c426c0b66077..bfbfb5e48e02 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/darwin.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/darwin.patch @@ -1,24 +1,26 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake -@@ -35,7 +35,6 @@ else() +@@ -80,7 +80,6 @@ else() message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") endif() if(NOT EXISTS "${LIBDIR}/") - message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'") endif() - if(WITH_OPENAL) -@@ -86,7 +85,7 @@ endif() - if(WITH_CODEC_SNDFILE) - set(LIBSNDFILE ${LIBDIR}/sndfile) - set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include) -- set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc) -+ set(LIBSNDFILE_LIBRARIES sndfile) - set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate - endif() + # ------------------------------------------------------------------------- +@@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE) + find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib) + find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib) + list(APPEND LIBSNDFILE_LIBRARIES +- ${_sndfile_FLAC_LIBRARY} +- ${_sndfile_OGG_LIBRARY} +- ${_sndfile_VORBIS_LIBRARY} +- ${_sndfile_VORBISENC_LIBRARY} + ) -@@ -97,7 +96,7 @@ if(WITH_PYTHON) + print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}") +@@ -132,7 +127,7 @@ if(WITH_PYTHON) # normally cached but not since we include them with blender set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m") set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m") @@ -27,40 +29,18 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled else() -@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG) - set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include) - set(FFMPEG_LIBRARIES +@@ -173,9 +168,7 @@ endif() + if(WITH_CODEC_FFMPEG) + set(FFMPEG_FIND_COMPONENTS avcodec avdevice avformat avutil -- mp3lame swscale x264 xvidcore -- theora theoradec theoraenc -- vorbis vorbisenc vorbisfile ogg opus -- vpx swresample) -+ swscale swresample) - set(FFMPEG_LIBPATH ${FFMPEG}/lib) +- mp3lame ogg opus swresample swscale +- theora theoradec theoraenc vorbis vorbisenc +- vorbisfile vpx x264 xvidcore) ++ swresample swscale) + find_package(FFmpeg) endif() -@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA) - set(OPENCOLLADA ${LIBDIR}/opencollada) - - set(OPENCOLLADA_INCLUDE_DIRS -- ${LIBDIR}/opencollada/include/COLLADAStreamWriter -- ${LIBDIR}/opencollada/include/COLLADABaseUtils -- ${LIBDIR}/opencollada/include/COLLADAFramework -- ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader -- ${LIBDIR}/opencollada/include/GeneratedSaxParser -+ ${LIBDIR}/opencollada/include/opencollada/COLLADAStreamWriter -+ ${LIBDIR}/opencollada/include/opencollada/COLLADABaseUtils -+ ${LIBDIR}/opencollada/include/opencollada/COLLADAFramework -+ ${LIBDIR}/opencollada/include/opencollada/COLLADASaxFrameworkLoader -+ ${LIBDIR}/opencollada/include/opencollada/GeneratedSaxParser - ) - -- set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) -+ set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada) - set(OPENCOLLADA_LIBRARIES - OpenCOLLADASaxFrameworkLoader - -lOpenCOLLADAFramework -@@ -277,14 +273,13 @@ if(WITH_BOOST) +@@ -266,7 +259,6 @@ if(WITH_BOOST) endif() if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) @@ -68,25 +48,8 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf endif() if(WITH_OPENIMAGEIO) - set(OPENIMAGEIO ${LIBDIR}/openimageio) - set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include) - set(OPENIMAGEIO_LIBRARIES -- ${OPENIMAGEIO}/lib/libOpenImageIO.a -+ ${OPENIMAGEIO}/lib/libOpenImageIO.dylib - ${PNG_LIBRARIES} - ${JPEG_LIBRARIES} - ${TIFF_LIBRARY} -@@ -307,7 +302,7 @@ endif() - if(WITH_OPENCOLORIO) - set(OPENCOLORIO ${LIBDIR}/opencolorio) - set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include) -- set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp) -+ set(OPENCOLORIO_LIBRARIES OpenColorIO) - set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib) - endif() - -@@ -443,7 +438,7 @@ else() - set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing") +@@ -439,7 +431,7 @@ else() + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic") endif() -if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/default.nix index 17f0ffdb92cd..9796aef9b7cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew +{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages @@ -8,8 +8,8 @@ , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada , makeWrapper -, pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL -, embree +, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, embree, gmp }: with lib; @@ -18,18 +18,18 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.90.1"; + version = "2.91.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "169xcmm1zkvab14qdxggqc758xdkqs7r7imwi6yx2fl2djacr3g7"; + sha256 = "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = - [ boost ffmpeg_3 gettext glew ilmbase + [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc alembic @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { tbb makeWrapper embree + gmp ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { openvdb ] else [ - pugixml SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL + pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit @@ -60,7 +61,9 @@ stdenv.mkDerivation rec { : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ - '${python}' + '${python}' \ + --replace '${"$"}{LIBDIR}/openmp' \ + '${llvmPackages.openmp}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ --replace 'set(PYTHON_VERSION 3.7)' \ 'set(PYTHON_VERSION ${python.pythonVersion})' \ @@ -71,15 +74,7 @@ stdenv.mkDerivation rec { --replace '${"$"}{LIBDIR}/opencollada' \ '${opencollada}' \ --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python3Packages.numpy}/${python.sitePackages}/numpy' \ - --replace 'set(OPENJPEG_INCLUDE_DIRS ' \ - 'set(OPENJPEG_INCLUDE_DIRS "'$(echo ${openjpeg.dev}/include/openjpeg-*)'") #' \ - --replace 'set(OPENJPEG_LIBRARIES ' \ - 'set(OPENJPEG_LIBRARIES "${openjpeg}/lib/libopenjp2.dylib") #' \ - --replace 'set(OPENIMAGEIO ' \ - 'set(OPENIMAGEIO "${openimageio2.out}") #' \ - --replace 'set(OPENEXR_INCLUDE_DIRS ' \ - 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' + '${python3Packages.numpy}/${python.sitePackages}/numpy' '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' ''); diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/blugon/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/blugon/default.nix index 896daa27f7cb..9aa8d3da39a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/blugon/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/blugon/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { buildInputs = [ python3 libX11 libXrandr ]; + # Remove at next release + # https://github.com/jumper149/blugon/commit/d262cd05 + postPatch = '' + sed -i 's,CC = gcc,CC ?= gcc,g' backends/scg/Makefile + ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/calcurse/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/calcurse/default.nix index 9f55975764fa..a3cad7d9f2e7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/calcurse/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calcurse"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; - sha256 = "0hzhdpkkn75jlymanwzl69hrrf1pw29hrchr11wlxqjpl43h62gs"; + sha256 = "0dc4bka2l9z03bnlygsnl06l1zi2wbn29rkc02b13x2kdab7arpg"; }; buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/charm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/charm/default.nix index 98e04e81c124..becbbda8acff 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/charm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.8.3"; + version = "0.8.5"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "1nbix7fi6g9jadak5zyx7fdz7d6367aly6fnrs0v98zsl1kxyvx3"; + sha256 = "0cgl5dpyzc4lciij9q9yghppiclrdnrl1jsbizfgh2an3s18ab8k"; }; - vendorSha256 = "0lhml6m0j9ksn09j7z4d9pix5aszhndpyqajycwj3apvi3ic90il"; + vendorSha256 = "1spzawnk2fslc1m14dp8lx4vpnxwz7xgm1hxbpz4bqlqz1hfd6ax"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/cheat/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/cheat/default.nix index 77717ff50a21..208c9c533137 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0x6msbbqkwxs6msqacpqw4wlw7c9ilf8n6jqmx297ij6isswgksh"; + sha256 = "sha256-Q/frWu82gB15LEzwYCbJr7k0yZ+AXBvcPWxoevSpeqU="; }; subPackages = [ "cmd/cheat" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix index b70f9a2e7d80..3a89773b8587 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/chewing-editor/default.nix @@ -7,8 +7,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "chewing"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/clight/clightd.nix index c06d00ebb52e..e1f019ffa455 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/clight/clightd.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/clight/clightd.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , dbus, cmake, pkgconfig , glib, udev, polkit, libmodule -, pcre, libXdmcp, utillinux, libpthreadstubs +, pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil , enableDpms ? true, libXext , enableGamma ? true, libXrandr @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { pcre libXdmcp - utillinux + util-linux libpthreadstubs ] ++ optional enableDdc ddcutil ++ optional enableDpms libXext diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/clipcat/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/clipcat/default.nix new file mode 100644 index 000000000000..244770e138f9 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/clipcat/default.nix @@ -0,0 +1,64 @@ +{ lib, fetchFromGitHub, installShellFiles, rustPlatform, rustfmt, xorg +, pkgconfig, llvmPackages, clang, protobuf, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "clipcat"; + version = "0.4.19"; + + src = fetchFromGitHub { + owner = "xrelkd"; + repo = pname; + rev = "v${version}"; + sha256 = "1lhnm521qqy3aw2iyk1dv4yc5ms0c5x5iipx96bz6v6y0cnmf4kw"; + }; + + cargoSha256 = "04iflyvz8g53z658rkxafiyi2m9kzxwl3p1xgkjq7vacmz5jk15c"; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + # needed for internal protobuf c wrapper library + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + nativeBuildInputs = [ + pkgconfig + + clang + llvmPackages.libclang + + rustfmt + protobuf + + python3 + + installShellFiles + ]; + buildInputs = [ xorg.libxcb ]; + + cargoBuildFlags = [ "--features=all" ]; + + postInstall = '' + installShellCompletion --bash --name clipcatd completions/bash-completion/completions/clipcatd + installShellCompletion --fish --name clipcatd.fish completions/fish/completions/clipcatd.fish + installShellCompletion --zsh --name _clipcatd completions/zsh/site-functions/_clipcatd + + installShellCompletion --bash --name clipcatctl completions/bash-completion/completions/clipcatctl + installShellCompletion --fish --name clipcatctl.fish completions/fish/completions/clipcatctl.fish + installShellCompletion --zsh --name _clipcatctl completions/zsh/site-functions/_clipcatctl + + installShellCompletion --bash --name clipcat-menu completions/bash-completion/completions/clipcat-menu + installShellCompletion --fish --name clipcat-menu.fish completions/fish/completions/clipcat-menu.fish + installShellCompletion --zsh --name _clipcat-menu completions/zsh/site-functions/_clipcat-menu + + installShellCompletion --bash --name clipcat-notify completions/bash-completion/completions/clipcat-notify + installShellCompletion --fish --name clipcat-notify.fish completions/fish/completions/clipcat-notify.fish + installShellCompletion --zsh --name _clipcat-notify completions/zsh/site-functions/_clipcat-notify + ''; + + meta = with lib; { + description = "Clipboard Manager written in Rust Programming Language"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ xrelkd ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/clipit/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/clipit/default.nix index 02207fb95806..cc6d7d29fcd4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/clipit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/clipit/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, fetchpatch, stdenv , autoreconfHook, intltool, pkgconfig -, gtk3, xdotool, which, wrapGAppsHook }: +, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "clipit"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ]; - configureFlags = [ "--with-gtk3" ]; - buildInputs = [ gtk3 ]; + configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ]; + buildInputs = [ gtk3 libayatana-appindicator ]; gappsWrapperArgs = [ "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/clipmenu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/clipmenu/default.nix index 54c2ab48f656..3227792d6a2f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/clipmenu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/clipmenu/default.nix @@ -1,6 +1,6 @@ -{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }: +{ clipnotify, makeWrapper, xsel, dmenu, util-linux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }: let - runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ]; + runtimePath = lib.makeBinPath [ clipnotify xsel dmenu util-linux gawk ]; in stdenv.mkDerivation rec { pname = "clipmenu"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/cointop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/cointop/default.nix index a74a3962996b..e57ffd352717 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = "v${version}"; - sha256 = "1gkrwh5g69mywlllszy310xpahr8rz8nghjjpiamd85djf1iz43b"; + sha256 = "051jxa07c58ym1w0mwckwxh60v28gqcpqw5nv8sm5wxil1crcayr"; }; goPackagePath = "github.com/miguelmota/cointop"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix deleted file mode 100644 index 739ad07adbf3..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/cool-retro-term/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget -, qtquickcontrols, qtgraphicaleffects, qmake }: - -mkDerivation rec { - version = "1.1.1"; - pname = "cool-retro-term"; - - src = fetchFromGitHub { - owner = "Swordfish90"; - repo = "cool-retro-term"; - rev = version; - sha256 = "0mird4k88ml6y61hky2jynrjmnxl849fvhsr5jfdlnv0i7r5vwi5"; - }; - - patchPhase = '' - sed -i -e '/qmltermwidget/d' cool-retro-term.pro - ''; - - buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ]; - nativeBuildInputs = [ qmake ]; - - installFlags = [ "INSTALL_ROOT=$(out)" ]; - - preFixup = '' - mv $out/usr/share $out/share - mv $out/usr/bin $out/bin - rmdir $out/usr - '' + stdenv.lib.optionalString stdenv.isDarwin '' - ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term - ''; - - enableParallelBuilding = true; - - meta = { - description = "Terminal emulator which mimics the old cathode display"; - longDescription = '' - cool-retro-term is a terminal emulator which tries to mimic the look and - feel of the old cathode tube screens. It has been designed to be - eye-candy, customizable, and reasonably lightweight. - ''; - homepage = "https://github.com/Swordfish90/cool-retro-term"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ skeidel ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/copyq/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/copyq/default.nix index 7cf89a74e100..de1dacd50c2e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "04jidibf0b80c5vd659pz2wibmggjyyj9yz2bw7j4g84hwraksxb"; + sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/corectrl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/corectrl/default.nix new file mode 100644 index 000000000000..090a63a32e4f --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/corectrl/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, fetchFromGitLab +, extra-cmake-modules +, botan2 +, karchive +, kauth +, libdrm +, mesa-demos +, procps +, util-linux +, vulkan-tools +, qtbase +, qtcharts +, qtquickcontrols2 +, qtsvg +, qttools +, qtxmlpatterns +, wrapQtAppsHook +} : + +stdenv.mkDerivation rec{ + pname = "corectrl"; + version = "1.1.1"; + + src = fetchFromGitLab { + owner = "corectrl"; + repo = "corectrl"; + rev = "v${version}"; + sha256 = "sha256-YQDrxPqCa3OzNKd3UiAffqqvOrgbXmDFJGjYPetolyY="; + }; + + nativeBuildInputs = [ + extra-cmake-modules + wrapQtAppsHook + ]; + buildInputs = [ + botan2 + karchive + kauth + libdrm + mesa-demos + procps + util-linux + vulkan-tools + qtbase + qtcharts + qtquickcontrols2 + qtsvg + qttools + qtxmlpatterns + ]; + + runtimeDeps = [ mesa-demos vulkan-tools ]; + binPath = stdenv.lib.makeBinPath runtimeDeps; + + dontWrapQtApps = true; + + postInstall = '' + wrapQtApp $out/bin/corectrl --prefix PATH ":" ${binPath} + ''; + + meta = with stdenv.lib; { + homepage = "https://gitlab.com/corectrl/corectrl/"; + description = "Control your computer hardware via application profiles"; + longDescription = '' + CoreCtrl is a Free and Open Source GNU/Linux application that allows you + to control with ease your computer hardware using application profiles. It + aims to be flexible, comfortable and accessible to regular users. + ''; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} +# TODO: report upstream that libdrm is not detected at configure time diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/cpp-ethereum/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/cpp-ethereum/default.nix deleted file mode 100644 index aed44d1213ce..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/cpp-ethereum/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, jsoncpp -, libjson-rpc-cpp -, curl -, boost -, leveldb -, cryptopp -, libcpuid -, opencl-headers -, ocl-icd -, miniupnpc -, libmicrohttpd -, gmp -, libGLU, libGL -, extraCmakeFlags ? [] -}: -stdenv.mkDerivation rec { - pname = "cpp-ethereum"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "ethereum"; - repo = "cpp-ethereum"; - rev = "62ab9522e58df9f28d2168ea27999a214b16ea96"; - sha256 = "1fxgpqhmjhpv0zzs1m3yf9h8mh25dqpa7pmcfy7f9qiqpfdr4zq9"; - }; - - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" extraCmakeFlags ]; - - configurePhase = '' - export BOOST_INCLUDEDIR=${boost.dev}/include - export BOOST_LIBRARYDIR=${boost.out}/lib - - mkdir -p Build/Install - pushd Build - - cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install $cmakeFlags - ''; - - enableParallelBuilding = true; - - runPath = with stdenv.lib; makeLibraryPath ([ stdenv.cc.cc ] ++ buildInputs); - - installPhase = '' - make install - - mkdir -p $out - - for f in Install/lib/*.so* $(find Install/bin -executable -type f); do - patchelf --set-rpath $runPath:$out/lib $f - done - - cp -r Install/* $out - ''; - - buildInputs = [ - cmake - jsoncpp - libjson-rpc-cpp - curl - boost - leveldb - cryptopp - libcpuid - opencl-headers - ocl-icd - miniupnpc - libmicrohttpd - gmp - libGLU libGL - ]; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "Ethereum C++ client"; - homepage = "https://github.com/ethereum/cpp-ethereum"; - license = licenses.gpl3; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - broken = true; # 2018-04-10 - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/cura/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/cura/default.nix index c0aa0a481bdc..46143747f6d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/cura/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/cura/default.nix @@ -1,26 +1,27 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, + qtquickcontrols2, qtgraphicaleffects, curaengine, plugins ? [] }: mkDerivation rec { pname = "cura"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "19an168iad3cb5w8i71c0wbr79qnz5qnpxqx1j6dgh64qz6ffn2r"; + sha256 = "060fqzspipm93ks0inrj7yrj5wmvkdfv8xaxrv22590yb9f95s9m"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "1w6i0dlff8b30q987x3y0zv8847fc8ppfcr9vi982msmv284c89z"; + sha256 = "0hi9w1fsnazlr0vvxdr3alsdb8m1vjjfp5zhmlz4kyyxhsy3bc33"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ - libsavitar numpy-stl pyserial requests uranium zeroconf + libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d sentry-sdk trimesh ] ++ plugins; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/curaengine/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/curaengine/default.nix index 5cc5db3115fb..8993c01a6bd2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/curaengine/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "177fk6j4gn3ssi8j1qxj8p4486f7jkz328vc75agxnh7vhd4mwsm"; + sha256 = "083l327ry6hv3yaa1p8dx1hx7fm12b0lh5nlbshxjyym0vi15rw2"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/dasel/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/dasel/default.nix new file mode 100644 index 000000000000..d76cf9b106e7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dasel"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "TomWright"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-N27XmrbZTLeNkNvGDsChqKZrAagkQoGFaJeeZ1/Qnkw="; + }; + + vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; + + buildFlagsArray = '' + -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} + ''; + + meta = with stdenv.lib; { + description = "Query and update data structures from the command line"; + longDescription = '' + Dasel (short for data-selector) allows you to query and modify data structures using selector strings. + Comparable to jq / yq, but supports JSON, YAML, TOML and XML with zero runtime dependencies. + ''; + homepage = "https://github.com/TomWright/dasel"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index c5cd4fa6c7e4..4e928ff34f06 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.2.2"; + version = "7.3.0"; 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 = "08dm10smmzrpsc4vc5p3p6fbkg6a5r1sgmbdgr2ihkbk28gylfh0"; + sha256 = "sha256-JhEF2/97vo2FgzpCFkuc31aLl9qjKHV8RYXO5oBU1no="; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix index 95159d1927ab..0c731aca713f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/digitalbitbox/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ mkDerivation +, lib , autoreconfHook , curl , fetchFromGitHub @@ -7,7 +8,7 @@ , libtool , qrencode , udev -, libusb-compat-0_1 +, libusb1 , makeWrapper , pkgconfig , qtbase @@ -46,18 +47,18 @@ let copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}"; -in stdenv.mkDerivation rec { +in mkDerivation rec { pname = "digitalbitbox"; - version = "2.2.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "digitalbitbox"; repo = "dbb-app"; rev = "v${version}"; - sha256 = "1r77fvqrlaryzij5dfbnigzhvg1d12g96qb2gp8dy3xph1j0k3s1"; + sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA="; }; - nativeBuildInputs = with stdenv.lib; [ + nativeBuildInputs = with lib; [ autoreconfHook curl git @@ -70,7 +71,7 @@ in stdenv.mkDerivation rec { libevent libtool udev - libusb-compat-0_1 + libusb1 qrencode qtbase @@ -93,6 +94,8 @@ in stdenv.mkDerivation rec { "format" ]; + qtWrapperArgs = [ ''--prefix LD_LIBRARY_PATH : $out/lib'' ]; + postInstall = '' mkdir -p "$out/lib" cp src/libbtc/.libs/*.so* $out/lib @@ -103,9 +106,6 @@ in stdenv.mkDerivation rec { # [RPATH][patchelf] Avoid forbidden reference error rm -rf $PWD - wrapProgram "$out/bin/dbb-cli" --prefix LD_LIBRARY_PATH : "$out/lib" - wrapProgram "$out/bin/dbb-app" --prefix LD_LIBRARY_PATH : "$out/lib" - # Provide udev rules as documented in https://digitalbitbox.com/start_linux mkdir -p "$out/etc/udev/rules.d" ${copyUdevRuleToOutput "51-hid-digitalbox.rules" udevRule51} @@ -114,7 +114,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A QT based application for the Digital Bitbox hardware wallet"; longDescription = '' Digital Bitbox provides dbb-app, a GUI tool, and dbb-cli, a CLI tool, to manage Digital Bitbox devices. @@ -138,6 +138,5 @@ in stdenv.mkDerivation rec { vidbina ]; platforms = platforms.linux; - broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/dmenu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/dmenu/default.nix index e4d0c82c4176..f83c5fc7f01f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/dmenu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? [ ./xim.patch ] }: +{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: stdenv.mkDerivation rec { - name = "dmenu-4.9"; + name = "dmenu-5.0"; src = fetchurl { url = "https://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk"; + sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y"; }; buildInputs = [ libX11 libXinerama zlib libXft ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/dmenu/xim.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/dmenu/xim.patch deleted file mode 100644 index f77d48324da4..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/dmenu/xim.patch +++ /dev/null @@ -1,31 +0,0 @@ -Revert https://git.suckless.org/dmenu/commit/377bd37e212b1ec4c03a481245603c6560d0be22.html - -Upstream has reverted it after v4.9 in https://git.suckless.org/dmenu/commit/db6093f6ec1bb884f7540f2512935b5254750b30.html ---- a/dmenu.c -+++ b/dmenu.c -@@ -552,7 +552,7 @@ run(void) - XEvent ev; - - while (!XNextEvent(dpy, &ev)) { -- if (XFilterEvent(&ev, None)) -+ if (XFilterEvent(&ev, win)) - continue; - switch(ev.type) { - case Expose: -@@ -664,7 +664,6 @@ setup(void) - XNClientWindow, win, XNFocusWindow, win, NULL); - - XMapRaised(dpy, win); -- XSetInputFocus(dpy, win, RevertToParent, CurrentTime); - if (embed) { - XSelectInput(dpy, parentwin, FocusChangeMask); - if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { -@@ -730,8 +729,6 @@ main(int argc, char *argv[]) - - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); -- if (!XSetLocaleModifiers("")) -- fputs("warning: no locale modifiers support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("cannot open display"); - screen = DefaultScreen(dpy); diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/dockbarx/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/dockbarx/default.nix index 97510bc3b457..463f7db6b0c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/dockbarx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/dockbarx/default.nix @@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://launchpad.net/dockbar/"; - description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; + description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.volth ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/dstask/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/dstask/default.nix index d5c02f695521..0c2f25b2653f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/dstask/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/dstask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dstask"; - version = "0.21"; + version = "0.23.1"; src = fetchFromGitHub { owner = "naggie"; repo = pname; rev = "v${version}"; - sha256 = "0af85rs4s0wfnibdhn28qycvy90aafkczccs5vyh36y7cnyhvgkl"; + sha256 = "0rfz8jim0xqcwdb5n28942v9r3hbvhjrwdgzvbwc9f9psqg2s8d2"; }; # Set vendorSha256 to null because dstask vendors its dependencies (meaning diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/dupeguru/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/dupeguru/default.nix index 41bfdb3fc5d9..51e1b77096d2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/dupeguru/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/dupeguru/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "arsenetar"; repo = "dupeguru"; - rev = "${version}"; + rev = version; sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy"; fetchSubmodules = true; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/effitask/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/effitask/default.nix index 4f3255551c21..26008c133b82 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/effitask/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/effitask/default.nix @@ -13,8 +13,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "sanpii"; - repo = "${pname}"; - rev = "${version}"; + repo = pname; + rev = version; sha256 = "09bffxdp43s8b1rpmsgqr2kyz3i4jbd2yrwbxw21fj3sf3mwb9ig"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/electron-cash/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/electron-cash/default.nix index 12362823cc50..fe263dd6692b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/electron-cash/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/electron-cash/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "1fllz2s20lg4hrppzmnlgjy9mrq7gaq66l2apb3vz1avzvsjw3gm"; + sha256 = "0ixsx4224jilc5zis6wbsbxqxv10mm5sksrzq15xp30zz0bzb6md"; }; propagatedBuildInputs = with python3Packages; [ @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { checkPhase = '' unset HOME - pytest lib/tests + pytest electroncash/tests ''; postInstall = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/electrum/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/electrum/default.nix index ad26a912e781..df6c99768e84 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -19,7 +19,7 @@ }: let - version = "4.0.3"; + version = "4.0.6"; # electrum is not compatible with dnspython 2.0.0 yet # use the latest 1.x release instead @@ -43,7 +43,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1r40i0v7nm35m3pzbd0l5z4qphl13s31l9v5njmyvpfjirdmhjbv"; + sha256 = "0mdbg2sq56nv0hx0rrcbgrv1lv89nqc6cqigivgk665hhjm4v5kq"; extraPostFetch = '' mv $out ./all @@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0q891fgzxvyzjxfczynx92hvclfs8i3nr5nr9sgbvz13hsg4s6lg"; + sha256 = "0sp8p720g3rqnh52ddhaw2v4hjgpxcwbackw9qc1g9xac1q0942d"; }; postUnpack = '' @@ -154,6 +154,6 @@ py.pkgs.buildPythonApplication { homepage = "https://electrum.org/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ehmry joachifm np ]; + maintainers = with maintainers; [ ehmry joachifm np prusnak ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index 2c6fb39fa433..7d6480b4696c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -27,6 +27,8 @@ python3Packages.buildPythonApplication rec { dnspython jsonrpclib-pelix pysocks + trezor + btchip ]; preBuild = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/elf-dissector/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/elf-dissector/default.nix new file mode 100644 index 000000000000..36ceb49d5c4b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/elf-dissector/default.nix @@ -0,0 +1,26 @@ +{ mkDerivation, fetchgit, lib, cmake, extra-cmake-modules, kitemmodels +, libiberty, libelf, libdwarf, libopcodes }: + +mkDerivation rec { + pname = "elf-dissector"; + version = "unstable-2020-11-14"; + + src = fetchgit { + url = "https://invent.kde.org/sdk/elf-dissector.git"; + rev = "d1700e76e3f60aff0a2a9fb63bc001251d2be522"; + sha256 = "1h1xr3ag1sbf005drcx8g8dc5mk7fb2ybs73swrld7clcawhxnk8"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://invent.kde.org/sdk/elf-dissector"; + description = "Tools for inspecting, analyzing and optimizing ELF files"; + license = licenses.gpl2; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/epr/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/epr/default.nix index f67c15f0a994..478422a1c5c8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/epr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/epr/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { description = "CLI Epub Reader"; homepage = "https://github.com/wustho/epr"; license = licenses.mit; - maintainers = [ maintainers.filalex77 ]; + maintainers = [ maintainers.Br1ght0ne ]; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/eterm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/eterm/default.nix deleted file mode 100644 index b51acd9fa728..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/eterm/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl -, libX11, libXext, libXaw -, pkgconfig, imlib2, libast }: - -stdenv.mkDerivation rec { - pname = "eterm"; - version = "0.9.6"; - srcName = "Eterm-${version}"; - - src = fetchurl { - url = "http://www.eterm.org/download/${srcName}.tar.gz"; - sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext libXaw imlib2 ]; - propagatedBuildInputs = [ libast ]; - - meta = with stdenv.lib; { - description = "Terminal emulator"; - homepage = "http://www.eterm.org"; - license = licenses.bsd2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix index d72aeb629c38..7cee0487ea82 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; license = licenses.gpl2; platforms = platforms.all; + broken = stdenv.isDarwin; maintainers = with maintainers; [ neonfuz ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/evilvte/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/evilvte/default.nix deleted file mode 100644 index 7a5284a527a6..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/evilvte/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchgit, makeWrapper, pkgconfig, - gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg, - configH ? "" -}: - -stdenv.mkDerivation { - pname = "evilvte"; - version = "0.5.2-20140827"; - - src = fetchgit { - url = "https://github.com/caleb-/evilvte.git"; - rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a"; - sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3"; - }; - - buildInputs = [ - gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11 - xorg.xorgproto xorg.libXext makeWrapper pkgconfig - ]; - - buildPhase = '' - cat >src/config.h <<EOF - ${configH} - EOF - make - ''; - - meta = with stdenv.lib; { - description = "VTE based, highly customizable terminal emulator"; - homepage = "http://www.calno.com/evilvte"; - license = licenses.gpl2; - maintainers = [ maintainers.bodil ]; - platforms = platforms.linux; - knownVulnerabilities = [ - "https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854585" - ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index fab83b75e7c9..ce6b7c64693c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.12"; + version = "6.4.14"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "11s83af63gs9nnrjb66yq58xriyvi8hzj4ykxp3kws5z3nby111b"; + sha256 = "1jxxb3qyrh7118fwqa3bhirjh97j2w8r71s8vcb6vp3w1wwhfis2"; }; buildInputs = [ openssl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/font-manager/default.nix index b2001c21bf76..defbe7520d7c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "0s1l30y55l45rrqd9lygvp2gzrqw25rmjgnnja6s5rzs79gc668c"; + sha256 = "1nc0i824v2szz0j9a5rwl8gygih15xbxnxpnx9d3wr0yq9057q6q"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/foot/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/foot/default.nix deleted file mode 100644 index 3d95f7c5772d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/foot/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchgit -, fcft, freetype, pixman, libxkbcommon, fontconfig, wayland -, meson, ninja, ncurses, scdoc, tllist, wayland-protocols, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "foot"; - version = "1.5.1"; - - src = fetchgit { - url = "https://codeberg.org/dnkl/foot.git"; - rev = version; - sha256 = "sha256-GAk2qkrgCNILJOeRcn1NT4t3w+R6WFTZ1goOhBEwKwc="; - }; - - 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/infra/libkookie/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix index dc3f1922c214..9ac701014906 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix @@ -1,16 +1,32 @@ -{ fetchurl, stdenv, pkg-config, wrapGAppsHook, curl, gnome2, gpsd, gtk2 +{ stdenv, fetchbzr, autoreconfHook, texinfo, help2man, imagemagick, pkg-config +, curl, gnome2, gpsd, gtk2, wrapGAppsHook , intltool, libexif, python3Packages, sqlite }: -stdenv.mkDerivation rec { +let + srcs = { + foxtrot = fetchbzr { + url = "lp:foxtrotgps"; + rev = "326"; + sha256 = "191pgcy5rng8djy22a5z9s8gssc73f9p5hm4ig52ra189cb48d8k"; + }; + screenshots = fetchbzr { + url = "lp:foxtrotgps/screenshots"; + rev = "2"; + sha256 = "1sgysn3dhfhrv7rj7wf8f2119vmhc1s1zzsp4r3nlrr45d20wmsv"; + }; + }; +in stdenv.mkDerivation rec { pname = "foxtrotgps"; - version = "1.2.2"; + version = "1.2.2+326"; - src = fetchurl { - url = "https://www.foxtrotgps.org/releases/foxtrotgps-${version}.tar.xz"; - sha256 = "0grn35j5kwc286dxx18fv32qa330xmalqliwy6zirxmj6dffvrkg"; - }; + # Pull directly from bzr because gpsd API version 9 is not supported on latest release + src = srcs.foxtrot; + + patches = [ + ./gps-status-fix.patch + ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man imagemagick wrapGAppsHook ]; buildInputs = [ curl.dev @@ -22,7 +38,16 @@ stdenv.mkDerivation rec { sqlite.dev (python3Packages.python.withPackages (pythonPackages: with python3Packages; [ beautifulsoup4 feedparser sqlalchemy ])) - ]; + ]; + + postUnpack = '' + cp -R ${srcs.screenshots} $sourceRoot/doc/screenshots + chmod -R u+w $sourceRoot/doc/screenshots + ''; + + preConfigure = '' + intltoolize --automake --copy --force + ''; meta = with stdenv.lib; { description = "GPS/GIS application optimized for small screens"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch new file mode 100644 index 000000000000..e9b3624a174b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch @@ -0,0 +1,14 @@ +--- foxtrot/src/gps_functions.c.orig 2020-12-04 15:02:22.290163204 -0600 ++++ foxtrot/src/gps_functions.c 2020-12-04 15:04:54.470648534 -0600 +@@ -762,7 +762,11 @@ + { + gpsdata->fix.time = (time_t) 0; + } ++#if GPSD_API_MAJOR_VERSION >= 9 ++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX); ++#else + gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX); ++#endif + if (gpsdata->valid) + { + gpsdata->seen_valid = TRUE; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/fsv/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/fsv/default.nix index 8b6898958d3c..ff556621f9ae 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/fsv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/fsv/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { version = "0.9-1"; src = fetchFromGitHub { - owner = "mcuelenaere"; + owner = "mcuelenaere"; repo = "fsv"; rev = "${pname}-${version}"; sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj"; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ file gtk2 libGLU gtkglarea ]; meta = with stdenv.lib; { - description = "fsv is a file system visualizer in cyberspace"; + description = "File system visualizer in cyberspace"; longDescription = '' fsv (pronounced eff-ess-vee) is a file system visualizer in cyberspace. It lays out files and directories in three dimensions, geometrically diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/fuzzel/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/fuzzel/default.nix index 717d4a3aab3f..337d68b4b20d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/fuzzel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/fuzzel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://codeberg.org/dnkl/fuzzel"; - rev = "${version}"; + rev = version; sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index ffe7d4ec47de..a93ebb12ed4c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -1,26 +1,28 @@ -{ lib, python3Packages }: +{ lib, buildPythonApplication, fetchPypi, requests, pytestCheckHook }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "gallery_dl"; - version = "1.15.1"; + version = "1.15.4"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "1pysh0gz3f3dxk5bfkzaii4myrgik396mf6vlks50inpbnslmqsl"; + sha256 = "0byn1ggrb9yg9d29205q312v95jy66qp4z384kys8cmrd3mky111"; }; - propagatedBuildInputs = with python3Packages; [ requests ]; + propagatedBuildInputs = [ requests ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ # requires network access "--ignore=test/test_results.py" + "--ignore=test/test_downloader.py" ]; - meta = { + meta = with lib; { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ dawidsowa ]; + license = licenses.gpl2; + maintainers = with maintainers; [ dawidsowa ]; + platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gammu/bashcomp-dir.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/gammu/bashcomp-dir.patch index d41aa432cf35..de402595cd38 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gammu/bashcomp-dir.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gammu/bashcomp-dir.patch @@ -5,7 +5,7 @@ macro_optional_find_package (BashCompletion) if (NOT BASH_COMPLETION_FOUND) - set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") -+ set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") ++ set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions" CACHE PATH "Location of bash_completion.d") endif (NOT BASH_COMPLETION_FOUND) install ( FILES bash-completion/gammu diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix index ee6ed27ddda8..1f2c275b13d1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.3.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "08h14bf4z2gx9sy34jpi2pvxv3i8g9ypl222hzdjsp2ixhl0jia9"; + sha256 = "0lhz7i4lprsik3s41y19vphsyc29vz6cbxikmvkmy6xjn40khjfr"; }; - vendorSha256 = "0q4byhvs1c1xm4qjvs2vyf98vdv121qn0z51arcf7k4ayrys5xcx"; + vendorSha256 = "1f858k8cl0dgiw124jv0p9jhi9aqxnc3nmc7hksw70fla2nzjrv0"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix index 7b0553f7f9e3..dc84b312626e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix @@ -5,7 +5,7 @@ , gettext , fetchFromGitLab , python3 -, libhandy +, libhandy_0 , libpwquality , wrapGAppsHook , gtk3 @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 glib gdk-pixbuf - libhandy + libhandy_0 ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix index 17aa7e9aa060..44d4727edba0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gnome-usage/default.nix @@ -14,15 +14,16 @@ , libdazzle , gnome3 , tracker +, libhandy }: stdenv.mkDerivation rec { pname = "gnome-usage"; - version = "3.33.2"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4"; + sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl"; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { libdazzle libgtop tracker + libhandy ]; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/go-jira/default.nix index 8b3ca1e2d8de..001f3d1de4c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/go-jira/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/go-jira/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jira"; - version = "1.0.24"; + version = "1.0.27"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-jira"; repo = "jira"; - sha256 = "1qpimh39hsg75mb32hlvxmd7jj5b0cmhdkqz3dizfcnidllr3grd"; + sha256 = "1sw56aqghfxh88mfchf0nvqld0x7w22jfwx13pd24slxv1iag1nb"; }; - vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18"; + vendorSha256 = "0d64gkkzfm6hbgqaibj26fpaqnjs50p1675ycrshdhn6blb5mbxg"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock b/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock index 91096ddc9173..eed618a5cbd1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,19 +1,18 @@ GEM remote: https://rubygems.org/ specs: - backports (3.18.1) concurrent-ruby (1.1.7) crass (1.0.6) execjs (2.7.0) ffi (1.13.1) gemojione (4.3.3) json - github-markup (3.0.4) - gollum (5.1.1) + github-markup (3.0.5) + gollum (5.1.2) gemojione (~> 4.1) gollum-lib (~> 5.0) kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.0.0) + kramdown-parser-gfm (~> 1.1.0) mustache (>= 0.99.5, < 1.0.0) octicons (~> 8.5) rss (~> 0.2.9) @@ -25,7 +24,7 @@ GEM therubyrhino (~> 2.1.0) uglifier (~> 3.2) useragent (~> 0.16.2) - gollum-lib (5.0.5) + gollum-lib (5.0.6) gemojione (~> 4.1) github-markup (~> 3.0) gollum-rugged_adapter (~> 1.0) @@ -40,14 +39,14 @@ GEM json (2.3.1) kramdown (2.3.0) rexml - kramdown-parser-gfm (1.0.1) + kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - loofah (2.6.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mini_portile2 (2.4.0) multi_json (1.15.0) mustache (0.99.8) @@ -58,13 +57,13 @@ GEM octicons (8.5.0) nokogiri (>= 1.6.3.1) rack (2.2.3) - rack-protection (2.0.8.1) + rack-protection (2.1.0) rack rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.22.0) + rouge (3.25.0) rss (0.2.9) rexml ruby2_keywords (0.0.2) @@ -74,22 +73,21 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sinatra (2.0.8.1) + sinatra (2.1.0) mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.8.1) + rack (~> 2.2) + rack-protection (= 2.1.0) tilt (~> 2.0) - sinatra-contrib (2.0.8.1) - backports (>= 2.8.2) + sinatra-contrib (2.1.0) multi_json mustermann (~> 1.0) - rack-protection (= 2.0.8.1) - sinatra (= 2.0.8.1) + rack-protection (= 2.1.0) + sinatra (= 2.1.0) tilt (~> 2.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-helpers (1.3.0) + sprockets-helpers (1.4.0) sprockets (>= 2.2) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/gemset.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/gemset.nix index 45bf0e04d07f..75ee9d05ab43 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/gemset.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gollum/gemset.nix @@ -1,14 +1,4 @@ { - backports = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qagwshq7zyjgm6k53hbrf4gfrwn6qz5d6rrc83cl59q37v68zsc"; - type = "gem"; - }; - version = "3.18.1"; - }; concurrent-ruby = { groups = ["default"]; platforms = []; @@ -65,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14991x92v8s60hfqv7162jfmdqa20fifn2bz0km3k5cgi01pf9rs"; + sha256 = "0rlq9hnvhhndqskl087xwabbvfbfnrvx8ac79iin35wmzpyagl96"; type = "gem"; }; - version = "3.0.4"; + version = "3.0.5"; }; gollum = { dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"]; @@ -76,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14i6y3ilv9l7cqvkawl75js26cfj1pd8cphhmq9lic95ajvdf371"; + sha256 = "0pmvxj7pka7pjpw060a9pfxsci1hmx45hk9hbp5m49xkkiiqf1gx"; type = "gem"; }; - version = "5.1.1"; + version = "5.1.2"; }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; @@ -87,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18f3g5px9zznyh6ppqlnjdp1ia8awgrix9lhbfh64rpgxg0b9xlr"; + sha256 = "02mc1w4hn9kjrgvg0r46x1bd0h8hq7lqs432dgjfn2dw36kchja4"; type = "gem"; }; - version = "5.0.5"; + version = "5.0.6"; }; gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -130,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykna2apphld9llmjnz0210fipp4fkmj2ja18l7iz9xikg0h0ihi"; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -141,10 +131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s9hq8bpn6g5vqr3nzyirn3agn7x8agan6151zvq5vmkf6rvmyb2"; + sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; type = "gem"; }; - version = "2.6.0"; + version = "2.8.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -162,10 +152,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2020.1104"; }; mini_portile2 = { groups = ["default"]; @@ -246,10 +236,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyj97bfr1shfgwk4ddmdbw0mdkm4qdyh9s1hl0k7accf3kxx1yi"; + sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; type = "gem"; }; - version = "2.0.8.1"; + version = "2.1.0"; }; rb-fsevent = { groups = ["default"]; @@ -287,10 +277,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m"; + sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn"; type = "gem"; }; - version = "3.22.0"; + version = "3.25.0"; }; rss = { dependencies = ["rexml"]; @@ -351,21 +341,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0riy3hwjab1mr73jcqx3brmbmwspnw3d193j06a5f0fy1w35z15q"; + sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; type = "gem"; }; - version = "2.0.8.1"; + version = "2.1.0"; }; sinatra-contrib = { - dependencies = ["backports" "multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; + dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mmrfm4pqh98f3irjpkvfpazhcx6q42bnx6bbms9dqvmck3mid28"; + sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja"; type = "gem"; }; - version = "2.0.8.1"; + version = "2.1.0"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; @@ -384,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14iq8v16l31bfq7pikfmgcv5x6pkc5lbdmwwg6zlzcy1bibcliar"; + sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; therubyrhino = { dependencies = ["therubyrhino_jar"]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/googler/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/googler/default.nix index 1eca26d7be02..7a096b52314a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/googler/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/googler/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jarun/googler"; description = "Google Search, Google Site Search, Google News from the terminal"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ koral filalex77 ]; + maintainers = with maintainers; [ koral Br1ght0ne ]; platforms = python.meta.platforms; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gphoto2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gphoto2/default.nix index 1235a41ffc7b..7bda292a4cba 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gphoto2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gphoto2/default.nix @@ -1,17 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt, gettext -, libjpeg, readline, libtool +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, gettext +, libexif +, libgphoto2 +, libjpeg +, libtool +, popt +, readline }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.23"; + pname = "gphoto2"; + version = "2.5.26"; - src = fetchurl { - url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1laqwhxr0xhbykmp0dhd3j4rr2lhj5y228s31afnqxp700hhk1yz"; + src = fetchFromGitHub { + owner = "gphoto"; + repo = "gphoto2"; + rev = "v${version}"; + sha256 = "1w01j3qvjl2nlfs38rnsmjvn3r0r2xf7prxz1i6yarbpj3fzwqqc"; }; - nativeBuildInputs = [ pkgconfig gettext libtool ]; - buildInputs = [ libgphoto2 libexif popt libjpeg readline ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + gettext + libtool + ]; + + buildInputs = [ + libexif + libgphoto2 + libjpeg + popt + readline + ]; meta = with stdenv.lib; { description = "A ready to use set of digital camera software applications"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix index 07918d3d599d..42f522175b04 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3 -, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils }: +, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpscorrelate"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { docbook_xsl libxslt pkgconfig + wrapGAppsHook ]; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpx/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpx/default.nix index dcf022fc4453..c052b1ddb059 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gpx"; - version = "2.5.2"; + version = "2.6.8"; nativeBuildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "markwal"; repo = "GPX"; rev = version; - sha256 = "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5"; + sha256 = "1izs8s5npkbfrsyk17429hyl1vyrbj9dp6vmdlbb2vh6mfgl54h8"; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 5b34007ec408..a081076ac83f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.33"; + version = "7.37"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1k4zl7knlpwxrpqk1axkmy8x12915z15h3q2sjnx3jcnx6qw73ja"; + sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8"; }; patches = (substituteAll { @@ -29,15 +29,14 @@ mkDerivation rec { wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { - homepage = "https://www.gpxsee.org/"; description = "GPS log file viewer and analyzer"; longDescription = '' GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats. ''; + homepage = "https://www.gpxsee.org/"; + changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; license = licenses.gpl3; maintainers = with maintainers; [ womfoo sikmir ]; platforms = with platforms; linux ++ darwin; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gramps/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gramps/default.nix index 09717cd64265..1ef00efaf7b4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gramps/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gramps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, +{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, pango, gobject-introspection, wrapGAppsHook, gettext, # Optional packages: enableOSM ? true, osm-gps-map, @@ -9,11 +9,11 @@ let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { - version = "5.0.1"; + version = "5.1.3"; pname = "gramps"; nativeBuildInputs = [ wrapGAppsHook gettext ]; - buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] + buildInputs = [ intltool gtk3 gobject-introspection pango gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map # Graphviz support @@ -26,7 +26,7 @@ in buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; rev = "v${version}"; - sha256 = "1jz1fbjj6byndvir7qxzhd2ryirrd5h2kwndxpp53xdc05z1i8g7"; + sha256 = "109dwkswz2h2328xkqk2zj736d117s9pp7rz5cc1qg2vxn1lpm93"; }; pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix index a4932943fa23..74485e2004aa 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.3.4"; + version = "3.4.8"; src = fetchzip { url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "14xr0yqklmm4jvj1hnkj89lj83zzs2l1375ni0jbf12gy31jlb2w"; + sha256 = "13ycr6ppyrz9rq7dasabjdk8lcsxdj3krb4j7d2jmbh2hij1rdvf"; }; buildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/grsync/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/grsync/default.nix index 8d17ff09204f..e1c9902c6ae7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/grsync/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/grsync/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Grsync is used to synchronize folders, files and make backups"; + description = "Synchronize folders, files and make backups"; homepage = "http://www.opbyte.it/grsync/"; license = licenses.gpl1; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/guake/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/guake/default.nix deleted file mode 100644 index d403ddc8b26c..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/guake/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv -, fetchFromGitHub -, python3 -, gettext -, gobject-introspection -, wrapGAppsHook -, gtk3 -, keybinder3 -, libnotify -, libutempter -, vte -, libwnck3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "guake"; - version = "3.6.3"; - - format = "other"; - - src = fetchFromGitHub { - owner = "Guake"; - repo = "guake"; - rev = version; - sha256 = "13ipnmqcyixpa6qv83m0f91za4kar14s5jpib68b32z65x1h0j3b"; - }; - - # Strict deps breaks guake - # See https://github.com/NixOS/nixpkgs/issues/59930 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - - nativeBuildInputs = [ - gettext - gobject-introspection - wrapGAppsHook - python3.pkgs.pip - ]; - - buildInputs = [ - gtk3 - keybinder3 - libnotify - libwnck3 - python3 - vte - ]; - - propagatedBuildInputs = with python3.pkgs; [ - dbus-python - pbr - pycairo - pygobject3 - setuptools - ]; - - PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var - - makeFlags = [ - "prefix=${placeholder ''out''}" - ]; - - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libutempter ]}") - ''; - - meta = with stdenv.lib; { - description = "Drop-down terminal for GNOME"; - homepage = "http://guake-project.org"; - license = licenses.gpl2; - maintainers = [ maintainers.msteen ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/havoc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/havoc/default.nix deleted file mode 100644 index a6d5278fc3c5..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/havoc/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchFromGitHub -, pkgconfig, libxkbcommon, wayland, wayland-protocols }: - -stdenv.mkDerivation rec { - - pname = "havoc"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "ii8"; - repo = pname; - rev = version; - sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxkbcommon wayland wayland-protocols ]; - - dontConfigure = true; - - installFlags = [ "PREFIX=$$out" ]; - - postInstall = '' - install -D -m 644 havoc.cfg -t $out/etc/${pname}/ - install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/ - ''; - - meta = with stdenv.lib; { - description = "A minimal terminal emulator for Wayland"; - homepage = "https://github.com/ii8/havoc"; - license = with licenses; [ mit publicDomain ]; - platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/haxor-news/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/haxor-news/default.nix index 98f84ca68b8e..41aa71cb82e2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/haxor-news/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/haxor-news/default.nix @@ -1,20 +1,35 @@ -{ stdenv, python, fetchpatch }: - -with python.pkgs; +{ stdenv, fetchFromGitHub, python3, fetchpatch }: + + +let + py = python3.override { + packageOverrides = self: super: { + self = py; + + # not compatible with prompt_toolkit >=2.0 + prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { + name = "${oldAttrs.pname}-${version}"; + version = "1.0.18"; + src = oldAttrs.src.override { + inherit version; + sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx"; + }; + }); + }; + }; +in +with py.pkgs; buildPythonApplication rec { pname = "haxor-news"; - version = "0.4.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88"; - }; - - # allow newer click version - patches = fetchpatch { - url = "${meta.homepage}/commit/5b0d3ef1775756ca15b6d83fba1fb751846b5427.patch"; - sha256 = "1551knh2f7yarqzcpip16ijmbx8kzdna8cihxlxx49ww55f5sg67"; + version = "unstable-2020-10-20"; + + # haven't done a stable release in 3+ years, but actively developed + src = fetchFromGitHub { + owner = "donnemartin"; + repo = pname; + rev = "811a5804c09406465b2b02eab638c08bf5c4fa7f"; + sha256 = "1g3dfsyk4727d9jh9w6j5r51ag07851cls7v7a7hmdvdixpvbzp6"; }; propagatedBuildInputs = [ @@ -26,6 +41,7 @@ buildPythonApplication rec { six ]; + # will fail without pre-seeded config files doCheck = false; checkInputs = [ mock ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/heimer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/heimer/default.nix index 19034c1dc762..444ee7ab5232 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/heimer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.19.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "18paabqfxz49fahdi4fs5z870aynmyfj3xw8q768qffgc26zhl3m"; + sha256 = "03q3jn0j0cydw2mxfv7236lv4w9fh9slha0mphj33mk2f97b9hl6"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/hr/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/hr/default.nix index 91a66bc73781..a0555f9032e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/hr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/hr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hr"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "LuRsT"; repo = "hr"; rev = version; - sha256 = "162vkip2772jl59lschpinimpg4ssiyg7fq0va5cx4d7wldpqmks"; + sha256 = "068kq37lbqfjzh28rlvkprni38ii991naawylwvq6d43y9dpzs2b"; }; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/hstr/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/hstr/default.nix index 81f931b11f8e..421d02e97b91 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/hstr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/hstr/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hstr"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "dvorka"; repo = "hstr"; rev = version; - sha256 = "07fkilqlkpygvf9kvxyvl58g3lfq0bwwdp3wczy4hk8qlbhmgihn"; + sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/hugo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/hugo/default.nix index 486a9cefc7f1..3ded9f013fbc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.75.1"; + version = "0.79.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1c3l3q2xkibl1lz2mbvhgj94s6d9g5nakhpzj252s3m3cgk4w5wh"; + sha256 = "0i9c12w0jlfrqb5gygfn20rn41m7qy6ab03n779wbzwfqqz85mj6"; }; - vendorSha256 = "0gdd8fqd4mwg69wj8dxmm5wh1pjhdc189l2gy6njgpmwh93xbvdg"; + vendorSha256 = "0jb6aqdv9yx7fxbkgd73rx6kvxagxscrin5b5bal3ig7ys1ghpsp"; doCheck = false; @@ -25,6 +25,6 @@ buildGoModule rec { description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; license = licenses.asl20; - maintainers = with maintainers; [ schneefux filalex77 Frostman ]; + maintainers = with maintainers; [ schneefux Br1ght0ne Frostman ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/hyper/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/hyper/default.nix deleted file mode 100644 index 1535b1a2568e..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/hyper/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk2, cairo -, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr -, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: - -let - libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio - ]; -in -stdenv.mkDerivation rec { - version = "2.1.2"; - pname = "hyper"; - src = fetchurl { - url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm"; - }; - buildInputs = [ dpkg ]; - unpackPhase = '' - mkdir pkg - dpkg-deb -x $src pkg - sourceRoot=pkg - ''; - installPhase = '' - mkdir -p "$out/bin" - mv opt "$out/" - ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper" - mv usr/* "$out/" - ''; - dontPatchELF = true; - meta = with lib; { - description = "A terminal built on web technologies"; - homepage = "https://hyper.is/"; - maintainers = with maintainers; [ puffnfresh ]; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/icesl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/icesl/default.nix index edcc5a58ad52..b3e7e53774d7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/icesl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/icesl/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing"; + description = "GPU-accelerated procedural modeler and slicer for 3D printing"; homepage = "http://shapeforge.loria.fr/icesl/index.html"; license = licenses.inria-icesl; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/ideamaker/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/ideamaker/default.nix new file mode 100644 index 000000000000..7b2eeec292bf --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/ideamaker/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, autoPatchelfHook +, curl +, dpkg +, fetchurl +, gcc +, lib +, libGLU +, libcork +, makeDesktopItem +, qt5 +, quazip_qt4 +, zlib +}: +stdenv.mkDerivation rec { + pname = "ideamaker"; + version = "4.0.1"; + + src = fetchurl { + # N.B. Unfortunately ideamaker adds a number after the patch number in + # their release scheme which is not referenced anywhere other than in + # the download URL. Because of this, I have chosen to not use ${version} + # and just handwrite the correct values in the following URL, hopefully + # avoiding surprises for the next person that comes to update this + # package. + url = "https://download.raise3d.com/ideamaker/release/4.0.1/ideaMaker_4.0.1.4802-ubuntu_amd64.deb"; + sha256 = "0a1jcakdglcr4kz0kyq692dbjk6aq2yqcp3i6gzni91k791h49hp"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg qt5.wrapQtAppsHook ]; + buildInputs = [ + curl + gcc.cc.lib + libGLU + libcork + qt5.qtbase + qt5.qtserialport + quazip_qt4 + zlib + ]; + + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/pixmaps} + + cp usr/lib/x86_64-linux-gnu/ideamaker/ideamaker $out/bin + ln -s "${desktopItem}/share/applications" $out/share/ + cp usr/share/ideamaker/icons/ideamaker-icon.png $out/share/pixmaps/${pname}.png + + runHook postInstall + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Ideamaker"; + genericName = meta.description; + categories = "Utility;Viewer;Engineering;"; + mimeType = "application/sla"; + }; + + meta = with lib; { + homepage = "https://www.raise3d.com/ideamaker/"; + description = "Raise3D's 3D slicer software"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix index 0c2abbd9f588..c97ea3d4b772 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which +{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20190228"; + version = "3.20200202.3"; lib = stdenv.lib; in @@ -28,10 +28,10 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz"; - sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh"; + sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr"; }; - buildInputs = [ which ] + buildInputs = [ which highlight ] ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase @@ -62,13 +62,14 @@ stdenv.mkDerivation { postInstall = '' for a in "$out/bin/"*; do 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 : ${breezy}/bin \''} - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} - ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''} - ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''} + ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \ + ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/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 ''} \ + ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \ + ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \ ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done ''; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch index c981857a248b..bae63a10bf67 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch @@ -1,10 +1,28 @@ diff --git a/t/mdwn.t b/t/mdwn.t -index ca3180139..d64750403 100755 +index 966aad2..2756173 100755 --- a/t/mdwn.t +++ b/t/mdwn.t -@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn", - "C. S. Lewis wrote books\n"), - "<p>C. S. Lewis wrote books</p>\n", "alphalist off by default"); +@@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) { + "<p>C. S. Lewis wrote books</p>\n", + "alphalist off by default for multimarkdown = $multimarkdown"); + +- like(IkiWiki::htmlize("foo", "foo", "mdwn", +- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), +- qr{<p>This works.*fnref:1.*}, +- "footnotes on by default for multimarkdown = $multimarkdown"); +- + $config{mdwn_footnotes} = 0; + unlike(IkiWiki::htmlize("foo", "foo", "mdwn", + "An unusual link label: [^1]\n\n[^1]: http://example.com/\n"), + qr{<p>An unusual link label: .*fnref:1.*}, + "footnotes can be disabled for multimarkdown = $multimarkdown"); +- +- $config{mdwn_footnotes} = 1; +- like(IkiWiki::htmlize("foo", "foo", "mdwn", +- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), +- qr{<p>This works.*fnref:1.*}, +- "footnotes can be enabled for multimarkdown = $multimarkdown"); + } -$config{mdwn_alpha_lists} = 1; -like(IkiWiki::htmlize("foo", "foo", "mdwn", @@ -15,23 +33,3 @@ index ca3180139..d64750403 100755 $config{mdwn_alpha_lists} = 0; like(IkiWiki::htmlize("foo", "foo", "mdwn", "A. One\n". - "B. Two\n"), - qr{<p>A. One\sB. Two</p>\n}, "alphalist can be disabled"); - --like(IkiWiki::htmlize("foo", "foo", "mdwn", -- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), -- qr{<p>This works<sup\W}, "footnotes on by default"); -- - $config{mdwn_footnotes} = 0; - like(IkiWiki::htmlize("foo", "foo", "mdwn", - "An unusual link label: [^1]\n\n[^1]: http://example.com/\n"), - qr{<a href="http://example\.com/">\^1</a>}, "footnotes can be disabled"); - --$config{mdwn_footnotes} = 1; --like(IkiWiki::htmlize("foo", "foo", "mdwn", -- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), -- qr{<p>This works<sup\W}, "footnotes can be enabled"); -- - SKIP: { - skip 'set $IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT if you have Discount 2.2.0+', 4 - unless $ENV{IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT}; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/imag/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/imag/default.nix index bb6956aaa596..f3d4e156d6cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/imag/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/imag/default.nix @@ -7,7 +7,7 @@ , installShellFiles , Security , gitMinimal -, utillinuxMinimal +, util-linuxMinimal }: rustPlatform.buildRustPackage rec { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - checkInputs = [ gitMinimal utillinuxMinimal ]; + checkInputs = [ gitMinimal util-linuxMinimal ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { description = "Commandline personal information management suite"; homepage = "https://imag-pim.org/"; license = licenses.lgpl21; - maintainers = with maintainers; [ filalex77 minijackson ]; + maintainers = with maintainers; [ Br1ght0ne minijackson ]; platforms = platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch new file mode 100644 index 000000000000..34e4e6f0e7fb --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch @@ -0,0 +1,85 @@ +From ddc1f9e63e7a769c71131b56f6a2a011c649635c Mon Sep 17 00:00:00 2001 +From: Arnout Engelen <arnout@bzzt.net> +Date: Tue, 24 Nov 2020 15:34:40 +0100 +Subject: [PATCH] Avoid name clash between inkscape plugin and inkcut itself + +Ohterwise, with an unfortunate PYTONPATH, inkcut would no longer +start since it'd try to invoke the inkcut.py from the extension +instead of the main application +--- + plugins/inkscape/{inkcut.py => inkcut4inkscape.py} | 2 +- + plugins/inkscape/inkcut_cut.inx | 2 +- + plugins/inkscape/inkcut_cut.py | 2 +- + plugins/inkscape/inkcut_open.inx | 2 +- + plugins/inkscape/inkcut_open.py | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + rename plugins/inkscape/{inkcut.py => inkcut4inkscape.py} (98%) + +diff --git a/plugins/inkscape/inkcut.py b/plugins/inkscape/inkcut4inkscape.py +similarity index 98% +rename from plugins/inkscape/inkcut.py +rename to plugins/inkscape/inkcut4inkscape.py +index 5b90475..7dc8d86 100644 +--- a/plugins/inkscape/inkcut.py ++++ b/plugins/inkscape/inkcut4inkscape.py +@@ -2,7 +2,7 @@ + # -*- coding: utf-8 -*- + """ + Inkcut, Plot HPGL directly from Inkscape. +- inkcut.py ++ inkcut4inkscape.py + + Copyright 2018 The Inkcut Team + +diff --git a/plugins/inkscape/inkcut_cut.inx b/plugins/inkscape/inkcut_cut.inx +index 4b44ae5..3db8721 100644 +--- a/plugins/inkscape/inkcut_cut.inx ++++ b/plugins/inkscape/inkcut_cut.inx +@@ -2,7 +2,7 @@ + <_name>Cut selection...</_name> + <id>org.ekips.filter.inkcut.cut</id> + <dependency type="executable" location="extensions">inkcut_cut.py</dependency> +- <dependency type="executable" location="extensions">inkcut.py</dependency> ++ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + <effect> + <object-type>all</object-type> +diff --git a/plugins/inkscape/inkcut_cut.py b/plugins/inkscape/inkcut_cut.py +index acaf812..777629a 100644 +--- a/plugins/inkscape/inkcut_cut.py ++++ b/plugins/inkscape/inkcut_cut.py +@@ -37,7 +37,7 @@ + else: + inkex.localize() + import subprocess +-from inkcut import contains_text, convert_objects_to_paths ++from inkcut4inkscape import contains_text, convert_objects_to_paths + + + +diff --git a/plugins/inkscape/inkcut_open.inx b/plugins/inkscape/inkcut_open.inx +index 45ee585..2dcd38e 100644 +--- a/plugins/inkscape/inkcut_open.inx ++++ b/plugins/inkscape/inkcut_open.inx +@@ -2,7 +2,7 @@ + <_name>Open current document...</_name> + <id>org.ekips.filter.inkcut.open</id> + <dependency type="executable" location="extensions">inkcut_open.py</dependency> +- <dependency type="executable" location="extensions">inkcut.py</dependency> ++ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency> + <dependency type="executable" location="extensions">inkex.py</dependency> + <effect> + <object-type>all</object-type> +diff --git a/plugins/inkscape/inkcut_open.py b/plugins/inkscape/inkcut_open.py +index b4652eb..e4c2d62 100644 +--- a/plugins/inkscape/inkcut_open.py ++++ b/plugins/inkscape/inkcut_open.py +@@ -38,7 +38,7 @@ + inkex.localize() + import subprocess + +-from inkcut import convert_objects_to_paths ++from inkcut4inkscape import convert_objects_to_paths + + DEBUG = False + try: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/inkcut/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/inkcut/default.nix index 6be6e842bde7..481069feac07 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/inkcut/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/inkcut/default.nix @@ -1,18 +1,28 @@ -{ lib, python3Packages, fetchFromGitHub, wrapQtAppsHook }: +{ lib +, python3Packages +, fetchFromGitHub +, wrapQtAppsHook +}: with python3Packages; buildPythonApplication rec { pname = "inkcut"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1c0mfdfy9iq4l683f3aa7cm7x2w9px83dyigc7655wvaq3bxi2rp"; + sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx"; }; + patches = [ + # https://github.com/inkcut/inkcut/pull/292 but downloaded + # because of https://github.com/NixOS/nixpkgs/issues/32084 + ./avoid-name-clash-between-inkcut-and-extension.patch + ]; + nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ @@ -45,6 +55,15 @@ buildPythonApplication rec { dontWrapQtApps = true; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + postInstall = '' + mkdir -p $out/share/inkscape/extensions + + cp plugins/inkscape/* $out/share/inkscape/extensions + + sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_cut.py + sed -i "s|cmd = \['inkcut'\]|cmd = \['$out/bin/inkcut'\]|" $out/share/inkscape/extensions/inkcut_open.py + ''; + meta = with lib; { homepage = "https://www.codelv.com/projects/inkcut/"; description = "Control 2D plotters, cutters, engravers, and CNC machines"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix index f561f15ab3ec..f3d8d5cbc205 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/ipmicfg/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://www.supermicro.com/wftp/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; sha256 = "0srkzivxa4qlf3x9zdkri7xfq7kjj4fsmn978vzmzsvbxkqswd5a"; - extraPostFetch = "chmod u+rwX,go-rwx+X $out/"; }; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/iterm2/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/iterm2/default.nix deleted file mode 100644 index e273eda45c31..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/iterm2/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchFromGitHub }: - - /* - This derivation is impure: it relies on an Xcode toolchain being installed - and available in the expected place. The values of sandboxProfile - are copied pretty directly from the MacVim derivation, which - is also impure. In order to build you at least need the `sandbox` - option set to `relaxed` or `false`. - */ - -stdenv.mkDerivation rec { - pname = "iterm2"; - version = "3.3.9"; - - src = fetchFromGitHub { - owner = "gnachman"; - repo = "iTerm2"; - rev = "v${version}"; - sha256 = "06mq3gfjgy8jw2f3fzdsi3pbfkdijfzzlhlw6ixa5bfb4hbcgn5j"; - }; - - patches = [ ./disable_updates.patch ]; - postPatch = '' - sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj - ''; - - preConfigure = "LD=$CC"; - makeFlagsArray = ["Nix"]; - installPhase = '' - mkdir -p $out/Applications - mv Build/Products/Deployment/iTerm2.app $out/Applications/iTerm.app - ''; - - sandboxProfile = '' - (allow file-read* file-write* process-exec mach-lookup) - ; block homebrew dependencies - (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) - ''; - - meta = with stdenv.lib; { - description = "A replacement for Terminal and the successor to iTerm"; - homepage = "https://www.iterm2.com/"; - license = licenses.gpl2; - maintainers = with maintainers; [ tricktron ]; - platforms = platforms.darwin; - hydraPlatforms = []; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/iterm2/disable_updates.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/iterm2/disable_updates.patch deleted file mode 100644 index e717c58f30f1..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/iterm2/disable_updates.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:28.000000000 +0200 -+++ iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:42.000000000 +0200 -@@ -189,7 +189,7 @@ - kPreferenceKeyInstantReplayMemoryMegabytes: @4, - kPreferenceKeySavePasteAndCommandHistory: @NO, - kPreferenceKeyAddBonjourHostsToProfiles: @NO, -- kPreferenceKeyCheckForUpdatesAutomatically: @YES, -+ kPreferenceKeyCheckForUpdatesAutomatically: @NO, - kPreferenceKeyCheckForTestReleases: @NO, - kPreferenceKeyLoadPrefsFromCustomFolder: @NO, - kPreferenceKeyNeverRemindPrefsChangesLostForFileHaveSelection: @NO, diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix index c20fa4ed9d9b..2b1b093fd354 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "j4-dmenu-desktop"; - version = "2.17"; + version = "2.18"; src = fetchFromGitHub { owner = "enkore"; repo = pname; rev = "r${version}"; - sha256 = "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc"; + sha256 = "1gxpgifzy0hnpd0ymw3r32amzr32z3bgb90ldjzl438p6h1q0i26"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index be103f3543a8..bcd4f686f818 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.2.6"; + version = "1.4.19"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "14svzfhszb0pnsajbydsic0rdc64zp6csqjp6k2p2i20jf0c0im6"; - x86_64-darwin = "1wdv8idnvn5567xdmsaa3f7skv48i9q6jqd4pgv8pz1zkhiqj0wi"; + x86_64-linux = "1xyj30pnlczchbh4awb955sxh51v89d170f4yk0v1jkj7dg2wjgj"; + x86_64-darwin = "166yp2rr87p0lh64ngs498a50ahcann8z5s0g2p0azs6wi54a6kw"; }.${system} or throwSystem; }; @@ -52,9 +52,9 @@ let extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' mv $out/bin/{${name},${pname}} - install -Dm444 ${appimageContents}/joplin.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/joplin.png -t $out/share/pixmaps - substituteInPlace $out/share/applications/joplin.desktop \ + install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/josm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/josm/default.nix index ea7672abf6e7..eab2519ad08e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "17084"; + version = "17329"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0avzpzmvv371jpbph9xpq0ia2nikha2aib9v10hr2f9q7vka9zx4"; + sha256 = "0hra146akadqz9acj1xa2vzrmipfzf8li7sgsmk169xr991y653k"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "1vd2r4sshjpd6ic460cdil75skrm6f6q48lm6n3g1ywkn4mx63p1"; + sha256 = "0i09jnfqbcirmic9vayrp78lnyk4mfh7ax3v3cs8kyqhk930pscf"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; @@ -43,6 +43,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An extensible editor for OpenStreetMap"; homepage = "https://josm.openstreetmap.de/"; + changelog = "https://josm.openstreetmap.de/wiki/Changelog"; license = licenses.gpl2Plus; maintainers = with maintainers; [ rycee sikmir ]; platforms = platforms.all; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix index 70ca28b46783..069d98111cc4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.6.24251"; + version = "0.7.35160"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "0f26fg5fqpz0f6jxp72cj5f2kf76jah5iaqlqsl87250y0hm330g"; + sha256 = "00fzycy199l9y738cj71s88qz96ppczb5sqsk3x9w4jj4m6ks239"; stripRoot = false; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix index 75e467d4cdf8..be61a76190a2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix @@ -2,7 +2,7 @@ , cmake, pkgconfig, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript -, enableMuPDF ? true, mupdf +, enableMuPDF ? true, mupdf_1_17 , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes , enableTesseract ? true, leptonica, tesseract4 @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/ ''; }; - mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: { + mupdf_modded = mupdf_1_17.overrideAttrs ({ patches ? [], ... }: { patches = patches ++ [ mupdf_patch ]; # This function is missing in font.c, see font-win32.c postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/kanboard/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/kanboard/default.nix index 4f84420330dd..ebe31b10c60e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/kanboard/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.15"; + version = "1.2.16"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "0lib2qlc8a59i9dak0g1j5hymwbq9vhflp5srhcjislxypfvrizs"; + sha256 = "1nps7xcw1gp7kfdp13wyj2sprc8hn5iamdb0xj4202qygpzm63wq"; }; dontBuild = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/kdeconnect/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/kdeconnect/default.nix deleted file mode 100644 index 31e919e37706..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/kdeconnect/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ mkDerivation -, lib -, fetchurl -, fetchpatch -, extra-cmake-modules -, kcmutils -, kconfigwidgets -, kdbusaddons -, kdoctools -, kiconthemes -, ki18n -, knotifications -, qca-qt5 -, libfakekey -, libXtst -, qtx11extras -, qtmultimedia -, qtgraphicaleffects -, sshfs -, makeWrapper -, kwayland -, kio -, kpeoplevcard -, kpeople -, kirigami2 -, pulseaudio-qt -}: - -mkDerivation rec { - pname = "kdeconnect"; - version = "20.08.1"; - - src = fetchurl { - url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz"; - sha256 = "0s76djgpx08jfmh99c7kx18mnr3w7bv4hdra120nicq89mmy7gwf"; - }; - - patches = [ - # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328 - (fetchpatch { - url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/6101ef3ad07d865958d58a3d2736f5536f1c5719.diff"; - sha256 = "17mr7k13226vzcgxlmfs6q2mdc5j7vwp4iri9apmh6xlf6r591ac"; - }) - ]; - - buildInputs = [ - libfakekey - libXtst - qtmultimedia - qtgraphicaleffects - pulseaudio-qt - kpeoplevcard - kpeople - kirigami2 - ki18n - kiconthemes - kcmutils - kconfigwidgets - kdbusaddons - knotifications - qca-qt5 - qtx11extras - makeWrapper - kwayland - kio - ]; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - - postInstall = '' - wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]} - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "KDE Connect provides several features to integrate your phone and your computer"; - homepage = "https://community.kde.org/KDEConnect"; - license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ fridh ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index f9dbf14624f7..10e6996873a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -8,7 +8,7 @@ let src = fetchFromGitHub { owner = "pfn"; repo = "keepasshttp"; - #rev = "${version}"; + # rev = version; # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff # afterwards and didn't move the tag), hence reference by commitid rev = "c2c4eb5388a02169400cba7a67be325caabdcc37"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index 3d41c45f6dc5..b28914a44a81 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -1,13 +1,13 @@ { stdenv, buildEnv, fetchurl, mono }: let - version = "1.8.0"; + version = "1.14.0"; drv = stdenv.mkDerivation { pname = "keepassrpc"; inherit version; src = fetchurl { url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; - sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd"; + sha256 = "1c410cc93c0252e7cfdb02507b8172c13e18d12c97f08630b721d897dc9b8b24"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass/default.nix index 23f80eaa9cab..6164a60d6a86 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.45"; + version = "2.46"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "07wyp3k2kiprr47mc4vxb7vmh7g5kshcqw0gq3qr87gi78c9i66m"; + sha256 = "0zyclydgyg8nhwxrzw7x4f82975cqdmp12py33k6sballx6jhgiy"; }; sourceRoot = "."; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepassx/community.nix index f0131712b237..7df1294874f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -31,7 +31,7 @@ , withKeePassKeeShare ? true , withKeePassKeeShareSecure ? true , withKeePassSSHAgent ? true -, withKeePassNetworking ? false +, withKeePassNetworking ? true , withKeePassTouchID ? true , withKeePassFDOSecrets ? true }: @@ -40,13 +40,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "0wgn0glmcxaa670bpxh7n7abjlxcx4h1rl1169cmah0ddxnxnxpq"; + sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/keeweb/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/keeweb/default.nix new file mode 100644 index 000000000000..8c1c56dacdc3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/keeweb/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchurl, appimageTools, undmg, libsecret }: +let + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + pname = "keeweb"; + version = "1.16.0"; + name = "${pname}-${version}"; + + suffix = { + x86_64-linux = "linux.AppImage"; + x86_64-darwin = "mac.dmg"; + }.${system} or throwSystem; + + src = fetchurl { + url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; + sha256 = { + x86_64-linux = "1pivic7n5nv00s8bb51i2jz2mxgjn92hkc8n0p8662ai1cdng47g"; + x86_64-darwin = "0q6k0qgkgzid9yjbfsfpp8l9dr0n8xp25a4jf2bxwickm4irs9mz"; + }.${system} or throwSystem; + }; + + appimageContents = appimageTools.extract { + inherit name src; + }; + + meta = with stdenv.lib; { + description = "Free cross-platform password manager compatible with KeePass"; + homepage = "https://keeweb.info/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; + + linux = appimageTools.wrapType2 rec { + inherit name src meta; + + extraPkgs = pkgs: with pkgs; [ libsecret ]; + + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -Dm644 ${appimageContents}/keeweb.desktop -t $out/share/applications + install -Dm644 ${appimageContents}/keeweb.png -t $out/share/icons/hicolor/256x256/apps + install -Dm644 ${appimageContents}/usr/share/mime/keeweb.xml -t $out/share/mime + substituteInPlace $out/share/applications/keeweb.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + }; + + darwin = stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "KeeWeb.app"; + + installPhase = '' + mkdir -p $out/Applications/KeeWeb.app + cp -R . $out/Applications/KeeWeb.app + ''; + }; +in +if stdenv.isDarwin +then darwin +else linux diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/kitty/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/kitty/default.nix deleted file mode 100644 index e2eda846d60f..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/kitty/default.nix +++ /dev/null @@ -1,143 +0,0 @@ -{ stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring, - harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, - libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, - libxkbcommon, libXi, libXext, wayland-protocols, wayland, - lcms2, - installShellFiles, - dbus, - Cocoa, - CoreGraphics, - Foundation, - IOKit, - Kernel, - OpenGL, - libcanberra, - libicns, - libpng, - python3, - zlib, -}: - -with python3Packages; -buildPythonApplication rec { - pname = "kitty"; - version = "0.19.1"; - format = "other"; - - src = fetchFromGitHub { - owner = "kovidgoyal"; - repo = "kitty"; - rev = "v${version}"; - sha256 = "145fx4nnn0gszawllfwqf1h65ak0ij6ffargs7y0cgaxsc991s6m"; - }; - - buildInputs = [ - harfbuzz - ncurses - lcms2 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - Cocoa - CoreGraphics - Foundation - IOKit - Kernel - OpenGL - libpng - python3 - zlib - ] ++ stdenv.lib.optionals stdenv.isLinux [ - fontconfig libunistring libcanberra libX11 - libXrandr libXinerama libXcursor libxkbcommon libXi libXext - wayland-protocols wayland dbus - ]; - - nativeBuildInputs = [ - pkgconfig sphinx ncurses - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - imagemagick - libicns # For the png2icns tool. - installShellFiles - ]; - - propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL; - - outputs = [ "out" "terminfo" ]; - - patches = [ - ./fix-paths.patch - ]; - - # Causes build failure due to warning - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow"; - - dontConfigure = true; - - buildPhase = if stdenv.isDarwin then '' - ${python.interpreter} setup.py kitty.app \ - --update-check-interval=0 \ - --disable-link-time-optimization - make man - '' else '' - ${python.interpreter} setup.py linux-package \ - --update-check-interval=0 \ - --egl-library='${stdenv.lib.getLib libGL}/lib/libEGL.so.1' \ - --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ - --canberra-library='${libcanberra}/lib/libcanberra.so' - ''; - - checkInputs = [ pillow ]; - - checkPhase = - let buildBinPath = - if stdenv.isDarwin - then "kitty.app/Contents/MacOS" - else "linux-package/bin"; - in - '' - env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out - ${if stdenv.isDarwin then '' - mkdir "$out/bin" - ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" - mkdir "$out/Applications" - cp -r kitty.app "$out/Applications/kitty.app" - - installManPage 'docs/_build/man/kitty.1' - '' else '' - cp -r linux-package/{bin,share,lib} $out - ''} - wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" - runHook postInstall - - mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} - "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish" - "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash" - "$out/bin/kitty" + complete setup zsh > "$out/share/zsh/site-functions/_kitty" - ''; - - postInstall = '' - terminfo_src=${if stdenv.isDarwin then - ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' - else - "$out/share/terminfo"} - - mkdir -p $terminfo/share - mv "$terminfo_src" $terminfo/share/terminfo - - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/kovidgoyal/kitty"; - description = "A modern, hackable, featureful, OpenGL based terminal emulator"; - license = licenses.gpl3; - changelog = "https://sw.kovidgoyal.net/kitty/changelog.html"; - platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs Luflosi ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch deleted file mode 100644 index 380f6d749146..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/kitty/fix-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -3,7 +3,7 @@ -# Patching is needed here for the following reason: -# * importing the `constants` package from Kitty has a side effect that it -# creates the user configuration directory. This package gets imported -# while sphinx scans the code for documentation strings. -# - - # You can set these variables from the command line. - SPHINXOPTS = -j auto -T $(FAIL_WARN) --SPHINXBUILD = sphinx-build -+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build - SPHINXPROJ = kitty - SOURCEDIR = . - BUILDDIR = _build diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/klayout/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/klayout/default.nix index 5f6c679f3ba1..60905be3b1b2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch , python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl, makeWrapper, fixDarwinDylibNames +, which, perl, makeWrapper }: mkDerivation rec { pname = "klayout"; - version = "0.26.6"; + version = "0.26.8"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "0z17pdjdc2r2m5yi5bfz504dzzs978z8p6bhlf08v2npvigp8vz1"; + sha256 = "0pkhvxcfk70dnmgczyyq585mxrfwqai44ikshs4c1imh92z25llq"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/kondo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/kondo/default.nix index 6b23d1d0437f..f47458f0f3ff 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/kondo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/kondo/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { description = "Save disk space by cleaning unneeded files from software projects"; homepage = "https://github.com/tbillington/kondo"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/koreader/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/koreader/default.nix index f49eebad6b4d..4ffd3f6fbf65 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/koreader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/koreader/default.nix @@ -11,12 +11,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2020.09"; + version = "2020.11"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "12kiw3mw8g8d9fb8ywd4clm2bgblhq2gqcxzadwpmf0wxq7p0v8z"; + sha256 = "15nw8kyjyhqlr742gkpzn1b9906rdm6cssnc6jbbph5pjdlzspc4"; }; sourceRoot = "."; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/krename/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/krename/default.nix index 578c56a748a7..c1e031b7277d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/krename/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/krename/default.nix @@ -7,14 +7,14 @@ let pname = "krename"; - version = "5.0.0"; + version = "5.0.1"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a"; + sha256 = "0zbadxjp13jqxgb58wslhm0wy2lhpdq1bgbvyhyn21mssfppib6a"; }; buildInputs = [ taglib exiv2 podofo ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/krusader/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/krusader/default.nix index ab13c4989d9a..585dfe3e04f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/krusader/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/krusader/default.nix @@ -4,25 +4,23 @@ karchive, kconfig, kcrash, kguiaddons, kinit, kparts, kwindowsystem }: -let +mkDerivation rec { pname = "krusader"; version = "2.7.2"; -in mkDerivation rec { - pname = "krusader"; - inherit version; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "02b1jz5a7cjr13v6c7fczrhs1xmg1krnva5fxk8x2bf4nd1rm8s1"; }; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + + propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ]; + meta = with lib; { description = "Norton/Total Commander clone for KDE"; - license = licenses.gpl2; homepage = "http://www.krusader.org"; + license = licenses.gpl2Only; maintainers = with maintainers; [ sander turion ]; }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ]; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/kupfer/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/kupfer/default.nix index c7f54990107f..f2744bf23ea5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/kupfer/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/kupfer/default.nix @@ -16,6 +16,8 @@ buildPythonApplication rec { pname = "kupfer"; version = "319"; + format = "other"; + src = fetchurl { url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"; sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92"; @@ -33,13 +35,9 @@ buildPythonApplication rec { # see https://github.com/NixOS/nixpkgs/issues/56943 for details strictDeps = false; - postInstall = let - pythonPath = (stdenv.lib.concatMapStringsSep ":" - (m: "${m}/lib/${python.libPrefix}/site-packages") - propagatedBuildInputs); - in '' + postInstall = '' gappsWrapperArgs+=( - "--prefix" "PYTHONPATH" : "${pythonPath}" + "--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}" "--set" "PYTHONNOUSERSITE" "1" ) ''; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/libosmocore/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/libosmocore/default.nix index 2bd8bfa99bcd..8b36d384e153 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/libosmocore/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/libosmocore/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "libosmocore"; + description = "Set of Osmocom core libraries"; homepage = "https://github.com/osmocom/libosmocore"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lilyterm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/lilyterm/default.nix deleted file mode 100644 index 28f9625b5b66..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/lilyterm/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub -, pkgconfig -, autoconf, automake, intltool, gettext -, gtk, vte -, flavour ? "stable" -}: - -assert lib.assertOneOf "flavour" flavour [ "stable" "git" ]; - -let - pname = "lilyterm"; - stuff = - if flavour == "stable" - then rec { - version = "0.9.9.4"; - src = fetchurl { - url = "https://lilyterm.luna.com.tw/file/${pname}-${version}.tar.gz"; - sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; - }; - } - else { - version = "2019-07-25"; - src = fetchFromGitHub { - owner = "Tetralet"; - repo = pname; - rev = "faf1254f46049edfb1fd6e9191e78b1b23b9c51d"; - sha256 = "054450gk237c62b677365bcwrijr63gd9xm8pv68br371wdzylz7"; - }; - }; - -in -with stdenv.lib; -stdenv.mkDerivation rec { - inherit pname; - - inherit (stuff) src version; - - nativeBuildInputs = [ pkgconfig autoconf automake intltool gettext ]; - buildInputs = [ gtk vte ]; - - preConfigure = "sh autogen.sh"; - - configureFlags = [ - "--enable-nls" - "--enable-safe-mode" - ]; - - meta = with stdenv.lib; { - description = "A fast, lightweight terminal emulator"; - longDescription = '' - LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. - ''; - homepage = "https://lilyterm.luna.com.tw/"; - license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres Profpatsch ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/llpp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/llpp/default.nix index d7752258df98..c16322ad84fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/llpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/llpp/default.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, -libGLU, libGL, freetype, xclip, inotify-tools, procps }: +{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, +libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "32"; + version = "33"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; rev = "v${version}"; - sha256 = "1h1zysm5cz8laq8li49djl6929cnrjlflag9hw0c1dcr4zaxk32y"; + sha256 = "0shqzhaflm2yhkx6c0csq9lxp1s1r7lh5kgpx9q5k06xya2a7yvs"; fetchSubmodules = false; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }); nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype ]; + buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; dontStrip = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch index fbc341c8af78..c12828f2d94d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/llpp/fix-build-bash.patch @@ -1,8 +1,9 @@ diff --git a/build.bash b/build.bash index 7c278b6..41494c5 100755 +with manual adjustments --- a/build.bash +++ b/build.bash -@@ -29,7 +29,6 @@ srcd="$(dirname $0)" +@@ -30,7 +30,6 @@ srcd="$(dirname $0)" mudir=$outd/mupdf muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" @@ -10,25 +11,25 @@ index 7c278b6..41494c5 100755 mkdir -p $outd/{$wsid,lablGL} :>$outd/ordered -@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } - mbt=${mbt:-native} - mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a +@@ -41,12 +40,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } + mulibst="$mudir/build/$mbt/libs" + mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a" -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" --isfresh "$mulibs" "$(eval $keycmd)" || ( +-isfresh "$mulibst" "$(eval $keycmd)" || ( - make -C "$mudir" build=$mbt -j $mjobs libs -- eval $keycmd >$mudir/build/$mbt/libmupdf.a.past +- eval $keycmd >${mulibst}.past -) && vecho "fresh mupdf" - oincs() { local i= local incs1= -@@ -89,34 +82,6 @@ mflags() { +@@ -100,35 +93,6 @@ mflags() { } overs="$(ocamlc -vnum 2>/dev/null)" || overs="" --test "$overs" = "4.10.0" || { -- url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz +-test "$overs" = "4.11.1" || { +- url=https://caml.inria.fr/pub/distrib/ocaml-4.11/ocaml-4.11.1.tar.xz - txz=$outd/$(basename $url) - keycmd="printf $url; digest $txz;" - isfresh $txz "$(eval $keycmd)" || { @@ -48,7 +49,8 @@ index 7c278b6..41494c5 100755 - tar xf $txz -C $outd - bn=$(basename $url) - cd $outd/${bn%.tar.xz} -- ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix +- ./configure --disable-ocamldoc --disable-ocamltest \ +- --enable-debugger=no --prefix=$absprefix - make -j $mjobs world - make install - eval $keycmd >$absprefix/bin/ocamlc.past @@ -58,7 +60,7 @@ index 7c278b6..41494c5 100755 ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \ { read _ c; echo $c; })} -@@ -230,7 +195,7 @@ bobjc() { +@@ -243,7 +208,7 @@ bobjc() { } && vecho "fresh $o" } @@ -67,12 +69,12 @@ index 7c278b6..41494c5 100755 cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" -@@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do +@@ -291,7 +256,7 @@ for m in ml_gl ml_glarray ml_raw; do done libs="str.cma unix.cma" -clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread" -+clibs="-lmupdf -lfreetype -lpthread" ++clibs="-lmupdf -lmupdf-third -lfreetype -lgumbo -ljpeg -lopenjp2 -ljbig2dec -llcms2 -lharfbuzz -lpthread -lz" if $darwin; then mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) clibs="$clibs -framework Cocoa -framework OpenGL" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix index 335279c7084a..b30d652584f5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/lsd2dsl/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "lsd2dsl"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "nongeneric"; repo = pname; rev = "v${version}"; - sha256 = "100qd9i0x6r0nkw1ic2p0xjr16jlhinxkn1x7i98s4xmw4wyb8n8"; + sha256 = "0s0la6zkg584is93p4nj1ha3pbnvadq84zgsv8nym3r35n7k8czi"; }; nativeBuildInputs = [ cmake ]; @@ -19,8 +19,7 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; installPhase = '' - install -Dm755 console/lsd2dsl $out/bin/lsd2dsl - install -m755 gui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui + install -Dm755 console/lsd2dsl gui/lsd2dsl-qtgui -t $out/bin '' + lib.optionalString stdenv.isDarwin '' wrapQtApp $out/bin/lsd2dsl wrapQtApp $out/bin/lsd2dsl-qtgui diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index 2b656775ab5c..d7eabae0e8e5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -103,7 +103,7 @@ in buildFHSUserEnv { # WINE cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap - ocl-icd utillinux libkrb5 + ocl-icd util-linux libkrb5 # Proton libselinux diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lxterminal/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/lxterminal/default.nix deleted file mode 100644 index 8c002bd14b08..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/lxterminal/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte, wrapGAppsHook -, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs -}: - -let version = "0.3.2"; in - -stdenv.mkDerivation { - pname = "lxterminal"; - inherit version; - - src = fetchurl { - url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; - sha256 = "1iafqmccsm3nnzwp6pb2c04iniqqnscj83bq1rvf58ppzk0bvih3"; - }; - - configureFlags = [ - "--enable-man" - "--enable-gtk3" - ]; - - nativeBuildInputs = [ - automake autoconf intltool pkgconfig wrapGAppsHook - libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs - ]; - - buildInputs = [ gtk3 vte ]; - - patches = [ - ./respect-xml-catalog-files-var.patch - ]; - - preConfigure = '' - ./autogen.sh - ''; - - doCheck = true; - - meta = { - description = "The standard terminal emulator of LXDE"; - longDescription = '' - LXTerminal is the standard terminal emulator of LXDE. The terminal is a - desktop-independent VTE-based terminal emulator for LXDE without any - unnecessary dependencies. - ''; - homepage = "https://wiki.lxde.org/en/LXTerminal"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.velovix ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch deleted file mode 100644 index 598f506118f2..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/acinclude.m4 b/acinclude.m4 -index be626c5..b449b1b 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], - [ - AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl - AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) -- if $jh_found_xmlcatalog && \ -- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then -+ # empty argument forces libxml to use XML_CATALOG_FILES variable -+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then - AC_MSG_RESULT([found]) - ifelse([$3],,,[$3 - ])dnl diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/lyx/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/lyx/default.nix index 34e7e145e749..3c9158750968 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/lyx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: mkDerivation rec { - version = "2.3.5.2"; + version = "2.3.6"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "1pwdh0ljd7lm5a83vsqmp4695irhig07wxa90jc23ng5gap589na"; + sha256 = "160whjwwrmxizdakjlkf9xc86bhqfnslw47fixgqq4qhbapcxxkg"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mapproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mapproxy/default.nix index 5676aef23607..41ae683548d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mapproxy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/mapproxy/default.nix @@ -56,7 +56,7 @@ buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/pull/56480 doCheck = false; meta = with lib; { - description = "MapProxy is an open source proxy for geospatial data"; + description = "Open source proxy for geospatial data"; homepage = "https://mapproxy.org/"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index 96833bb25d35..b3e23f2245cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "20.08"; + version = "20.09"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l"; + sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index 09f20a9ba5dd..0fd3826f4e56 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "20.08"; + version = "20.09"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l"; + sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/megasync/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/megasync/default.nix index d5da4c7d773a..3b25d7e606a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/megasync/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/megasync/default.nix @@ -1,17 +1,40 @@ -{ stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub -, fetchpatch, ffmpeg_3, libmediainfo, libraw, libsodium, libtool, libuv, libzen -, lsb-release, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip -, wget }: +{ stdenv +, autoconf +, automake +, c-ares +, cryptopp +, curl +, doxygen +, fetchFromGitHub +, fetchpatch +, ffmpeg_3 +, libmediainfo +, libraw +, libsodium +, libtool +, libuv +, libzen +, lsb-release +, mkDerivation +, pkgconfig +, qtbase +, qttools +, qtx11extras +, sqlite +, swig +, unzip +, wget +}: mkDerivation rec { pname = "megasync"; - version = "4.3.1.0"; + version = "4.3.5.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "0b68wpif8a0wf1vfn1nr19dmz8f31dprb27jpldxrxhyfslc43yj"; + sha256 = "0rr1jjy0n5bj1lh6xi3nbbcikvq69j3r9qnajp4mhywr5izpccvs"; fetchSubmodules = true; }; @@ -29,6 +52,7 @@ mkDerivation rec { libuv libzen qtbase + qtx11extras sqlite unzip wget diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/microcom/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/microcom/default.nix deleted file mode 100644 index 8377505ec1c5..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/microcom/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, - lib, - fetchFromGitHub, - readline, - autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "microcom"; - version = "2019.01.0"; - - src = fetchFromGitHub { - owner = "pengutronix"; - repo = pname; - rev = "v${version}"; - sha256 = "056v28hvagnzns6p8i3bq8609k82d3w1ab2lab5dr4cdfwhs4pqj"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ readline ]; - - meta = with lib; { - description = "A minimalistic terminal program for communicating - with devices over a serial connection"; - inherit (src.meta) homepage; - license = licenses.gpl2; - maintainers = with maintainers; [ emantor ]; - platforms = with platforms; linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/minder/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/minder/default.nix index 14b9ebfe4c7d..bf94ac429947 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/minder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.9.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj"; + sha256 = "137kyf82n5a2v0cm9q02rhv8rmbjgnj60h64prq90h0d42prj3gd"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mlterm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mlterm/default.nix deleted file mode 100644 index 7c7906fc841f..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mlterm/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem -, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte -, 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 { - pname = "mlterm"; - version = "3.9.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k"; - }; - - 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 - preConfigure = '' - sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \ - main/Makefile.in \ - tool/mlfc/Makefile.in \ - tool/mlimgloader/Makefile.in \ - tool/mlconfig/Makefile.in \ - uitoolkit/libtype/Makefile.in \ - uitoolkit/libotl/Makefile.in - sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \ - tool/mlconfig/po/Makefile.in.in - #utmp and mlterm-fb - substituteInPlace configure.in \ - --replace "-m 2755 -g utmp" " " \ - --replace "-m 4755 -o root" " " - substituteInPlace configure \ - --replace "-m 2755 -g utmp" " " \ - --replace "-m 4755 -o root" " " - ''; - NIX_LDFLAGS = " - -L${stdenv.cc.cc.lib}/lib - -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft - -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n - " + stdenv.lib.optionalString (openssl != null) " - -lcrypto - " + stdenv.lib.optionalString (libssh2 != null) " - -lssh2 - "; - - configureFlags = [ - "--with-x=yes" - "--with-gui=xlib,fb" - "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice - "--with-type-engines=cairo,xft,xcore" - "--with-gtk=3.0" - "--enable-ind" #indic scripts - "--enable-fribidi" #bidi scripts - "--enable-m17nlib" #character encodings - "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" - #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core - #and configuring ~/.mlterm/key correctly. - ] ++ stdenv.lib.optional (libssh2 == null) "--disable-ssh2"; - - postInstall = '' - install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" - install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" - install -D -t $out/share/applications $desktopItem/share/applications/* - ''; - - desktopItem = makeDesktopItem { - name = "mlterm"; - exec = "mlterm %U"; - icon = "mlterm"; - type = "Application"; - comment = "Terminal emulator"; - desktopName = "mlterm"; - genericName = "Terminal emulator"; - categories = stdenv.lib.concatStringsSep ";" [ - "Application" "System" "TerminalEmulator" - ]; - startupNotify = "false"; - }; - - meta = with stdenv.lib; { - description = "Multi Lingual TERMinal emulator on X11"; - homepage = "http://mlterm.sourceforge.net/"; - license = licenses.bsd3; - maintainers = with maintainers; [ vrthra ramkromberg ]; - platforms = with platforms; linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/moolticute/default.nix index c815a74e0197..bc825b94facb 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.44.0"; + version = "0.44.17"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1xlbhx6f1ysx8gka8g67271whzhkzsnkavpq3x58hdxr8v88khby"; + sha256 = "1bqp99n8cqr7kjiffbs39v0dd280f50hid5py3c4zgc7aqj9k0bx"; }; outputs = [ "out" "udev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mrxvt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mrxvt/default.nix deleted file mode 100644 index 4dc70133ec47..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mrxvt/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE -, freetype, pkgconfig, which }: - -stdenv.mkDerivation { - name = "mrxvt-0.5.4"; - - buildInputs = - [ libX11 libXft libXi xorgproto libSM libICE freetype pkgconfig which ]; - - configureFlags = [ - "--with-x" - "--enable-frills" - "--enable-xft" - "--enable-xim" - # "--with-term=xterm" - "--with-max-profiles=100" - "--with-max-term=100" - "--with-save-lines=10000" - ]; - - preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"; - ''; - - src = fetchurl { - url = "mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz"; - sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; - }; - - meta = with stdenv.lib; { - description = "Lightweight multitabbed feature-rich X11 terminal emulator"; - longDescription = " - Multitabbed lightweight terminal emulator based on rxvt. - Supports transparency, backgroundimages, freetype fonts, ... - "; - homepage = "https://sourceforge.net/projects/materm"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mu-repo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mu-repo/default.nix index ddee1939b02a..eacd1971610f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mu-repo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/mu-repo/default.nix @@ -1,20 +1,19 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pytest, git }: +{ lib, fetchFromGitHub, buildPythonApplication, pytestCheckHook, git }: buildPythonApplication rec { pname = "mu-repo"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "fabioz"; repo = pname; - rev = with lib; - "mu_repo_" + concatStringsSep "_" (splitVersion version); - sha256 = "1dxfggzbhiips0ww2s93yba9842ycp0i3x2i8vvcx0vgicv3rv6f"; + rev = "mu_repo_${lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "0mmjdkvmdlsndi2q56ybxyz2988ppxsbbr1g54nzzkkvab2bc2na"; }; - checkInputs = [ pytest git ]; - # disable test which assumes it's a git repo - checkPhase = "py.test mu_repo --ignore=mu_repo/tests/test_checkout.py"; + propagatedBuildInputs = [ git ]; + + checkInputs = [ pytestCheckHook git ]; meta = with lib; { description = "Tool to help in dealing with multiple git repositories"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/multibootusb/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/multibootusb/default.nix index 8f90c7a581d0..c1c7b5a2706e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/multibootusb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/multibootusb/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, - python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }: + python36Packages, qt5, runtimeShell, stdenv, util-linux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the # $PYTHONPATH variable containing some of their code, so that @@ -30,7 +30,7 @@ python36Packages.buildPythonApplication rec { gnugrep which parted - utillinux + util-linux qemu p7zip gnused diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mupdf/1.17.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mupdf/1.17.nix new file mode 100644 index 000000000000..c6243e5f1d6b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/mupdf/1.17.nix @@ -0,0 +1,95 @@ +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +, jbig2dec, libjpeg , darwin +, enableX11 ? true, libX11, libXext, libXi, libXrandr +, enableCurl ? true, curl, openssl +, enableGL ? true, freeglut, libGLU +}: + +let + + # OpenJPEG version is hardcoded in package source + openJpegVersion = with stdenv; + lib.versions.majorMinor (lib.getVersion openjpeg); + + +in stdenv.mkDerivation rec { + version = "1.17.0"; + pname = "mupdf"; + + src = fetchurl { + url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; + sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; + }; + + patches = + # Use shared libraries to decrease size + stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch + ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch + ; + + postPatch = '' + sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c + ''; + + makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] + ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] + ++ lib.optionals enableCurl [ curl openssl ] + ++ lib.optionals enableGL ( + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] + else + [ freeglut libGLU ]) + ; + outputs = [ "bin" "dev" "out" "man" "doc" ]; + + preConfigure = '' + # Don't remove mujs because upstream version is incompatible + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} + ''; + + postInstall = '' + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF + prefix=$out + libdir=$out/lib + includedir=$out/include + + Name: mupdf + Description: Library for rendering PDF documents + Version: ${version} + Libs: -L$out/lib -lmupdf -lmupdf-third + Cflags: -I$dev/include + EOF + + moveToOutput "bin" "$bin" + ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf" + mkdir -p $bin/share/applications + cat > $bin/share/applications/mupdf.desktop <<EOF + [Desktop Entry] + Type=Application + Version=1.0 + Name=mupdf + Comment=PDF viewer + Exec=$bin/bin/mupdf-x11 %f + Terminal=false + MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip + EOF + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://mupdf.com"; + repositories.git = "git://git.ghostscript.com/mupdf.git"; + description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ vrthra fpletz ]; + platforms = platforms.unix; + knownVulnerabilities = [ + "CVE-2020-26519: denial of service when parsing JBIG2" + "CVE-2017-5991: NULL pointer dereference" + ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mupdf/default.nix index 61eb32bbd5cd..836d970a2b55 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin +, gumbo , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl , enableGL ? true, freeglut, libGLU @@ -13,27 +14,43 @@ let in stdenv.mkDerivation rec { - version = "1.17.0"; + version = "1.18.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; + sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48"; }; patches = - # Use shared libraries to decrease size - stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch - ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch - ; + stdenv.lib.optional stdenv.isDarwin ./darwin.patch ++ [ + (fetchpatch { + name = "pdfocr.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; + sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3"; + }) + (fetchpatch { + name = "pdf-layer.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54"; + sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm"; + }) + (fetchpatch { + name = "pixmap.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; + sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; + }) + ]; postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c ''; + # Use shared libraries to decrease size + buildFlags = [ "shared" ]; + makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix index 63d7077d32e0..71adcdc0757b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix @@ -9,7 +9,7 @@ , gtkmm3 , pcre , swig -, antlr4_7 +, antlr4_8 , sudo , mysql , libxml2 @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { # have it look for 4.7.2 instead of 4.7.1 preConfigure = '' substituteInPlace CMakeLists.txt \ - --replace "antlr-4.7.1-complete.jar" "antlr-4.7.2-complete.jar" + --replace "antlr-4.7.1-complete.jar" "antlr-4.8-complete.jar" ''; nativeBuildInputs = [ @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { gtk3 gtkmm3 libX11 - antlr4_7.runtime.cpp + antlr4_8.runtime.cpp python2 mysql libxml2 @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" - "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" + "-DWITH_ANTLR_JAR=${antlr4_8.jarLocation}" # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8. # Newer versions of connector still provide the legacy library when enabled # but the headers are in a different location. diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/navi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/navi/default.nix index 1965a8ad5ec5..46d463645e56 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/navi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "0izmf4flwwn2h1wwpsnghb6rd494lj63hhsky1v9v6l1l641had4"; + sha256 = "04ks38s6d3nkdj0arhxw8f3sfw796l97fbqxsm7b9g5d2953a6cs"; }; - cargoSha256 = "19xv9kbmxbp84lj8ycifsdr7sw9vhwgla7cdmrvlhayiq5r04xd7"; + cargoSha256 = "1zwar1l793809bsgqnwrgi50y76bd78qd4s8lw6d64f4z72dh80g"; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/navit/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/navit/default.nix index 099bcbfb25df..e04669d68964 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/navit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/navit/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { homepage = "https://www.navit-project.org"; description = "Car navigation system with routing engine using OSM maps"; license = licenses.gpl2; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/nimmm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/nimmm/default.nix deleted file mode 100644 index 383057ca6551..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/nimmm/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchFromGitHub, nim, termbox, pcre }: - -let - noise = fetchFromGitHub { - owner = "jangko"; - repo = "nim-noise"; - rev = "db1e86e312413e4348fa82c02340784316a89cc1"; - sha256 = "0n9l2dww5smrsl1xfqxjnxz3f1srb72lc1wl3pdvs6xfyf44qzlh"; - }; - - nimbox = fetchFromGitHub { - owner = "dom96"; - repo = "nimbox"; - rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b"; - sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1"; - }; - - lscolors = fetchFromGitHub { - owner = "joachimschmidt557"; - repo = "nim-lscolors"; - rev = "v0.3.3"; - sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4"; - }; - -in stdenv.mkDerivation rec { - pname = "nimmm"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "joachimschmidt557"; - repo = "nimmm"; - rev = "v${version}"; - sha256 = "1zpq181iz6g7yfi298gjwv33b89l4fpnkjprimykah7py5cpw67w"; - }; - - nativeBuildInputs = [ nim ]; - buildInputs = [ termbox pcre ]; - - buildPhase = '' - export HOME=$TMPDIR; - nim -p:${noise} -p:${nimbox} -p:${lscolors}/src c -d:release src/nimmm.nim - ''; - - installPhase = '' - install -Dt $out/bin src/nimmm - ''; - - meta = with stdenv.lib; { - description = "Terminal file manager written in nim"; - homepage = "https://github.com/joachimschmidt557/nimmm"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = [ maintainers.joachimschmidt557 ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/nnn/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/nnn/default.nix index 9ec5018c4e3f..81f2f648e5f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/nnn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "nnn"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "0lyrpyhzzs2bdgx3ifq1c5dq3s2v30xdiaq0j8zjc64s6bghfxnd"; + sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy"; }; configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jarun/nnn"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau filalex77 ]; + maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix index fc8cf3ee02e1..77eae10293d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.3.3"; + version = "0.4.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "1p1bwsn7l4vp7y183735pgsfbh7dssdfn0wjzacl4s87arjdcgvb"; + sha256 = "0flp7mwj1pgcwx3k9pzc8pmqlkhbddj0maimdnvlazk87kzxpfd0"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 4e53657a7474..5618a8df9101 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.1"; + version = "0.9.17"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "1skilcqfawvvyj9dnacsmlls55cqq6a4hzz9is165cwkyab185c5"; + sha256 = "0spa5zsipd456dcsp7ww24ab5vk4vmwyvrdmraw3hcsbnj9vcnwa"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = - "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files"; + "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; license = licenses.obsidian; maintainers = with maintainers; [ conradmearns zaninime ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch deleted file mode 100644 index 24c9c4a80f5d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov <ab@fmap.me> -Date: Wed, 23 Nov 2016 00:40:48 +0300 -Subject: [PATCH] Build and use one version of preprocessor library - ---- - octoprint_m33fio/__init__.py | 73 ++---------------------------------------- - shared library source/Makefile | 62 +++-------------------------------- - 2 files changed, 6 insertions(+), 129 deletions(-) - -diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index 054870a..4d5ecc1 100755 ---- a/octoprint_m33fio/__init__.py -+++ b/octoprint_m33fio/__init__.py -@@ -1189,78 +1189,9 @@ class M33FioPlugin( - # Check if using shared library or checking if it is usable - if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : - -- # Check if running on Linux -- if platform.uname()[0].startswith("Linux") : -- -- # Check if running on a Raspberry Pi 1 -- if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm1176jzf-s.so") -- -- # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 -- elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm_cortex-a7.so") -- -- # Otherwise check if running on an ARM7 device -- elif platform.uname()[4].startswith("armv7") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm7.so") -- -- # Otherwise check if using an i386 or x86-64 device -- elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.so") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.so") -- -- # Otherwise check if running on Windows and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -+ # Set shared library -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") - -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dll") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dll") -- -- # Otherwise check if running on macOS and using an i386 or x86-64 device -- elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : -- -- # Check if Python is running as 32-bit -- if platform.architecture()[0].startswith("32") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dylib") -- -- # Otherwise check if Python is running as 64-bit -- elif platform.architecture()[0].startswith("64") : -- -- # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib") -- -- # Otherwise check if running FreeBSD -- elif platform.uname()[0].startswith("FreeBSD") : -- -- # TODO: Compile FreeBSD shared library pre-processors -- pass -- - # Check if shared library was set - if self.sharedLibrary : - -diff --git a/shared library source/Makefile b/shared library source/Makefile -index 792b4f4..4c74f5c 100755 ---- a/shared library source/Makefile -+++ b/shared library source/Makefile -@@ -1,68 +1,14 @@ --# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, MACOS32, MACOS64 --LIBRARY_NAME = preprocessor --TARGET_PLATFORM = LINUX64 -+LIBRARY_NAME = libpreprocessor - VER = .1 - --ifeq ($(TARGET_PLATFORM), LINUX32) -- PROG = $(LIBRARY_NAME)_i386.so -- CC = g++ -- CFLAGS = -fPIC -m32 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), LINUX64) -- PROG = $(LIBRARY_NAME)_x86-64.so -- CC = g++ -- CFLAGS = -fPIC -m64 -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), WINDOWS32) -- PROG = $(LIBRARY_NAME)_i386.dll -- CC = i686-w64-mingw32-g++ -- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), WINDOWS64) -- PROG = $(LIBRARY_NAME)_x86-64.dll -- CC = x86_64-w64-mingw32-g++ -- CFLAGS = -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), PI) -- PROG = $(LIBRARY_NAME)_arm1176jzf-s.so -- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), PI2) -- PROG = $(LIBRARY_NAME)_arm_cortex-a7.so -- CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), ARM7) -- PROG = $(LIBRARY_NAME)_arm7.so -- CC = /opt/arm-toolchain/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++ -- CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ --endif -- --ifeq ($(TARGET_PLATFORM), MACOS32) -- PROG = $(LIBRARY_NAME)_i386.dylib -- CC = clang++ -- CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) -- --endif -- --ifeq ($(TARGET_PLATFORM), MACOS64) -- PROG = $(LIBRARY_NAME)_x86-64.dylib -- CC = clang++ -- CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) --endif -+PROG = $(LIBRARY_NAME).so -+CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER) - - SRCS = preprocessor.cpp gcode.cpp vector.cpp - CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared - - all: -- $(CC) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) -+ $(CXX) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS) - - clean: - rm -f ../octoprint_m33fio/static/libraries/$(PROG) --- -2.14.1 - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix index 514ac859c776..421690f29d46 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix @@ -13,170 +13,151 @@ self: super: let in { inherit buildPlugin; - # Deprecated alias - m3d-fio = self.m33-fio; # added 2016-08-13 - - m33-fio = buildPlugin rec { - pname = "M33-Fio"; - version = "1.21"; + abl-expert = buildPlugin rec { + pname = "ABL_Expert"; + version = "0.6"; - src = fetchFromGitHub { - owner = "donovan6000"; - repo = "M33-Fio"; - rev = "V${version}"; - sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; + src = fetchgit { + url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + rev = version; + sha256 = "0ij3rvdwya1sbymwm5swlh2j4jagb6fal945g88zrzh5xf26hzjh"; }; - patches = [ - ./m33-fio-one-library.patch - ]; - - postPatch = '' - rm -rf octoprint_m33fio/static/libraries/* - ( - cd 'shared library source' - make - ) - ''; - meta = with stdenv.lib; { - description = "OctoPrint plugin for the Micro 3D printer"; - homepage = "https://github.com/donovan6000/M33-Fio"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; + description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; + homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; }; }; - mqtt = buildPlugin rec { - pname = "MQTT"; - version = "0.8.6"; + bedlevelvisualizer = buildPlugin rec { + pname = "BedLevelVisualizer"; + version = "0.1.15"; src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-MQTT"; + owner = "jneilliii"; + repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; + sha256 = "1bq39fnarnpk8phxfbpx6l4n9anf358z1cgid5r89nadmn2a0cny"; }; - propagatedBuildInputs = with super; [ paho-mqtt ]; + propagatedBuildInputs = with super; [ numpy ]; meta = with stdenv.lib; { - description = "Publish printer status MQTT"; - homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; + description = "Displays 3D mesh of bed topography report"; + homepage = "https://github.com/jneilliii/OctoPrint-BedLevelVisualizer"; license = licenses.agpl3; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ lovesegfault ]; }; }; - titlestatus = buildPlugin rec { - pname = "TitleStatus"; - version = "0.0.4"; + curaenginelegacy = buildPlugin rec { + pname = "CuraEngineLegacy"; + version = "1.1.1"; src = fetchFromGitHub { - owner = "MoonshineSG"; - repo = "OctoPrint-TitleStatus"; + owner = "OctoPrint"; + repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; + sha256 = "1a7pxlmj1a7blkv97sn1k390pbjcxx2860011pbjcdnli74zpvv5"; }; meta = with stdenv.lib; { - description = "Show printers status in window title"; - homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; + description = "Plugin for slicing via Cura Legacy from within OctoPrint"; + homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ gebner ]; }; }; - stlviewer = buildPlugin rec { - pname = "STLViewer"; - version = "0.4.2"; + displaylayerprogress = buildPlugin rec { + pname = "OctoPrint-DisplayLayerProgress"; + version = "1.24.0"; src = fetchFromGitHub { - owner = "jneilliii"; - repo = "OctoPrint-STLViewer"; + owner = "OllisGit"; + repo = pname; rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; }; meta = with stdenv.lib; { - description = "A simple stl viewer tab for OctoPrint"; - homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; + description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; + homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ j0hax ]; }; }; - curaenginelegacy = buildPlugin rec { - pname = "CuraEngineLegacy"; - version = "1.0.2"; + gcodeeditor = buildPlugin rec { + pname = "GcodeEditor"; + version = "0.2.9"; src = fetchFromGitHub { - owner = "OctoPrint"; + owner = "ieatacid"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; + sha256 = "1yjj9lmxbzmzrn7gahw9lj7554fphalbjjp8ns0rr9py3rshwxkm"; }; meta = with stdenv.lib; { - description = "Plugin for slicing via Cura Legacy from within OctoPrint"; - homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; + description = "Edit gcode on OctoPrint"; + homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ WhittlesJr ]; }; }; - touchui = buildPlugin rec { - pname = "TouchUI"; - version = "0.3.14"; + marlingcodedocumentation = buildPlugin rec { + pname = "MarlinGcodeDocumentation"; + version = "0.11.0"; src = fetchFromGitHub { - owner = "BillyBlaze"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "033b9nk3kpnmjw9nggcaxy39hcgfviykcy2cx0j6m411agvmqbzf"; + owner = "costas-basdekis"; + repo = pname; + rev = "v${version}"; + sha256 = "0vx06w9hqwy0k4r8g67y8gdckfdx7wl8ghfx6hmxc1s8fgkghfkc"; }; meta = with stdenv.lib; { - description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; - homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + description = "Displays GCode documentation for Marlin in the Octoprint terminal command line"; + homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation"; license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ lovesegfault ]; }; }; - psucontrol = buildPlugin rec { - pname = "PSUControl"; - version = "0.1.9"; + mqtt = buildPlugin rec { + pname = "MQTT"; + version = "0.8.7"; src = fetchFromGitHub { - owner = "kantlivelong"; - repo = "OctoPrint-${pname}"; + owner = "OctoPrint"; + repo = "OctoPrint-MQTT"; rev = version; - sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; + sha256 = "0k82h7wafbcqdvk5wjw4dp9lydwszfj1lf8vvymwbqdn7pf5h0dy"; }; - preConfigure = '' - # optional; RPi.GPIO is broken on vanilla kernels - sed /RPi.GPIO/d -i requirements.txt - ''; + propagatedBuildInputs = with super; [ paho-mqtt ]; meta = with stdenv.lib; { - description = "OctoPrint plugin to control ATX/AUX power supply"; - homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; + description = "Publish printer status MQTT"; + homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ peterhoeg ]; }; }; printtimegenius = buildPlugin rec { pname = "PrintTimeGenius"; - version = "2.2.1"; + version = "2.2.6"; src = fetchFromGitHub { owner = "eyal0"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; + sha256 = "04zfgd3x3lbriyzwhpqnwdcfdm19fsqgsb7l2ix5d0ssmqxwg2r6"; }; preConfigure = '' @@ -197,78 +178,122 @@ in { }; }; - abl-expert = buildPlugin rec { - pname = "ABL_Expert"; - version = "2019-12-21"; + psucontrol = buildPlugin rec { + pname = "PSUControl"; + version = "0.1.9"; - src = fetchgit { - url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; - sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; + src = fetchFromGitHub { + owner = "kantlivelong"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; }; + preConfigure = '' + # optional; RPi.GPIO is broken on vanilla kernels + sed /RPi.GPIO/d -i requirements.txt + ''; + meta = with stdenv.lib; { - description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; - homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + description = "OctoPrint plugin to control ATX/AUX power supply"; + homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; + maintainers = with maintainers; [ gebner ]; }; }; - gcodeeditor = buildPlugin rec { - pname = "GcodeEditor"; - version = "0.2.6"; + simpleemergencystop = buildPlugin rec { + pname = "SimpleEmergencyStop"; + version = "1.0.3"; src = fetchFromGitHub { - owner = "ieatacid"; + owner = "Sebclem"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; + sha256 = "0hhh5grmn32abkix1b9fr1d0pcpdi2r066iypcxdxcza9qzwjiyi"; }; meta = with stdenv.lib; { - description = "Edit gcode on OctoPrint"; - homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; + homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; license = licenses.agpl3; maintainers = with maintainers; [ WhittlesJr ]; }; }; - simpleemergencystop = buildPlugin rec { - pname = "SimpleEmergencyStop"; - version = "0.2.5"; + stlviewer = buildPlugin rec { + pname = "STLViewer"; + version = "0.4.2"; src = fetchFromGitHub { - owner = "Sebclem"; - repo = "OctoPrint-${pname}"; + owner = "jneilliii"; + repo = "OctoPrint-STLViewer"; rev = version; - sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; + sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; }; meta = with stdenv.lib; { - description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; - homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; + description = "A simple stl viewer tab for OctoPrint"; + homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; + maintainers = with maintainers; [ abbradar ]; }; }; - displaylayerprogress = buildPlugin rec { - pname = "OctoPrint-DisplayLayerProgress"; - version = "1.24.0"; + themeify = buildPlugin rec { + pname = "Themeify"; + version = "1.2.2"; src = fetchFromGitHub { - owner = "OllisGit"; - repo = pname; + owner = "Birkbjo"; + repo = "Octoprint-${pname}"; + rev = "v${version}"; + sha256 = "0j1qs6kyh947npdy7pqda25fjkqinpas3sy0qyscqlxi558lhvx2"; + }; + + meta = with stdenv.lib; { + description = "Beautiful themes for OctoPrint"; + homepage = "https://github.com/birkbjo/OctoPrint-Themeify"; + license = licenses.agpl3; + maintainers = with maintainers; [ lovesegfault ]; + }; + }; + + titlestatus = buildPlugin rec { + pname = "TitleStatus"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "MoonshineSG"; + repo = "OctoPrint-TitleStatus"; rev = version; - sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; + sha256 = "10nxjrixg0i6n6x8ghc1ndshm25c97bvkcis5j9kmlkkzs36i2c6"; }; meta = with stdenv.lib; { - description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; - homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; + description = "Show printers status in window title"; + homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; license = licenses.agpl3; - maintainers = with maintainers; [ j0hax ]; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + touchui = buildPlugin rec { + pname = "TouchUI"; + version = "0.3.16"; + + src = fetchFromGitHub { + owner = "BillyBlaze"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1jlqjirc4ygl4k7jp93l2h6b18jap3mzz8sf2g61j9w0kgv9l365"; + }; + + meta = with stdenv.lib; { + description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; + homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; }; }; @@ -293,13 +318,13 @@ in { octoprint-dashboard = buildPlugin rec { pname = "OctoPrint-Dashboard"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "StefanCohen"; repo = pname; rev = version; - sha256 = "1psk069g8xdpgbzmna51dh978vrildh33dn7kbbi5y31ry5c3gx6"; + sha256 = "0p94jwd7kagh3sixhcrqmsgbay4aaf9l1pgyi2b45jym8pvld5n4"; }; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/opentx/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/opentx/default.nix index a117ecc06a9c..6bdcd0da1fca 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/opentx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.9"; + version = "2.3.10"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; rev = "release/${version}"; - sha256 = "0kh3jdy1pgvns8lrncf61ayaq0hmsv41j8xv4r4rf17zyvjl0qph"; + sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq"; }; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/orca/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/orca/default.nix index ccb7f3e47c86..377f00d1c166 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.5"; + version = "3.38.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x"; + sha256 = "1sqmq9xhcm3rc3mbhj1bdn55bkpzbk72xhmgka75syxh77gzz0ld"; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix new file mode 100644 index 000000000000..678bc06f8004 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, python3, dbus, gnupg }: + +python3.pkgs.buildPythonApplication rec { + pname = "pass-secret-service"; + # PyPI has old alpha version. Since then the project has switched from using a + # seemingly abandoned D-Bus package pydbus and started using maintained + # dbus-next. So let's use latest from GitHub. + version = "unstable-2020-04-12"; + + src = fetchFromGitHub { + owner = "mdellweg"; + repo = "pass_secret_service"; + rev = "f6fbca6ac3ccd16bfec407d845ed9257adf74dfa"; + sha256 = "0rm4pbx1fiwds1v7f99khhh7x3inv9yniclwd95mrbgljk3cc6a4"; + }; + + + # Need to specify session.conf file for tests because it won't be found under + # /etc/ in check phase. + postPatch = '' + substituteInPlace Makefile \ + --replace \ + "dbus-run-session" \ + "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + click + cryptography + dbus-next + decorator + pypass + secretstorage + ]; + + checkInputs = + let + ps = python3.pkgs; + in + [ + dbus + gnupg + ps.pytest + ps.pytest-asyncio + ps.pypass + ]; + + checkPhase = '' + runHook preCheck + make test + runHook postCheck + ''; + + meta = { + description = "Libsecret D-Bus API with pass as the backend"; + homepage = "https://github.com/mdellweg/pass_secret_service/"; + license = stdenv.lib.licenses.gpl3Only; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ jluttine ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix index d364074d4450..c84c09e59a7e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: +{ stdenv, fetchFromGitHub, pkgs, python3, wrapGAppsHook}: -pythonPackages.buildPythonApplication { +python3.pkgs.buildPythonApplication { pname = "pdf-quench"; version = "1.0.5"; @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication { goocanvas2 poppler_gi ]; - propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pypdf2 ]; format = "other"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix index b8f7c4641d20..8c8413b2ce60 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { - owner = "jeromerobert"; + owner = pname; repo = pname; rev = version; - sha256 = "03siz4ar6flyvrrgh7hr7sslc6n9x5d9i13lc5rm2qnssd0qdich"; + sha256 = "wJ6ImWpszfgErfLh7YgHirVKFIt0ij8A/CdYJmkNBP0="; }; nativeBuildInputs = [ @@ -33,6 +33,10 @@ python3Packages.buildPythonApplication rec { # incompatible with wrapGAppsHook strictDeps = false; + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; doCheck = false; # no tests diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfpc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfpc/default.nix index 4e172e5fd7c1..fc0bf62f1e9f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfpc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { repo = product; owner = product; rev = "v${version}"; - sha256 = "0vh2r32akvasdrghkaq7ard24r2qncp34jfiyshi3zxabm9bhfaa"; + sha256 = "11n925c5jj3yfwnqkgxzqrmsrpqh8ls1g4idmqqzpsanpam1xvna"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index a6dd86393ff1..039967f41820 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.1.4"; + version = "4.2.1"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "1gw3cmc8c1xxc55bm71v1dz9x9560lbhx9nkwprarhxlmn0m0zzp"; + sha256 = "0d7pvl87ybkvcxk69fr35fz0w447hy2pm65bhvlril16ljm2izja"; }; unpackPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/peaclock/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/peaclock/default.nix new file mode 100644 index 000000000000..e824bbaf583b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/peaclock/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, libpthreadstubs, icu }: + +stdenv.mkDerivation rec { + pname = "peaclock"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "octobanana"; + repo = pname; + rev = version; + sha256 = "1582vgslhpgbvcd7ipgf1d1razrvgpq1f93q069yr2bbk6xn8i16"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libpthreadstubs icu ]; + + meta = with stdenv.lib; { + description = "A clock, timer, and stopwatch for the terminal"; + homepage = "https://octobanana.com/software/peaclock"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/plater/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/plater/default.nix new file mode 100644 index 000000000000..9d29390870e8 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/plater/default.nix @@ -0,0 +1,30 @@ +{ mkDerivation +, cmake +, fetchFromGitHub +, lib +, libGLU +, qtbase +}: + +mkDerivation rec { + pname = "plater"; + version = "2020-07-30"; + + src = fetchFromGitHub { + owner = "Rhoban"; + repo = "Plater"; + rev = "f8de6d038f95a9edebfcfe142c8e9783697d5b47"; + sha256 = "0r20mbzd16zv1aiadjqdy7z6sp09rr6lgfxhvir4ll3cpakkynr4"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU qtbase ]; + + meta = with lib; { + description = "3D-printer parts placer and plate generator"; + homepage = "https://github.com/Rhoban/Plater"; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + license = licenses.cc-by-nc-30; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/playonlinux/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/playonlinux/default.nix index e3b7c48d2b4b..3acb77545055 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/playonlinux/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/playonlinux/default.nix @@ -25,7 +25,7 @@ }: let - version = "4.3.4"; + version = "4.4"; binpath = stdenv.lib.makeBinPath [ cabextract @@ -65,7 +65,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz"; - sha256 = "019dvb55zqrhlbx73p6913807ql866rm0j011ix5mkk2g79dzhqp"; + sha256 = "0n40927c8cnjackfns68zwl7h4d7dvhf7cyqdkazzwwx4k2xxvma"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix index fc86b2e885de..cd309797aa32 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix @@ -1,29 +1,29 @@ { stdenv, lib, makeWrapper, fetchurl , dpkg, wrapGAppsHook, autoPatchelfHook -, gtk3, cairo, gnome2, atk, gdk-pixbuf, glib +, gtk3, cairo, pango, atk, gdk-pixbuf, glib , at-spi2-atk, dbus, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver , nss, nspr, alsaLib, cups, fontconfig, expat -, libudev0-shim, glibc, curl, openssl, libnghttp2, gnome3 }: +, libudev0-shim, glibc, curl, openssl, libnghttp2, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "polar-bookshelf"; - version = "1.13.10"; + version = "2.0.42"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { - url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "1bxcyf6n2m5x1z8ic6kzskinyyc6lh6nj0bycbwc524n6ms5j99p"; + url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-desktop-app-${version}-amd64.deb"; + hash = "sha256-JyO71wyE6b0iHAYs/6/WbG+OdUVUUPpJla+ZUzg0Gng="; }; buildInputs = [ - gnome3.gsettings_desktop_schemas + gsettings-desktop-schemas glib gtk3 cairo - gnome2.pango + pango atk gdk-pixbuf at-spi2-atk @@ -64,16 +64,15 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/lib - mv opt/Polar\ Bookshelf/* $out/share/polar-bookshelf + mv opt/Polar/* $out/share/polar-bookshelf mv $out/share/polar-bookshelf/*.so $out/lib mv usr/share/* $out/share/ - ln -s $out/share/polar-bookshelf/polar-bookshelf $out/bin/polar-bookshelf + ln -s $out/share/polar-bookshelf/polar-desktop-app $out/bin/polar-desktop-app - # Correct desktop file `Exec` - substituteInPlace $out/share/applications/polar-bookshelf.desktop \ - --replace "/opt/Polar Bookshelf/polar-bookshelf" "$out/bin/polar-bookshelf" + substituteInPlace $out/share/applications/polar-desktop-app.desktop \ + --replace "/opt/Polar/polar-desktop-app" "$out/bin/polar-desktop-app" ''; preFixup = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/polybar/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/polybar/default.nix index c324a3f8be40..df08de7a4a22 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/polybar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/polybar/default.nix @@ -27,13 +27,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { pname = "polybar"; - version = "3.4.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0fsfh3xv0c0hz10xqzvd01c0p0wvzcnanbyczi45zhaxfrisb39w"; + sha256 = "1kga98cgllsjcq692l27y01sgl8ii4wxp70kmdcwxkrliylg3dji"; fetchSubmodules = true; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { having a black belt in shell scripting. ''; license = licenses.mit; - maintainers = with maintainers; [ afldcr filalex77 ]; + maintainers = with maintainers; [ afldcr Br1ght0ne ]; platforms = platforms.linux; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/prevo/tools.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/prevo/tools.nix index 6a85e73bf851..39c54b73b2fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/prevo/tools.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/prevo/tools.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib expat ]; postInstall = '' - installShellCompletion --bash $out/etc/bash_completion.d/prevo-completion + installShellCompletion --bash src/prevo-completion ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/projectlibre/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/projectlibre/default.nix index 344c3d7168ac..2a7a82bc74a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/projectlibre/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/projectlibre/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://www.projectlibre.com/"; + homepage = "https://www.projectlibre.com/"; description = "Project-Management Software similar to MS-Project"; maintainers = [ maintainers.Mogria ]; license = licenses.cpal10; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index da8cea8ab020..2bc59e855a08 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -3,7 +3,7 @@ }: let appname = "SuperSlicer"; - version = "2.2.54.0"; + version = "2.2.54.2"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -12,7 +12,7 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-vvuUecysSdBvGBKOariQnsGJ9/Qccwp/lSq8WCED+Uk="; + sha256 = "sha256-ThmsxFXI1uReK+JwpHrIWzHpBdIOP77kDjv+QaK+Azk="; rev = version; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/pueue/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/pueue/default.nix index f5c237da440a..d0459cb426c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -2,27 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.7.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "1ksks8c35q9aq5vnjxh480vqjyaa8c1fz1fb465vngnlyw762b22"; + sha256 = "1vdlsfnqnyri0ny2g695lhivs9m25v9lsqf1valwbjv9l9vjxfqa"; }; - cargoSha256 = "0v1h4jhrzfb55zmpnbq18188rdvx7a7lvnjqh0w7cy90kvxssian"; + cargoSha256 = "0qziwb69qpbziz772np8dcb1dvxg6m506k5kl63m75z4zicgykcv"; nativeBuildInputs = [ installShellFiles ]; - checkFlagsArray = [ "--skip=test_single_huge_payload" ]; + checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ]; postInstall = '' - # zsh completion generation fails. See: https://github.com/Nukesor/pueue/issues/57 - for shell in bash fish; do + for shell in bash fish zsh; do $out/bin/pueue completions $shell . - installShellCompletion pueue.$shell done + installShellCompletion pueue.{bash,fish} _pueue ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/pwsafe/default.nix index 26bc6cc0a0bb..6a9de9e600f4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/pwsafe/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/pwsafe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl -, wxGTK31, libXext, libXi, libXt, libXtst, xercesc +, wxGTK30, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization , curl, openssl, file }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "${version}"; + rev = version; sha256 = "0nh5jnf5yls2qv5hpfhm6i854zsknyh7d93c987a0cg14sg820fv"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cmake gettext perl pkgconfig zip ]; buildInputs = [ - libXext libXi libXt libXtst wxGTK31 + libXext libXi libXt libXtst wxGTK30 curl qrencode libuuid openssl xercesc libyubikey yubikey-personalization file diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/pyditz/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/pyditz/default.nix index 05338b38dfef..d8b2b2ec602e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/pyditz/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/pyditz/default.nix @@ -6,11 +6,11 @@ let cerberus_1_1 = callPackage ./cerberus.nix { }; in buildPythonApplication rec { pname = "pyditz"; - version = "0.10.3"; + version = "0.11"; src = fetchPypi { inherit pname version; - sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf"; + sha256 = "da0365ae9064e30c4a27526fb0d7a802fda5c8651cda6990d17be7ede89a2551"; }; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix index d780125fbbfa..9ae65a962ddc 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/qlandkartegt/default.nix @@ -33,6 +33,10 @@ mkDerivation rec { sha256 = "16hql8ignzw4n1hlp4icbvaddqcadh2rjns0bvis720535112sc8"; }) (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-timespec.patch?h=qlandkartegt"; + sha256 = "1yzdwfsgjn7q04r9f7s5qk50y25hdl384dxrmpfmkm97fmpgyr7w"; + }) + (fetchpatch { url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-ver_str.patch?h=qlandkartegt"; sha256 = "13fg05gqrjfa9j00lrqz1b06xf6r5j01kl6l06vkn0hz1jzxss5m"; }) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index b47d8feecf76..452629b6181d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qlcplus"; - version = "4.12.2"; + version = "4.12.3"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "1j0jhgql78p5ghcaz36l1k55447s5qiv396a448qic7xqpym2vl3"; + sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs="; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/qmapshack/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/qmapshack/default.nix deleted file mode 100644 index 1a8758955cef..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/qmapshack/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake -, qtscript, qtwebengine, gdal, proj, routino, quazip }: - -mkDerivation rec { - pname = "qmapshack"; - version = "1.15.0"; - - src = fetchFromGitHub { - owner = "Maproom"; - repo = pname; - rev = "V_${version}"; - sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qtscript qtwebengine gdal proj routino quazip ]; - - cmakeFlags = [ - "-DROUTINO_XML_PATH=${routino}/share/routino" - "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5" - "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so" - ]; - - enableParallelBuilding = true; - - patches = [ - "${src}/FindPROJ4.patch" - "${src}/FindQuaZip5.patch" - ]; - - qtWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ gdal routino ]}" - ]; - - meta = with lib; { - homepage = "https://github.com/Maproom/qmapshack"; - description = "Consumer grade GIS software"; - license = licenses.gpl3; - maintainers = with maintainers; [ dotlambda sikmir ]; - platforms = with platforms; linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/razergenie/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/razergenie/default.nix index 9042ab38e758..ac0f373dc93d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/razergenie/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/razergenie/default.nix @@ -27,8 +27,8 @@ in stdenv.mkDerivation { ]; mesonFlags = [ - "-Denable_experimental=${if enableExperimental then "true" else "false"}" - "-Dinclude_matrix_discovery=${if includeMatrixDiscovery then "true" else "false"}" + "-Denable_experimental=${lib.boolToString enableExperimental}" + "-Dinclude_matrix_discovery=${lib.boolToString includeMatrixDiscovery}" ]; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/redshift/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/redshift/default.nix index 86c787df62aa..a450b2e3eb77 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/redshift/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/redshift/default.nix @@ -127,13 +127,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "09wqlz3yya955galhs20014qfwm2yk0lxhyqdsw8gwddvcpyprzg"; + sha256 = "1l3x4gnichwzbb0529bhm723xpryn5svhhsfdiwlw122q1vmz2q7"; }; meta = redshift.meta // { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rescuetime/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rescuetime/default.nix index 3b989a75c9b0..fcdab3ddbc48 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rescuetime/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/rescuetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript }: let version = "2.16.4.2"; @@ -34,6 +34,15 @@ in mkDerivation { --set-rpath "${lib.makeLibraryPath [ qt5.qtbase libXtst libXext libX11 libXScrnSaver ]}" \ $out/bin/rescuetime ''; + + passthru.updateScript = writeScript "rescuetime-updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pup common-updater-scripts + set -eu -o pipefail + latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')" + update-source-version rescuetime "$latestVersion" + ''; + meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rofi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rofi/default.nix index d565e1874cd1..6ee2cb8c3495 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "sha256-BS/ypMS/MfaiUizWVov8yYgGJjgwMWvz0PiH3sYYn50="; + sha256 = "04glljqbf9ckkc6x6fv4x1gqmy468n1agya0kd8rxdvz24wzf7cd"; }; preConfigure = '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/roxterm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/roxterm/default.nix deleted file mode 100644 index d02296f0e16d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/roxterm/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub -, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs -, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 -, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto -}: - -stdenv.mkDerivation rec { - pname = "roxterm"; - version = "3.7.5"; - - src = fetchFromGitHub { - owner = "realh"; - repo = "roxterm"; - rev = version; - sha256 = "042hchvgk9jzz035zsgnfhh8105zvspbzz6b78waylsdlgqn0pp1"; - }; - - patches = [ - # This is the commit directly after v3.7.5. It is needed to get roxterm to - # build correctly. It can be removed when v3.7.6 (or v3.8.0) has been - # released. - (fetchpatch { - url = "https://github.com/realh/roxterm/commit/f7c38fd48bd1810e16d82794bdfb61a9760a2fe1.patch"; - sha256 = "1v77b7ilgf8zy1npxxcyc06mq6lck6bi6lw4aksnq3mi61n5znmx"; - }) - ]; - - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ]; - - buildInputs = - [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp - utillinuxMinimal glib docbook_xsl xmlto libselinux - libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit - ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/realh/roxterm"; - license = licenses.gpl3; - description = "Tabbed, VTE-based terminal emulator"; - longDescription = '' - Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without - the dependencies on Gnome. - ''; - maintainers = with maintainers; [ cdepillabout ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rsibreak/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rsibreak/default.nix index 432cbfb9b693..9f765793dc9a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rsibreak/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/rsibreak/default.nix @@ -20,7 +20,7 @@ in mkDerivation rec { propagatedBuildInputs = [ knotifyconfig kidletime kwindowsystem ktextwidgets kcrash ]; meta = with lib; { - description = "RSIBreak takes care of your health and regularly breaks your work to avoid repetitive strain injury (RSI)"; + description = "Takes care of your health and regularly breaks your work to avoid repetitive strain injury (RSI)"; license = licenses.gpl2; homepage = "https://www.kde.org/applications/utilities/rsibreak/"; maintainers = with maintainers; [ vandenoever ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rss-bridge-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rss-bridge-cli/default.nix new file mode 100644 index 000000000000..f481f0953f81 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/rss-bridge-cli/default.nix @@ -0,0 +1,28 @@ +{ stdenv, writeShellScriptBin, rss-bridge, php }: + +let + phpWithExts = (php.withExtensions + ({ all, ... }: with all; [ + curl + filter + iconv + json + mbstring + openssl + simplexml + sqlite3 + ]) + ); + phpBin = "${phpWithExts}/bin/php"; +in (writeShellScriptBin "rss-bridge-cli" '' + ${phpBin} ${rss-bridge}/index.php "$@" +'').overrideAttrs (oldAttrs: rec { + version = rss-bridge.version; + + meta = with stdenv.lib; { + description = "Command-line interface for RSS-Bridge"; + homepage = "https://github.com/RSS-Bridge/rss-bridge"; + license = licenses.unlicense; + maintainers = with maintainers; [ ymeister ]; + }; +}) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/default.nix deleted file mode 100644 index 74bfbe83e91f..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ callPackage }: - -{ - autocomplete-all-the-things = callPackage ./urxvt-autocomplete-all-the-things { }; - - bidi = callPackage ./urxvt-bidi { }; - - font-size = callPackage ./urxvt-font-size { }; - - perl = callPackage ./urxvt-perl { }; - - perls = callPackage ./urxvt-perls { }; - - resize-font = callPackage ./urxvt-resize-font { }; - - tabbedex = callPackage ./urxvt-tabbedex { }; - - theme-switch = callPackage ./urxvt-theme-switch { }; - - vtwheel = callPackage ./urxvt-vtwheel { }; - -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix deleted file mode 100644 index a4e03fa347f0..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "urxvt-autocomplete-all-the-things"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "Vifon"; - repo = "autocomplete-ALL-the-things"; - rev = version; - sha256 = "06xd59c6gd9rglwq4km93n2p078k7v4x300lqrg1f32vvnjvs7sr"; - }; - - installPhase = '' - mkdir -p $out/lib/urxvt/perl - cp autocomplete-ALL-the-things $out/lib/urxvt/perl - ''; - - meta = with stdenv.lib; { - description = "urxvt plugin allowing user to easily complete arbitrary text"; - homepage = "https://github.com/Vifon/autocomplete-ALL-the-things"; - license = licenses.gpl3; - maintainers = with maintainers; [ nickhu ]; - platforms = with platforms; unix; - }; -} - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix deleted file mode 100644 index 4b6b4eb8184c..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchurl, perlPackages, pkgconfig, fribidi }: - -perlPackages.buildPerlPackage rec { - pname = "urxvt-bidi"; - version = "2.15"; - - src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAMENSKY/Text-Bidi-${version}.tar.gz"; - sha256 = "1w65xbi4mw5acsrpv3phyzv82ghb29kpbb3b1b1gcinlfxl6f61m"; - }; - - nativeBuildInputs = [ pkgconfig perlPackages.ExtUtilsPkgConfig ]; - buildInputs = [ fribidi ]; - - postInstall = '' - install -Dm555 misc/bidi "$out/lib/urxvt/perl/bidi" - ''; - - passthru.perlPackages = [ "self" ]; - - meta = with lib; { - description = "Text::Bidi Perl package using fribidi, providing a urxvt plugin"; - homepage = "https://github.com/mkamensky/Text-Bidi"; - maintainers = with maintainers; [ doronbehar ]; - platforms = with platforms; unix; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix deleted file mode 100644 index f81709b97390..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, xrdb, xlsfonts }: - -stdenv.mkDerivation { - name = "urxvt-font-size-2015-05-22"; - dontPatchShebangs = true; - - src = fetchFromGitHub { - owner = "majutsushi"; - repo = "urxvt-font-size"; - rev = "fd5b09c10798c6723bbf771d4d8881cf6563bc69"; - sha256 = "16m3kkypg3y00x597zx05zy167a0kaqpawz0l591wzb2bv1dz55z"; - }; - - installPhase = '' - substituteInPlace font-size \ - --replace "xrdb -merge" "${xrdb}/bin/xrdb -merge" \ - --replace "xlsfonts" "${xlsfonts}/bin/xlsfonts" - - mkdir -p $out/lib/urxvt/perl - cp font-size $out/lib/urxvt/perl - ''; - - meta = with stdenv.lib; { - description = "Change the urxvt font size on the fly"; - homepage = "https://github.com/majutsushi/urxvt-font-size"; - license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; - platforms = with platforms; unix; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix deleted file mode 100644 index 0c95acd72057..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, wmctrl }: - -stdenv.mkDerivation { - name = "urxvt-perl-2015-01-16"; - - src = fetchFromGitHub { - owner = "effigies"; - repo = "urxvt-perl"; - rev = "c3beb9ff09a7139591416c61f8e9458c8a23bea5"; - sha256 = "1w1p8ng7bwq5hnaprjl1zf073y5l3hdsj7sz7cll6isjswcm6r0s"; - }; - - installPhase = '' - substituteInPlace fullscreen \ - --replace "wmctrl" "${wmctrl}/bin/wmctrl" - - mkdir -p $out/lib/urxvt/perl - cp fullscreen $out/lib/urxvt/perl - cp newterm $out/lib/urxvt/perl - ''; - - meta = with stdenv.lib; { - description = "Perl extensions for the rxvt-unicode terminal emulator"; - homepage = "https://github.com/effigies/urxvt-perl"; - license = licenses.gpl3; - maintainers = with maintainers; [ cstrahan ]; - platforms = with platforms; unix; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix deleted file mode 100644 index 53bb938c3330..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "urxvt-perls"; - version = "2.3"; - - src = fetchFromGitHub { - owner = "muennich"; - repo = "urxvt-perls"; - rev = version; - sha256 = "0xvwfw7965ghhd9g6rl6y6fgpd444l46rjqmlgg0rfjypbh6c0p1"; - }; - - installPhase = '' - mkdir -p $out/lib/urxvt/perl - cp keyboard-select $out/lib/urxvt/perl - cp deprecated/clipboard \ - deprecated/url-select \ - $out/lib/urxvt/perl - ''; - - meta = with stdenv.lib; { - description = "Perl extensions for the rxvt-unicode terminal emulator"; - homepage = "https://github.com/muennich/urxvt-perls"; - license = licenses.gpl2; - maintainers = with maintainers; [ abbradar ]; - platforms = with platforms; unix; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix deleted file mode 100644 index a056e603f004..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "urxvt-resize-font"; - version = "2019-10-05"; - dontPatchShebangs = true; - - src = fetchFromGitHub { - owner = "simmel"; - repo = "urxvt-resize-font"; - rev = "e966a5d77264e9263bfc8a51e160fad24055776b"; - sha256 = "18ab3bsfdkzzh1n9fpi2al5bksvv2b7fjmvxpx6fzqcy4bc64vkh"; - }; - - installPhase = '' - mkdir -p $out/lib/urxvt/perl - cp resize-font $out/lib/urxvt/perl - ''; - - meta = with stdenv.lib; { - description = "URxvt Perl extension for resizing the font"; - homepage = "https://github.com/simmel/urxvt-resize-font"; - license = licenses.mit; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix deleted file mode 100644 index 71a55f9293c6..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, perl }: - -stdenv.mkDerivation rec { - pname = "urxvt-tabbedex"; - version = "19.21"; - - src = fetchFromGitHub { - owner = "mina86"; - repo = "urxvt-tabbedex"; - rev = "v${version}"; - sha256 = "06msd156h6r8ss7qg66sjz5jz8613qfq2yvp0pc24i6mxzj8vl77"; - }; - - nativeBuildInputs = [ perl ]; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = with stdenv.lib; { - description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; - homepage = "https://github.com/mina86/urxvt-tabbedex"; - maintainers = with maintainers; [ abbradar ]; - platforms = with platforms; unix; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix deleted file mode 100644 index 5a84a9b472a5..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; - name = "urxvt-theme-switch-2014-12-21_rev${builtins.substring 0 1 rev}"; - dontPatchShebangs = true; - - src = fetchFromGitHub { - owner = "felixr"; - repo = "urxvt-theme-switch"; - inherit rev; - sha256 = "0x27m1vdqprn3lqpwgxvffill7prmaj6j9rhgvkvi13mzl5wmlli"; - }; - - installPhase = '' - mkdir -p $out/lib/urxvt/perl - sed -i -e "s|/usr/bin/env||" color-themes - cp color-themes $out/lib/urxvt/perl - ''; - - meta = with stdenv.lib; { - description = "urxvt plugin that allows to switch color themes during runtime"; - homepage = "https://github.com/felixr/urxvt-theme-switch"; - license = "CCBYNC"; - maintainers = with maintainers; [ ]; - platforms = with platforms; unix; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix deleted file mode 100644 index aebbedacef64..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchgit, perl }: - -stdenv.mkDerivation { - - name = "rxvt-unicode-vtwheel-0.3.2"; - - src = fetchgit { - url = "https://aur.archlinux.org/urxvt-vtwheel.git"; - rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; - sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; - }; - - installPhase = '' - sed -i 's|#! perl|#! ${perl}/bin/perl|g' vtwheel - mkdir -p $out/lib/urxvt/perl - cp vtwheel $out/lib/urxvt/perl - ''; - - meta = with stdenv.lib; { - description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)"; - homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel"; - license = licenses.mit; - maintainers = with maintainers; [ danbst ]; - platforms = with platforms; unix; - }; - -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/default.nix deleted file mode 100644 index 6512f402ffbd..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, fetchurl, makeDesktopItem -, libX11, libXt, libXft, libXrender -, ncurses, fontconfig, freetype -, pkgconfig, gdk-pixbuf, perl -, perlSupport ? true -, gdkPixbufSupport ? true -, unicode3Support ? true -}: - -let - pname = "rxvt-unicode"; - version = "9.22"; - description = "A clone of the well-known terminal emulator rxvt"; - - desktopItem = makeDesktopItem { - name = pname; - exec = "urxvt"; - icon = "utilities-terminal"; - comment = description; - desktopName = "URxvt"; - genericName = pname; - categories = "System;TerminalEmulator;"; - }; -in - -with stdenv.lib; - -stdenv.mkDerivation { - name = "${pname}-unwrapped-${version}"; - inherit pname version; - - src = fetchurl { - url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9"; - }; - - buildInputs = - [ libX11 libXt libXft ncurses # required to build the terminfo file - fontconfig freetype pkgconfig libXrender - ] ++ optional perlSupport perl - ++ optional gdkPixbufSupport gdk-pixbuf; - - outputs = [ "out" "terminfo" ]; - - patches = [ - ./patches/9.06-font-width.patch - ./patches/256-color-resources.patch - ] ++ optional stdenv.isDarwin ./patches/makefile-phony.patch; - - - configureFlags = [ - "--with-terminfo=$terminfo/share/terminfo" - "--enable-256-color" - (enableFeature perlSupport "perl") - (enableFeature unicode3Support "unicode3") - ]; - - LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ]; - CFLAGS = [ "-I${freetype.dev}/include/freetype2" ]; - - preConfigure = - '' - # without this the terminfo won't be compiled by tic, see man tic - mkdir -p $terminfo/share/terminfo - export TERMINFO=$terminfo/share/terminfo - '' - + stdenv.lib.optionalString perlSupport '' - # make urxvt find its perl file lib/perl5/site_perl - # is added to PERL5LIB automatically - mkdir -p $out/$(dirname ${perl.libPrefix}) - ln -s $out/lib/urxvt $out/${perl.libPrefix} - ''; - - postInstall = '' - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - cp -r ${desktopItem}/share/applications/ $out/share/ - ''; - - meta = { - inherit description; - homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; - downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - license = licenses.gpl3; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch deleted file mode 100644 index c8d2acfbdc51..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch +++ /dev/null @@ -1,255 +0,0 @@ -diff --git a/src/xdefaults.C b/src/xdefaults.C -index 23b6822..382f3b1 100644 ---- a/src/xdefaults.C -+++ b/src/xdefaults.C -@@ -155,6 +155,250 @@ optList[] = { - RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), - RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), - RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), -+ // 88 xterm colors -+ RSTRG (Rs_color + minCOLOR + 16, "color16", "color"), -+ RSTRG (Rs_color + minCOLOR + 17, "color17", "color"), -+ RSTRG (Rs_color + minCOLOR + 18, "color18", "color"), -+ RSTRG (Rs_color + minCOLOR + 19, "color19", "color"), -+ RSTRG (Rs_color + minCOLOR + 20, "color20", "color"), -+ RSTRG (Rs_color + minCOLOR + 21, "color21", "color"), -+ RSTRG (Rs_color + minCOLOR + 22, "color22", "color"), -+ RSTRG (Rs_color + minCOLOR + 23, "color23", "color"), -+ RSTRG (Rs_color + minCOLOR + 24, "color24", "color"), -+ RSTRG (Rs_color + minCOLOR + 25, "color25", "color"), -+ RSTRG (Rs_color + minCOLOR + 26, "color26", "color"), -+ RSTRG (Rs_color + minCOLOR + 27, "color27", "color"), -+ RSTRG (Rs_color + minCOLOR + 28, "color28", "color"), -+ RSTRG (Rs_color + minCOLOR + 29, "color29", "color"), -+ RSTRG (Rs_color + minCOLOR + 30, "color30", "color"), -+ RSTRG (Rs_color + minCOLOR + 31, "color31", "color"), -+ RSTRG (Rs_color + minCOLOR + 32, "color32", "color"), -+ RSTRG (Rs_color + minCOLOR + 33, "color33", "color"), -+ RSTRG (Rs_color + minCOLOR + 34, "color34", "color"), -+ RSTRG (Rs_color + minCOLOR + 35, "color35", "color"), -+ RSTRG (Rs_color + minCOLOR + 36, "color36", "color"), -+ RSTRG (Rs_color + minCOLOR + 37, "color37", "color"), -+ RSTRG (Rs_color + minCOLOR + 38, "color38", "color"), -+ RSTRG (Rs_color + minCOLOR + 39, "color39", "color"), -+ RSTRG (Rs_color + minCOLOR + 40, "color40", "color"), -+ RSTRG (Rs_color + minCOLOR + 41, "color41", "color"), -+ RSTRG (Rs_color + minCOLOR + 42, "color42", "color"), -+ RSTRG (Rs_color + minCOLOR + 43, "color43", "color"), -+ RSTRG (Rs_color + minCOLOR + 44, "color44", "color"), -+ RSTRG (Rs_color + minCOLOR + 45, "color45", "color"), -+ RSTRG (Rs_color + minCOLOR + 46, "color46", "color"), -+ RSTRG (Rs_color + minCOLOR + 47, "color47", "color"), -+ RSTRG (Rs_color + minCOLOR + 48, "color48", "color"), -+ RSTRG (Rs_color + minCOLOR + 49, "color49", "color"), -+ RSTRG (Rs_color + minCOLOR + 50, "color50", "color"), -+ RSTRG (Rs_color + minCOLOR + 51, "color51", "color"), -+ RSTRG (Rs_color + minCOLOR + 52, "color52", "color"), -+ RSTRG (Rs_color + minCOLOR + 53, "color53", "color"), -+ RSTRG (Rs_color + minCOLOR + 54, "color54", "color"), -+ RSTRG (Rs_color + minCOLOR + 55, "color55", "color"), -+ RSTRG (Rs_color + minCOLOR + 56, "color56", "color"), -+ RSTRG (Rs_color + minCOLOR + 57, "color57", "color"), -+ RSTRG (Rs_color + minCOLOR + 58, "color58", "color"), -+ RSTRG (Rs_color + minCOLOR + 59, "color59", "color"), -+ RSTRG (Rs_color + minCOLOR + 60, "color60", "color"), -+ RSTRG (Rs_color + minCOLOR + 61, "color61", "color"), -+ RSTRG (Rs_color + minCOLOR + 62, "color62", "color"), -+ RSTRG (Rs_color + minCOLOR + 63, "color63", "color"), -+ RSTRG (Rs_color + minCOLOR + 64, "color64", "color"), -+ RSTRG (Rs_color + minCOLOR + 65, "color65", "color"), -+ RSTRG (Rs_color + minCOLOR + 66, "color66", "color"), -+ RSTRG (Rs_color + minCOLOR + 67, "color67", "color"), -+ RSTRG (Rs_color + minCOLOR + 68, "color68", "color"), -+ RSTRG (Rs_color + minCOLOR + 69, "color69", "color"), -+ RSTRG (Rs_color + minCOLOR + 70, "color70", "color"), -+ RSTRG (Rs_color + minCOLOR + 71, "color71", "color"), -+ RSTRG (Rs_color + minCOLOR + 72, "color72", "color"), -+ RSTRG (Rs_color + minCOLOR + 73, "color73", "color"), -+ RSTRG (Rs_color + minCOLOR + 74, "color74", "color"), -+ RSTRG (Rs_color + minCOLOR + 75, "color75", "color"), -+ RSTRG (Rs_color + minCOLOR + 76, "color76", "color"), -+ RSTRG (Rs_color + minCOLOR + 77, "color77", "color"), -+ RSTRG (Rs_color + minCOLOR + 78, "color78", "color"), -+ RSTRG (Rs_color + minCOLOR + 79, "color79", "color"), -+ RSTRG (Rs_color + minCOLOR + 80, "color80", "color"), -+ RSTRG (Rs_color + minCOLOR + 81, "color81", "color"), -+ RSTRG (Rs_color + minCOLOR + 82, "color82", "color"), -+ RSTRG (Rs_color + minCOLOR + 83, "color83", "color"), -+ RSTRG (Rs_color + minCOLOR + 84, "color84", "color"), -+ RSTRG (Rs_color + minCOLOR + 85, "color85", "color"), -+ RSTRG (Rs_color + minCOLOR + 86, "color86", "color"), -+ RSTRG (Rs_color + minCOLOR + 87, "color87", "color"), -+#if USE_256_COLORS -+ // 256 xterm colors -+ RSTRG (Rs_color + minCOLOR + 88, "color88", "color"), -+ RSTRG (Rs_color + minCOLOR + 89, "color89", "color"), -+ RSTRG (Rs_color + minCOLOR + 90, "color90", "color"), -+ RSTRG (Rs_color + minCOLOR + 91, "color91", "color"), -+ RSTRG (Rs_color + minCOLOR + 92, "color92", "color"), -+ RSTRG (Rs_color + minCOLOR + 93, "color93", "color"), -+ RSTRG (Rs_color + minCOLOR + 94, "color94", "color"), -+ RSTRG (Rs_color + minCOLOR + 95, "color95", "color"), -+ RSTRG (Rs_color + minCOLOR + 96, "color96", "color"), -+ RSTRG (Rs_color + minCOLOR + 97, "color97", "color"), -+ RSTRG (Rs_color + minCOLOR + 98, "color98", "color"), -+ RSTRG (Rs_color + minCOLOR + 99, "color99", "color"), -+ RSTRG (Rs_color + minCOLOR + 100, "color100", "color"), -+ RSTRG (Rs_color + minCOLOR + 101, "color101", "color"), -+ RSTRG (Rs_color + minCOLOR + 102, "color102", "color"), -+ RSTRG (Rs_color + minCOLOR + 103, "color103", "color"), -+ RSTRG (Rs_color + minCOLOR + 104, "color104", "color"), -+ RSTRG (Rs_color + minCOLOR + 105, "color105", "color"), -+ RSTRG (Rs_color + minCOLOR + 106, "color106", "color"), -+ RSTRG (Rs_color + minCOLOR + 107, "color107", "color"), -+ RSTRG (Rs_color + minCOLOR + 108, "color108", "color"), -+ RSTRG (Rs_color + minCOLOR + 109, "color109", "color"), -+ RSTRG (Rs_color + minCOLOR + 110, "color110", "color"), -+ RSTRG (Rs_color + minCOLOR + 111, "color111", "color"), -+ RSTRG (Rs_color + minCOLOR + 112, "color112", "color"), -+ RSTRG (Rs_color + minCOLOR + 113, "color113", "color"), -+ RSTRG (Rs_color + minCOLOR + 114, "color114", "color"), -+ RSTRG (Rs_color + minCOLOR + 115, "color115", "color"), -+ RSTRG (Rs_color + minCOLOR + 116, "color116", "color"), -+ RSTRG (Rs_color + minCOLOR + 117, "color117", "color"), -+ RSTRG (Rs_color + minCOLOR + 118, "color118", "color"), -+ RSTRG (Rs_color + minCOLOR + 119, "color119", "color"), -+ RSTRG (Rs_color + minCOLOR + 120, "color120", "color"), -+ RSTRG (Rs_color + minCOLOR + 121, "color121", "color"), -+ RSTRG (Rs_color + minCOLOR + 122, "color122", "color"), -+ RSTRG (Rs_color + minCOLOR + 123, "color123", "color"), -+ RSTRG (Rs_color + minCOLOR + 124, "color124", "color"), -+ RSTRG (Rs_color + minCOLOR + 125, "color125", "color"), -+ RSTRG (Rs_color + minCOLOR + 126, "color126", "color"), -+ RSTRG (Rs_color + minCOLOR + 127, "color127", "color"), -+ RSTRG (Rs_color + minCOLOR + 128, "color128", "color"), -+ RSTRG (Rs_color + minCOLOR + 129, "color129", "color"), -+ RSTRG (Rs_color + minCOLOR + 130, "color130", "color"), -+ RSTRG (Rs_color + minCOLOR + 131, "color131", "color"), -+ RSTRG (Rs_color + minCOLOR + 132, "color132", "color"), -+ RSTRG (Rs_color + minCOLOR + 133, "color133", "color"), -+ RSTRG (Rs_color + minCOLOR + 134, "color134", "color"), -+ RSTRG (Rs_color + minCOLOR + 135, "color135", "color"), -+ RSTRG (Rs_color + minCOLOR + 136, "color136", "color"), -+ RSTRG (Rs_color + minCOLOR + 137, "color137", "color"), -+ RSTRG (Rs_color + minCOLOR + 138, "color138", "color"), -+ RSTRG (Rs_color + minCOLOR + 139, "color139", "color"), -+ RSTRG (Rs_color + minCOLOR + 140, "color140", "color"), -+ RSTRG (Rs_color + minCOLOR + 141, "color141", "color"), -+ RSTRG (Rs_color + minCOLOR + 142, "color142", "color"), -+ RSTRG (Rs_color + minCOLOR + 143, "color143", "color"), -+ RSTRG (Rs_color + minCOLOR + 144, "color144", "color"), -+ RSTRG (Rs_color + minCOLOR + 145, "color145", "color"), -+ RSTRG (Rs_color + minCOLOR + 146, "color146", "color"), -+ RSTRG (Rs_color + minCOLOR + 147, "color147", "color"), -+ RSTRG (Rs_color + minCOLOR + 148, "color148", "color"), -+ RSTRG (Rs_color + minCOLOR + 149, "color149", "color"), -+ RSTRG (Rs_color + minCOLOR + 150, "color150", "color"), -+ RSTRG (Rs_color + minCOLOR + 151, "color151", "color"), -+ RSTRG (Rs_color + minCOLOR + 152, "color152", "color"), -+ RSTRG (Rs_color + minCOLOR + 153, "color153", "color"), -+ RSTRG (Rs_color + minCOLOR + 154, "color154", "color"), -+ RSTRG (Rs_color + minCOLOR + 155, "color155", "color"), -+ RSTRG (Rs_color + minCOLOR + 156, "color156", "color"), -+ RSTRG (Rs_color + minCOLOR + 157, "color157", "color"), -+ RSTRG (Rs_color + minCOLOR + 158, "color158", "color"), -+ RSTRG (Rs_color + minCOLOR + 159, "color159", "color"), -+ RSTRG (Rs_color + minCOLOR + 160, "color160", "color"), -+ RSTRG (Rs_color + minCOLOR + 161, "color161", "color"), -+ RSTRG (Rs_color + minCOLOR + 162, "color162", "color"), -+ RSTRG (Rs_color + minCOLOR + 163, "color163", "color"), -+ RSTRG (Rs_color + minCOLOR + 164, "color164", "color"), -+ RSTRG (Rs_color + minCOLOR + 165, "color165", "color"), -+ RSTRG (Rs_color + minCOLOR + 166, "color166", "color"), -+ RSTRG (Rs_color + minCOLOR + 167, "color167", "color"), -+ RSTRG (Rs_color + minCOLOR + 168, "color168", "color"), -+ RSTRG (Rs_color + minCOLOR + 169, "color169", "color"), -+ RSTRG (Rs_color + minCOLOR + 170, "color170", "color"), -+ RSTRG (Rs_color + minCOLOR + 171, "color171", "color"), -+ RSTRG (Rs_color + minCOLOR + 172, "color172", "color"), -+ RSTRG (Rs_color + minCOLOR + 173, "color173", "color"), -+ RSTRG (Rs_color + minCOLOR + 174, "color174", "color"), -+ RSTRG (Rs_color + minCOLOR + 175, "color175", "color"), -+ RSTRG (Rs_color + minCOLOR + 176, "color176", "color"), -+ RSTRG (Rs_color + minCOLOR + 177, "color177", "color"), -+ RSTRG (Rs_color + minCOLOR + 178, "color178", "color"), -+ RSTRG (Rs_color + minCOLOR + 179, "color179", "color"), -+ RSTRG (Rs_color + minCOLOR + 180, "color180", "color"), -+ RSTRG (Rs_color + minCOLOR + 181, "color181", "color"), -+ RSTRG (Rs_color + minCOLOR + 182, "color182", "color"), -+ RSTRG (Rs_color + minCOLOR + 183, "color183", "color"), -+ RSTRG (Rs_color + minCOLOR + 184, "color184", "color"), -+ RSTRG (Rs_color + minCOLOR + 185, "color185", "color"), -+ RSTRG (Rs_color + minCOLOR + 186, "color186", "color"), -+ RSTRG (Rs_color + minCOLOR + 187, "color187", "color"), -+ RSTRG (Rs_color + minCOLOR + 188, "color188", "color"), -+ RSTRG (Rs_color + minCOLOR + 189, "color189", "color"), -+ RSTRG (Rs_color + minCOLOR + 190, "color190", "color"), -+ RSTRG (Rs_color + minCOLOR + 191, "color191", "color"), -+ RSTRG (Rs_color + minCOLOR + 192, "color192", "color"), -+ RSTRG (Rs_color + minCOLOR + 193, "color193", "color"), -+ RSTRG (Rs_color + minCOLOR + 194, "color194", "color"), -+ RSTRG (Rs_color + minCOLOR + 195, "color195", "color"), -+ RSTRG (Rs_color + minCOLOR + 196, "color196", "color"), -+ RSTRG (Rs_color + minCOLOR + 197, "color197", "color"), -+ RSTRG (Rs_color + minCOLOR + 198, "color198", "color"), -+ RSTRG (Rs_color + minCOLOR + 199, "color199", "color"), -+ RSTRG (Rs_color + minCOLOR + 200, "color200", "color"), -+ RSTRG (Rs_color + minCOLOR + 201, "color201", "color"), -+ RSTRG (Rs_color + minCOLOR + 202, "color202", "color"), -+ RSTRG (Rs_color + minCOLOR + 203, "color203", "color"), -+ RSTRG (Rs_color + minCOLOR + 204, "color204", "color"), -+ RSTRG (Rs_color + minCOLOR + 205, "color205", "color"), -+ RSTRG (Rs_color + minCOLOR + 206, "color206", "color"), -+ RSTRG (Rs_color + minCOLOR + 207, "color207", "color"), -+ RSTRG (Rs_color + minCOLOR + 208, "color208", "color"), -+ RSTRG (Rs_color + minCOLOR + 209, "color209", "color"), -+ RSTRG (Rs_color + minCOLOR + 210, "color210", "color"), -+ RSTRG (Rs_color + minCOLOR + 211, "color211", "color"), -+ RSTRG (Rs_color + minCOLOR + 212, "color212", "color"), -+ RSTRG (Rs_color + minCOLOR + 213, "color213", "color"), -+ RSTRG (Rs_color + minCOLOR + 214, "color214", "color"), -+ RSTRG (Rs_color + minCOLOR + 215, "color215", "color"), -+ RSTRG (Rs_color + minCOLOR + 216, "color216", "color"), -+ RSTRG (Rs_color + minCOLOR + 217, "color217", "color"), -+ RSTRG (Rs_color + minCOLOR + 218, "color218", "color"), -+ RSTRG (Rs_color + minCOLOR + 219, "color219", "color"), -+ RSTRG (Rs_color + minCOLOR + 220, "color220", "color"), -+ RSTRG (Rs_color + minCOLOR + 221, "color221", "color"), -+ RSTRG (Rs_color + minCOLOR + 222, "color222", "color"), -+ RSTRG (Rs_color + minCOLOR + 223, "color223", "color"), -+ RSTRG (Rs_color + minCOLOR + 224, "color224", "color"), -+ RSTRG (Rs_color + minCOLOR + 225, "color225", "color"), -+ RSTRG (Rs_color + minCOLOR + 226, "color226", "color"), -+ RSTRG (Rs_color + minCOLOR + 227, "color227", "color"), -+ RSTRG (Rs_color + minCOLOR + 228, "color228", "color"), -+ RSTRG (Rs_color + minCOLOR + 229, "color229", "color"), -+ RSTRG (Rs_color + minCOLOR + 230, "color230", "color"), -+ RSTRG (Rs_color + minCOLOR + 231, "color231", "color"), -+ RSTRG (Rs_color + minCOLOR + 232, "color232", "color"), -+ RSTRG (Rs_color + minCOLOR + 233, "color233", "color"), -+ RSTRG (Rs_color + minCOLOR + 234, "color234", "color"), -+ RSTRG (Rs_color + minCOLOR + 235, "color235", "color"), -+ RSTRG (Rs_color + minCOLOR + 236, "color236", "color"), -+ RSTRG (Rs_color + minCOLOR + 237, "color237", "color"), -+ RSTRG (Rs_color + minCOLOR + 238, "color238", "color"), -+ RSTRG (Rs_color + minCOLOR + 239, "color239", "color"), -+ RSTRG (Rs_color + minCOLOR + 240, "color240", "color"), -+ RSTRG (Rs_color + minCOLOR + 241, "color241", "color"), -+ RSTRG (Rs_color + minCOLOR + 242, "color242", "color"), -+ RSTRG (Rs_color + minCOLOR + 243, "color243", "color"), -+ RSTRG (Rs_color + minCOLOR + 244, "color244", "color"), -+ RSTRG (Rs_color + minCOLOR + 245, "color245", "color"), -+ RSTRG (Rs_color + minCOLOR + 246, "color246", "color"), -+ RSTRG (Rs_color + minCOLOR + 247, "color247", "color"), -+ RSTRG (Rs_color + minCOLOR + 248, "color248", "color"), -+ RSTRG (Rs_color + minCOLOR + 249, "color249", "color"), -+ RSTRG (Rs_color + minCOLOR + 250, "color250", "color"), -+ RSTRG (Rs_color + minCOLOR + 251, "color251", "color"), -+ RSTRG (Rs_color + minCOLOR + 252, "color252", "color"), -+ RSTRG (Rs_color + minCOLOR + 253, "color253", "color"), -+ RSTRG (Rs_color + minCOLOR + 254, "color254", "color"), -+ RSTRG (Rs_color + minCOLOR + 255, "color255", "color"), -+#endif - RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), - RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), - RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch deleted file mode 100644 index 636083218fa5..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/rxvtfont.C 2008-07-09 12:21:45.000000000 +0400 -+++ b/src/rxvtfont.C 2009-10-30 14:32:53.000000000 +0300 -@@ -1195,12 +1195,14 @@ - XGlyphInfo g; - XftTextExtents16 (disp, f, &ch, 1, &g); - -- g.width -= g.x; -- -+/* -+ * bukind: don't use g.width as a width of a character! -+ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial -+ */ - int wcw = WCWIDTH (ch); -- if (wcw > 0) g.width = (g.width + wcw - 1) / wcw; -+ if (wcw > 1) g.xOff = g.xOff / wcw; -+ if (width < g.xOff) width = g.xOff; - -- if (width < g.width ) width = g.width; - if (height < g.height ) height = g.height; - if (glheight < g.height - g.y) glheight = g.height - g.y; - }
\ No newline at end of file diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch deleted file mode 100644 index 5e42e17c156a..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile.in 2015-01-13 08:52:30.000000000 +0100 -+++ b/Makefile.in 2015-01-13 08:52:58.000000000 +0100 -@@ -30,6 +30,7 @@ - subdirs = src doc - - RECURSIVE_TARGETS = all allbin alldoc tags clean distclean realclean install -+.PHONY: $(RECURSIVE_TARGETS) - - #------------------------------------------------------------------------- - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/wrapper.nix deleted file mode 100644 index 38978799b5a8..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt-unicode/wrapper.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ callPackage -, symlinkJoin -, makeWrapper -, lib -, rxvt-unicode-unwrapped -, rxvt-unicode-plugins -, perlPackages -, configure ? { availablePlugins, ... }: - { plugins = builtins.attrValues availablePlugins; - extraDeps = [ ]; - perlDeps = [ ]; - } -}: - -let - availablePlugins = rxvt-unicode-plugins; - - # Transform the string "self" to the plugin itself. - # It's needed for plugins like bidi who depends on the perl - # package they provide themself. - mkPerlDeps = p: - let deps = p.perlPackages or [ ]; - in map (x: if x == "self" then p else x) deps; - - # The wrapper is called with a `configure` function - # that takes the urxvt plugins as input and produce - # the configuration of the wrapper: list of plugins, - # extra dependencies and perl dependencies. - # This provides simple way to customize urxvt using - # the `.override` mechanism. - wrapper = { configure, ... }: - let - config = configure { inherit availablePlugins; }; - plugins = config.plugins or (builtins.attrValues availablePlugins); - extraDeps = config.extraDeps or [ ]; - perlDeps = (config.perlDeps or [ ]) ++ lib.concatMap mkPerlDeps plugins; - in - symlinkJoin { - name = "rxvt-unicode-${rxvt-unicode-unwrapped.version}"; - - paths = [ rxvt-unicode-unwrapped ] ++ plugins ++ extraDeps; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/urxvt \ - --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ - --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" - wrapProgram $out/bin/urxvtd \ - --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ - --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" - ''; - - passthru.plugins = plugins; - }; - -in - lib.makeOverridable wrapper { inherit configure; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt/default.nix deleted file mode 100644 index c71973da13be..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/rxvt/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl -, pkgconfig, libtool -, libX11, libXt, libXpm }: - -stdenv.mkDerivation rec { - pname = "rxvt"; - version = "2.7.10"; - - src = fetchurl { - url = "mirror://sourceforge/rxvt/${pname}-${version}.tar.gz"; - sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libtool libX11 libXt libXpm ]; - - configurePhase = '' - LIBTOOL=${libtool}/bin/libtool ./configure --prefix=$out --enable-everything --enable-smart-resize --enable-256-color - ''; - - meta = with stdenv.lib; { - homepage = "http://rxvt.sourceforge.net/"; - description = "Colour vt102 terminal emulator with less features and lower memory consumption"; - longDescription = '' - rxvt (acronym for our extended virtual terminal) is a terminal - emulator for the X Window System, originally written by Rob Nation - as an extended version of the older xvt terminal by John Bovey of - University of Kent. Mark Olesen extensively modified it later and - took over maintenance for several years. - - rxvt is intended to be a slimmed-down alternate for xterm, - omitting some of its little-used features, like Tektronix 4014 - emulation and toolkit-style configurability. - ''; - maintainers = with maintainers; [ AndersonTorres ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/sakura/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/sakura/default.nix deleted file mode 100644 index 89a4cf25b8db..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/sakura/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }: - -stdenv.mkDerivation rec { - pname = "sakura"; - version = "3.7.0"; - - src = fetchurl { - url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "15gskj5yv5qs3cj4ps43735kfx2nzjlhq4dk9ghirl8lvhhxsm5m"; - }; - - nativeBuildInputs = [ cmake perl pkgconfig ]; - - buildInputs = [ makeWrapper gtk3 vte pcre2 glib ]; - - # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ... - postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; - - meta = with stdenv.lib; { - description = "A terminal emulator based on GTK and VTE"; - homepage = "https://www.pleyades.net/david/projects/sakura"; - license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl codyopel ]; - platforms = platforms.linux; - longDescription = '' - sakura is a terminal emulator based on GTK and VTE. It's a terminal - emulator with few dependencies, so you don't need a full GNOME desktop - installed to have a decent terminal emulator. Current terminal emulators - based on VTE are gnome-terminal, XFCE Terminal, TermIt and a small - sample program included in the vte sources. The differences between - sakura and the last one are that it uses a notebook to provide several - terminals in one window and adds a contextual menu with some basic - options. No more no less. - ''; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/simplenote/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/simplenote/default.nix index 05cf15b8accc..fa0a47fdcb5e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/simplenote/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/simplenote/default.nix @@ -17,10 +17,10 @@ let pname = "simplenote"; - version = "1.21.1"; + version = "2.2.0"; sha256 = { - x86_64-linux = "00qx82d17yrrg2mxwhm40av0mpf5hy14j338i5ijhwp79yc8fk8x"; + x86_64-linux = "123b0fh14068s2z3k6s5mmh46xwlz02qfnpmj838zlm5hckjmifv"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/solaar/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/solaar/default.nix index 83a7e9d62165..f92fe87b9481 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; - rev = "${version}"; + rev = version; sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix new file mode 100644 index 000000000000..a042cc53c055 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "spicetify-cli"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "khanhas"; + repo = pname; + rev = "v${version}"; + sha256 = "08rnwj7ggh114n3mhhm8hb8fm1njgb4j6vba3hynp8x1c2ngidff"; + }; + + vendorSha256 = "0k06c3jw5z8rw8nk4qf794kyfipylmz6x6l126a2snvwi0lmc601"; + + # used at runtime, but not installed by default + postInstall = '' + cp -r ${src}/jsHelper $out/bin/jsHelper + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/spicetify-cli --help > /dev/null + ''; + + meta = with lib; { + description = "Command-line tool to customize Spotify client"; + homepage = "https://github.com/khanhas/spicetify-cli/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/ssw/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/ssw/default.nix index 24b7953fe3d2..7e1e40258106 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/ssw/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/ssw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ssw"; - version = "0.3"; + version = "0.6"; src = fetchurl { url = "https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-${version}.tar.gz"; - sha256 = "1h93yyh2by6yrmkwqg38nd5knids05k5nqzcihc1hdwgzg3c4b8y"; + sha256 = "08ck9l697xg8vpya5h07raq837i4pqxjqzx30vhscq4xpps2b8kj"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/st/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/st/default.nix deleted file mode 100644 index a91229f2921e..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/st/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses -, libXft, conf ? null, patches ? [], extraLibs ? []}: - -with stdenv.lib; - -stdenv.mkDerivation rec { - pname = "st"; - version = "0.8.4"; - - src = fetchurl { - url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; - sha256 = "19j66fhckihbg30ypngvqc9bcva47mp379ch5vinasjdxgn3qbfl"; - }; - - inherit patches; - - configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - - postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h" - + optionalString stdenv.isDarwin '' - substituteInPlace config.mk --replace "-lrt" "" - ''; - - nativeBuildInputs = [ pkgconfig ncurses ]; - buildInputs = [ libX11 libXft ] ++ extraLibs; - - installPhase = '' - TERMINFO=$out/share/terminfo make install PREFIX=$out - ''; - - meta = { - homepage = "https://st.suckless.org/"; - description = "Simple Terminal for X from Suckless.org Community"; - license = licenses.mit; - maintainers = with maintainers; [ andsild ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/st/xst.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/st/xst.nix deleted file mode 100644 index 3e29abee5d65..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/st/xst.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: - -with stdenv.lib; - -let - version = "0.7.2"; - name = "xst-${version}"; -in stdenv.mkDerivation { - inherit name; - - src = fetchFromGitHub { - owner = "gnotclub"; - repo = "xst"; - rev = "v${version}"; - sha256 = "1fplgy30gyrwkjsw3z947327r98i13zd1whwkplpj9fzckhb9vs9"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; - - installPhase = '' - TERMINFO=$out/share/terminfo make install PREFIX=$out - ''; - - meta = { - homepage = "https://github.com/neeasade/xst"; - description = "Simple terminal fork that can load config from Xresources"; - license = licenses.mit; - maintainers = [ maintainers.vyp ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/stupidterm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/stupidterm/default.nix deleted file mode 100644 index 2016059d81e7..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/stupidterm/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }: - -stdenv.mkDerivation { - pname = "stupidterm"; - version = "2019-03-26"; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ vte gtk pcre2 ]; - - src = fetchFromGitHub { - owner = "esmil"; - repo = "stupidterm"; - rev = "f824e41c2ca9016db73556c5d2f5a2861e235c8e"; - sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; - }; - - makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" "binary=stupidterm" ]; - - installPhase = '' - install -D stupidterm $out/bin/stupidterm - install -D -m 644 stupidterm.desktop $out/share/applications/stupidterm.desktop - install -D -m 644 stupidterm.ini $out/share/stupidterm/stupidterm.ini - - substituteInPlace $out/share/applications/stupidterm.desktop \ - --replace "Exec=st" "Exec=$out/bin/stupidterm" - ''; - - meta = with stdenv.lib; { - description = "Simple wrapper around the VTE terminal emulator widget for GTK"; - homepage = "https://github.com/esmil/stupidterm"; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.etu ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index 94875de7ebc8..bf2db2966508 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -51,7 +51,12 @@ let cp "${sweethome3dItem}/share/applications/"* $out/share/applications + # MESA_GL_VERSION_OVERRIDE is needed since the update from MESA 19.3.3 to 20.0.2: + # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null" + # exception is thrown on startup. + # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753 makeWrapper ${jre}/bin/java $out/bin/$exec \ + --set MESA_GL_VERSION_OVERRIDE 2.1 \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" ''; @@ -73,14 +78,14 @@ in { application = mkSweetHome3D rec { pname = stdenv.lib.toLower module + "-application"; - version = "6.3"; + version = "6.4.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "1c13g0f73jgbzmjhdm9knqq1kh3vdl04zl3xlp30g9a1n0jkr38i"; - rev = "6896"; + sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4"; + rev = "7504"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index c45ea27c425e..bbe629ecb14f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.11.0"; + version = "1.1.0"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "1lpjrij6y8l738hd7bfig0piglqinnqbadidzw9k0nm53bh4pqrr"; + sha256 = "0nzkzx870hzil2kny1irp4w2kxz5gmpchr2qxb7q4f9cnih92n0j"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/teleprompter/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/teleprompter/default.nix index 37b3f10329b9..96265356ead7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/teleprompter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/teleprompter/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, electron_4, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}: +{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}: let - electron = electron_4; + electron = electron_10; in stdenv.mkDerivation rec { pname = "teleprompter"; - version = "2.3.4"; + version = "2.4.0"; src = fetchurl { - url = "mirror://sourceforge/teleprompter-imaginary-films/imaginary-${pname}-${version}-64bit.tar.gz"; - sha256 = "084ml2l3qg46bsazaapyxdx4zavvxp0j4ycsdpdwk3f94g9xb120"; + url = "https://github.com/ImaginarySense/Imaginary-Teleprompter-Electron/releases/download/${lib.versions.majorMinor version}/imaginary-teleprompter-${version}.tar.gz"; + sha256 = "bgdtK8l5d26avv1WUw9cfOgZrIL1q/a9890Ams4yidQ="; }; dontBuild = true; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The most complete, free, teleprompter app on the web"; - license = [ licenses.gpl3 ]; + license = [ licenses.gpl3Plus ]; homepage = "https://github.com/ImaginarySense/Teleprompter-Core"; platforms = platforms.linux; maintainers = with maintainers; [ Scriptkiddi ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/tellico/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tellico/default.nix index 6425be004186..fa725ad9c96c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/tellico/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/tellico/default.nix @@ -1,7 +1,7 @@ { lib , fetchurl , mkDerivation -, kdeApplications +, libkcddb , kinit , kdelibs4support , solid @@ -46,7 +46,7 @@ mkDerivation rec { exempi extra-cmake-modules karchive - kdeApplications.libkcddb + libkcddb kdelibs4support kfilemetadata khtml diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/terminator/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/terminator/default.nix deleted file mode 100644 index 5de8109e3a4d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/terminator/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv -, fetchFromGitHub -, python3 -, keybinder3 -, intltool -, file -, gtk3 -, gobject-introspection -, libnotify -, wrapGAppsHook -, vte -}: - -python3.pkgs.buildPythonApplication rec { - pname = "terminator"; - version = "1.92"; - - src = fetchFromGitHub { - owner = "gnome-terminator"; - repo = "terminator"; - rev = "v${version}"; - sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh"; - }; - - nativeBuildInputs = [ - file - intltool - gobject-introspection - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 - keybinder3 - libnotify - python3 - vte - ]; - - propagatedBuildInputs = with python3.pkgs; [ - configobj - dbus-python - pygobject3 - psutil - pycairo - ]; - - postPatch = '' - patchShebangs run_tests tests po - # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. - # The wrapped terminator has the correct path added, so ignore this. - substituteInPlace setup.py --replace "'dbus-python'," "" - ''; - - checkPhase = '' - runHook preCheck - - ./run_tests - - runHook postCheck - ''; - - meta = with stdenv.lib; { - description = "Terminal emulator with support for tiling and tabs"; - longDescription = '' - The goal of this project is to produce a useful tool for arranging - terminals. It is inspired by programs such as gnome-multi-term, - quadkonsole, etc. in that the main focus is arranging terminals in grids - (tabs is the most common default method, which Terminator also supports). - ''; - homepage = "https://github.com/gnome-terminator/terminator"; - license = licenses.gpl2; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/terminus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/terminus/default.nix deleted file mode 100644 index 4c38e530247e..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/terminus/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk-pixbuf, cairo -, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr -, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb, makeWrapper, nodejs -, nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }: - -let - libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc gtk2 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio - ]; -in -stdenv.mkDerivation rec { - version = "1.0.0-alpha.42"; - pname = "terminus"; - src = fetchurl { - url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb"; - sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb"; - }; - buildInputs = [ dpkg makeWrapper ]; - unpackPhase = '' - mkdir pkg - dpkg-deb -x $src pkg - sourceRoot=pkg - ''; - installPhase = '' - mkdir -p "$out/bin" - mv opt "$out/" - ln -s "$out/opt/Terminus/terminus" "$out/bin/terminus" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Terminus/terminus" - mv usr/* "$out/" - wrapProgram $out/bin/terminus --prefix PATH : ${lib.makeBinPath [ nodejs ]} - ''; - dontPatchELF = true; - meta = with lib; { - description = "A terminal for a more modern age"; - homepage = "https://eugeny.github.io/terminus/"; - maintainers = with maintainers; [ jlesquembre ]; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/add_errno_header.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/add_errno_header.patch deleted file mode 100644 index 81283f86a21d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/add_errno_header.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 95c90f302c384f410dc92e64468ac7061b57fe2d Mon Sep 17 00:00:00 2001 -From: Michael Hoang <enzime@users.noreply.github.com> -Date: Fri, 13 Jul 2018 19:03:09 +1000 -Subject: [PATCH] Add errno.h header which isn't always included automatically. - ---- - termite.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/termite.cc b/termite.cc -index 160fe82..13e2572 100644 ---- a/termite.cc -+++ b/termite.cc -@@ -21,6 +21,7 @@ - #include <cstdlib> - #include <cstring> - #include <cmath> -+#include <errno.h> - #include <functional> - #include <limits> - #include <map> --- -2.17.1 - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/default.nix deleted file mode 100644 index 63565e207f77..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: - -let - - # termite requires VTE with some internals exposed - # https://github.com/thestinger/vte-ng - vte-ng = vte.overrideAttrs (attrs: { - patches = attrs.patches or [] ++ [ - (fetchpatch { - name = "0001-expose-functions-for-pausing-unpausing-output.patch"; - url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch"; - sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715"; - }) - (fetchpatch { - name = "0002-expose-function-for-setting-cursor-position.patch"; - url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch"; - sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89"; - }) - (fetchpatch { - name = "0003-add-function-for-setting-the-text-selections.patch"; - url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch"; - sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x"; - }) - (fetchpatch { - name = "0004-add-functions-to-get-set-block-selection-mode.patch"; - url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch"; - sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g"; - }) - (fetchpatch { - name = "0005-expose-function-for-getting-the-selected-text.patch"; - url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch"; - sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27"; - }) - ]; - }); - -in stdenv.mkDerivation rec { - pname = "termite"; - version = "15"; - - src = fetchFromGitHub { - owner = "thestinger"; - repo = "termite"; - rev = "v${version}"; - sha256 = "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k"; - fetchSubmodules = true; - }; - - # https://github.com/thestinger/termite/pull/516 - patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch - # Fix off-by-one in select_text() on libvte >= 0.55.0 - # Expected to be included in next release (16). - (fetchpatch { - url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch"; - sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j"; - }) - ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; - - makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - - buildInputs = [ vte-ng gtk3 ncurses pcre2 ]; - - nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; - - outputs = [ "out" "terminfo" ]; - - passthru = { inherit vte-ng; }; - - postInstall = '' - mkdir -p $terminfo/share - mv $out/share/terminfo $terminfo/share/terminfo - - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - ''; - - meta = with stdenv.lib; { - description = "A simple VTE-based terminal"; - license = licenses.lgpl2Plus; - homepage = "https://github.com/thestinger/termite/"; - maintainers = with maintainers; [ koral ]; - platforms = platforms.all; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/remove_ldflags_macos.patch deleted file mode 100644 index f8c68518bb4d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/remove_ldflags_macos.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1b5a6934635c55472eb7949bd87ab3f45fa1b2f3 Mon Sep 17 00:00:00 2001 -From: Michael Hoang <enzime@users.noreply.github.com> -Date: Fri, 13 Jul 2018 19:01:51 +1000 -Subject: [PATCH] Remove --as-needed flag from ld to fix compilation on macOS. - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index b115f42..ab301ba 100644 ---- a/Makefile -+++ b/Makefile -@@ -29,7 +29,7 @@ ifeq (${CXX}, clang++) - CXXFLAGS += -Wimplicit-fallthrough - endif - --LDFLAGS := -s -Wl,--as-needed ${LDFLAGS} -+LDFLAGS := -s -Wl ${LDFLAGS} - LDLIBS := ${shell pkg-config --libs ${GTK} ${VTE}} - - termite: termite.cc url_regex.hh util/clamp.hh util/maybe.hh util/memory.hh --- -2.17.1 - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/url_regexp_trailing.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/url_regexp_trailing.patch deleted file mode 100644 index 96deaa073d71..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/url_regexp_trailing.patch +++ /dev/null @@ -1,27 +0,0 @@ -Based on https://github.com/thestinger/termite/pull/516 -Modified to apply to v13 - -From 65a454ffa8e681f3f14729cba7c42e1570a85e8a Mon Sep 17 00:00:00 2001 -From: Paul Baecher <pbaecher@gmail.com> -Date: Thu, 7 Sep 2017 22:58:51 +0200 -Subject: [PATCH] Do not match punctuation at the end of URLs - -Punctuation at the end of URLs is most likely part of natural language -or markup (for example in Markdown). Do not match it as part of the URL. ---- - url_regex.hh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/url_regex.hh b/url_regex.hh -index 2ec6be8..3039b53 100644 ---- a/url_regex.hh -+++ b/url_regex.hh -@@ -9,7 +9,7 @@ - #define PORT "(?:\\:[[:digit:]]{1,5})?" - #define SCHEME "(?:[[:alpha:]][+-.[:alnum:]]*:)" - #define USERPASS USERCHARS_CLASS "+(?:\\:" PASSCHARS_CLASS "+)?" --#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*)?" -+#define URLPATH "(?:/[[:alnum:]\\Q-_.!~*'();/?:@&=+$,#%\\E]*(?<![\\Q.,:;()!?\\E]))?" - - const char * const url_regex = SCHEME "//(?:" USERPASS "\\@)?" HOST PORT URLPATH; - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/wrapper.nix deleted file mode 100644 index 379223d9076d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/termite/wrapper.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ makeWrapper, symlinkJoin, configFile ? null, termite }: - -if configFile == null then termite else symlinkJoin { - name = "termite-with-config-${termite.version}"; - - paths = [ termite ]; - nativeBuildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/termite \ - --add-flags "--config ${configFile}" - ''; - - passthru.terminfo = termite.terminfo; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/termonad/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/termonad/default.nix deleted file mode 100644 index 4388cbcfb441..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/termonad/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, ghcWithPackages, makeWrapper, packages ? (pkgSet: []) }: - -let - termonadEnv = ghcWithPackages (self: [ self.termonad ] ++ packages self); -in stdenv.mkDerivation { - name = "termonad-with-packages-${termonadEnv.version}"; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin $out/share - makeWrapper ${termonadEnv}/bin/termonad $out/bin/termonad \ - --set NIX_GHC "${termonadEnv}/bin/ghc" - ''; - - # trivial derivation - preferLocalBuild = true; - allowSubstitutes = false; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tickrs/default.nix new file mode 100644 index 000000000000..754de71f1ae7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub, perl }: + +rustPlatform.buildRustPackage rec { + pname = "tickrs"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "tarkah"; + repo = pname; + rev = "v${version}"; + sha256 = "159smcjrf5193yijfpvy1g9b1gin72xwbjghfyrrphwscwhb215z"; + }; + + cargoSha256 = "1s95b3x7vs1z8xs7j6j80y6mfpy5bdgnzmzn3qa9zr6cghabbf6n"; + + nativeBuildInputs = [ perl ]; + + meta = with stdenv.lib; { + description = "Realtime ticker data in your terminal"; + homepage = "https://github.com/tarkah/tickrs"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/tilda/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tilda/default.nix deleted file mode 100644 index 0a672b039f6b..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/tilda/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig -, autoreconfHook, gettext, expat, pcre2 -, libconfuse, vte, gtk -, makeWrapper }: - -with stdenv.lib; -stdenv.mkDerivation rec { - - pname = "tilda"; - version = "1.5.2"; - - src = fetchFromGitHub { - owner = "lanoxx"; - repo = "tilda"; - rev = "${pname}-${version}"; - sha256 = "0psq0f4s0s92bba6wwcf6b0j7i59b76svqxhvpavwv53yvhmmamn"; - }; - - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; - buildInputs = [ gettext pcre2 libconfuse vte gtk ]; - - LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build - - # The config locking scheme relies on the binary being called "tilda", - # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice: - postInstall = '' - mkdir $out/bin/wrapped - mv "$out/bin/tilda" "$out/bin/wrapped/tilda" - makeWrapper "$out/bin/wrapped/tilda" "$out/bin/tilda" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - description = "A Gtk based drop down terminal for Linux and Unix"; - homepage = "https://github.com/lanoxx/tilda/"; - license = licenses.gpl3; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} - diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/tilix/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tilix/default.nix deleted file mode 100644 index 4707685e3dab..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/tilix/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv -, fetchFromGitHub -, fetchpatch -, meson -, ninja -, python3 -, pkgconfig -, dmd -, dconf -, dbus -, gsettings-desktop-schemas -, desktop-file-utils -, gettext -, gtkd -, libsecret -, glib -, wrapGAppsHook -, libunwind -}: - -stdenv.mkDerivation { - pname = "tilix"; - version = "unstable-2019-10-02"; - - src = fetchFromGitHub { - owner = "gnunn1"; - repo = "tilix"; - rev = "ffcd31e3c0e1a560ce89468152d8726065e8fb1f"; - sha256 = "1bzv7xiqhyblz1rw8ln4zpspmml49vnshn1zsv9di5q7kfgpqrgq"; - }; - - # Default upstream else LDC fails to link - mesonBuildType = [ - "debugoptimized" - ]; - - nativeBuildInputs = [ - desktop-file-utils - dmd - meson - ninja - pkgconfig - python3 - wrapGAppsHook - ]; - - buildInputs = [ - dbus - gettext - dconf - gsettings-desktop-schemas - gtkd - libsecret - libunwind - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - preFixup = '' - substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \ - --replace "Exec=tilix" "Exec=$out/bin/tilix" - ''; - - meta = with stdenv.lib; { - description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; - homepage = "https://gnunn1.github.io/tilix-web"; - license = licenses.mpl20; - maintainers = with maintainers; [ midchildan worldofpeace ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/tiv/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tiv/default.nix new file mode 100644 index 000000000000..3790a9fdd069 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/tiv/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, imagemagick }: + +stdenv.mkDerivation rec { + pname = "tiv"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "stefanhaustein"; + repo = "TerminalImageViewer"; + rev = "v${version}"; + sha256 = "17zqbwj2imk6ygyc142mw6v4fh7h4rd5vzn5wxr9gs0g8qdc6ixn"; + }; + + buildInputs = [ imagemagick ]; + + makeFlags = [ "prefix=$(out)" ]; + + preConfigure = "cd src/main/cpp"; + + meta = with stdenv.lib; { + homepage = "https://github.com/stefanhaustein/TerminalImageViewer"; + description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters"; + license = licenses.asl20; + maintainers = with maintainers; [ magnetophon ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/tmatrix/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tmatrix/default.nix index c03918c4875e..e63370566880 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/tmatrix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/tmatrix/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/M4444/TMatrix"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ infinisil filalex77 ]; + maintainers = with maintainers; [ infinisil Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix index e1d578edb0f5..cdcb54cbc6c4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix @@ -1,19 +1,21 @@ { stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf , gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat -, udev, libpulseaudio, utillinux, makeWrapper }: +, udev, libpulseaudio, util-linux, makeWrapper }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}_amd64.deb"; - sha256 = "1yxa0fdc3fnffny6jf1hm7545792pw7828mc27il17l4kn346g98"; + sha256 = "0g35518z6nf6pnfyx4ax75rq8b8br72mi6wv6jzgac9ric1q4h2s"; }; desktopItem = makeDesktopItem { name = "Todoist"; - exec = "todoist"; + exec = "todoist %U"; + icon = "todoist"; + comment = "Todoist for Linux"; desktopName = "Todoist"; categories = "Utility"; }; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { installPhase = let libPath = lib.makeLibraryPath ([ stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus - nss nspr alsaLib libpulseaudio cups expat udev utillinux + nss nspr alsaLib libpulseaudio cups expat udev util-linux ] ++ (with xorg; [ libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXrender libX11 libXtst libXScrnSaver @@ -35,6 +37,7 @@ stdenv.mkDerivation rec { in '' mkdir -p "$out/bin" mv opt "$out/" + mv usr/share "$out/share" # Patch binary patchelf \ @@ -48,14 +51,15 @@ stdenv.mkDerivation rec { # Desktop item mkdir -p "$out/share" - ln -s "${desktopItem}/share/applications" "$out/share/applications" + rm -r "$out/share/applications" + cp -r "${desktopItem}/share/applications" "$out/share/applications" ''; meta = with lib; { homepage = "https://github.com/KryDos/todoist-linux"; description = "The Linux wrapper for Todoist web version"; platforms = [ "x86_64-linux" ]; - license = licenses.isc; + license = licenses.mit; maintainers = with maintainers; [ i077 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix index 410c17be803a..eb49853885b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/toggldesktop/default.nix @@ -139,6 +139,7 @@ buildEnv { paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ]; meta = with lib; { + broken = true; # libtoggl is broken description = "Client for Toggl time tracking service"; homepage = "https://github.com/toggl/toggldesktop"; license = licenses.bsd3; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/tuir/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/tuir/default.nix index 11bf70cb56b3..c086cdb9503b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/tuir/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/tuir/default.nix @@ -27,6 +27,6 @@ buildPythonApplication rec { description = "Browse Reddit from your Terminal (fork of rtv)"; homepage = "https://gitlab.com/ajak/tuir/"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 matthiasbeyer ]; + maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/udevil/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/udevil/default.nix index dbf721888df6..8e01f73f9675 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/udevil/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/udevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, utillinux, acl }: +{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }: stdenv.mkDerivation { name = "udevil-0.4.4"; src = fetchurl { @@ -13,9 +13,9 @@ stdenv.mkDerivation { substituteInPlace src/Makefile.in --replace 4755 0755 ./configure \ --prefix=$out \ - --with-mount-prog=${utillinux}/bin/mount \ - --with-umount-prog=${utillinux}/bin/umount \ - --with-losetup-prog=${utillinux}/bin/losetup \ + --with-mount-prog=${util-linux}/bin/mount \ + --with-umount-prog=${util-linux}/bin/umount \ + --with-losetup-prog=${util-linux}/bin/losetup \ --with-setfacl-prog=${acl.bin}/bin/setfacl \ --sysconfdir=$prefix/etc ''; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/vifm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/vifm/default.nix index b014543e8ceb..2c388e58fe11 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/vifm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/vifm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper , pkgconfig , ncurses, libX11 -, utillinux, file, which, groff +, util-linux, file, which, groff # adds support for handling removable media (vifm-media). Linux only! , mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ ncurses libX11 utillinux file which groff ]; + buildInputs = [ ncurses libX11 util-linux file which groff ]; postFixup = let path = lib.makeBinPath diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/visidata/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/visidata/default.nix index 4cecf07f0fa3..e23df96efed2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -11,16 +11,17 @@ , pandas , pyshp , setuptools +, withPcap ? true, dpkt ? null, dnslib ? null }: buildPythonApplication rec { pname = "visidata"; - version = "1.5.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "19gs8i6chrrwibz706gib5sixx1cjgfzh7v011kp3izcrn524mc0"; + sha256 = "sha256-AkGU9p00y+psBS/fL2YLyQYRSMOp1aPs21E9bpN9z0M="; }; propagatedBuildInputs = [ @@ -34,7 +35,7 @@ buildPythonApplication rec { pandas pyshp setuptools - ]; + ] ++ lib.optionals withPcap [ dpkt dnslib ]; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/wofi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/wofi/default.nix index 4aeff6c9ec8d..7b9e38c87d17 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/wofi/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/wofi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.1"; + version = "1.2.3"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "0hx61br19dlmc3lay23ww3n9ry06m7b6xrkjx7sk4vrg1422iq99"; + sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i"; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/wordnet/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/wordnet/default.nix index 1f0414838adb..f681923978bd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/wordnet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}: +{ stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }: stdenv.mkDerivation rec { version = "3.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; }; - buildInputs = [tcl tk xlibsWrapper makeWrapper]; + buildInputs = [ tcl tk xlibsWrapper makeWrapper ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/wtf/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/wtf/default.nix index ad8e261cf686..ad107b644722 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0dszc3igfvlb6dgf5whyhw72id39lqqmgpd42kyqx5yjf5dw2wg7"; + sha256 = "01zydr1w8byjhxf4xj6z001q4ynq0452cn332ap1l1w0dmx9mxyr"; }; - vendorSha256 = "1wcqk8lfv3jq7dfaj9dj8bzsmq2qislzs1m38gx1hh4jwg1rn2cn"; + vendorSha256 = "1xyai417l8q44b562ssp5qqw04klrhg5397ahr4pc3i30csz8a7a"; doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/x3270/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/x3270/default.nix deleted file mode 100644 index 747d26538764..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/x3270/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, openssl, m4, expat -, libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir -, fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi -, fontbhlucidatypewriter100dpi, fontbitstream100dpi -, tcl -, ncurses }: - -let - majorVersion = "4"; - minorVersion = "0"; - versionSuffix = "ga9"; -in stdenv.mkDerivation rec { - pname = "x3270"; - version = "${majorVersion}.${minorVersion}${versionSuffix}"; - - src = fetchurl { - url = "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz"; - sha256 = "0km24rgll0s4ji6iz8lvy5ra76ds162s95y33w5px6697cwqkp9j"; - }; - - buildFlags = "unix"; - - postConfigure = '' - pushd c3270 ; ./configure ; popd - ''; - - nativeBuildInputs = [ m4 ]; - buildInputs = [ - expat - libX11 libXt libXaw libXmu bdftopcf mkfontdir - fontadobe100dpi fontadobeutopia100dpi fontbh100dpi - fontbhlucidatypewriter100dpi fontbitstream100dpi - tcl - ncurses - expat - ]; - - meta = with stdenv.lib; { - description = "IBM 3270 terminal emulator for the X Window System"; - homepage = "http://x3270.bgp.nu/index.html"; - license = licenses.bsd3; - maintainers = [ maintainers.anna328p ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xautoclick/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xautoclick/default.nix index 4f441d8a9a99..f259b28131db 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xautoclick/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/xautoclick/default.nix @@ -1,32 +1,30 @@ -{ stdenv, fetchurl, xorg, pkgconfig -, gtkSupport ? true, gtk2 -, qtSupport ? true, qt4 +{ stdenv, fetchFromGitHub, xorg, pkg-config +, cmake, libevdev +, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook +, fltkSupport ? true, fltk +, qtSupport ? true, qt5 }: -stdenv.mkDerivation { - version = "0.31"; +stdenv.mkDerivation rec { pname = "xautoclick"; - src = fetchurl { - url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; - sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; + version = "0.34"; + + src = fetchFromGitHub { + owner = "qarkai"; + repo = "xautoclick"; + rev = "v${version}"; + sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE="; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext ] - ++ stdenv.lib.optionals gtkSupport [ gtk2 ] - ++ stdenv.lib.optionals qtSupport [ qt4 ]; - patchPhase = '' - substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev} - ''; - preConfigure = stdenv.lib.optional qtSupport '' - mkdir .bin - ln -s ${qt4}/bin/moc .bin/moc-qt4 - addToSearchPath PATH .bin - sed -i -e "s@LD=\$_cc@LD=\$_cxx@" configure - ''; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libevdev xorg.libXtst ] + ++ stdenv.lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] + ++ stdenv.lib.optionals fltkSupport [ fltk ] + ++ stdenv.lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; meta = with stdenv.lib; { description = "Autoclicker application, which enables you to automatically click the left mousebutton"; - homepage = "http://xautoclick.sourceforge.net"; + homepage = "https://github.com/qarkai/xautoclick"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xkbd/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xkbd/default.nix index d03d78a9fd1d..cbca2a33d59e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xkbd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/xkbd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mahatma-kaganovich/xkbd"; description = "onscreen soft keyboard for X11"; license = licenses.gpl2Plus; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xmenu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xmenu/default.nix index 0904d1d048fc..e84f95e09981 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xmenu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/xmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xmenu"; - version = "4.3.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "phillbush"; repo = "xmenu"; rev = "v${version}"; - sha256 = "0m97w1nwak5drcxxlyisqb73fxkapy2rlph9mg531kbx3k2h30r1"; + sha256 = "1s70zvsaqnsjqs298vw3py0vcvia68xlks1wcz37pb88bwligz1x"; }; buildInputs = [ imlib2 libX11 libXft libXinerama ]; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { postPatch = "sed -i \"s:/usr/local:$out:\" config.mk"; meta = with stdenv.lib; { - description = "XMenu is a menu utility for X"; + description = "A menu utility for X"; homepage = "https://github.com/phillbush/xmenu"; - license = licenses.publicDomain; + license = licenses.mit; maintainers = with maintainers; [ neonfuz ]; platforms = platforms.all; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix index b6f05ea3094a..cb4233be8ec3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix @@ -1,5 +1,5 @@ { stdenv, stdenvGcc6, lib -, fetchFromGitHub, cmake, libmicrohttpd, openssl +, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl , opencl-headers, ocl-icd, hwloc, cudatoolkit , devDonationLevel ? "0.0" , cudaSupport ? false @@ -27,7 +27,7 @@ stdenv'.mkDerivation rec { ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; nativeBuildInputs = [ cmake ]; - buildInputs = [ libmicrohttpd openssl hwloc ] + buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xmrig/default.nix index d4d93c77ed42..35a19cb3063e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.11.3"; + version = "6.6.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "019g64rp6g0b0w17bm9l4q5lh7szc6ai8r3bfmy98ngi929r4rl7"; + sha256 = "03phq1c6fylvkg5x7l0bskspr9jdfx61jy67yx2lxhymqgpbf64z"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index 39cd50204095..1b8f79415838 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "5.11.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "0wwvsmanvcn0kbb5zqrj8786yg9rmdbink6rsnsm7ifak1iwvls9"; + sha256 = "0bcbil9b5z95haqbmdqaslckvjflw7h77fqrcdxc6lrn29575nnf"; }; nativeBuildInputs = [ cmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xteddy/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xteddy/default.nix index 856ddb8ff50c..34ec17b0b9a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xteddy/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/xteddy/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "games-team"; - repo = "xteddy"; - rev = "debian%2F${version}"; # %2F = urlquote("/"); + repo = pname; + rev = "debian/${version}"; sha256 = "0rm7w78d6qajq4fvi4agyqm0c70f3c1i0cy2jdb6kqql2k8w78qy"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xterm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xterm/default.nix deleted file mode 100644 index 109444fc5180..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xterm/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig, makeWrapper -, enableDecLocator ? true -}: - -stdenv.mkDerivation rec { - name = "xterm-353"; - - src = fetchurl { - urls = [ - "ftp://ftp.invisible-island.net/xterm/${name}.tgz" - "https://invisible-mirror.net/archives/xterm/${name}.tgz" - ]; - sha256 = "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5"; - }; - - buildInputs = - [ xorg.libXaw xorg.xorgproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE - ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit makeWrapper - ]; - - patches = [ - ./sixel-256.support.patch - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl - (fetchpatch { - name = "posix-ptys.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; - sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; - }); - - configureFlags = [ - "--enable-wide-chars" - "--enable-256-color" - "--enable-sixel-graphics" - "--enable-regis-graphics" - "--enable-load-vt-fonts" - "--enable-i18n" - "--enable-doublechars" - "--enable-luit" - "--enable-mini-luit" - "--with-tty-group=tty" - "--with-app-defaults=$(out)/lib/X11/app-defaults" - ] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator"; - - # Work around broken "plink.sh". - NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; - - # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp', - # decided by the sysadmin to allow the xterm reporting to /var/run/utmp - # If we used the configure option, that would have affected the xterm installation, - # (setgid with the given group set), and at build time the environment even doesn't have - # groups, and the builder will end up removing any setgid. - postConfigure = '' - echo '#define USE_UTMP_SETGID 1' - ''; - - postInstall = '' - for bin in $out/bin/*; do - wrapProgram $bin --set XAPPLRESDIR $out/lib/X11/app-defaults/ - done - - install -D -t $out/share/applications xterm.desktop - install -D -t $out/share/icons/hicolor/48x48/apps icons/xterm-color_48x48.xpm - ''; - - meta = { - homepage = "https://invisible-island.net/xterm"; - license = with stdenv.lib.licenses; [ mit ]; - maintainers = with stdenv.lib.maintainers; [vrthra]; - platforms = with stdenv.lib.platforms; linux ++ darwin; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xterm/sixel-256.support.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/xterm/sixel-256.support.patch deleted file mode 100644 index 480e67e89ca3..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xterm/sixel-256.support.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xterm-325/graphics.c 2016-05-17 03:04:40.000000000 -0700 -+++ xterm-325/graphics.c 2016-06-11 16:37:29.552584281 -0700 -@@ -667,7 +667,7 @@ - case 330: - return 4U; - case 340: -- return 16U; -+ return 256U; - case 382: - return 2U; - default: diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix deleted file mode 100644 index f7c0edf22420..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "3.7"; - pname = "xtermcontrol"; - - src = fetchurl { - url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; - sha256 = "04m12ddaps5sdbqvkwkp6lh81i8vh5ya5gzcxkrkilsga3m6qff2"; - }; - - meta = { - description = "Enables dynamic control of xterm properties"; - longDescription = '' - Enables dynamic control of xterm properties. - It makes it easy to change colors, title, font and geometry of a running xterm, as well as to report the current settings of these properties. - Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported. - To complete the feature set; xtermcontrol lets advanced users issue any xterm control sequence of their choosing. - ''; - homepage = "http://thrysoee.dk/xtermcontrol"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.derchris ]; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/xygrib/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/xygrib/default.nix index c7f449d97cdb..e3d22b5d00a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/xygrib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/xygrib/default.nix @@ -13,9 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ]; - cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ]; + cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; - postInstall = '' + postInstall = if stdenv.isDarwin then '' + mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" + cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" + mv $out/XyGrib/XyGrib.app $out/Applications + wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib" + '' else '' wrapQtApp $out/XyGrib/XyGrib mkdir -p $out/bin ln -s $out/XyGrib/XyGrib $out/bin/xygrib @@ -29,6 +35,6 @@ stdenv.mkDerivation rec { of global and large area atmospheric and wave models.''; license = licenses.gpl3; platforms = platforms.all; - maintainers = [ maintainers.j03 ]; + maintainers = with maintainers; [ j03 SuperSandro2000 ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/yaft/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/yaft/default.nix deleted file mode 100644 index e66f397a3830..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/yaft/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, ncurses }: - -stdenv.mkDerivation rec { - version = "0.2.9"; - pname = "yaft"; - - src = fetchFromGitHub { - owner = "uobikiemukot"; - repo = "yaft"; - rev = "v${version}"; - sha256 = "0l1ig8wm545kpn4l7186rymny83jkahnjim290wsl7hsszfq1ckd"; - }; - - buildInputs = [ ncurses ]; - - installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ]; - - meta = { - homepage = "https://github.com/uobikiemukot/yaft"; - description = "Yet another framebuffer terminal"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch b/infra/libkookie/nixpkgs/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch new file mode 100644 index 000000000000..d56a6cfab073 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch @@ -0,0 +1,24 @@ +From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Wed, 25 Nov 2020 11:26:49 +0100 +Subject: [PATCH] replace git with normal python package +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index ef25aad..b4246a4 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,2 +1,2 @@ +-git+https://github.com/Yubico/yubikey-manager.git ++yubikey-manager + ./py/qr +-- +2.29.2 + diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix index c6a1022288f7..460b34416ff5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix @@ -19,6 +19,10 @@ mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; + patches = [ + ./0001-replace-git-with-normal-python-package.patch + ]; + postPatch = '' substituteInPlace deployment.pri \ --replace '/usr/bin' "$out/bin" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index 58b1a81c90fc..2fc158daf62f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "zathura"; - version = "0.4.5"; + version = "0.4.7"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c"; + sha256 = "1rx1fk9s556fk59lmqgvhwrmv71ashh89bx9adjq46wq5gzdn4p0"; }; outputs = [ "bin" "man" "dev" "out" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 32a2ec420110..97f36f828472 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,29 +1,45 @@ { stdenv, lib, meson, ninja, fetchurl, fetchpatch -, pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: +, cairo +, girara +, gtk-mac-integration +, gumbo +, jbig2dec +, libjpeg +, mupdf +, openjpeg_2 +, pkgconfig +, zathura_core +}: stdenv.mkDerivation rec { - version = "0.3.5"; + version = "0.3.6"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq"; + sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66"; }; - patches = [ - # compatibility with MuPDF 1.17 - (fetchpatch { - url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/commit/c7f341addb76d5e6fd8c24c666d8fe97c451a4cb.patch"; - sha256 = "12rikx2j7dpngfma9x4i504w58a8xx3rc0gmyz183v19hn54c075"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - zathura_core girara mupdf cairo + cairo + girara + gumbo + jbig2dec + libjpeg + mupdf + openjpeg_2 + zathura_core ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; + mesonFlags = [ + "-Dlink-external=true" + ]; + + # avoid: undefined symbol: gumbo_destroy_output + NIX_LDFLAGS = [ "-lgumbo" ]; + PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; meta = with lib; { |