diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 183de7292101..6971ab42d99f 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -8,10 +8,7 @@ let etc' = filter (f: f.enable) (attrValues config.environment.etc); - etc = pkgs.runCommand "etc" { - preferLocalBuild = true; - allowSubstitutes = false; - + etc = pkgs.runCommandLocal "etc" { # This is needed for the systemd module passthru.targets = map (x: x.target) etc'; } /* sh */ '' diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 09be8faa8a0f..591c14c1adfa 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -2,7 +2,6 @@ , stdenv , lib , fetchFromGitHub -, fetchpatch , qmake , pkg-config , qttools @@ -13,25 +12,16 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.4.6"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "rerrahkr"; + owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; - sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc"; + fetchSubmodules = true; + sha256 = "1mpbvhsmrn0wdmxfp3n5dwv4474qlhy47r3vwc2jwdslq6vgl1fa"; }; - # TODO Remove when updating past 0.4.6 - # Fixes build failure on darwin - patches = [ - (fetchpatch { - name = "bambootracker-Add_braces_in_initialization_of_std-array.patch"; - url = "https://github.com/rerrahkr/BambooTracker/commit/0fc96c60c7ae6c2504ee696bb7dec979ac19717d.patch"; - sha256 = "1z28af46mqrgnyrr4i8883gp3wablkk8rijnj0jvpq01s4m2sfjn"; - }) - ]; - nativeBuildInputs = [ qmake qttools pkg-config ]; buildInputs = [ qtbase rtaudio rtmidi ]; @@ -40,18 +30,20 @@ mkDerivation rec { postConfigure = "make qmake_all"; - # installs app bundle on darwin, re-extract the binary - # wrapQtAppsHook fails to wrap mach-o binaries, manually call wrapper (https://github.com/NixOS/nixpkgs/issues/102044) + # 1. installs app bundle on darwin, move to app bundle dir & link binary to bin + # 2. wrapQtAppsHook fails to wrap mach-o binaries automatically, manually call wrapper + # (see https://github.com/NixOS/nixpkgs/issues/102044) postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mv $out/bin/BambooTracker{.app/Contents/MacOS/BambooTracker,} - rm -r $out/bin/BambooTracker.app - wrapQtApp $out/bin/BambooTracker + mkdir -p $out/Applications + mv $out/{bin,Applications}/BambooTracker.app + wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker + ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker ''; meta = with lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; - homepage = "https://rerrahkr.github.io/BambooTracker"; - license = licenses.gpl2Only; + homepage = "https://bambootracker.github.io/BambooTracker/"; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; }; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 3ed11aa8b706..b32dd4c8fe2f 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -24,7 +24,7 @@ let six ]; in mkDerivation rec { - version = "3.16.7"; + version = "3.16.9"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -32,7 +32,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0yvb2w83dplh0my72xljglq9a4a7qkfliwslav26lw4yqxr8mr0p"; + sha256 = "sha256-Y9WVgKEMOSMaXxfC9EQ8yqBYEj4XNL7YdMp8vjV55d0="; }; passthru = { diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 843193bba182..336bd5a7f64d 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.46"; + version = "2.48.1"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0zyclydgyg8nhwxrzw7x4f82975cqdmp12py33k6sballx6jhgiy"; + sha256 = "sha256-HkAgKPvf8TUgUlgsGWVgjuYJaRPGi8obOFQEtmzDtLE="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 71bab089601d..d220d5fa2fa1 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,16 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.13"; + version = "2.3.14"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; - rev = "release/${version}"; - sha256 = "sha256-Bi/Cz2T2NdtnJZHav8qvo+gErPsR8Ym7K3KcD5APt6Y="; + # 2.3.14 release tag points to the commit before the one that updates the + # version number. + # rev = "release/${version}"; + rev = "1e09791a1e2fe2a0ca9835019d634a4c6a4fa3bf"; + sha256 = "0mhzp1j6nmqvkjxg8lv8xa637m1lavdsak30mdlq0g25dhwg6k92"; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; @@ -41,7 +44,7 @@ mkDerivation rec { running radio simulators. ''; homepage = "https://www.open-tx.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ elitak lopsided98 ]; }; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 713f934f7789..40feaebd72cc 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -2,6 +2,7 @@ , fetchurl, pkg-config, ncurses, gzip , sslSupport ? true, openssl ? null , nukeReferences +, fetchpatch }: assert sslSupport -> openssl != null; @@ -22,6 +23,14 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; + patches = [ + (fetchpatch { + name = "CVE-2021-38165.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/lynx/CVE-2021-38165.patch?id=3400945dbbb8a87065360963e4caa0e17d3dcc61"; + sha256 = "1aykb9y2g2vdpbbpvjlm4r40x7py2yv6jbywwcqcxrlciqcw4x57"; + }) + ]; + configureFlags = [ "--enable-default-colors" "--enable-widec" diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index baf67f2b6816..eb55e3f9aa9e 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.16.1"; + version = "0.16.2"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-OjbyDg+3dSJco162NubK12pbmwib6uGlJQxVaJOzSig="; + sha256 = "sha256-hP2HQI9Oc7IlzVS5r7yqGAgSgqECOSZVe2B3vO2sgKA="; }; - vendorSha256 = "sha256-GPbuHv/Xi9sWWZ6SIlW8cm5bY1gTO41vygx2C8dEt0k="; + vendorSha256 = "sha256-6ABnX0GV3HmhpUpPWS0bigubRqpXGoikEeQ/LqO6Ybs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 89d07da74829..3c7b232cc214 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.14"; + version = "0.24.15"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-Kw3TT8IeJT0y2vSd38/y7BRq7PxMH2tiXV4/lOn5INA="; + sha256 = "sha256-ws5JC2/WkgwxKwYtP9xtFELRhztzL6tNSvopyeC6H0Q="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-JBWQxRaMvIbUiOD7sJiZH1SHNCdysgh5FeSmYf+FdG4="; + vendorSha256 = "sha256-T9khJeg5XPhVyUiu4gEEHZR6RgJF4P8LYFycqJglms8="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 589164e2769f..66e80f6648dc 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.31.1"; + version = "0.31.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vc3DGYb3vp55LRguhg3nG5zH7w1lTFEI2bx7kNffvas="; + sha256 = "sha256-I7S7B+mQxLdMWiLAkUIW39kXGU9k647OOhHysYotkfU="; }; - vendorSha256 = "sha256-lBhLaYn8adgfCXQJBsIVuwnA0vY8+tgeqE+C669AV+A="; + vendorSha256 = "sha256-CVWg2SvRO//xye05G3svGeqgaTKdRcoERrR7Tp0JZUo="; doCheck = false; diff --git a/pkgs/applications/networking/gftp/default.nix b/pkgs/applications/networking/gftp/default.nix new file mode 100644 index 000000000000..947a75d0e2d2 --- /dev/null +++ b/pkgs/applications/networking/gftp/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, gettext +, gtk +, intltool +, libtool +, ncurses +, openssl +, pkg-config +, readline +}: + +stdenv.mkDerivation rec { + pname = "gftp"; + version = "2.7.0b"; + + src = fetchFromGitHub { + owner = "masneyb"; + repo = pname; + rev = version; + hash = "sha256-cIB3SneYKavgdI8eTtM1qsOrBJJ0c7/3CEvNPishNog="; + }; + + nativeBuildInputs = [ + autoconf + automake + gettext + intltool + libtool + pkg-config + ]; + buildInputs = [ + gtk + ncurses + openssl + readline + ]; + + hardeningDisable = [ "format" ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with lib; { + homepage = "https://github.com/masneyb/gftp"; + description = "GTK-based multithreaded FTP client for *nix-based machines"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: report the hardeningDisable to upstream diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 74a4ab968c9c..ced3dcf5fe48 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -15,6 +15,7 @@ , enableSpelling ? true, gspell , enableUPnP ? true, gupnp-igd , enableOmemoPluginDependencies ? true +, enableAppIndicator ? true, libappindicator-gtk3 , extraPythonPackages ? ps: [] }: @@ -33,7 +34,8 @@ python3.pkgs.buildPythonApplication rec { ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell - ++ lib.optional enableUPnP gupnp-igd; + ++ lib.optional enableUPnP gupnp-igd + ++ lib.optional enableAppIndicator libappindicator-gtk3; nativeBuildInputs = [ gettext wrapGAppsHook diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index e82680e36b3a..dce623897f73 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.9"; + version = "2.9.10"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-36/fatztop2eB1z9DfnseQXw0Di3Wss72IfgdnKpsNU="; + sha256 = "sha256-2gCJ6aN6uN0KtOVddLDry4pLhScSh4JHmdsFws59phk="; }; - vendorSha256 = "sha256-MH9lZNc9KevovZJCN2nClmqJbRSwYoQ4Jb0CXqBBUd0="; + vendorSha256 = "sha256-vFO3Rv+7CLIkl1qS4zp177GmerewfgmyjxEbzdt/RsE="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 2991550defcd..017525142881 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { - version = "6.8.9"; + version = "6.9.4"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "0f5vyliwncryj6hj5xx0dycxycxddsn28n6zixjrn56jajijyl6q"; + sha256 = "sha256-sWvQDUJGytKA9/UbC7fOk6WhDtTqdhyRmW9GvHFMZh4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix index 9dbdae3f0206..97edd9e1fa2e 100644 --- a/pkgs/applications/office/flexibee/default.nix +++ b/pkgs/applications/office/flexibee/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: let - version = "2020.2.6"; + version = "2021.2.1"; majorVersion = builtins.substring 0 6 version; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0vscz24sabk9xafywnx41rqhq6300ddsw1x95ibc7ghsgbkq80ja"; + sha256 = "sha256-WorRyfjWucV8UhAjvuW+22CRzPcz5tjXF7Has4wrLMI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix index d691882a2c6f..610342c3f809 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/applications/video/corrscope/default.nix @@ -1,6 +1,8 @@ { lib , mkDerivationWith , python3Packages +, fetchFromGitHub +, fetchpatch , wrapQtAppsHook , ffmpeg , qtbase @@ -8,24 +10,31 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "corrscope"; - version = "0.7.0"; + version = "0.7.1"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "0m62p3jlbx5dlp3j8wn1ka1sqpffsxbpsgv2h5cvj1n1lsgbss2s"; + src = fetchFromGitHub { + owner = "corrscope"; + repo = "corrscope"; + rev = version; + sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'attrs>=18.2.0,<19.0.0' 'attrs>=18.2.0' \ - --replace 'numpy>=1.15,<2.0,!=1.19.4' 'numpy>=1.15,<2.0' - ''; + format = "pyproject"; + + patches = [ + # Remove when bumping past 0.7.1 + (fetchpatch { + name = "0001-Use-poetry-core.patch"; + url = "https://github.com/corrscope/corrscope/commit/d40d1846dd54b8bccd7b8055d6aece48aacbb943.patch"; + sha256 = "0xxsbmxdbh3agfm6ww3rpa7ab0ysppan490w0gaqwmwzrxmmdljv"; + }) + ]; nativeBuildInputs = [ wrapQtAppsHook ]; buildInputs = [ ffmpeg qtbase ]; - propagatedBuildInputs = with python3Packages; [ appdirs attrs click matplotlib numpy pyqt5 ruamel_yaml ]; + propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy poetry-core pyqt5 ruamel_yaml ]; dontWrapQtApps = true; @@ -36,8 +45,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { ) ''; - preCheck = "export HOME=$TEMP"; - meta = with lib; { description = "Render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm"; longDescription = '' diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/data/fonts/weather-icons/default.nix index cf45152178ec..a979dca44774 100644 --- a/pkgs/data/fonts/weather-icons/default.nix +++ b/pkgs/data/fonts/weather-icons/default.nix @@ -1,18 +1,18 @@ { lib, fetchzip }: let - version = "2.0.10"; + version = "2.0.12"; in fetchzip { name = "weather-icons-${version}"; - url = "https://github.com/erikflowers/weather-icons/archive/${version}.zip"; + url = "https://github.com/erikflowers/weather-icons/archive/refs/tags/${version}.zip"; + sha256 = "sha256-NGPzAloeZa1nCazb+mjAbYw7ZYYDoKpLwcvzg1Ly9oM="; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile weather-icons-${version}/_docs/font-source/weathericons-regular.otf -d $out/share/fonts/opentype ''; - sha256 = "10zny9987wybq55sm803hrjkp33dq1lgmnxc15kssr8yb81g6qrl"; meta = with lib; { description = "Weather Icons"; diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 9e50fb0c1369..5c8f3d15b663 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-79C/M5WXQswA1xuA6pwVSRlDtQC9+EzkwSEV3SdPzBc="; + sha256 = "sha256-5tXXAfGY5JQ5RiKayUuQJDgX6sPHRi8Hy2ht/Hl0hdo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 6bc74971c4e9..00b20abbda8a 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -1,23 +1,19 @@ {lib, stdenv, fetchFromGitHub, bison, flex, pkg-config, libpng}: -# TODO: byacc is the recommended parser generator but due to https://github.com/rednex/rgbds/issues/333 -# it does not work for the moment. We should switch back to byacc as soon as the fix is integrated -# in a published version. - stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { - owner = "rednex"; + owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "0lygj7jzjlq4w0mkiir7ycysrd1p1akyvzrppjcchja05mi8wy9p"; + sha256 = "11b1hg2m2f60q5622rb0nxhrzzylsxjx0c8inbxifi6lvmj9ak4x"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; meta = with lib; { - homepage = "https://rednex.github.io/rgbds/"; + homepage = "https://rgbds.gbdev.io/"; description = "A free assembler/linker package for the Game Boy and Game Boy Color"; license = licenses.mit; longDescription = diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index 524273e080fe..f58441beedbf 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { inherit version; }; - phases = [ "installPhase" ]; - installPhase = '' runHook preInstall install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index 83afeaf2d67b..7c90092fe8dd 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { ]; preConfigure = "autoreconf -i -f"; + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ SDL pango ]; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 79c1715c61d7..13305d312736 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out mv * $out/ diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 3923416c4a35..81f4bb6c2dce 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -153,7 +153,7 @@ let } ''; - phases = [ "preBuild" "buildPhase" "installPhase" ]; + dontUnpack = true; } // args); in rec { @@ -905,7 +905,11 @@ in rec { langInputs = [ en ]; - buildPhase = "cat $src | aspell-affix en-computers --dont-validate-words --lang=en"; + buildPhase = '' + runHook preBuild + cat $src | aspell-affix en-computers --dont-validate-words --lang=en + runHook postBuild + ''; installPhase = "aspell-install en-computers"; meta = { @@ -930,8 +934,10 @@ in rec { langInputs = [ en ]; buildPhase = '' + runHook preBuild cat $src1 | aspell-plain en_US-science --dont-validate-words --lang=en cat $src2 | aspell-plain en_GB-science --dont-validate-words --lang=en + runHook postBuild ''; installPhase = "aspell-install en_US-science en_GB-science"; diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 34a4f93bb860..3057c888b02a 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.7.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-t1QRqasb82W277XEV2FG5JrsQWIWZ0G5V7wLI+p4MpQ="; + sha256 = "sha256-gieft0sErTr3aB6mZLdALSx+RkmCQuE9lopAwJbOXnA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 2ca20eaa5f0d..a4f19678f240 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "21.02"; + version = "21.08"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-4w0Zd3vmrw4KM9O/axy1BJpoHeQeZy0P6Ptolxrabjc="; + sha256 = "sha256-zgXIho1jmoOCVcjvDwiq+J1jOzsPgxvvaWN8NfszEdA="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 212b656adda5..a80a5cd9f8f0 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2021.01.25.00"; + version = "2021.08.02.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-n2cpXdjPZYNjvSHBZFFn3JFwqYCFWc8qSKwet80LtJE="; + sha256 = "sha256-Y2CqPlhbfC++udbbURnI9mvRZswC8kmikp1HY0qJz4k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 596326b36df4..f1a2aa0c6c60 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -45,7 +45,6 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - phases = "unpackPhase patchPhase buildPhase installPhase"; nativeBuildInputs = [ unzip ]; buildInputs = [ bash coreutils which zip ]; patchPhase = '' @@ -89,7 +88,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' unzip $src dictionaries/${dictFileName}.dic dictionaries/${dictFileName}.aff $readmeFile @@ -129,7 +127,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} @@ -158,7 +155,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; sourceRoot = "."; unpackCmd = '' unzip $src ${srcFileName}.dic ${srcFileName}.aff ${srcReadmeFile} @@ -185,7 +181,6 @@ let platforms = platforms.all; }; nativeBuildInputs = [ unzip ]; - phases = "unpackPhase patchPhase installPhase"; sourceRoot = "."; prePatch = '' # Fix dic file empty lines (FS#22275) @@ -204,7 +199,6 @@ let inherit srcs; - phases = ["unpackPhase" "installPhase"]; sourceRoot = "."; # Copy files stripping until first dash (path and hash) unpackCmd = "cp $curSrc \${curSrc##*-}"; @@ -242,7 +236,8 @@ let buildInputs = [ ispell perl hunspell ]; - phases = ["unpackPhase" "installPhase"]; + dontBuild = true; + installPhase = '' patchShebangs bin make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix index a4dd9cbaa45d..0d3c20651c75 100644 --- a/pkgs/development/libraries/kdsoap/default.nix +++ b/pkgs/development/libraries/kdsoap/default.nix @@ -1,12 +1,34 @@ -{ mkDerivation, lib, fetchurl +{ mkDerivation +, lib +, fetchurl , cmake , qtbase }: mkDerivation rec { pname = "kdsoap"; - version = "1.10.0"; - meta = { + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; + sha256 = "sha256-0YljEE+m99ArBEYxzdvnjxj3DgbGB69oDHrOBNbPBO4="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase ]; + + postInstall = '' + moveToOutput bin/kdwsdl2cpp "$dev" + sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \ + -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" + sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \ + -e "s@$out/bin@$dev/bin@" + ''; + + meta = with lib; { description = "A Qt-based client-side and server-side SOAP component"; longDescription = '' KD Soap is a Qt-based client-side and server-side SOAP component. @@ -15,21 +37,7 @@ mkDerivation rec { provides the means to create web services without the need for any further component such as a dedicated web server. ''; - license = with lib.licenses; [ gpl2 gpl3 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; + license = with licenses; [ gpl2 gpl3 lgpl21 ]; + maintainers = [ maintainers.ttuegel ]; }; - src = fetchurl { - url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "sha256-DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48="; - }; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase ]; - postInstall = '' - moveToOutput bin/kdwsdl2cpp "$dev" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \ - -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \ - -e "s@$out/bin@$dev/bin@" - ''; } diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index e48857861d68..13a814684a42 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/include diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 4b5793dc1332..d8f75875b9b3 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - phases = "unpackPhase installPhase"; - # move to nix-support to not create that many symlinks.. # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog) installPhase = '' diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 2f4a4f0437a2..fbb75e613309 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { buildInputs = [ findlib ]; propagatedBuildInputs = [ ounit2 ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontBuild = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/z3/default.nix b/pkgs/development/ocaml-modules/z3/default.nix index d24a95102013..01b384fe0ba5 100644 --- a/pkgs/development/ocaml-modules/z3/default.nix +++ b/pkgs/development/ocaml-modules/z3/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { pname = "ocaml${ocaml.version}-z3"; inherit (z3-with-ocaml) version; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index bcc7a4b5c988..e82679443562 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = version; + rev = "v${version}"; sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; }; diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix index 6de88632027f..4022befcb14d 100644 --- a/pkgs/development/python-modules/pytest-mockservers/default.nix +++ b/pkgs/development/python-modules/pytest-mockservers/default.nix @@ -31,9 +31,12 @@ buildPythonPackage rec { poetry-core ]; + buildInputs = [ + pytest + ]; + propagatedBuildInputs = [ aiohttp - pytest pytest-asyncio ]; diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix index a0517ee20aa8..7476801794c3 100644 --- a/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchFromGitHub , colorama -, pytest-runner , pytest , pytestCheckHook }: @@ -20,13 +19,17 @@ buildPythonPackage rec { sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2"; }; - nativeBuildInputs = [ - pytest-runner + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" + ''; + + buildInputs = [ + pytest ]; propagatedBuildInputs = [ colorama - pytest ]; checkInputs = [ diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index aded311feab0..ccc5749387b1 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , ifaddr , poetry-core , pythonOlder diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index df3c42b4718f..8dac16f243ca 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.7"; + version = "2.5.8"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-dKJQv/omXT/L5dWYkveXodNNt5Q3i1WDIA9nwmo0Sfc="; + sha256 = "sha256-XfxzvzGiSBhPVIvdtDifKjkcGK2afWXVWul3Pah3tKo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index bc8113fc6a1d..a1bd3ecd451b 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = version; - sha256 = "0186lih30zps2d4600ikafbgsml269jzpcszdggzzkdw8p628qw9"; + sha256 = "sha256-w5H1USQ2aladwSFdfYsX925pjCt3QWoXK4HqyEL7rH0="; }; buildInputs = [ openssl curl postgresql yajl ]; diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix index 4518215a3374..9c2c9ad1ecf4 100644 --- a/pkgs/games/alephone/marathon/default.nix +++ b/pkgs/games/alephone/marathon/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20200904"; + version = "20210408"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "sha256-x5M8RkxH+Rn8hUJIIq/AFC5Ibn0zF95BqZIDEwM6wVg="; + sha256 = "sha256-WM5c0X/BGeDu8d7hME3LiZavkgJll6rc3Beat/2bsdg="; }; meta = { diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index b5caa603eaf8..a87236c48f4a 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU, libGL, zlib, libjpeg, libogg, libvorbis -, openal, curl }: +, openal, curl, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "dhewm3"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "dhewm"; repo = "dhewm3"; rev = version; - sha256 = "0wsabvh1x4g12xmhzs2m2pgri2q9sir1w3m2r7fpy6kzxp32hqdk"; + sha256 = "sha256-QI2INtNP+TSXdGSNxBcJ+lQK9dvDStrir20z3kCY8v4="; }; # Add libGLU libGL linking @@ -21,9 +21,18 @@ stdenv.mkDerivation rec { cd "$(ls -d dhewm3-*.src)"/neo ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake copyDesktopItems ]; buildInputs = [ SDL2 libGLU libGL zlib libjpeg libogg libvorbis openal curl ]; + desktopItems = [ + (makeDesktopItem { + name = "dhewm3"; + exec = "dhewm3"; + desktopName = "Doom 3"; + categories = "Game;"; + }) + ]; + hardeningDisable = [ "format" ]; meta = with lib; { diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index ea154db121ee..fabfdeea8ce6 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-fqV2u6vChzU8387aQGf3OKeiWX188GouYZr4ZUmXWxs="; + sha256 = "sha256-zm7yR87pJY26USHocT7HnPNQK5xYjFPNo4RT2Lr3C/k="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 8ab54468c001..787184273fc3 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 -, game-music-emu, pkg-config }: +, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }: let zmusic-src = fetchFromGitHub { @@ -38,7 +38,7 @@ let fetchSubmodules = true; }; - nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config copyDesktopItems ]; buildInputs = [ SDL2 libGL @@ -55,7 +55,18 @@ let NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; + desktopItems = [ + (makeDesktopItem { + name = "gzdoom"; + exec = "gzdoom"; + desktopName = "GZDoom"; + categories = "Game;"; + }) + ]; + installPhase = '' + runHook preInstall + install -Dm755 gzdoom "$out/lib/gzdoom/gzdoom" for i in *.pk3; do install -Dm644 "$i" "$out/lib/gzdoom/$i" @@ -68,6 +79,8 @@ let done mkdir $out/bin makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 41589caed6db..87ecd4601339 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: +{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "quakespasm"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { sourceRoot = "${pname}-${version}/Quake"; + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ gzip SDL libvorbis libmad ]; @@ -25,6 +26,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + desktopItems = [ + (makeDesktopItem { + name = "quakespasm"; + exec = "quake"; + desktopName = "Quakespasm"; + categories = "Game;"; + }) + ]; + meta = with lib; { description = "An engine for iD software's Quake"; homepage = "http://quakespasm.sourceforge.net/"; diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index fb5a5d06212b..31460297213c 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, libaio }: stdenv.mkDerivation { - name = "blktrace-1.2.0"; + name = "blktrace-1.3.0"; # Official source # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { - url = "http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2"; - sha256 = "0i9z7ayh9qx4wi0ihyz15bhr1c9aknjl8v5i8c9mx3rhyy41i5i6"; + url = "http://brick.kernel.dk/snaps/blktrace-1.3.0.tar.bz2"; + sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY="; }; buildInputs = [ libaio ]; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index b20632be334c..85e4065e90a4 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "175"; + version = "178"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "sha256-Xzbck/nRdTR9H5o2XVFlFdNLz2ve65KEcefKAKe0eW8="; + sha256 = "sha256-++R/R3oRw0O0MoDnASdVr9UIiI0yS4UcIO8nV62PLzE="; }; postPatch = '' @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { errors are logged to /var/log/mcelog or syslog or the journal. ''; homepage = "http://mcelog.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index dd9d34c85fdd..1f355e61e457 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-felix"; - version = "6.0.3"; + version = "7.0.0"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; - sha256 = "1yk04q8rfbbabacbhmrsw5ywr96496x1cz4icdqimb1cfxixv1q0"; + sha256 = "sha256-ea1QYUqf6m3HB17TrEQ7UEc48fl5QHQMYsN3t0T9VD4="; }; buildCommand = '' diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index a5b2f14e9d58..c2f9e206e9cb 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { - owner = "tulir"; - repo = "mautrix-whatsapp"; + owner = "mautrix"; + repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-PXahSrA+jBWreFhqCp1Ar9yYfIJGJfU2xH88Ax3fdkE="; + sha256 = "bFuJa4pKwqQmpJDqYwA97CjrTeQ1Q8V/pNqD0ff6x/U="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-Iscojrn6wVnweOQV1GvhZ4QjUdTfDLOsCP1hVR4u/b4="; + vendorSha256 = "NTORR0ixVozUllWlGziTUSJNy1zHoPWQMZbmPUchpQ0="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ vskilet ma27 ]; }; } diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index c642784af922..4e0d3d0b701f 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-wbww6pYq2ATRRmeUAzFDGKzLk6MNYyGp6QKf8ybeaTc="; + sha256 = "sha256-jjxO35PaxEI9n0qsawTPt3mHNC0PjWfmEA4NkIAwyTY="; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "sha256-NIf5nyUXZY5UGFcdjeeFZdGKVcD2pve+PytziCD2NFk="; + vendorSha256 = "sha256-2MPenTV0fgvXbf8WkoPd9uApPSDLPyHtCq9o3CHB/D0="; doCheck = false; diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index c24857d9dc5f..0ae5523c35a3 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "galene"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "sha256-yb+gEex4WEvIAEMuSTkw25rsBTL9tlfhf9qQtISWUd0="; + sha256 = "sha256-CqwxHLXhiBYPS+93/MycS2IR//31puhI+oSpMS/jR1s="; }; vendorSha256 = "sha256-Vm7tTTQJyZZVbORl5ziy4GJ34kHh5dh0ojX/ZuTpshA="; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index f7cc0cb8fcae..a51d33735b77 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.59.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-qSZos1BO48Z5aiay8B/9DFGPgAOC8ib7IRjlFhzFh5Y="; + sha256 = "sha256-zRwdluwVi4hbDZGlRwhNWkeq05c2VTZ52KrxvyFIBio="; }; vendorSha256 = "sha256-mapok/c3uh7xmLZnN5S9zavgxSOfytqtqxBScv4Ao8w="; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 0939584fa970..528f0999b2c6 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0whs1bqnn1fgzrq7y2w1d06ldvfafq6h2xzmcfncbwmyb4i0mhgw"; + sha256 = "sha256-Ge1ZsaE09YT8AF9HKV/vZAqXCf2bmyMHOI4RKjLs0PY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix index 7f57cab585bc..7405535edd43 100644 --- a/pkgs/tools/misc/convbin/default.nix +++ b/pkgs/tools/misc/convbin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convbin"; - version = "3.0"; + version = "3.4"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9"; + sha256 = "sha256-JM9ixxOI3NnK3h54byFycTCJ/A+JTcNHKR71zxRed/s="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix deleted file mode 100644 index ab956a45b492..000000000000 --- a/pkgs/tools/networking/gftp/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }: - -stdenv.mkDerivation rec { - pname = "gftp"; - version = "2.0.19"; - - src = fetchurl { - url = "https://www.gftp.org/gftp-${version}.tar.bz2"; - sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; - }; - - postPatch = '' - sed -i -e '//d' lib/pty.c - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 readline ncurses gettext openssl ]; - - meta = { - description = "GTK-based FTP client"; - homepage = "http://www.gftp.org"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 346141ca8925..b1d7ec6bc2b7 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-jyGymAplSe8vaSwbONtpRoAondxNBcRbFZ+YyOtr7qo="; + sha256 = "sha256-zBUUhHecf3jn9HSoydsKBQLXtfsVb56RbECg7zteZzc="; }; - vendorSha256 = "11mrdf7pwf8v7bb7wamv2yhixw4x06rd0qym942kk9bwif2balfp"; + vendorSha256 = "sha256-uuzcDsi3f8KWE8WtN9v4jqmZPWsOm5I2LAbsyj1sjOY="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index c2f0c2ea51d0..52d0f261d4be 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.0"; + version = "1.8.1"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-H+kPDE8xuu2lgENf4t+vCb+Tni+ChkB8K5ZEgIY3Jyo="; + sha256 = "sha256-u0EfK7rXnC5PBkDx09XvUOK9p9T0CHWlaRfJX/eDwts="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "19c7d7yr5nm1xgrkh46pcgwwxa6iic6is06n343qaxcj0dfg43kn"; + sha256 = "11khjx5lrb7zmrahkniqwn4ad98yjy2fm0miz63nzpq85c0yrjdn"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "0zql0r6gmq0yqb1cbpjgwsg6cky9y43n5gsvijp6snhnp86bicdr"; + sha256 = "02gqavhg3pk6jkdmn1yp9pl3pv4ni2sg56q218gs8gbbypj22wpq"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1ajkgkanq8ijcxbb5zbn9z25r0v7qcq13ivjqr0x7ql5bxm3xfmc"; + sha256 = "0500nc8v7hwnrckz4fkf5fpqcg3i45q25lz4lghzkcabnss4qand"; }; }; diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index 6c92983585b3..9a3f37cc64a5 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ispell"; - version = "3.4.00"; + version = "3.4.04"; src = fetchurl { url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz"; - sha256 = "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x"; + sha256 = "sha256-h7zW8FIdhaCjp4NCFZVtdOvEkxRMx8eR+HvmhyzP4T4="; }; buildInputs = [ bison ncurses ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83700a40def8..3437f948bf9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5147,7 +5147,9 @@ in gexiv2 = callPackage ../development/libraries/gexiv2 { }; - gftp = callPackage ../tools/networking/gftp { }; + gftp = callPackage ../applications/networking/gftp { + gtk = gtk2; + }; gfbgraph = callPackage ../development/libraries/gfbgraph { }; @@ -27889,7 +27891,7 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - # neovim doesn't build with luajit on aarch64: + # neovim doesn't build with luajit on aarch64-darwin : # ./luarocks init # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: # no field package.preload['luarocks.core.hardcoded'] @@ -27913,7 +27915,7 @@ in # See https://github.com/NixOS/nixpkgs/issues/129099 # Possibly related: https://github.com/neovim/neovim/issues/7879 lua = - if stdenv.isAarch64 then lua5_1 else + if (stdenv.isDarwin && stdenv.isAarch64) then lua5_1 else luajit; };