diff options
Diffstat (limited to 'pkgs')
20 files changed, 121 insertions, 33 deletions
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index cae58b590c7a5..365ea7d9c9eb0 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-vJhCONoEC4Bdd1ZOLLobjNgLb/DT6auuMGk8L9lj6TU="; + hash = "sha256-wQ+K31TvDTVwDyVQ5nWgcneZ1cFxztmsbSXrDs33Uoc="; }; postPatch = '' diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/applications/misc/sqls/default.nix index 6f3e5a9c1bb79..fe5735d0e553a 100644 --- a/pkgs/applications/misc/sqls/default.nix +++ b/pkgs/applications/misc/sqls/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { description = "SQL language server written in Go"; mainProgram = "sqls"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ vinnymeller ]; }; } diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index 19b0a6d9309e0..9f534f4d179a7 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -19,7 +19,9 @@ LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE} -LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ +LATEST_TAG_NAME=$(cat ${LATEST_TAG_RAWFILE} | \ + jq -r 'map(select(.prerelease == false))' | \ + jq 'map(.tag_name)' | \ grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | grep -E "^v1\.${MINOR_VERSION}\." | head -n1) K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') diff --git a/pkgs/by-name/4d/4d-minesweeper/package.nix b/pkgs/by-name/_4/_4d-minesweeper/package.nix index 006480efc058a..006480efc058a 100644 --- a/pkgs/by-name/4d/4d-minesweeper/package.nix +++ b/pkgs/by-name/_4/_4d-minesweeper/package.nix diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index d0dbf909500fd..d3893eefb3952 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -17,6 +17,8 @@ , fetchFromGitHub , buildFHSEnv , glib-networking +, wrapGAppsHook +, gsettings-desktop-schemas }: let am2r-run = buildFHSEnv { @@ -69,7 +71,9 @@ buildDotnetModule { openssl ]; - buildInputs = [ gtk3 ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ gtk3 gsettings-desktop-schemas glib-networking ]; patches = [ ./am2r-run-binary.patch ]; @@ -78,7 +82,6 @@ buildDotnetModule { postFixup = '' wrapProgram $out/bin/AM2RLauncher.Gtk \ --prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \ - --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules mkdir -p $out/share/icons install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 4d24e46c05fed..a54c6b85ecb23 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.38.0-48670"; + version = "1.40.0-49176"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-6LJEIkr1NA8HHxbLWtd/OTlPPErh05UTjVhjuZVcmTg="; + hash = "sha256-SjdlMEhmO00ADWTFR4u9fHKWbbQRAC/UstXIoshgYuA="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix index 6f2e7729797c7..86ca8145d12da 100644 --- a/pkgs/by-name/bu/butt/package.nix +++ b/pkgs/by-name/bu/butt/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, fltk13, portaudio, lame, libvorbis, libogg -, flac, libopus, libsamplerate, fdk_aac, dbus, openssl, curl }: +, flac, libopus, libsamplerate, fdk_aac, dbus, openssl, curl, portmidi }: stdenv.mkDerivation (finalAttrs: { pname = "butt"; - version = "0.1.40"; + version = "0.1.41"; src = fetchurl { url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz"; - hash = "sha256-wag177UIQ6YpBkJ5XQlxYtTdBFFNO5q+BLD/CiUkGoA="; + hash = "sha256-wTypjqd2PpmDSA8vScMLkAL44xE/WAccm747PS9ClVA="; }; postPatch = '' @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { dbus openssl curl + portmidi ]; postInstall = '' @@ -45,5 +46,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ehmry ]; mainProgram = "butt"; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/sk/skimpdf/package.nix b/pkgs/by-name/sk/skimpdf/package.nix new file mode 100644 index 0000000000000..0be793c9cb15f --- /dev/null +++ b/pkgs/by-name/sk/skimpdf/package.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, undmg +, fetchurl +}: +stdenv.mkDerivation rec { + pname = "Skim"; + version = "1.7.2"; + + src = fetchurl { + name = "Skim-${version}.dmg"; + url = "mirror://sourceforge/project/skim-app/Skim/Skim-${version}/Skim-${version}.dmg"; + sha256 = "t/A3Bd7mQ8hFGdbpQou4ru9i5jX4HaYOXgMvfPAUEYc="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -R Skim.app $out/Applications + runHook postInstall + ''; + + meta = with lib; { + description = "Skim is a PDF reader and note-taker for OS X"; + homepage = "https://skim-app.sourceforge.io/"; + license = licenses.bsd0; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "Skim.app"; + maintainers = with maintainers; [ YvesStraten ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index a6f1275938907..c13f42abe6e14 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://jetbrains.com/mono/"; changelog = "https://github.com/JetBrains/JetBrainsMono/blob/v${version}/Changelog.md"; license = licenses.ofl; - maintainers = [ ]; + maintainers = with maintainers; [ vinnymeller ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 50483758beb57..42edfc190c092 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" - "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${version}.tar.gz" ]; sha256 = "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv"; diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/development/libraries/wlroots/protocols.nix index 0a747c1e86a4e..fa69879ae97e0 100644 --- a/pkgs/development/libraries/wlroots/protocols.nix +++ b/pkgs/development/libraries/wlroots/protocols.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/wlroots/wlr-protocols"; license = licenses.mit; # See file headers platforms = platforms.linux; - maintainers = with maintainers; [ twitchyliquid64 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index db59f743e777b..68bb9460c14fd 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -151,6 +151,6 @@ buildPythonPackage rec { homepage = "https://scrapy.org/"; changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ vinnymeller ]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ecc3d2d66b428..df9540f4487d5 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -328,11 +328,13 @@ let CellBarcode = [ pkgs.zlib ]; cld3 = [ pkgs.protobuf ]; bnpmr = [ pkgs.gsl ]; + caviarpd = [ pkgs.cargo ]; cairoDevice = [ pkgs.gtk2.dev ]; Cairo = with pkgs; [ libtiff libjpeg cairo.dev xorg.libXt.dev fontconfig.lib ]; Cardinal = [ pkgs.which ]; chebpol = [ pkgs.fftw.dev ]; ChemmineOB = [ pkgs.pkg-config ]; + clarabel = [ pkgs.cargo ]; curl = [ pkgs.curl.dev ]; CytoML = [ pkgs.libxml2.dev ]; data_table = with pkgs; [ pkg-config zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; @@ -357,7 +359,9 @@ let gslnls = [ pkgs.gsl ]; gert = [ pkgs.libgit2 ]; haven = with pkgs; [ zlib.dev ]; + hellorust = [ pkgs.cargo ]; h5vc = with pkgs; [ zlib.dev bzip2.dev xz.dev ]; + yyjsonr = with pkgs; [ zlib.dev ]; highs = [ pkgs.which pkgs.cmake ]; rbedrock = [ pkgs.zlib.dev pkgs.which pkgs.cmake ]; HiCseg = [ pkgs.gsl ]; @@ -441,6 +445,8 @@ let clustermq = [ pkgs.zeromq ]; SAVE = with pkgs; [ zlib bzip2 icu xz pcre ]; salso = [ pkgs.cargo ]; + ymd = [ pkgs.cargo ]; + arcpbf = [ pkgs.cargo ]; sdcTable = with pkgs; [ gmp glpk ]; seewave = with pkgs; [ fftw.dev libsndfile.dev ]; seqinr = [ pkgs.zlib.dev ]; @@ -531,6 +537,7 @@ let textshaping = [ pkgs.pkg-config ]; ragg = [ pkgs.pkg-config ]; qqconf = [ pkgs.pkg-config ]; + qspray = [ pkgs.pkg-config ]; vapour = [ pkgs.pkg-config ]; }; @@ -548,6 +555,8 @@ let bayesWatch = [ pkgs.boost.dev ]; clustermq = [ pkgs.pkg-config ]; coga = [ pkgs.gsl.dev ]; + mBvs = [ pkgs.gsl.dev ]; + rcontroll = [ pkgs.gsl.dev ]; deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; epialleleR = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; gdalraster = with pkgs; [ gdal proj.dev sqlite.dev ]; @@ -568,6 +577,7 @@ let cairoDevice = [ pkgs.pkg-config ]; chebpol = [ pkgs.pkg-config ]; eds = [ pkgs.zlib.dev ]; + pgenlibr = [ pkgs.zlib.dev ]; fftw = [ pkgs.pkg-config ]; gdtools = [ pkgs.pkg-config ]; archive = [ pkgs.libarchive]; @@ -666,6 +676,7 @@ let seqbias = with pkgs; [ zlib.dev bzip2.dev xz.dev ]; sparkwarc = [ pkgs.zlib.dev ]; RoBMA = [ pkgs.jags ]; + RoBSA = [ pkgs.jags ]; pexm = [ pkgs.jags ]; rGEDI = with pkgs; [ libgeotiff.dev libaec zlib.dev hdf5.dev ]; rawrr = [ pkgs.mono ]; @@ -697,6 +708,7 @@ let PoissonMultinomial = [ pkgs.fftw.dev ]; rrd = [ pkgs.rrdtool ]; flowWorkspace = [ pkgs.zlib.dev ]; + RITCH = [ pkgs.zlib.dev ]; RcppMeCab = [ pkgs.mecab ]; PING = [ pkgs.gsl ]; RcppAlgos = [ pkgs.gmp.dev ]; @@ -710,7 +722,9 @@ let ijtiff = [ pkgs.libtiff ]; ragg = with pkgs; [ freetype.dev libpng.dev libtiff.dev zlib.dev libjpeg.dev bzip2.dev ] ++ lib.optional stdenv.isDarwin lerc.dev; qqconf = [ pkgs.fftw.dev ]; + qspray = with pkgs; [ gmp.dev mpfr.dev ]; vapour = with pkgs; [ proj.dev gdal ]; + MedianaDesigner = [ pkgs.zlib.dev ]; ChemmineOB = [ pkgs.eigen ]; }; @@ -795,6 +809,7 @@ let "likeLTD" "logmult" "loon" + "loon_ggplot" "LS2Wstat" "MareyMap" "memgene" @@ -832,6 +847,7 @@ let "RandomFields" "rareNMtests" "rAverage" + "rfviz" "RclusTool" "Rcmdr" "RcmdrPlugin_coin" @@ -915,6 +931,8 @@ let "connections" "csodata" "DiceView" + "facmodTS" + "margaret" "MSnID" "OmnipathR" "precommit" @@ -937,6 +955,7 @@ let "ACNE" "APAlyzer" "EstMix" + "Patterns" "PECA" "Quartet" "ShinyQuickStarter" @@ -1104,6 +1123,10 @@ let postPatch = "patchShebangs configure"; }); + surtvep = old.surtvep.overrideAttrs (attrs: { + postPatch = "patchShebangs configure"; + }); + purrr = old.purrr.overrideAttrs (attrs: { patchPhase = "patchShebangs configure"; }); @@ -1116,6 +1139,11 @@ let postPatch = "patchShebangs configure"; }); + zoomerjoin = old.zoomerjoin.overrideAttrs (attrs: { + nativeBuildInputs = [ pkgs.cargo ] ++ attrs.nativeBuildInputs; + postPatch = "patchShebangs configure"; + }); + data_table = old.data_table.overrideAttrs (attrs: { env = (attrs.env or { }) // { NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -fopenmp"; diff --git a/pkgs/games/1oom/default.nix b/pkgs/games/1oom/default.nix index 54bfb4d0b3219..487a08f752974 100644 --- a/pkgs/games/1oom/default.nix +++ b/pkgs/games/1oom/default.nix @@ -1,30 +1,34 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, libsamplerate, SDL2, SDL2_mixer, readline }: +{ lib, stdenv, fetchFromGitHub, gitUpdater, autoreconfHook, allegro, libsamplerate, libX11, libXext, SDL, SDL_mixer, SDL2, SDL2_mixer, readline }: stdenv.mkDerivation rec { pname = "1oom"; - version = "1.0"; + version = "1.8.1"; - src = fetchFromGitLab { - owner = "KilgoreTroutMaskReplicant"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+HwSykSyAGHtITVOu4nIG87kWwVxGyFXb/NRSjhWlvs="; + src = fetchFromGitHub { + owner = "1oom-fork"; + repo = "1oom"; + rev = "refs/tags/f${version}"; + hash = "sha256-sBVcPR4+MDjyOLgrB4VcVy0cDyyG5MVY9vNhWwqAhBA="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libsamplerate SDL2 SDL2_mixer readline ]; + buildInputs = [ allegro libsamplerate libX11 libXext SDL SDL_mixer SDL2 SDL2_mixer readline ]; outputs = [ "out" "doc" ]; postInstall = '' install -d $doc/share/doc/${pname} install -t $doc/share/doc/${pname} \ - HACKING NEWS PHILOSOPHY README doc/*.txt + HACKING NEWS PHILOSOPHY README.md doc/*.txt ''; + passthru.updateScript = gitUpdater { + rev-prefix = "f"; + }; + meta = with lib; { - homepage = "https://kilgoretroutmaskreplicant.gitlab.io/plain-html/"; - description = "Master of Orion (1993) game engine recreation"; + homepage = "https://github.com/1oom-fork/1oom"; + description = "Master of Orion (1993) game engine recreation; a more updated fork"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index ba4864487cb82..20637c70129f0 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -65,6 +65,6 @@ buildGoModule { description = "The node agent for Tailscale, a mesh VPN built on WireGuard"; license = licenses.bsd3; mainProgram = "tailscale"; - maintainers = with maintainers; [ mbaillie twitchyliquid64 jk mfrw ]; + maintainers = with maintainers; [ mbaillie jk mfrw ]; }; } diff --git a/pkgs/tools/misc/maker-panel/default.nix b/pkgs/tools/misc/maker-panel/default.nix index cbe618d406fe0..12a5d46547a2c 100644 --- a/pkgs/tools/misc/maker-panel/default.nix +++ b/pkgs/tools/misc/maker-panel/default.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { description = "Make mechanical PCBs by combining shapes together"; homepage = "https://github.com/twitchyliquid64/maker-panel"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ twitchyliquid64 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/text/ltex-ls/default.nix b/pkgs/tools/text/ltex-ls/default.nix index cf50449fc0da4..744c4f3345e7c 100644 --- a/pkgs/tools/text/ltex-ls/default.nix +++ b/pkgs/tools/text/ltex-ls/default.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://valentjn.github.io/ltex/"; description = "LSP language server for LanguageTool"; license = licenses.mpl20; - maintainers = [ ]; + maintainers = with maintainers; [ vinnymeller ]; platforms = jre_headless.meta.platforms; }; } diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 4093554604f62..5cc8594741185 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3 }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + python3, + opencc, +}: stdenv.mkDerivation rec { pname = "opencc"; @@ -11,7 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-N7nazA0xoQ2ewOGDiJg1vBBYMdF1/qiCfNjG5CFFbuk="; }; - nativeBuildInputs = [ cmake python3 ]; + nativeBuildInputs = + [ + cmake + python3 + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + opencc # opencc_dict + ]; meta = with lib; { homepage = "https://github.com/BYVoid/OpenCC"; diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/tools/wayland/sirula/default.nix index c190c232fdaec..afb10c2a49bf1 100644 --- a/pkgs/tools/wayland/sirula/default.nix +++ b/pkgs/tools/wayland/sirula/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { description = "Simple app launcher for wayland written in rust"; homepage = "https://github.com/DorianRudolph/sirula"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ twitchyliquid64 ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 73355f0877d8b..96830926a6713 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Ferdi265/wl-mirror"; description = "A simple Wayland output mirror client"; license = licenses.gpl3; - maintainers = with maintainers; [ synthetica twitchyliquid64 ]; + maintainers = with maintainers; [ synthetica ]; platforms = platforms.linux; }; } |