diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 13:15:49 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 13:15:49 -0500 |
| commit | b6b59334bbb7b3ca273fb729483dcaa2a6f889c8 (patch) | |
| tree | d264bcb769847136b623616512acbec02fc310a2 | |
| parent | 83b45c228556168cb22183d5fbc772fb5a192559 (diff) | |
| parent | 32e770042e8c1ba70d89d9190f30405b26208f26 (diff) | |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/celery/default.nix pkgs/development/python-modules/kombu/default.nix
111 files changed, 390 insertions, 378 deletions
diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 012838eb436d2..b36d977b2bdf1 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.6"; + version = "3.8"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-qW39g6rQ5VPQ3Hx9NmwLbpZiITnzFZDZlcLkE+pJKPc="; + sha256 = "sha256-uwRSOJ5WvDH4mfL9pCTCGzuSRT8SIBrI+Wsbumzejv0="; }; buildInputs = [ @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - install -Dm755 build/Helio $out/bin - wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome.zenity}/bin + install -Dm755 build/helio $out/bin + wrapProgram $out/bin/helio --prefix PATH ":" ${gnome.zenity}/bin mkdir -p $out/share cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share substituteInPlace $out/share/applications/Helio.desktop \ - --replace "/usr/bin/helio" "$out/bin/Helio" + --replace "/usr/bin/helio" "$out/bin/helio" ''; meta = with lib; { diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 299fe547366a6..3bc06abcbffa3 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JMusicBot"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; - sha256 = "sha256-++/ot9k74pkN9Wl7IEjiMIv/q5zklIEdU6uFjam0tmU="; + sha256 = "sha256-Hc3dsOADC+jVZScY19OYDkHimntMjdw/BoB3EUS/d0k="; }; dontUnpack = true; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 337ee31f03d63..5e0e6580bf9be 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "42.7"; + version = "42.8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "1q66wccnph78cp1r5mln2iq4bcqdrrchxq3c1pjrzkmzwc6l93gz"; + sha256 = "sha256-DkRqZAj47wzt4lDvhAbO0PYcRA7oHEo2k69IMLOD3Ps="; }; patches = [ diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index dcf42b55c5c59..99e4992576783 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -1,20 +1,24 @@ -{ pkgs, fetchurl, python2Packages }: +{ pkgs, fetchFromGitHub, python3Packages }: let - pythonPackages = python2Packages; + pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "0.9.7"; + version = "2.1.0"; pname = "nvpy"; - src = fetchurl { - url = "https://github.com/cpbotha/nvpy/archive/v${version}.tar.gz"; - sha256 = "1rd3vlaqkg16iz6qcw6rkbq0jmyvc0843wa3brnvn1nz0kla243f"; + src = fetchFromGitHub { + owner = "cpbotha"; + repo = pname; + rev = "v${version}"; + sha256 = "02njvybd8yaqdnc5ghwrm8225z57gg4w7rhmx3w5jqzh16ld4mhh"; }; + propagatedBuildInputs = with pythonPackages; [ markdown - tkinter docutils + simplenote + tkinter ]; # No tests diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix index bc253f394c7ff..5672fe0905d74 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/applications/gis/gmt/dcw.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "dcw-gmt"; - version = "1.1.4"; + version = "2.0.1"; src = fetchurl { url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; - sha256 = "8d47402abcd7f54a0f711365cd022e4eaea7da324edac83611ca035ea443aad3"; + sha256 = "sha256-XJCylo9Alc9epEo1TcnY+d0bj+VRTgM4/4W0jgNUeiU="; }; installPhase = '' diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 0aae4ab3baf7e..47facd867bc77 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PIHokB7GlGtx1A0IqFX9+HA/Vab1CDpVS/qhk/y8Nzk="; + sha256 = "sha256-wGzZRp+7KBV/sxm08XCkCDx+A8nR9To5MCmcdWdlttM="; }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 08ca656301431..832c6e93c5001 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.11.44593"; + version = "0.12.51202"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "1f06zmcpvm0f3phwc43ai6v4ykhkrd4f3br2j89nx9bfmj6ss2ic"; + sha256 = "sha256-B7Rn/0hFVUsEK2Wo8KbqAnzOwQmMKkAssfmaN3dPAUY="; stripRoot = false; }; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 2e7a1365f4d2f..bcfd581edcf92 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -1,17 +1,17 @@ -{ lib, python2, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: -python2.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication { pname = "loxodo"; - version = "unstable-2015-01-24"; + version = "unstable-2021-02-08"; src = fetchFromGitHub { owner = "sommer"; repo = "loxodo"; - rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795"; - sha256 = "1cg0dfcv57ps54f1a0ksib7hgkrbdi9q699w302xyyfyvjcb5dd2"; + rev = "7add982135545817e9b3e2bbd0d27a2763866133"; + sha256 = "1cips4pvrqga8q1ibs23vjrf8dwan860x8jvjmc52h6qvvvv60yl"; }; - propagatedBuildInputs = with python2.pkgs; [ wxPython ]; + propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_0 ]; postInstall = '' mv $out/bin/loxodo.py $out/bin/loxodo @@ -20,13 +20,15 @@ python2.pkgs.buildPythonApplication { [Desktop Entry] Type=Application Exec=$out/bin/loxodo - Icon=$out/lib/${python2.libPrefix}/site-packages/resources/loxodo-icon.png + Icon=$out/lib/${python3.libPrefix}/site-packages/resources/loxodo-icon.png Name=Loxodo GenericName=Password Vault Categories=Application;Other; EOF ''; + doCheck = false; # Tests are interactive. + meta = with lib; { description = "A Password Safe V3 compatible password vault"; homepage = "https://www.christoph-sommer.de/loxodo/"; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index dd7d3f4768ef9..04324a090a8f6 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0xfxcwb24rp0kni2b4wdk6fvhqnhd6fh559ag6wdr4sspzkqwdjf"; + sha256 = "1lcmlr7x4143f7wcn0m1ijlvch07nww2qfp3jfnacgy889ijvbfx"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c36d37ccfdf7a..5019fe5722f94 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0"; + version = "11.0.2"; lang = "en-US"; @@ -97,7 +97,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0938a9yjfg9qa9rv5acrmbgqq11mc8j0pvl1n64jrdz29crk6sj2"; + sha256 = "1bqlb8dlh92dpl9gmfh3yclq5ii09vv333yisa0i5gpwwzajnh5s"; }; i686-linux = fetchurl { @@ -105,7 +105,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "07v1ca66a69jl238qdq81mw654yffrcyq685y4rvv8xvx11fnzzp"; + sha256 = "1blp4z9rmnnsvl3bk0ajdccvpzfshnpyijjfiqb9ma02qw2z0gff"; }; }; in diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 3e6475ca65863..31d869524dac9 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.38.1"; + version = "0.39.2"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gJAdxg/evsQ+mKsNx/migDMK5lCZ2qSrksbsGDr4fmU="; + sha256 = "sha256-PG4SzycXRguKyaQ7LDnTtxF3EgqcjfjeEWD5rROXBPI="; }; - vendorSha256 = "sha256-GvkT51JudEdPz6zbqyf5qY6P2AbsaSMbirnxXmza5aI="; + vendorSha256 = "sha256-CoXlUX9hkP8gijA/vg19AS9030w95A2oKGD1wjzO8ak="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index cd8d1f703d2d2..399f37baabcbf 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.22.15"; + version = "0.23.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Aim80bg1vGRkiIlVqDa4qOFQ+mwSOL75HOPYQYovYlE="; + sha256 = "sha256-lCo+sTkbqpbCI9aCh/QqlDw7jzYzKt3Gf67shvBIc7k="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index fef5c11ae8f6b..5cd3520149a85 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.25.0"; # Please backport all updates to the stable channel. + version = "5.25.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0ql9rzxrisqms3plcrmf3fjinpxba10asmpsxvhn0zlfajy47d0a"; + sha256 = "1b634sy2bac5i548g1z1fd5qqy8jr6abl5kbhq50d1kmwnqy1a5l"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 649cc8843d2eb..159dfdc0310ea 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, fetchFromGitLab, jre_headless, coreutils, gradle_6, git, perl +{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl , makeWrapper }: let pname = "signald"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "K/G5+w1GINLZwJIG5a7u0TxlGe+Cyp4wQm+pgm28qCA="; + sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg="; }; buildConfigJar = fetchurl { @@ -17,15 +17,10 @@ let sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f"; }; - postPatch = '' - patchShebangs gradlew - sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle - ''; - # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src version postPatch; + pname = "${pname}-deps"; + inherit src version; nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -43,16 +38,20 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "/gJFoT+vvdSWr33oI44XiZXlFfyUjtRVB1M6CMzSztM="; - aarch64-linux = "v71stMWBbNALasfGAHvsVTBaDOZfpKK3sQrjNJ6FG1A="; + x86_64-linux = "gEaOOsELhfKC1cFV8tqRHbBUI6+M/cDOaqN8FQ1J/TE="; + aarch64-linux = "UhnQ+Ge48/NdTqUWIxd0VNadHFvQ9awBTtn65Nz3+UM="; }.${stdenv.system} or (throw "Unsupported platform"); }; in stdenv.mkDerivation rec { - inherit pname src version postPatch; + inherit pname src version; patches = [ ./gradle-plugin.patch ]; + postPatch = '' + sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle + ''; + buildPhase = '' runHook preBuild @@ -73,7 +72,7 @@ in stdenv.mkDerivation rec { tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ wrapProgram $out/bin/signald \ --prefix PATH : ${lib.makeBinPath [ coreutils ]} \ - --set JAVA_HOME "${jre_headless}" + --set JAVA_HOME "${jdk17_headless}" runHook postInstall ''; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index e03d6fa23f5ab..fd08817f026d1 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -33,6 +33,7 @@ let deps = [ xorg.libXrender xorg.libXtst xorg.libxcb + xorg.libxshmfence nspr nss systemd @@ -42,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.5"; + version = "2021.6"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "186va4pllimmcqnlbry5ni8gi8p3mbpgjf7sdspmhy2hlfjvlz47"; + sha256 = "0vpahryw4hm1k9p4vang84ji88znz67s7wxnwqndf02a627n7fcm"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index daf0d4d9b2f1f..13efa2390ffae 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack , fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper -, libxsmm, spglib, which, elpa, pkg-config +, libxsmm, spglib, which, pkg-config +, enableElpa ? false +, elpa } : let @@ -21,7 +23,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ python3 which openssh makeWrapper pkg-config ]; buildInputs = [ - elpa gfortran fftw gsl @@ -33,7 +34,7 @@ in stdenv.mkDerivation rec { scalapack blas lapack - ]; + ] ++ lib.optional enableElpa elpa; propagatedBuildInputs = [ mpi ]; propagatedUserEnvPkgs = [ mpi ]; @@ -61,20 +62,20 @@ in stdenv.mkDerivation rec { AR = ar -r DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \ -D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \ - -D__MAX_CONTR=4 -D__LIBVORI -D__ELPA + -D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"} CFLAGS = -fopenmp FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \ -ftree-vectorize -funroll-loops -msse2 \ -std=f2008 \ -fopenmp -ftree-vectorize -funroll-loops \ -I${libxc}/include -I${libxsmm}/include \ - -I${libint}/include $(pkg-config --variable=fcflags elpa) + -I${libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} LIBS = -lfftw3 -lfftw3_threads \ -lscalapack -lblas -llapack \ -lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \ -lint2 -lstdc++ -lvori \ -lgomp -lpthread -lm \ - -fopenmp $(pkg-config --libs elpa) + -fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"} LDFLAGS = \$(FCFLAGS) \$(LIBS) EOF ''; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 43007cb1f0f58..584554232ab20 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -35,10 +35,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.59"; + version = "2.60"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-APMOJeZt/zp8JvXghKZ5lQFRKWO/4TVDORok8qAgEBk="; + sha256 = "sha256-38PIardlOzDrVKWvV4AiQlecTYmwYegtzRya713Au/Y="; }; nativeBuildInputs = [ pkg-config file ]; diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 4c9ce3e95959d..195dd98aa3b4a 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cryptoverif"; - version = "2.04"; + version = "2.05"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "1mzk6n0g2vdsv38y493zg85lxrpz72b92cmsray3g970xzanqd6s"; + sha256 = "sha256-F5eVN5ATYo9Ivpi2eYh96ktuTWUeoqgWMR4BqHu8EFs="; }; buildInputs = [ ocaml ]; diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index 450021925bdee..175add544b5c9 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2021b"; + version = "2021d"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-3KSAA0UPx3cqMXf/G5nrlCfLjWcDiGtzvJe/syRyE6c="; + sha256 = "sha256-zij337P/MemCwvMah2bUE3odv0Kf/KW6fUl2OgMzjuI="; }; buildInputs = [ diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 7c8d8ce11bce6..70620944c2d73 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "cvs-fast-export"; - version = "1.58"; + version = "1.59"; src = fetchurl { url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; - sha256 = "sha256-jY/GURa6WzULwpnoqBmzVQdK4WH95tf59v07y8gHeWM="; + sha256 = "sha256-JDnNg/VMmPJI6F07o77L4ChYDollLFB1YCL75WSp6No="; }; strictDeps = true; diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index 2a732ffa1846c..b1f5a693de426 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "bino"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { url = "https://bino3d.org/releases/${pname}-${version}.tar.xz"; - sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k"; + sha256 = "sha256-8sIdX+qm7CGPHIziFBHHIe+KEbhbwDY6w/iRm1V+so4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index f8d3054cc8b2a..e029bd9742956 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.23"; + version = "19.0.0"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-3w/fMaGqaOHSE7GUJtYoWovBKSOv3sNOIX1UOcp8hQE="; + sha256 = "sha256-o3tiNEVc17RIlEgf3V2oOK04da0DpmexT9m8m/xtI4I="; }; extraNativeBuildInputs = [ gtest ]; diff --git a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix index 53abde6c3f4ab..313456bbfa7cf 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "1.21.8"; + version = "19.0.0"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; rev = "${version}-${rel}"; - sha256 = "0iq89vfb3p3b5qhivxs95xk122vgmbpixdvqpmkxp19rlyn3z9j6"; + sha256 = "sha256-qdN2tmwS6uD9wrHnKC3iNvHnA2WlJAoNhdwvw16/L0U="; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix b/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix index c575cfccfccf3..eb53aee68bb42 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-rtmp/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-rtmp"; namespace = "inputstream.rtmp"; - version = "3.4.0"; + version = "19.0.0"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.rtmp"; rev = "${version}-${rel}"; - sha256 = "1q4k6plkjasnjs7gnbcc1x2mwr562ach7bkqk1z1y343s0dp9qnq"; + sha256 = "sha256-76yGttcLJJ5XJKsFJ3GnEuPs9+9J0Tr8Znm45676OI8="; }; extraBuildInputs = [ openssl rtmpdump zlib ]; diff --git a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix index 7cdc5a0c63517..093322b231c45 100644 --- a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "7.1.1"; + version = "19.0.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "sha256-mQeeeCOxhUTiUcOJ1OiIiJ+7envAIGO67Bp4EAf4sIE="; + sha256 = "sha256-KaT+BPRrkhw5R18aUNdnA9PKXF87EzwQLaY9ep86OvE="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix index 30f5c895c3552..30f56b2c3c7be 100644 --- a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "8.3.4"; + version = "19.0.3"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "15gv499r6jf89chp7xpv0z4v0nia907czs83lz57lxydqcbmmjnn"; + sha256 = "sha256-kO+wRFt4MudYP9UOTaruRCWs/QMla+BYTRfSUdlVpR8="; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index 7905ffc8ef5a2..17811c162920b 100644 --- a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "7.6.9"; + version = "19.0.2"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "1nj4qgr35cw5ly16w2fdgscz5245d7mgvm4sxgxy19jkyv7jmzn3"; + sha256 = "sha256-WPLXESP5QvjroCygzMQc3+QKbsA05ri0oKvsqBQv8w0="; }; extraBuildInputs = [ diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 3ce3d9a880f8b..b155d2deee19e 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.0.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-6OjA3f6c9s/86UPxy9EqLIc/0ZuW6UhKyQdkM7YoTsU="; + sha256 = "sha256-2wNC3APKbJ3Ug8M3w4nllfWlKTd10W7W/Csq/3xbXAI="; }; - vendorSha256 = "sha256-6h36TZmo0RvB3YzZRmsrs2Fbl+8zPTuL9LxWkuNgRqw="; + vendorSha256 = "sha256-RzAQnuOjT8eMH+rJm+/JrF96PZbCgzDVNPQYUeXPWnY="; doCheck = false; installPhase = '' diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 7b517333d9e38..20df74d3666d4 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -90,6 +90,10 @@ rec { done mount -t devtmpfs devtmpfs /dev + ln -s /proc/self/fd /dev/fd + ln -s /proc/self/fd/0 /dev/stdin + ln -s /proc/self/fd/1 /dev/stdout + ln -s /proc/self/fd/2 /dev/stderr ifconfig lo up diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index eb85c97f9f21a..74987c07a5b92 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -57,9 +59,12 @@ stdenv.mkDerivation rec { patches = lib.optionals withPantheon [ # Make this respect dark mode settings from Pantheon - # https://github.com/elementary/evince - # The patch currently differs from upstream (updated for evince 41). - ./pantheon-dark-style.patch + # https://github.com/elementary/evince/pull/21 + # https://github.com/elementary/evince/pull/31 + (fetchpatch { + url = "https://raw.githubusercontent.com/elementary/evince/c8364019ee2c2dffd2a1bccf79b8f4e526aa22af/dark-style.patch"; + sha256 = "sha256-nKELRXnM6gMRTGmWdO1Qqlo9ciy+4HOK5z2CYOoi2Lo="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch b/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch deleted file mode 100644 index 5e1ef67b08cd4..0000000000000 --- a/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/meson.build b/meson.build -index bcb69cf7..4a18c08c 100644 ---- a/meson.build -+++ b/meson.build -@@ -162,6 +162,7 @@ gmodule_dep = dependency('gmodule-2.0') - gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req_version) - gtk_dep = dependency('gtk+-3.0', version: gtk_req_version) - gthread_dep = dependency('gthread-2.0', version: glib_req_version) -+granite_dep = dependency('granite') - # Keep the version here synchronised with subprojects/libhandy.wrap - hdy_dep = dependency('libhandy-1', version: hdy_req_version, fallback: ['libhandy', 'libhandy_dep']) - -diff --git a/shell/ev-application.c b/shell/ev-application.c -index e704bda2..d705328c 100644 ---- a/shell/ev-application.c -+++ b/shell/ev-application.c -@@ -30,6 +30,7 @@ - #include <glib/gi18n.h> - #include <glib/gstdio.h> - #include <gtk/gtk.h> -+#include <granite.h> - #include <handy.h> - #ifdef GDK_WINDOWING_X11 - #include <gdk/gdkx.h> -@@ -176,7 +177,7 @@ ev_spawn (const char *uri, - - g_string_append_printf (cmd, " %s", path); - g_free (path); -- -+ - /* Page label */ - if (dest) { - switch (ev_link_dest_get_dest_type (dest)) { -@@ -940,6 +941,20 @@ ev_application_migrate_config_dir (EvApplication *application) - g_free (old_accels); - } - -+static void -+ev_application_set_prefers_color_scheme () -+{ -+ GtkSettings* gtk_settings = gtk_settings_get_default (); -+ GraniteSettings* granite_settings = granite_settings_get_default (); -+ -+ g_object_set ( -+ gtk_settings, -+ "gtk-application-prefer-dark-theme", -+ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK, -+ NULL -+ ); -+} -+ - static void - ev_application_startup (GApplication *gapplication) - { -@@ -992,6 +1007,7 @@ ev_application_startup (GApplication *gapplication) - - EvApplication *application = EV_APPLICATION (gapplication); - const gchar **it; -+ GraniteSettings* granite_settings = granite_settings_get_default (); - - g_application_set_resource_base_path (gapplication, "/org/gnome/evince"); - -@@ -999,6 +1015,11 @@ ev_application_startup (GApplication *gapplication) - - hdy_init (); - -+ ev_application_set_prefers_color_scheme (); -+ -+ g_signal_connect (granite_settings, "notify::prefers-color-scheme", -+ G_CALLBACK(ev_application_set_prefers_color_scheme), NULL); -+ - for (it = action_accels; it[0]; it += g_strv_length ((gchar **)it) + 1) - gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]); - } -diff --git a/shell/meson.build b/shell/meson.build -index 7cbc48f2..a3089b13 100644 ---- a/shell/meson.build -+++ b/shell/meson.build -@@ -52,6 +52,7 @@ sources += gnome.compile_resources( - deps = [ - gdk_pixbuf_dep, - gnome_desktop_dep, -+ granite_dep, - hdy_dep, - libevmisc_dep, - libevproperties_dep, diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 6492c9332940f..d0c1cc970a7c4 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-+r19n42FPoBArZNDF4ZAdUBZqsSxpLwpeBoyaRJBCrg="; + sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0="; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index d74907db9118f..badfec690eb58 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,15 +26,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.10.1"; - - repoName = "applications-menu"; + version = "2.10.2"; src = fetchFromGitHub { owner = "elementary"; - repo = repoName; + repo = "applications-menu"; rev = version; - sha256 = "sha256-e9InWx5b2DAFK7m7z/oCW7Mw/ymBNz1Sc7vT65kkZ9o="; + sha256 = "sha256-xBuMJzIFOueSvNwvXc85AI9NHuMW3bOblNsyuDkIzyk="; }; patches = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 708e2b6eb0cc9..1164e0592bfbb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -24,13 +23,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-/kbwZVzOlC3ATCuXVMdf2RIskoGQKG1evaDYO3yFerg="; + sha256 = "sha256-GxlnzLDrZmDDAGlUMoM4k4SkbCqra3Th6ugRAj3Wse4="; }; patches = [ @@ -38,12 +37,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; elementary_calendar = elementary-calendar; }) - # Fix incorrect month shown on re-opening indicator if previously changed month - # https://github.com/elementary/wingpanel-indicator-datetime/pull/284 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch"; - sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch index bec5f43e0d78a..51c4953620272 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch @@ -1,8 +1,21 @@ +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 4aba03c..6385bc9 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -55,7 +55,7 @@ public class DateTime.Indicator : Wingpanel.Indicator { + + panel_label.button_press_event.connect ((e) => { + if (e.button == Gdk.BUTTON_MIDDLE) { +- var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F")); ++ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F")); + try { + var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE); + appinfo.launch_uris (null, null); diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala -index 6e0d530a..2f90f96c 100644 +index cb54253..7477d1a 100644 --- a/src/Widgets/calendar/CalendarView.vala +++ b/src/Widgets/calendar/CalendarView.vala -@@ -222,7 +222,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { +@@ -242,7 +242,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. public void show_date_in_maya (GLib.DateTime date) { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index a0a687985f914..3ebc38138795e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-ZuOZlfxtRq8ZcrXGe9wlFGwn2isdvMoXQveKKnEPFdo="; + sha256 = "sha256-iHhZJwaomQgH1Sal8uejl4QlavOQ75UKZ9xchTi1X3U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index a02256697dafe..82035e4563413 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "chez-scheme"; - version = "9.5.4"; + version = "9.5.6"; src = fetchFromGitHub { owner = "cisco"; repo = "ChezScheme"; rev = "refs/tags/v${version}"; - sha256 = "065dir19cqpn0d1bk9w49wnwzn6qfrgvcqw8da2fdhkafhfcb1bj"; + sha256 = "sha256-1C5fEbVIpFXlDQ5wFmYZ2nrDUq9jBmvnku/7f0MH7vc="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index daadebf4c4dcc..12a25ca6a4d74 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.27"; + version = "1.73.28"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-aAFIN3+207ZmOFKID6oDUU1zJrWZV0LTOofiRPSM8LE="; + sha256 = "sha256-ntHrtIX9EXQRGpTrdzEFojSRE5jgUJD15xSr9iyAkpI="; }; installPhase = '' diff --git a/pkgs/development/compilers/openjdk/darwin/17.nix b/pkgs/development/compilers/openjdk/darwin/17.nix index 813702a2fbfd3..98e6fc6216e23 100644 --- a/pkgs/development/compilers/openjdk/darwin/17.nix +++ b/pkgs/development/compilers/openjdk/darwin/17.nix @@ -12,7 +12,7 @@ let aarch64-darwin = { arch = "aarch64"; - zuluVersion = "17.30.19"; + zuluVersion = "17.30.15"; jdkVersion = "17.0.1"; sha256 = "sha256-zhBCXOnO/fsj6+q+vAlEz7QVMRFKLVvYnjwZzFz6mRM="; }; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index ab97090e88994..a8648a1a1c7bb 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -60,6 +60,8 @@ let homepage = "https://www.un4seen.com/"; license = licenses.unfreeRedistributable; platforms = builtins.attrNames bass.so; + # until upstream has stable URLs, this package is prone to always being broken + broken = true; }; }; diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 6ee48a0a042a5..1144f4afaf54f 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.0.0"; + version = "5.0.55"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-cagRN0DQw1/efCuMWngcF04SE9bViHANaNsQNKB5txA="; + sha256 = "sha256-+rUDKdMUeVnGsvG7NgQkN6e+DY2bThIyuPTvqxG6uDk="; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 1a4f617cf469b..2700a9cbad846 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -16,8 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY="; }; + patches = [ + # Proposed upstream as https://lists.gnu.org/archive/html/bug-ncurses/2021-12/msg00004.html + ./parallel.patch + ]; + + enableParallelBuilding = true; + meta = with lib; { description = "Curses development kit"; + homepage = "https://invisible-island.net/cdk/"; license = licenses.bsdOriginal ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cdk/parallel.patch b/pkgs/development/libraries/cdk/parallel.patch new file mode 100644 index 0000000000000..729c71e96aff1 --- /dev/null +++ b/pkgs/development/libraries/cdk/parallel.patch @@ -0,0 +1,13 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -296,7 +296,9 @@ LIB_OBJECT = @LIB_OBJECT@ + + all sources :: $(AUTO_SRC) + +-$(OBJECTS) : include/cdk_config.h ++# make sure we generate all headers before trying ++# to build first source file. ++$(OBJECTS) : $(MY_HDR) + + # + # Standard library directive. diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 36f2ecd84be2e..7cbeffd5b7ec7 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.3.1"; + version = "2.4.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-0DUFmL8sifxbC782CYT4eoe4m1kq8T1tEs3YNy8iQuc="; + sha256 = "sha256-nmqgS08ZBQ2vBEDtoriNbYLaNQA1DWeDhbRo70rBOP0="; }; patches = [ diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix index cad69e8b41877..474db9891aa77 100644 --- a/pkgs/development/libraries/hamlib/4.nix +++ b/pkgs/development/libraries/hamlib/4.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "hamlib"; - version = "4.2"; + version = "4.4"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1m8gb20i8ga6ndnnw187ry1h4z8wx27v1hl7c610r6ky60pv4072"; + sha256 = "sha256-i/AQewcfUvCFh/OOLe6KeEjeE0NDWzJvj2bZXh+KJIc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index dae01961a10cf..0a57b3c26fffc 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation rec { pname = "incrtcl"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl { url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl${version}.tar.gz"; - sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw"; + sha256 = "sha256-rExnDq8bWyVb/KzKgyCzPVa72S/VRGPGPW9pmocOFWw="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index c0bac7e5466d7..870276c17232e 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "21.3.1"; + version = "21.4.3"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-Ki+gTDL6gj+f3wjhVp4EIVvrPn6NRmCCkCj5g//kAW8="; + sha256 = "sha256-Z6wIwgcKa+EaqSmbD//pYzGjDezASNWGnLCROiRvACo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 0c5ac8f4dded5..ba8b59162c5c6 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.8.0"; + version = "2.11.0"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "02c54cjf3sdwbc9rcgg3xkx1f3yk8p5iv3iwvq78f5vfxsj53lkk"; + sha256 = "sha256-9RXVNzjEhdYCYWbB9/xW3rm+gSOuD6+jwAO9zJVt4fk="; }; installPhase = '' diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 19c8833db7283..8f678ce7555b7 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.6.0"; + version = "2.6.1"; underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "sha256-GhuTBJl1E+aoWa8pTWEqzghHDXXiCQFIt++8pjCQYik="; + sha256 = "sha256-cixyEwjEt68UOotd1TcJNyVUxTRDx4XyfyYg9k6kRtQ="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index 49d84c1b5c79e..d5f1713151b53 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libabigail"; - version = "1.8.2"; + version = "2.0"; outputs = [ "bin" "out" "dev" ]; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-hjR8nwqGZvJj/WP4w/5MT5yxvbPsQmDsuvEX0Tfol4c="; + sha256 = "sha256-NwSul6Vr8HbKCPtd6msh25mPu/FMT53hKCS3jbU7b9o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix index aa146ca241336..58d7150a23464 100644 --- a/pkgs/development/libraries/libaec/default.nix +++ b/pkgs/development/libraries/libaec/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "libaec"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitLab { domain = "gitlab.dkrz.de"; owner = "k202009"; repo = "libaec"; rev = "v${version}"; - sha256 = "sha256-Vi0fCd9V/EH+PcD+e6RZK2/isR1xGX25POhm1Xen5ak="; + sha256 = "sha256-N0YwJuVqv8jv/uSbpn/eJBTMhlHDcY/74+anH2vNvpI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 81f07703c942e..03dd9a33628f2 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0/5JLynYzr7ZewBbrNoxr26UkVzpSP9RqlmH2ql8tfs="; + sha256 = "sha256-ME/mkaHhFeHajTbc7zhg9vtf/8XgkgSRu9I/mlQXnds="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 8efdb1bee02df..c315379d92c73 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libexttextcat"; - version = "3.4.5"; + version = "3.4.6"; src = fetchurl { url = "https://dev-www.libreoffice.org/src/libexttextcat/${pname}-${version}.tar.xz"; - sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; + sha256 = "sha256-bXfqziDp6hBsEzDiaO3nDJpKiXRN3CVxVoJ1TsozaN8="; }; meta = with lib; { diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 2e0b77d812fbe..c83a0f70b6b24 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.31.1"; + version = "0.34.2"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-mX1Yh7YBXzhp03Wwy8S0lC/LJNvktDRohclGz+czFm8="; + sha256 = "sha256-IKKLd+whs4CtAgLbAWbtHHycItRQSN1oBtXsn+J/7Uo="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 72d28761323d7..ec2b614ee9caf 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -38,8 +38,8 @@ in stdenv.mkDerivation (rec { '' + lib.optionalString (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isMusl) '' ln -s lock-obj-pub.i686-unknown-linux-gnu.h src/syscfg/lock-obj-pub.linux-musl.h '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' - ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h - ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h + ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h + ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h ''; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index a15b00a66ef74..eb34bc56f4437 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libiodbc"; - version = "3.52.12"; + version = "3.52.15"; src = fetchurl { url = "mirror://sourceforge/iodbc/${pname}-${version}.tar.gz"; - sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai"; + sha256 = "sha256-x0VB4zJ/yaHHzPEDZFRxxnvAFFQtcPVyR26wfAst1Dw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 813aa660ae9d5..993c090299bd1 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "liblscp"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz"; - sha256 = "sha256-GTW6SBQVCDtzeU+arLmAJi6N9jtN68NdI69p6RSazvs="; + sha256 = "sha256-8+3qHgIv32wfNHHggXID1W8M7pTqji4bHNGob3DTkho="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index e9ef841b65d76..99728a3854dec 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - name = "log4cplus-2.0.6"; + name = "log4cplus-2.0.7"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "sha256-GpY6/Q+IPWLelGsYkn0jgFH9R5NuQV6r7/4rE5fxbso="; + sha256 = "sha256-j626/uK6TlWKD3iEJhPJ+yOcd12D8jNA0JEITA4bEqs="; }; meta = { diff --git a/pkgs/development/libraries/lzlib/default.nix b/pkgs/development/libraries/lzlib/default.nix index 098336dfbd126..9c5311d742a95 100644 --- a/pkgs/development/libraries/lzlib/default.nix +++ b/pkgs/development/libraries/lzlib/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lzlib"; - version = "1.10"; + version = "1.12"; outputs = [ "out" "info" ]; nativeBuildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-HWq3gApbQ+Vv0gYH/Sz9qeVQNQ3JX1vrakzhT4W0EEM="; + sha256 = "sha256-jl2EJC61LPHcyY5YvZuo7xrvpQFDGr3QJzoiv0zjN7E="; }; makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 82635ae66d63d..5f46ec313b15b 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.10.1"; + version = "0.10.3"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "sha256-GgY+E+1gzmiAAALzdKu1CjN3xPeVMhbmNLqJNB1zHaU="; + sha256 = "sha256-SA4QyzV/aNUmyr9BYTsemx5x7S6WpxdTBK6zmVMkwh4="; }; patches = [ diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 89fbdd9f21559..4ddd3b40d3641 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mdds"; - version = "1.7.0"; + version = "2.0.1"; src = fetchurl { url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "1kzy70b18f2dsqarmdmzbj9nc9kf2lvc5xxgkg6wdax3jf12lsm6"; + sha256 = "sha256-OrM/zljmrPlUDMGlImS+aGPvgPVawocZTMmM2kjnH+Y="; }; postInstall = '' diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 126e309ec0c41..08641aa935f90 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -1,31 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, django }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, django-jinja +, python +}: buildPythonPackage rec { pname = "django-sites"; version = "0.11"; - src = fetchPypi { - inherit pname version; - sha256 = "1cbee714fdf2bfbe92e4f5055de4e6c41b64ebb32e1f96b1016c0748210928b8"; + src = fetchFromGitHub { + owner = "niwinz"; + repo = "django-sites"; + rev = version; + sha256 = "sha256-MQtQC+9DyS1ICXXovbqPpkKIQ5wpuJDgq3Lcd/1kORU="; }; - # LICENSE file appears to be missing from pypi package, but expected by the installer - # https://github.com/niwinz/django-sites/issues/11 - postPatch = '' - touch LICENSE - ''; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + django-jinja + ]; + + checkPhase = '' + runHook preCheck - # required files for test don't seem to be included in pypi package, full source for 0.10 - # version doesn't appear to be present on github - # https://github.com/niwinz/django-sites/issues/9 - doCheck = false; + ${python.interpreter} runtests.py + + runHook postCheck + ''; meta = { - description = '' - Alternative implementation of django "sites" framework - based on settings instead of models. - ''; + description = "Alternative implementation of django sites framework"; homepage = "https://github.com/niwinz/django-sites"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index df2615cd3bdf1..de93a715bb8d4 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.1"; + version = "5.0.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "236a0f24e3724b49bae4cbd5144ed036b0ae6feaf5828ad033eb2824bf05e5be"; + sha256 = "55dd9e257ad45c479aed9283e5abe8d517a0c4e2dd443bf0a9849b53f826c0ca"; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 3728420e12b5e..3437dd902bcd5 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.50.1"; + version = "0.50.2"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-d9caVmXV/yynimXYZNspGar4BXXXec/d8kw2DDEgvpY="; + hash = "sha256-ki38Kr+eDEIQPRuoQePR7dCRDSgq2ZLXws1pq2gtQrI="; }; checkInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { # tests require a network connection "test_action" "test_folders" - "test_connectio" + "test_connection" "test_attributes" "test_live" ]; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 1fd1b8d696d1d..ed5327c241d29 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -88,7 +88,6 @@ buildPythonPackage rec { homepage = "https://github.com/jbarlow83/OCRmyPDF"; description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; license = with licenses; [ mpl20 mit ]; - platforms = platforms.linux; maintainers = with maintainers; [ kiwi dotlambda ]; changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst"; }; diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index c800d982cac5b..4fa5c74830204 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "v${version}"; - sha256 = "1sr3ys4g4lkfis3x4b1dbn8fcwxhyppj7cl5bv0a8brbkx7v025q"; + sha256 = "0q272asmmciy50hakb6p0p70rqgf22sqryh9f07jrnlpvsc6pi91"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix index 1d46e65d34909..d97f67488e612 100644 --- a/pkgs/development/python-modules/sarge/default.nix +++ b/pkgs/development/python-modules/sarge/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sarge"; - version = "0.1.6"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "f48fb904e64f10ad6bef62422eaf4736acfd9b13ab64ba44822637a9dbb53265"; + sha256 = "3b810d396a75a5a2805272f64f4316f6dcc086e0a744b042cdb0effc85c0f21b"; }; # No tests in PyPI tarball diff --git a/pkgs/development/python-modules/simplenote/default.nix b/pkgs/development/python-modules/simplenote/default.nix new file mode 100644 index 0000000000000..5cde9b794cdf4 --- /dev/null +++ b/pkgs/development/python-modules/simplenote/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "simplenote"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "simplenote-vim"; + repo = "simplenote.py"; + rev = "v${version}"; + sha256 = "1grvvgzdybhxjydalnsgh2aaz3f48idv5lqs48gr0cn7n18xwhd5"; + }; + + propagatedBuildInputs = [ ]; + + meta = with lib; { + description = "A python library for the simplenote.com web service"; + homepage = "http://readthedocs.org/docs/simplenotepy/en/latest/api.html"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; + +} diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index e76d424953b8a..24f2a54f42e52 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -4,13 +4,13 @@ assert jdk != null; stdenv.mkDerivation rec { pname = "apache-maven"; - version = "3.8.3"; + version = "3.8.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-DxWX0RCFuP6T2EZSoYxt7qcezp+rukWgLPZgDHdY/Vs="; + sha256 = "sha256-LNycUZQnuyD9wlvvWpBjt5Dkq9kw57FLTp9IY9b58Tw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 8fe044e41cced..729e523dc89da 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.15.1"; + version = "0.18.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ftzV5babf3/l59CWDzVgUF2qws5yo1qEuepFLYd8psA="; + sha256 = "sha256-5vWkIQtbeQzPgc1BDjxfWCmCYseOUiV0LXapypcLItI="; }; - cargoSha256 = "sha256-ayCCNE44cOpbrk3FFtW2ZPZ1fTwzXwq3srmptI629sw="; + cargoSha256 = "sha256-ezfVDgZs0QemYHm/o3aX2QGO2WuMweE8LuNZaX4whhw="; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 381a53f0f1e52..a36dba9660456 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "2.9.4"; + version = "3.0.4"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "1rwnmp2rnzwc7anmk7nr8l4ncza8s1f8sn0r2la4ai2sx1iqn06h"; + sha256 = "sha256-SU8byylr/Rv4lDWkt9+U4UvgCM5kYZeRsTk+hdz0y8w="; }; - cargoSha256 = "1c83mmdxci7l3c6ja5fhk4cak1gcbg0r0nlpbpims5gi16nf99r3"; + cargoSha256 = "sha256-snc5QSaxbnXo6FOceqYucjN+ECo+RonejXda9Fvgggc="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index cfd2ed81e7c45..c8448f44153b8 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "cproto"; - version = "4.7s"; + version = "4.7t"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # No version listings and apparently no versioned tarball over http(s). "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz" ]; - sha256 = "sha256-TGpZNahykQjRcUhgmwgDRQ/OFRWFiW+7gXhfHGEYQrg="; + sha256 = "sha256-PM6CpxaHtp4KPiNIn+glunLmk+VZzPGTOVIIrA65b+U="; }; # patch made by Joe Khoobyar copied from gentoo bugs diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 7b5e8552f82c9..1725929026286 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "gede"; - version = "2.17.1"; + version = "2.18.1"; src = fetchurl { url = "http://gede.dexar.se/uploads/source/${pname}-${version}.tar.xz"; - sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3"; + sha256 = "sha256-iIP4QYBiowRs9vjgF73JVKKle8f7ig2exaIp1+ozRp0="; }; nativeBuildInputs = [ qmake makeWrapper python3 ]; diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix index 0425f4f56b3b0..30abbba93f286 100644 --- a/pkgs/games/cbonsai/default.nix +++ b/pkgs/games/cbonsai/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script }: +{ stdenv, lib, fetchFromGitLab, ncurses, pkg-config, nix-update-script, scdoc }: stdenv.mkDerivation rec { - version = "1.2.1"; pname = "cbonsai"; + version = "1.3.1"; src = fetchFromGitLab { owner = "jallbrit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kofJqMoBsvHrV3XfIQbSYO7OWpN7UgvrSs3WX3IVAJs="; + sha256 = "sha256-XFK6DiIb8CzVubTnEMkqRW8xZkX/SWjUsrfS+I7LOs8="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config scdoc ]; buildInputs = [ ncurses ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index beba37c07aca0..e38294ff4014a 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -28,13 +28,13 @@ let gzdoom = stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "0xxxy7k2zr5g0vr1lnwv4n5amiwq1wln7r6hr37gmrjr72zkcjqn"; + sha256 = "sha256-3wO83RgxzeJnoxykKQxb1S1GA6QZlhZMw6GrV3YEm/0="; fetchSubmodules = true; }; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 6740b51cfd92a..e1554bdcb4106 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let mcVersion = "1.17.1"; - buildNum = "97"; + buildNum = "399"; jar = fetchurl { - url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "sha256:0d7q6v5w872phcgkha7j5sxniqq9wqbh1jxdvyvy6d2jl74g1gzw"; + url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; + sha256 = "01374201dkzrx28phy87wji7kzjwx8bpjzv85bjl6672ziskbmpd"; }; in stdenv.mkDerivation { pname = "papermc"; diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix index 76a874d1c8466..c9f7cbd378f7b 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/misc/emulators/yuzu/default.nix @@ -4,13 +4,13 @@ let in { mainline = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-mainline"; - version = "788"; + version = "844"; branchName = branch; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "0vgj1jvbc1ylrzvbl7njdwpajhmp8l39i2k6hgh4az34ry4iaayy"; + sha256 = "0vr1pqackvcb1sppfaqsibkm1agpdlg70lqfl5gcizkq9668gr12"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c71d373e1e169..e3f971923e8f0 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -199,8 +199,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "0.0.82"; - sha256 = "17f0jzg9vdbqdjnnc5i1q28ij2kckvvxi7fw9szmyy754f074jb1"; + version = "0.0.83"; + sha256 = "1giybf12p0h0fm950w9bwvzdk77771zfkylrqs9h0lhbdzr92qbl"; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index b438ea98a2662..beaa176dae157 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -72,7 +72,7 @@ in lib.makeScopeWithSplicing nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook makeMinimal - install tsort lorder mandoc groff statHook rsync + install tsort lorder buildPackages.mandoc groff statHook rsync ]; buildInputs = with self; compatIfNeeded; diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 0736a13ce12e8..246aa471c2a90 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brillo"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitLab { owner= "cameronnemo"; repo= "brillo"; rev= "v${version}"; - sha256 = "0ab7s60zcgl6hvm0a9rlwq35p25n3jnw6r9256pwl4cdwyjyybsb"; + sha256 = "sha256-x8K6CMkOyR+kWRlqa/BmJogZo41LvsL1kfz6CZ5PaUI="; }; patches = [ diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index 4e94b69f5124f..b35201ce1dfd1 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dictd"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { url = "mirror://sourceforge/dict/dictd-${version}.tar.gz"; - sha256 = "1r413a78sa3mcrgddgdj1za34dj6mnd4dg66csqv2yz8fypm3fpf"; + sha256 = "sha256-5PGmfRaJTYSUVp19yUQsFcw4wBHyuWMcfxzGInZlKhs="; }; buildInputs = [ libmaa zlib ]; diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 91b4e1d283ef8..22cfeb07300c5 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, docutils, libev, openssl, pkg-config, nixosTests }: stdenv.mkDerivation rec { - version = "1.7.0"; + version = "1.7.2"; pname = "hitch"; src = fetchurl { url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz"; - sha256 = "1i75giwyr66ip8xsvk3gg5xdbxnmcabgxz8dqi06c58mw7qzhzn9"; + sha256 = "sha256-3NZcvsYofGIqWjF9Xzfh6lUm2qk/tNso9CBvyZEaF4U="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index 68aaeb16af7a6..ffeead30a2933 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.41.0"; + version = "1.48.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-f/dmQvsWHlc9thJ9Ekp14VjdjW5+IMtD0vDMlYksUx4="; + sha256 = "sha256-oSimHF4qiI2zcMSx51qxs88AcrrewHIbhaRW8s4Ut7Q="; }; - vendorSha256 = "sha256-C/1CuUbZEfawzAasTM1VsbK3vVvuRAWUR3cBm5zGzXs="; + vendorSha256 = "sha256-dzYO1yAQSVJmDJvjB5XPRBiYCk+ko1n928CTtUXbHBc="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index f115b71091861..454cbcd7630e7 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ircd-hybrid"; - version = "8.2.38"; + version = "8.2.39"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz"; - sha256 = "sha256-xRA0hzowgjSQtb37Pnw7de1nPtlHAg2FwRMSaKdr+2M="; + sha256 = "sha256-A10nH2sN1FEVf4AUbRibwcm4TMm6G3rQb9cu5RCObk0="; }; buildInputs = [ openssl zlib ]; diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 0842b72f67f14..1ccaca4213374 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "0.11.3"; + version = "0.11.5"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "15nadpz67w24f4wz8ya0kx0a1jc4wxv1kl0d5fr7kckkdyijh7gz"; + sha256 = "sha256-+ojBVdglOTqdmWT8QPUzJRT7RgtXxEOLNC5GqP0vO6Y="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index f684883b8f554..ca91d4eb12b7d 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.9"; + version = "1.6.12"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "1lcjy1b9krnb2gk72qd1fvivlfiyfvknfi3wngyvyk9ifzijr9nm"; + sha256 = "sha256-8pGjX4Lvl1btHZUoee9fS+hw+TK9/LKrYTVmCav4I0Y="; }; configureFlags = [ diff --git a/pkgs/servers/mpd/libmpdclient.nix b/pkgs/servers/mpd/libmpdclient.nix index 4ff45b527b145..72c3a37d97d66 100644 --- a/pkgs/servers/mpd/libmpdclient.nix +++ b/pkgs/servers/mpd/libmpdclient.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libmpdclient"; - version = "2.19"; + version = "2.20"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = pname; rev = "v${version}"; - sha256 = "01agvjscdxagw6jcfx0wg81c4b6p8rh0hp3slycmjs2b835kvmq2"; + sha256 = "sha256-qEgdwG7ygVblIa3uRf1tddxHg7T1yvY17nbhZ7NRNvg="; }; nativeBuildInputs = [ meson ninja ] diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 95413986e8a4a..f139194e98b3e 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "blueberry"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-dz0uGesyuQVXI7aEONCeOsa2vVw5yuStSFPnrqv2VcM="; + sha256 = "sha256-DDxrreo133DIn5XhXKgWvbhPV2NXdyyywC+e73W5aY4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 2b573f9afdb11..ab9609635c5ef 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "davfs2"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; - sha256 = "sha256-LmtnVoW9kXdyvmDwmZrgmMgPef8g3BMej+xFR8u2O1A="; + sha256 = "sha256-zj65SOzlgqUck0zLDMcOZZg5FycXyv8XP2ml4q+QxcA="; }; buildInputs = [ neon zlib ]; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 7c9edf2f84d9c..6db496242d244 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, help2man}: stdenv.mkDerivation rec { - version = "1.6.3.622"; + version = "1.6.4.625"; pname = "fatsort"; src = fetchurl { url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz"; - sha256 = "1z2nabm38lg56h05yx3jjsndbqxk1zbjcisrczzamypn13m98728"; + sha256 = "sha256-mm+JoGQLt4LYL/I6eAyfCuw9++RoLAqO2hV+CBBkLq0="; }; patches = [ ./fatsort-Makefiles.patch ]; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 6f0a40d76afef..aa836e3ca43c0 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.32.4"; + version = "2.33.1"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-VTnAAJWya1JLZA0gjzpUsdnO5XQP8sJzEP8qHBH+t5k="; + sha256 = "sha256-60jGW3aMBf1Ue+AbV/kHb8WoKBqCRMa0fgt6Id1Xt9w="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index f79b15a9890ad..fcbed6d4fa136 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "034csv43vc0q2ycwjfskv1zx08c40ykf1m22fh9wvms0860k2ysn"; + sha256 = "sha256-x2p+6m1pwXhmI9JvGUgLhxrGwpJa/e2wb5wOFdKQ2xg="; }; - cargoSha256 = "0jgwf30gqwwpaf2g5zbsglcmsa00vixrnlizvcd41afi1wkjgiyd"; + cargoSha256 = "sha256-8t7VhPby56UX2LlD2xcJKkWamuJxN9LiVEQPEa78EQQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index d12a213a31e54..e43370aef908e 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.8"; + version = "2.9.9"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "sha256-GNa7xzGuO02oplasGJR2eTsRGp3Rn3LbIxLwdN983II="; + sha256 = "sha256-nwUzOHUuyWprYZcYA3dnaCxf1Y4kccCPN0D9sHBgW8A="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index ad18becfc72fa..5d5bd7bdfc2be 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "interception-tools"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitLab { owner = "interception/linux"; repo = "tools"; rev = "v${version}"; - sha256 = "0wcmppa7092b33wb8vc782day5phf90pc25cn1x7rk0rlw565z36"; + sha256 = "sha256-jhdgfCWbkF+jD/iXsJ+fYKOtPymxcC46Q4w0aqpvcek="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 90a438adb73af..6606f1f0011f2 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "09a252z69msy4wd5kazpca8dcn0a2djdw0vs663062fl977p73qs"; + sha256 = "sha256-VgTjQXjJn17+BhREew62RTjNo8UWc4Fn9x+924nGD+I="; }; buildInputs = [ libX11 libXi libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "1pgj0m67g759mcs4s34h4pq3mc7gni643z5cp6ffq4rrn8mdi060"; + vendorSha256 = "sha256-Cw4uMnID0nDhSl+ijHMo1VcXLdY1bHFpEkqDQDJOJOw="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 2f9db4c85cb43..ea9f888b04446 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -16,13 +16,13 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.124"; + version = "1.0.126"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; - sha256 = "sha256-dwDphksp8WaybFQVPtjCdbRvS5pgRou2B+AZpkwWzY8="; + sha256 = "sha256-vEjhxQDDO+1QvQDSAfM408ktbA3LHyAsO8AO8B+Wxhg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/diffoscope/fix-tests.patch b/pkgs/tools/misc/diffoscope/fix-tests.patch index b5566cb932f78..7e643f61b0a8c 100644 --- a/pkgs/tools/misc/diffoscope/fix-tests.patch +++ b/pkgs/tools/misc/diffoscope/fix-tests.patch @@ -12,3 +12,22 @@ index 8d201ab..05960aa 100644 return get_data(diff_file) +diff --git a/tests/data/pgp_signed_expected_diff b/tests/data/pgp_signed_expected_diff +index 7e90e428..9628efa0 100644 +--- a/tests/data/pgp_signed_expected_diff ++++ b/tests/data/pgp_signed_expected_diff +@@ -5,11 +5,11 @@ + Key ID - 0x1E953E27D4311E58 + Next packet - other than one pass signature + Old: Literal Data Packet(tag 11)(10255 bytes) +- Format - binary ++ Packet data format - binary + - Filename - test1.tar +-- File modified time - Tue Aug 25 11:47:35 UTC 2020 ++- Creation time - Tue Aug 25 11:47:35 UTC 2020 + + Filename - test2.tar +-+ File modified time - Tue Aug 25 11:47:38 UTC 2020 +++ Creation time - Tue Aug 25 11:47:38 UTC 2020 + Literal - ... + Old: Signature Packet(tag 2)(563 bytes) + Ver 4 - new diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index bdb762c98a600..40b6d80199416 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fpart"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "martymac"; repo = "fpart"; rev = "${pname}-${version}"; - sha256 = "17zm3cgp3f2plynqhj8a0hbma5rvawrx5kqygjqyynn7cljv458v"; + sha256 = "sha256-O+OV/uhehKMWhND3L7wtIL9lMUSN5bX2YRRD7ftcIGY="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index e4783ddb0ef2b..8a53d144068d6 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "burpsuite"; - version = "2021.8.1"; + version = "2021.10.3"; src = fetchurl { name = "burpsuite.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-R1WV3oaweW4nfszUOtmrfBlbKJm8HDNjwtbj97dFzB0="; + sha256 = "sha256-UfxsUrT59hBAnItOv6ScRlVo5N0jP3GpdQHzIy4ztck="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index 46fbb1a084f27..3e902f0f3b7f3 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.8.7"; + version = "0.8.8"; src = fetchCrate { inherit pname version; - sha256 = "0kpkvnw12cvcswsx2p8xicyn57i5fd7p5d7n1dqq9x18q6am181p"; + sha256 = "sha256-7VTx52V70i4N7ZmprX9cLrYu7xCSmb+m+Yaphs94c4w"; }; - cargoHash = "sha256:1y07iazb7rwgs0viwn81qmwbcnxza9n89w2jh0r4fq98rr337081"; + cargoHash = "sha256-is9O0fQacE+j9gyZDIWgo3AXMs4ZGUVE5EKUO4ntjq8"; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 232b6b4b0e834..22a1d3b5f7682 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "RustSec"; repo = "rustsec"; rev = "cargo-audit%2Fv${version}"; - sha256 = "1j5ijrjhzqimamhj51qhpbaxx485hcxhaj64lknkn0xrda3apkx8"; + sha256 = "sha256-6Jb7ViVY4YcnNvGarnHWyBPnpz7xiHQjumOmVaA8rzg="; }; - cargoSha256 = "1qvrzaila3wbjmc7ri5asa3di2nzln78ys9innzd84fr36c90kkc"; + cargoSha256 = "sha256-31zZMjIFnMIzSmTEACFBE4nSMje9SvE9KzZdoxTg4VM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 0a98f27182bf3..1fb613aef2e23 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, aflplusplus, python2, zlib, pkg-config, glib, perl +{ lib, stdenv, fetchurl, aflplusplus, python3, zlib, pkg-config, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ - python2 perl pkg-config flex bison autoconf texinfo + python3 perl pkg-config flex bison autoconf texinfo ]; buildInputs = [ diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index a7312731203b6..d1b5f4a83c0fb 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.4.35"; + version = "1.4.36"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-fD4qeSTt2nIhicpXyNHP+lHn+TVKI+ga7NnRro2XEMo="; + sha256 = "sha256-K3OsiF8byrgZ3DV4lE0XQGJB4MckBCmJzqQ3NTtnScE="; }; postPatch = '' diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 97181371690f4..a63db582301e6 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-12-07"; + version = "2021-12-11"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-6rc3c4i1X6b6CgsJPUx/pMT6sE6jc/Sy8Ffw5mVVgEU="; + sha256 = "sha256-S0PlUSSVBI5OpEsd0BoDINdX+gpsP1GMs4uH6xvrs0I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix index 4f9e65b49b8b0..502757262787e 100644 --- a/pkgs/tools/security/lethe/default.nix +++ b/pkgs/tools/security/lethe/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lethe"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "kostassoid"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WYDO44S2cBPe14vv/4i51tgtnoR+6FN2GyAbjJ7AYy8="; + sha256 = "sha256-0UYUzef7ja8nc2zs7eWqqXQfVVbEJEH9/NRRHVkvkYk="; }; - cargoSha256 = "sha256-5fWclZgt5EuWrsYRheTX9otNiGbJ41Q/fTYdKMWRMHc="; + cargoSha256 = "sha256-suE8USKTZECVlTX4Wpz3vapo/Wmn7qaC3eyAJ3gmzqk="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index eb7cec0717822..927ccf73ccd2a 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.17" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.19" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 68f4acd96b6c7..cffd8c5475e65 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: fc76ef1517b10ab7c84fa47d2cb8528881f29b8b - ref: refs/tags/6.1.17 + revision: ede9849ebbca64d7f47bfd19f3088b18fdb220cc + ref: refs/tags/6.1.19 specs: - metasploit-framework (6.1.17) + metasploit-framework (6.1.19) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.60) + metasploit-payloads (= 2.0.65) metasploit_data_models metasploit_payloads-mettle (= 1.0.15) mqtt @@ -125,16 +125,16 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - arel-helpers (2.12.1) + arel-helpers (2.13.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.539.0) + aws-partitions (1.540.0) aws-sdk-core (3.124.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.286.0) + aws-sdk-ec2 (1.287.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.64.0) @@ -225,7 +225,7 @@ GEM logging (2.3.0) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.12.0) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.5) @@ -247,7 +247,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.60) + metasploit-payloads (2.0.65) metasploit_data_models (5.0.4) activerecord (~> 6.0) activesupport (~> 6.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 3a5146ac8e17a..e2c8791501b87 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.17"; + version = "6.1.19"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-JkqjqtnWGbW/G74jlDF8/Ai8KvfzmdDybfA3ArVfoEY="; + sha256 = "sha256-AGSvUtkl2yiMpe5Clc0puG5MN1v5GlwH5XbJPvGPToA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index d412a38c03520..97f42e52610da 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -74,10 +74,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1733g96xxmmgjxambhnr98aj2yq401vgg0afyf46ayzgablij4cb"; + sha256 = "0c0w9wd58yyv0mbhffxm0nsz4f7ycy2vdqfi8vsimhkial6791y2"; type = "gem"; }; - version = "2.12.1"; + version = "2.13.0"; }; Ascii85 = { groups = ["default"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01676g6hsdyzv9ym1f9r59r4jmnh1fl8fr9pqxdnqrysalpdi5gx"; + sha256 = "1ns0378h8qa5vwrq7a7i0xji17japs95mddpvam351k19a79vbwh"; type = "gem"; }; - version = "1.539.0"; + version = "1.540.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11yclwnfckc4xbhhrr5cy0y5q7vaf51qnvpd1vh5l0x7ngjlx0z3"; + sha256 = "1gwhniprki7y357z1kprycrxq0g3j72ahqcimxa326xjw0mba8jz"; type = "gem"; }; - version = "1.286.0"; + version = "1.287.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -624,10 +624,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; + sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg"; type = "gem"; }; - version = "2.12.0"; + version = "2.13.0"; }; metasm = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "fc76ef1517b10ab7c84fa47d2cb8528881f29b8b"; - sha256 = "0im0bysh4dzhdprd16gkywmbq27wghqr88xy3fzva6fnv6ma6ji6"; + rev = "ede9849ebbca64d7f47bfd19f3088b18fdb220cc"; + sha256 = "102fizqkxjbnwl3mq6prbcvlqvmq576rahpfln62inr5v59ayr00"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.17"; + version = "6.1.19"; }; metasploit-model = { groups = ["default"]; @@ -686,10 +686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rg11gjy590cixfy6lmwgd76ai0s2gs4w8m379bkkx2f12lkibhn"; + sha256 = "0vpjl3rvz4pxcpwc8r6kdiflb5xn6gz0yrclczcpikgn7hhjdiif"; type = "gem"; }; - version = "2.0.60"; + version = "2.0.65"; }; metasploit_data_models = { groups = ["default"]; diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index c287b37dd1b57..28b4765ede4a7 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hyx"; - version = "2020-06-09"; + version = "2021.06.09"; src = fetchurl { url = "https://yx7.cc/code/hyx/hyx-${lib.replaceStrings [ "-" ] [ "." ] version}.tar.xz"; - sha256 = "1x8dmll93hrnj24kn5knpwj36y6r1v2ygwynpjwrg2hwd4c1a8hi"; + sha256 = "sha256-jU8U5YWE1syPBOQ8o4BC7tIYiCo4kknCCwhnMCVtpes="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48827736220f2..45e4708f93497 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8760,6 +8760,8 @@ in { simplekml = callPackage ../development/python-modules/simplekml { }; + simplenote = callPackage ../development/python-modules/simplenote { }; + simple-di = callPackage ../development/python-modules/simple-di { }; simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; |