diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9101690bd0f3..1e9a4fbed442 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6338,6 +6338,12 @@ githubId = 209729; name = "Kevin Griffin"; }; + kevink = { + email = "kevin@kevink.dev"; + github = "Unkn0wnCat"; + githubId = 8211181; + name = "Kevin Kandlbinder"; + }; kfollesdal = { email = "kfollesdal@gmail.com"; github = "kfollesdal"; diff --git a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml index 1dd15ddacba8..94172de65ea0 100644 --- a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml @@ -7,11 +7,11 @@ These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another - option. To build the necessary files from a recent version of + option. To build the necessary files from your current version of nixpkgs, you can run: -nix-build -A netboot.x86_64-linux nixos/release.nix +nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>' This will create a result directory containing: * diff --git a/nixos/doc/manual/installation/installing-pxe.section.md b/nixos/doc/manual/installation/installing-pxe.section.md index 2016a258251f..4fbd6525f8c3 100644 --- a/nixos/doc/manual/installation/installing-pxe.section.md +++ b/nixos/doc/manual/installation/installing-pxe.section.md @@ -5,11 +5,11 @@ setup. These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another -option. To build the necessary files from a recent version of nixpkgs, +option. To build the necessary files from your current version of nixpkgs, you can run: ```ShellSession -nix-build -A netboot.x86_64-linux nixos/release.nix +nix-build -A netboot.x86_64-linux '' ``` This will create a `result` directory containing: \* `bzImage` -- the diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index 9d063b92aa1e..4f3881af8bbf 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -81,7 +81,9 @@ let http_access deny all # Squid normally listens to port 3128 - http_port ${toString cfg.proxyPort} + http_port ${ + optionalString (cfg.proxyAddress != null) "${cfg.proxyAddress}:" + }${toString cfg.proxyPort} # Leave coredumps in the first cache dir coredump_dir /var/cache/squid @@ -109,6 +111,12 @@ in description = "Whether to run squid web proxy."; }; + proxyAddress = mkOption { + type = types.nullOr types.str; + default = null; + description = "IP address on which squid will listen."; + }; + proxyPort = mkOption { type = types.int; default = 3128; diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 8a0ca33b51f0..c6d4ed6d39de 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -192,6 +192,7 @@ in { # Copy config folder chmod g+s "${dataDir}" cp -r "${cfg.package}/share/config" "${dataDir}/" + mkdir -p "${dataDir}/misc" chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 3aa3f622024f..842ebcc69ec8 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.15"; + version = "1.10.16"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0f6n9rg42ph47mvykc9f0lf99yzwqy4jm7mlzyks4l6i6fl1g3q1"; + sha256 = "sha256-l+hxAUw55d9MYLIUdF6qSEIelJQYRCvHyw1yuossmyA="; }; - vendorSha256 = "1s5yfpk2yn7f3zwjl2fdrh6c63ki2b8rlmnlss27yxibsidaj0yd"; + vendorSha256 = "sha256-keeox2d2WEzY9ynEcovPaU95YzVQlbTu1i7PLpjkjZU="; doCheck = false; diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 6b380e32bc69..894b7a43c013 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "sha256-uh6mXXJP/EpfvHTXL7PH+Yd1F5Q+6B01ns4vRr/2Xqo="; + hash = "sha256-rfk/csJJATXI1JvAHn2K/+fVLsqmkKxIbNWlcu1EhYY="; }; format = "other"; diff --git a/pkgs/misc/emulators/ares/default.nix b/pkgs/applications/emulators/ares/default.nix similarity index 100% rename from pkgs/misc/emulators/ares/default.nix rename to pkgs/applications/emulators/ares/default.nix diff --git a/pkgs/misc/emulators/ares/fix-ruby.patch b/pkgs/applications/emulators/ares/fix-ruby.patch similarity index 100% rename from pkgs/misc/emulators/ares/fix-ruby.patch rename to pkgs/applications/emulators/ares/fix-ruby.patch diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/applications/emulators/atari++/default.nix similarity index 100% rename from pkgs/misc/emulators/atari++/default.nix rename to pkgs/applications/emulators/atari++/default.nix diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix similarity index 100% rename from pkgs/misc/emulators/atari800/default.nix rename to pkgs/applications/emulators/atari800/default.nix diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/applications/emulators/attract-mode/default.nix similarity index 100% rename from pkgs/misc/emulators/attract-mode/default.nix rename to pkgs/applications/emulators/attract-mode/default.nix diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/emulators/bochs/default.nix similarity index 100% rename from pkgs/applications/virtualization/bochs/default.nix rename to pkgs/applications/emulators/bochs/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes-hd/default.nix similarity index 100% rename from pkgs/misc/emulators/bsnes-hd/default.nix rename to pkgs/applications/emulators/bsnes-hd/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch similarity index 100% rename from pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch rename to pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch diff --git a/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch similarity index 100% rename from pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch rename to pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/applications/emulators/caprice32/default.nix similarity index 100% rename from pkgs/misc/emulators/caprice32/default.nix rename to pkgs/applications/emulators/caprice32/default.nix diff --git a/pkgs/misc/emulators/caprice32/string.patch b/pkgs/applications/emulators/caprice32/string.patch similarity index 100% rename from pkgs/misc/emulators/caprice32/string.patch rename to pkgs/applications/emulators/caprice32/string.patch diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix similarity index 100% rename from pkgs/misc/emulators/ccemux/default.nix rename to pkgs/applications/emulators/ccemux/default.nix diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/analyzer.nix rename to pkgs/applications/emulators/cdemu/analyzer.nix diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/applications/emulators/cdemu/base.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/base.nix rename to pkgs/applications/emulators/cdemu/base.nix diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/client.nix rename to pkgs/applications/emulators/cdemu/client.nix diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/daemon.nix rename to pkgs/applications/emulators/cdemu/daemon.nix diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/gui.nix rename to pkgs/applications/emulators/cdemu/gui.nix diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/libmirage.nix rename to pkgs/applications/emulators/cdemu/libmirage.nix diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/vhba.nix rename to pkgs/applications/emulators/cdemu/vhba.nix diff --git a/pkgs/misc/emulators/cen64/default.nix b/pkgs/applications/emulators/cen64/default.nix similarity index 100% rename from pkgs/misc/emulators/cen64/default.nix rename to pkgs/applications/emulators/cen64/default.nix diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix similarity index 100% rename from pkgs/misc/emulators/citra/default.nix rename to pkgs/applications/emulators/citra/default.nix diff --git a/pkgs/misc/emulators/commanderx16/emulator.nix b/pkgs/applications/emulators/commanderx16/emulator.nix similarity index 100% rename from pkgs/misc/emulators/commanderx16/emulator.nix rename to pkgs/applications/emulators/commanderx16/emulator.nix diff --git a/pkgs/misc/emulators/commanderx16/rom.nix b/pkgs/applications/emulators/commanderx16/rom.nix similarity index 100% rename from pkgs/misc/emulators/commanderx16/rom.nix rename to pkgs/applications/emulators/commanderx16/rom.nix diff --git a/pkgs/misc/emulators/commanderx16/run.nix b/pkgs/applications/emulators/commanderx16/run.nix similarity index 100% rename from pkgs/misc/emulators/commanderx16/run.nix rename to pkgs/applications/emulators/commanderx16/run.nix diff --git a/pkgs/misc/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix similarity index 100% rename from pkgs/misc/emulators/craftos-pc/default.nix rename to pkgs/applications/emulators/craftos-pc/default.nix diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/applications/emulators/darcnes/default.nix similarity index 100% rename from pkgs/misc/emulators/darcnes/default.nix rename to pkgs/applications/emulators/darcnes/default.nix diff --git a/pkgs/misc/emulators/darcnes/label.patch b/pkgs/applications/emulators/darcnes/label.patch similarity index 100% rename from pkgs/misc/emulators/darcnes/label.patch rename to pkgs/applications/emulators/darcnes/label.patch diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix similarity index 100% rename from pkgs/misc/emulators/desmume/default.nix rename to pkgs/applications/emulators/desmume/default.nix diff --git a/pkgs/misc/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix similarity index 100% rename from pkgs/misc/emulators/dgen-sdl/default.nix rename to pkgs/applications/emulators/dgen-sdl/default.nix diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/applications/emulators/dlx/default.nix similarity index 100% rename from pkgs/misc/emulators/dlx/default.nix rename to pkgs/applications/emulators/dlx/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix similarity index 100% rename from pkgs/misc/emulators/dolphin-emu/default.nix rename to pkgs/applications/emulators/dolphin-emu/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix similarity index 100% rename from pkgs/misc/emulators/dolphin-emu/master.nix rename to pkgs/applications/emulators/dolphin-emu/master.nix diff --git a/pkgs/misc/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix similarity index 100% rename from pkgs/misc/emulators/dolphin-emu/primehack.nix rename to pkgs/applications/emulators/dolphin-emu/primehack.nix diff --git a/pkgs/misc/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix similarity index 100% rename from pkgs/misc/emulators/dosbox-staging/default.nix rename to pkgs/applications/emulators/dosbox-staging/default.nix diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix similarity index 100% rename from pkgs/misc/emulators/dosbox/default.nix rename to pkgs/applications/emulators/dosbox/default.nix diff --git a/pkgs/misc/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix similarity index 100% rename from pkgs/misc/emulators/duckstation/default.nix rename to pkgs/applications/emulators/duckstation/default.nix diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix similarity index 83% rename from pkgs/applications/virtualization/dynamips/default.nix rename to pkgs/applications/emulators/dynamips/default.nix index 7f3320101530..26ff779ba05a 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libelf, libpcap }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libelf +, libpcap +}: stdenv.mkDerivation rec { pname = "dynamips"; @@ -8,7 +14,7 @@ stdenv.mkDerivation rec { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5"; + hash = "sha256-JQJa3NZ9mQqqvuTzU7XmAr1WRB4zuLIwBx18OY3GbV8="; }; nativeBuildInputs = [ cmake ]; @@ -17,12 +23,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; meta = with lib; { + inherit (src.meta) homepage; description = "A Cisco router emulator"; longDescription = '' Dynamips is an emulator computer program that was written to emulate Cisco routers. ''; - inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/applications/emulators/emu2/default.nix similarity index 100% rename from pkgs/misc/emulators/emu2/default.nix rename to pkgs/applications/emulators/emu2/default.nix diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/applications/emulators/emulationstation/default.nix similarity index 100% rename from pkgs/misc/emulators/emulationstation/default.nix rename to pkgs/applications/emulators/emulationstation/default.nix diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/applications/emulators/epsxe/default.nix similarity index 100% rename from pkgs/misc/emulators/epsxe/default.nix rename to pkgs/applications/emulators/epsxe/default.nix diff --git a/pkgs/misc/emulators/fakenes/build.patch b/pkgs/applications/emulators/fakenes/build.patch similarity index 100% rename from pkgs/misc/emulators/fakenes/build.patch rename to pkgs/applications/emulators/fakenes/build.patch diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/applications/emulators/fakenes/default.nix similarity index 100% rename from pkgs/misc/emulators/fakenes/default.nix rename to pkgs/applications/emulators/fakenes/default.nix diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix similarity index 100% rename from pkgs/misc/emulators/fceux/default.nix rename to pkgs/applications/emulators/fceux/default.nix diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix similarity index 100% rename from pkgs/misc/emulators/firebird-emu/default.nix rename to pkgs/applications/emulators/firebird-emu/default.nix diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/applications/emulators/fs-uae/default.nix similarity index 100% rename from pkgs/misc/emulators/fs-uae/default.nix rename to pkgs/applications/emulators/fs-uae/default.nix diff --git a/pkgs/misc/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix similarity index 100% rename from pkgs/misc/emulators/fs-uae/launcher.nix rename to pkgs/applications/emulators/fs-uae/launcher.nix diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/applications/emulators/fuse-emulator/default.nix similarity index 100% rename from pkgs/misc/emulators/fuse-emulator/default.nix rename to pkgs/applications/emulators/fuse-emulator/default.nix diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix similarity index 100% rename from pkgs/misc/emulators/gens-gs/default.nix rename to pkgs/applications/emulators/gens-gs/default.nix diff --git a/pkgs/misc/emulators/gxemul/0001-fix-attributes.patch b/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch similarity index 100% rename from pkgs/misc/emulators/gxemul/0001-fix-attributes.patch rename to pkgs/applications/emulators/gxemul/0001-fix-attributes.patch diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/applications/emulators/gxemul/default.nix similarity index 100% rename from pkgs/misc/emulators/gxemul/default.nix rename to pkgs/applications/emulators/gxemul/default.nix diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/applications/emulators/hatari/default.nix similarity index 100% rename from pkgs/misc/emulators/hatari/default.nix rename to pkgs/applications/emulators/hatari/default.nix diff --git a/pkgs/applications/virtualization/hercules/default.nix b/pkgs/applications/emulators/hercules/default.nix similarity index 57% rename from pkgs/applications/virtualization/hercules/default.nix rename to pkgs/applications/emulators/hercules/default.nix index f33055baacbc..67506d36b63c 100644 --- a/pkgs/applications/virtualization/hercules/default.nix +++ b/pkgs/applications/emulators/hercules/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "hercules"; @@ -10,8 +13,14 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "IBM mainframe emulator"; homepage = "http://www.hercules-390.eu"; + description = "IBM mainframe emulator"; + longDescription = '' + Hercules is an open source software implementation of the mainframe + System/370 and ESA/390 architectures, in addition to the latest 64-bit + z/Architecture. Hercules runs under Linux, Windows, Solaris, FreeBSD, and + Mac OS X. + ''; license = licenses.qpl; maintainers = [ maintainers.anna328p ]; }; diff --git a/pkgs/misc/emulators/higan/001-include-cmath.patch b/pkgs/applications/emulators/higan/001-include-cmath.patch similarity index 100% rename from pkgs/misc/emulators/higan/001-include-cmath.patch rename to pkgs/applications/emulators/higan/001-include-cmath.patch diff --git a/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch b/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch similarity index 100% rename from pkgs/misc/emulators/higan/002-sips-to-png2icns.patch rename to pkgs/applications/emulators/higan/002-sips-to-png2icns.patch diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/applications/emulators/higan/default.nix similarity index 100% rename from pkgs/misc/emulators/higan/default.nix rename to pkgs/applications/emulators/higan/default.nix diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix similarity index 100% rename from pkgs/misc/emulators/kega-fusion/default.nix rename to pkgs/applications/emulators/kega-fusion/default.nix diff --git a/pkgs/misc/emulators/lambda-delta/default.nix b/pkgs/applications/emulators/lambda-delta/default.nix similarity index 100% rename from pkgs/misc/emulators/lambda-delta/default.nix rename to pkgs/applications/emulators/lambda-delta/default.nix diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/applications/emulators/libdsk/default.nix similarity index 100% rename from pkgs/misc/emulators/libdsk/default.nix rename to pkgs/applications/emulators/libdsk/default.nix diff --git a/pkgs/misc/emulators/maiko/default.nix b/pkgs/applications/emulators/maiko/default.nix similarity index 100% rename from pkgs/misc/emulators/maiko/default.nix rename to pkgs/applications/emulators/maiko/default.nix diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix similarity index 100% rename from pkgs/misc/emulators/mame/default.nix rename to pkgs/applications/emulators/mame/default.nix diff --git a/pkgs/misc/emulators/mame/emuopts.patch b/pkgs/applications/emulators/mame/emuopts.patch similarity index 100% rename from pkgs/misc/emulators/mame/emuopts.patch rename to pkgs/applications/emulators/mame/emuopts.patch diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/applications/emulators/mednafen/default.nix similarity index 100% rename from pkgs/misc/emulators/mednafen/default.nix rename to pkgs/applications/emulators/mednafen/default.nix diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/applications/emulators/mednafen/server.nix similarity index 100% rename from pkgs/misc/emulators/mednafen/server.nix rename to pkgs/applications/emulators/mednafen/server.nix diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/applications/emulators/mednaffe/default.nix similarity index 100% rename from pkgs/misc/emulators/mednaffe/default.nix rename to pkgs/applications/emulators/mednaffe/default.nix diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix similarity index 100% rename from pkgs/misc/emulators/melonDS/default.nix rename to pkgs/applications/emulators/melonDS/default.nix diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix similarity index 100% rename from pkgs/misc/emulators/mgba/default.nix rename to pkgs/applications/emulators/mgba/default.nix diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/applications/emulators/mupen64plus/default.nix similarity index 100% rename from pkgs/misc/emulators/mupen64plus/default.nix rename to pkgs/applications/emulators/mupen64plus/default.nix diff --git a/pkgs/misc/emulators/nestopia/build-fix.patch b/pkgs/applications/emulators/nestopia/build-fix.patch similarity index 100% rename from pkgs/misc/emulators/nestopia/build-fix.patch rename to pkgs/applications/emulators/nestopia/build-fix.patch diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/applications/emulators/nestopia/default.nix similarity index 100% rename from pkgs/misc/emulators/nestopia/default.nix rename to pkgs/applications/emulators/nestopia/default.nix diff --git a/pkgs/misc/emulators/nestopia/gcc6.patch b/pkgs/applications/emulators/nestopia/gcc6.patch similarity index 100% rename from pkgs/misc/emulators/nestopia/gcc6.patch rename to pkgs/applications/emulators/nestopia/gcc6.patch diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/applications/emulators/np2kai/default.nix similarity index 100% rename from pkgs/misc/emulators/np2kai/default.nix rename to pkgs/applications/emulators/np2kai/default.nix diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/applications/emulators/oberon-risc-emu/default.nix similarity index 100% rename from pkgs/misc/emulators/oberon-risc-emu/default.nix rename to pkgs/applications/emulators/oberon-risc-emu/default.nix diff --git a/pkgs/misc/emulators/openmsx/custom-nix.mk b/pkgs/applications/emulators/openmsx/custom-nix.mk similarity index 100% rename from pkgs/misc/emulators/openmsx/custom-nix.mk rename to pkgs/applications/emulators/openmsx/custom-nix.mk diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix similarity index 100% rename from pkgs/misc/emulators/openmsx/default.nix rename to pkgs/applications/emulators/openmsx/default.nix diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix similarity index 100% rename from pkgs/misc/emulators/pcem/default.nix rename to pkgs/applications/emulators/pcem/default.nix diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix similarity index 100% rename from pkgs/misc/emulators/pcsx2/default.nix rename to pkgs/applications/emulators/pcsx2/default.nix diff --git a/pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch b/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch similarity index 100% rename from pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch rename to pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix similarity index 100% rename from pkgs/misc/emulators/pcsxr/default.nix rename to pkgs/applications/emulators/pcsxr/default.nix diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/pkgs/applications/emulators/pcsxr/uncompress2.patch similarity index 100% rename from pkgs/misc/emulators/pcsxr/uncompress2.patch rename to pkgs/applications/emulators/pcsxr/uncompress2.patch diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix similarity index 100% rename from pkgs/misc/emulators/ppsspp/default.nix rename to pkgs/applications/emulators/ppsspp/default.nix diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/applications/emulators/proton-caller/default.nix similarity index 100% rename from pkgs/misc/emulators/proton-caller/default.nix rename to pkgs/applications/emulators/proton-caller/default.nix diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix similarity index 100% rename from pkgs/misc/emulators/punes/default.nix rename to pkgs/applications/emulators/punes/default.nix diff --git a/pkgs/misc/emulators/py65/default.nix b/pkgs/applications/emulators/py65/default.nix similarity index 100% rename from pkgs/misc/emulators/py65/default.nix rename to pkgs/applications/emulators/py65/default.nix diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/applications/emulators/qmc2/default.nix similarity index 100% rename from pkgs/misc/emulators/qmc2/default.nix rename to pkgs/applications/emulators/qmc2/default.nix diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/applications/emulators/reicast/default.nix similarity index 100% rename from pkgs/misc/emulators/reicast/default.nix rename to pkgs/applications/emulators/reicast/default.nix diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/applications/emulators/resim/default.nix similarity index 100% rename from pkgs/misc/emulators/resim/default.nix rename to pkgs/applications/emulators/resim/default.nix diff --git a/pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch b/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch rename to pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch diff --git a/pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch b/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch rename to pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/cores.nix rename to pkgs/applications/emulators/retroarch/cores.nix diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/default.nix rename to pkgs/applications/emulators/retroarch/default.nix diff --git a/pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch b/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch rename to pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch diff --git a/pkgs/misc/emulators/retroarch/fix-config.patch b/pkgs/applications/emulators/retroarch/fix-config.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/fix-config.patch rename to pkgs/applications/emulators/retroarch/fix-config.patch diff --git a/pkgs/misc/emulators/retroarch/fix-libretro-paths.patch b/pkgs/applications/emulators/retroarch/fix-libretro-paths.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/fix-libretro-paths.patch rename to pkgs/applications/emulators/retroarch/fix-libretro-paths.patch diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json similarity index 100% rename from pkgs/misc/emulators/retroarch/hashes.json rename to pkgs/applications/emulators/retroarch/hashes.json diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix rename to pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py similarity index 100% rename from pkgs/misc/emulators/retroarch/update.py rename to pkgs/applications/emulators/retroarch/update.py diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/wrapper.nix rename to pkgs/applications/emulators/retroarch/wrapper.nix diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/applications/emulators/retrofe/default.nix similarity index 100% rename from pkgs/misc/emulators/retrofe/default.nix rename to pkgs/applications/emulators/retrofe/default.nix diff --git a/pkgs/misc/emulators/retrofe/include-paths.patch b/pkgs/applications/emulators/retrofe/include-paths.patch similarity index 100% rename from pkgs/misc/emulators/retrofe/include-paths.patch rename to pkgs/applications/emulators/retrofe/include-paths.patch diff --git a/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch b/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch similarity index 100% rename from pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch rename to pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix similarity index 100% rename from pkgs/misc/emulators/rpcs3/default.nix rename to pkgs/applications/emulators/rpcs3/default.nix diff --git a/pkgs/misc/emulators/rpcs3/update.sh b/pkgs/applications/emulators/rpcs3/update.sh similarity index 100% rename from pkgs/misc/emulators/rpcs3/update.sh rename to pkgs/applications/emulators/rpcs3/update.sh diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix similarity index 100% rename from pkgs/misc/emulators/ruffle/default.nix rename to pkgs/applications/emulators/ruffle/default.nix diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix similarity index 100% rename from pkgs/misc/emulators/ryujinx/default.nix rename to pkgs/applications/emulators/ryujinx/default.nix diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix similarity index 100% rename from pkgs/misc/emulators/ryujinx/deps.nix rename to pkgs/applications/emulators/ryujinx/deps.nix diff --git a/pkgs/misc/emulators/ryujinx/log.patch b/pkgs/applications/emulators/ryujinx/log.patch similarity index 100% rename from pkgs/misc/emulators/ryujinx/log.patch rename to pkgs/applications/emulators/ryujinx/log.patch diff --git a/pkgs/misc/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh similarity index 100% rename from pkgs/misc/emulators/ryujinx/updater.sh rename to pkgs/applications/emulators/ryujinx/updater.sh diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix similarity index 100% rename from pkgs/misc/emulators/sameboy/default.nix rename to pkgs/applications/emulators/sameboy/default.nix diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix similarity index 100% rename from pkgs/misc/emulators/simh/default.nix rename to pkgs/applications/emulators/simh/default.nix diff --git a/pkgs/misc/emulators/simplenes/default.nix b/pkgs/applications/emulators/simplenes/default.nix similarity index 100% rename from pkgs/misc/emulators/simplenes/default.nix rename to pkgs/applications/emulators/simplenes/default.nix diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/applications/emulators/snes9x-gtk/default.nix similarity index 100% rename from pkgs/misc/emulators/snes9x-gtk/default.nix rename to pkgs/applications/emulators/snes9x-gtk/default.nix diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/applications/emulators/stella/default.nix similarity index 100% rename from pkgs/misc/emulators/stella/default.nix rename to pkgs/applications/emulators/stella/default.nix diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/applications/emulators/termtekst/default.nix similarity index 100% rename from pkgs/misc/emulators/termtekst/default.nix rename to pkgs/applications/emulators/termtekst/default.nix diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/applications/emulators/tilem/default.nix similarity index 100% rename from pkgs/misc/emulators/tilem/default.nix rename to pkgs/applications/emulators/tilem/default.nix diff --git a/pkgs/applications/virtualization/tiny8086/default.nix b/pkgs/applications/emulators/tiny8086/default.nix similarity index 83% rename from pkgs/applications/virtualization/tiny8086/default.nix rename to pkgs/applications/emulators/tiny8086/default.nix index 60d69432cde6..a0cc6bd7929b 100644 --- a/pkgs/applications/virtualization/tiny8086/default.nix +++ b/pkgs/applications/emulators/tiny8086/default.nix @@ -24,32 +24,33 @@ stdenv.mkDerivation rec { makeFlags = [ "8086tiny" ]; postBuild = lib.optionalString localBios '' - ( - cd bios_source - nasm -f bin bios.asm -o bios - ) + pushd bios_source + nasm -f bin bios.asm -o bios + popd ''; installPhase = '' - mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images + runHook preInstall + mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images install -m 755 8086tiny $out/bin install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm install -m 644 docs/8086tiny.css $out/share/doc/8086tiny install -m 644 docs/doc.html $out/share/doc/$name - for i in docs/images/\*.gif; do - install -m 644 $i $out/share/doc/8086tiny/images + for image in docs/images/\*.gif; do + install -m 644 $image $out/share/doc/8086tiny/images done - ${if localBios then - "install -m 644 bios_source/bios $out/share/8086tiny/8086tiny-bios" - else - "install -m 644 bios $out/share/8086tiny/8086tiny-bios"} + install -m 644 ${lib.optionalString localBios "bios_source/"}bios \ + $out/share/8086tiny/8086tiny-bios + + runHook postInstall ''; meta = with lib; { + homepage = "https://github.com/adriancable/8086tiny"; description = "An open-source small 8086 emulator"; longDescription = '' 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) @@ -60,7 +61,6 @@ stdenv.mkDerivation rec { 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; - homepage = "https://github.com/adriancable/8086tiny"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/emulators/tinyemu/default.nix b/pkgs/applications/emulators/tinyemu/default.nix new file mode 100644 index 000000000000..c32fd24fe477 --- /dev/null +++ b/pkgs/applications/emulators/tinyemu/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchurl +, SDL +, curl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "tinyemu"; + version = "2019-12-21"; + + src = fetchurl { + url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; + hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU="; + }; + + buildInputs = [ + SDL + curl + openssl + ]; + + makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + meta = with lib; { + homepage = "https://bellard.org/tinyemu/"; + description = "A system emulator for the RISC-V and x86 architectures"; + longDescription = '' + TinyEMU is a system emulator for the RISC-V and x86 architectures. Its + purpose is to be small and simple while being complete. + ''; + license = with licenses; [ mit bsd2 ]; + maintainers = with maintainers; [ jhhuh AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix similarity index 100% rename from pkgs/misc/emulators/uae/default.nix rename to pkgs/applications/emulators/uae/default.nix diff --git a/pkgs/misc/emulators/uxn/default.nix b/pkgs/applications/emulators/uxn/default.nix similarity index 100% rename from pkgs/misc/emulators/uxn/default.nix rename to pkgs/applications/emulators/uxn/default.nix diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix similarity index 100% rename from pkgs/misc/emulators/vbam/default.nix rename to pkgs/applications/emulators/vbam/default.nix diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/applications/emulators/vice/default.nix similarity index 100% rename from pkgs/misc/emulators/vice/default.nix rename to pkgs/applications/emulators/vice/default.nix diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix similarity index 100% rename from pkgs/misc/emulators/wine/base.nix rename to pkgs/applications/emulators/wine/base.nix diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh similarity index 100% rename from pkgs/misc/emulators/wine/builder-wow.sh rename to pkgs/applications/emulators/wine/builder-wow.sh diff --git a/pkgs/misc/emulators/wine/cert-path.patch b/pkgs/applications/emulators/wine/cert-path.patch similarity index 100% rename from pkgs/misc/emulators/wine/cert-path.patch rename to pkgs/applications/emulators/wine/cert-path.patch diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix similarity index 100% rename from pkgs/misc/emulators/wine/default.nix rename to pkgs/applications/emulators/wine/default.nix diff --git a/pkgs/misc/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix similarity index 100% rename from pkgs/misc/emulators/wine/fonts.nix rename to pkgs/applications/emulators/wine/fonts.nix diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix similarity index 100% rename from pkgs/misc/emulators/wine/packages.nix rename to pkgs/applications/emulators/wine/packages.nix diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix similarity index 100% rename from pkgs/misc/emulators/wine/sources.nix rename to pkgs/applications/emulators/wine/sources.nix diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix similarity index 100% rename from pkgs/misc/emulators/wine/staging.nix rename to pkgs/applications/emulators/wine/staging.nix diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/applications/emulators/wine/util.nix similarity index 100% rename from pkgs/misc/emulators/wine/util.nix rename to pkgs/applications/emulators/wine/util.nix diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix similarity index 100% rename from pkgs/misc/emulators/wine/vkd3d.nix rename to pkgs/applications/emulators/wine/vkd3d.nix diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix similarity index 100% rename from pkgs/misc/emulators/wine/winetricks.nix rename to pkgs/applications/emulators/wine/winetricks.nix diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/applications/emulators/xcpc/default.nix similarity index 100% rename from pkgs/misc/emulators/xcpc/default.nix rename to pkgs/applications/emulators/xcpc/default.nix diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch similarity index 100% rename from pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch rename to pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix similarity index 100% rename from pkgs/misc/emulators/yabause/default.nix rename to pkgs/applications/emulators/yabause/default.nix diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch b/pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch similarity index 100% rename from pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch rename to pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch diff --git a/pkgs/misc/emulators/yapesdl/default.nix b/pkgs/applications/emulators/yapesdl/default.nix similarity index 100% rename from pkgs/misc/emulators/yapesdl/default.nix rename to pkgs/applications/emulators/yapesdl/default.nix diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/applications/emulators/yuzu/base.nix similarity index 100% rename from pkgs/misc/emulators/yuzu/base.nix rename to pkgs/applications/emulators/yuzu/base.nix diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix similarity index 100% rename from pkgs/misc/emulators/yuzu/default.nix rename to pkgs/applications/emulators/yuzu/default.nix diff --git a/pkgs/misc/emulators/zesarux/default.nix b/pkgs/applications/emulators/zesarux/default.nix similarity index 100% rename from pkgs/misc/emulators/zesarux/default.nix rename to pkgs/applications/emulators/zesarux/default.nix diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix similarity index 100% rename from pkgs/misc/emulators/zsnes/default.nix rename to pkgs/applications/emulators/zsnes/default.nix diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 74dc55fc5e13..0e61da0041b6 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,31 +1,40 @@ -{ lib, stdenv, fetchFromGitHub -, libX11, libXext, libXi +{ lib, stdenv, fetchFromGitLab +, desktop-file-utils, shared-mime-info +, libiconv +, libX11, libXcursor, libXext, libXi , freetype, fontconfig -, libpng, libjpeg +, libjpeg, libpng, libtiff, libwebp , zlib }: stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.6"; + version = "3.0.4"; - src = fetchFromGitHub { - owner = "Symbian9"; + src = fetchFromGitLab { + owner = "azelpg"; repo = pname; rev = "v${version}"; - sha256 = "0i5g67s4ysnvbaxmi7dhan0hfcfk8an14xykkafl47pqfx33npva"; + hash = "sha256-2gTTF1ti9bO24d75mhwyvJISSgMKdmp+oJVmgzEQHdY="; }; - buildInputs = [ - libX11 libXext libXi - freetype fontconfig - libpng libjpeg - zlib + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + shared-mime-info # for update-mime-info ]; + buildInputs = [ + libX11 libXcursor libXext libXi + freetype fontconfig + libjpeg libpng libtiff libwebp + zlib + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + enableParallelBuilding = true; + meta = with lib; { description = "Full color painting software for illustration drawing"; - homepage = "https://osdn.net/projects/azpainter"; + homepage = "http://azsky2.html.xdomain.jp/soft/azpainter.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix new file mode 100644 index 000000000000..fb8d407ef12f --- /dev/null +++ b/pkgs/applications/misc/plasma-theme-switcher/default.nix @@ -0,0 +1,42 @@ +{ + stdenv, lib, cmake, extra-cmake-modules, fetchFromGitHub, qtbase, kdeFrameworks +}: + +stdenv.mkDerivation rec { + pname = "plasma-theme-switcher"; + version = "0.1"; + dontWrapQtApps = true; + + src = fetchFromGitHub { + owner = "maldoinc"; + repo = "plasma-theme-switcher"; + rev = "v${version}"; + sha256 = "sdcJ6K5QmglJEDIEl4sd8x7DuCPCqMHRxdYbcToM46Q="; + }; + + buildInputs = [ + qtbase + kdeFrameworks.plasma-framework + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp plasma-theme $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/maldoinc/plasma-theme-switcher/"; + description = "A KDE Plasma theme switcher"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ kevink ]; + }; +} diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index bb1b9213fde5..d478655eed1b 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-yl4R/1flm2Lfvyh9PXlJcZ1VtnP8nBQC0i7zs4U+g7g="; + sha256 = "sha256-70fCyxiM4CiNuG4Lqr4Tq0FHak3wDcp8G93EKYj+0kc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1da699bbe987..f6c3dd66ed05 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "98.0.4758.80", - "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", - "sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi", + "version": "98.0.4758.102", + "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", + "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", "deps": { "gn": { "version": "2021-12-07", @@ -12,10 +12,10 @@ } }, "chromedriver": { - "version": "98.0.4758.48", - "sha256_linux": "1nk3vki803b30mc7ww911l68jfxmpp6mddyq02a3f68893qa2mcf", - "sha256_darwin": "09m5vsqfn6qyn3faf2p0dldll6fracjg6z81xzpyp2bh9zp8vk82", - "sha256_darwin_aarch64": "04lnbm9wiaz8dlc4qigxakcwghhjc3wvahvl5j80k8agkbv7fdvi" + "version": "98.0.4758.102", + "sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im", + "sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny", + "sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l" } }, "beta": { @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "98.0.4758.80", - "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", - "sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi", + "version": "98.0.4758.102", + "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", + "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", "deps": { "gn": { "version": "2021-12-07", @@ -56,8 +56,8 @@ "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" }, "ungoogled-patches": { - "rev": "98.0.4758.80-1", - "sha256": "0a8y9yz6xyh025gk3dr0ndrdwmrslhd1ph2f8nivmqk61j7c2g8h" + "rev": "98.0.4758.102-1", + "sha256": "0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0" } } } diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix index 5d056907264d..5e78cc9b72bd 100644 --- a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-doctor"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "emirozer"; repo = pname; rev = version; - sha256 = "0x784jbcwd34vzdnhg2yldh5ivkxvs2qlbsvaammbxkn04ch1ijz"; + sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY="; }; - vendorSha256 = "04xq5kp1m7c98gb4fd0dni258vpfnhv535gl2qllfcp2mvk3mn55"; + vendorSha256 = "sha256-pdg65q7iMkcpFvSVUTa07m5URLQNNEfWQ4mdGu4suBM="; postInstall = '' mv $out/bin/{cmd,kubectl-doctor} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 07302ddc1ef3..3954a143e5b8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -191,9 +191,9 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.5"; - sha256 = "sha256-zIerP8v6ovIx+xwLsSmMFH41l140W9IwQMvomb/pk8E="; - vendorSha256 = "sha256-4ctuErxZIaESfIkS7BXI+eQcdatXE/1p20P9f890twM="; + version = "1.1.6"; + sha256 = "sha256-Y1ARRCzqYBUQqpqwVrH0PPOZ9IWnw51yfyGFD/6P/ro="; + vendorSha256 = "sha256-RhGiY/APd12v0Hoqw381Wlk4oDx7aZt5zZvqkR99rd0="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 30966deb0caf..73506867a32d 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.65"; + version = "1.2.67"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-uQO8zJ3+eAu/F5vmaGCd2qqwK8GRlensqypRlK6CXSk="; + sha256 = "sha256-SCSj+spANhbrdhj204fsvshkDi0fKmt8jbc11UHJARw="; }; - vendorSha256 = "sha256-dRevwdLiSsM2zzNQ913ytXf2XxZOfLWAUiJjk04mY28="; + vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 5da0536b3794..ed6a4bbe0849 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220107"; + version = "20220216"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-sB8/xQgSORtwupcwSejKUhHoz04exdYS0ymefw9wXDQ="; + sha256 = "sha256-hB5zjSBOcpVW+kGja4DP0syAvYqkeDBJbtg0y2sX9w4="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index f98b1c28ebf8..4dd603dae1ea 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.88"; + version = "2.89"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-B/gcuga82lZSLPKjYWAiLyvqf1FRQmHJsH2jqLkusjA="; + sha256 = "sha256-OCfgWMKFhdjdmNHnTUP2VthPxBjAVd9Z+yH/c+vF1a4="; }; - vendorSha256 = "sha256-N7zOrSMrCR/eOH+08TImI1q2AFGUuWN7xIt3CUVB9rM="; + vendorSha256 = "sha256-E6bMpWzXb5dMPXkrVSJJWXJYvkmI3cNRseMgrQNpCl4="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix deleted file mode 100644 index 17cee52a64e0..000000000000 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, curl, SDL }: - -stdenv.mkDerivation rec { - pname = "tinyemu"; - version = "2018-09-23"; - src = fetchurl { - url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; - sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v"; - }; - buildInputs = [ openssl curl SDL ]; - makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; - preInstall = '' - mkdir -p "$out/bin" - ''; - meta = { - homepage = "https://bellard.org/tinyemu/"; - description = "A system emulator for the RISC-V and x86 architectures"; - longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; - license = with lib.licenses; [ mit bsd2 ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jhhuh ]; - }; -} diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index c7bfa49ac719..81c5bed0a542 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.22.0"; + version = "0.23.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-s5gCqQ0gJViS8t/jCAFtNYfmXQ7SBarlRLKUWHHEgSg="; + sha256 = "sha256-OuTd8XhoWU598eMh1/OL2t3LHf+UAumiuAY7KocfI6c="; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 1cb253774d4e..57bf47f3abf1 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; + nativeBuildInputs = [ makeWrapper ]; buildInputs = optional stdenv.isFreeBSD autoreconfHook; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] @@ -38,7 +39,15 @@ stdenv.mkDerivation rec { "--without-freetds" "--without-berkeley-db" "--without-crypto" ] ; - propagatedBuildInputs = [ makeWrapper apr expat libiconv ] + # For some reason, db version 6.9 is selected when cross-compiling. + # It's unclear as to why, it requires someone with more autotools / configure knowledge to go deeper into that. + # Always replacing the link flag with a generic link flag seems to help though, so let's do that for now. + postConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace Makefile \ + --replace "-ldb-6.9" "-ldb" + ''; + + propagatedBuildInputs = [ apr expat libiconv ] ++ optional sslSupport openssl ++ optional bdbSupport db ++ optional ldapSupport openldap diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index e575173d7257..0e17e13e5818 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -272,7 +272,6 @@ stdenv.mkDerivation rec { "-Ddirectfb=disabled" "-Dflite=disabled" "-Dkms=disabled" # renders to libdrm output - "-Dofa=disabled" "-Dlv2=disabled" "-Dsbc=disabled" "-Dspandsp=disabled" diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 40ae88bf71bb..bbc4189fff84 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -5,6 +5,7 @@ , python3 , enableModTool ? true , removeReferencesTo +, fetchpatch }: stdenv.mkDerivation rec { @@ -19,6 +20,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; + sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; + extraPrefix = ""; + }) + ]; + cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; postInstall = lib.optionalString (!stdenv.isDarwin) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 342ca1665c77..f9ee74dcc505 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.1.2"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-V+de9tcZBLaUVpyFLKDH9jv8Nq+UuauxnurGHbGW8xY="; + hash = "sha256-/NcCo4Jvq1JeXD1UTrzNpPNDNmEt7GOrbCl79V00+eM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 91dabf40e93d..e82aa3a2e8ef 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.5.8"; + version = "0.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8VDneIfZ2o96fOdSRxDbbGg6rEsqdNTyfT7amnEYvBI="; + sha256 = "sha256-MBnO6k1nHKvLImLqGFiikIC03ThylwXb7Xehy5HjS0s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix index e9a8ae0323d0..1a8d561d5de2 100644 --- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -3,17 +3,21 @@ , buildPythonPackage , fetchFromGitHub , requests +, pythonOlder }: buildPythonPackage rec { pname = "yalesmartalarmclient"; - version = "0.3.7"; + version = "0.3.8"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "domwillcode"; repo = "yale-smart-alarm-client"; rev = "v${version}"; - sha256 = "sha256-LcHXw4rZhQ942EhiGrRTf3MpT7G5OFSX8QbpxVjvTTo="; + sha256 = "sha256-CWL1uvmUGLaa2Ho0Ka4wTWstebhe1nQr9R821mweE60="; }; propagatedBuildInputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "yalesmartalarmclient" ]; + pythonImportsCheck = [ + "yalesmartalarmclient" + ]; meta = with lib; { description = "Python module to interface with Yale Smart Alarm Systems"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 6c9ff9f8789f..335974f012ee 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.845"; + version = "2.0.853"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-vF09H2fnMYWxUnadOCfLfAdcWNSVASLvHYLJIhD+Y/4="; + hash = "sha256-qD6P3ppxckqiCB6wiypdVQtY+b3PN3dhuAQP5REDq3U="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 715c237f494b..f0e125245efa 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.13"; + version = "3.14.14"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-apX4MFzeR7+5gWauw5HXPK0c7N4uTSqkE2vqnYB5LJs="; + sha256 = "sha256-1ie/pkg0pv8bJphQ8PXceRd2WALYaVxBAW1O/s4kKHA="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-4Ak+mh9ege38iO1QyxvGkYvRyU11QjphfLrit1qfu58="; + vendorSha256 = "sha256-vWqj2fRtaDextDstIb5GrdRn4nxQpCfjegYiVbPILuM="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix index 25ab4ceab5f5..ed1b80787c4e 100644 --- a/pkgs/development/tools/mask/default.nix +++ b/pkgs/development/tools/mask/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "jakedeichert"; repo = pname; rev = "v${version}"; - sha256 = "0gsfs837nzh71df6p6klcsgxp471c8hq14xqd62q5bsv7jg9dygc"; + sha256 = "sha256-qRN9M/DxkxcF1/dmYqmf3qB8yHzuaN3LRENy1ehgg0c="; }; - cargoSha256 = "1h4sasqdl3rli0v6lizdci0vvr2fvbyhllddxwv8vx8r7w9ry963"; + cargoSha256 = "sha256-7ts63n9aGtaK8INBh11TShOQCVpV+82VADmNbKURv+g="; # tests require mask to be installed doCheck = false; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 5ec2ff7ac459..213a8da8ce02 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-SXwIwBlajzcXJaB90aesPk6BTRUNLRXtx4FPuM7pcyU="; + sha256 = "sha256-L3dHkF7yKnwXpXxCEswwA0TxVfjTzc89l0rpT7EYpIU="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 72a2f8a71bcf..4fb114829445 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -11686,6 +11686,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + winshift-nvim = buildVimPluginFrom2Nix { + pname = "winshift.vim"; + version = "2021-11-15"; + src = fetchFromGitHub { + owner = "sindrets"; + repo = "winshift.vim"; + rev = "aaa04b97640165eb0877bfc04943f4282887470b"; + sha256 = "g5v/qd1FNg7mMZif7Liga3BAnZV7Mi7hkqnCUEFk52U="; + }; + meta.homepage = "https://github.com/sindrets/winshift.nvim"; + }; + wmgraphviz-vim = buildVimPluginFrom2Nix { pname = "wmgraphviz.vim"; version = "2018-04-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 547c59ee2cb4..5e54d5577cbe 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -756,6 +756,7 @@ simnalamburt/vim-mundo simrat39/rust-tools.nvim simrat39/symbols-outline.nvim sindrets/diffview.nvim +sindrets/winshift.nvim SirVer/ultisnips sjl/gundo.vim sjl/splice.vim diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1162f38d2bc6..bdf0ed345bba 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.2.7"; + version = "2022.2.8"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2c5a8e1875b8..7116aedcdf46 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -138,7 +138,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.2.7"; + hassVersion = "2022.2.8"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -156,7 +156,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-jLam1FDN20/+o1Rq/GNd9VOVXJl8cCDoUxKCLY/ezpQ="; + hash = "sha256-BzBlAKI1u8DqsfmivCVaK3fhYzgEmqlVkRMI17VRu0w="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 226294e5f425..695480a05c96 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -1,21 +1,23 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -with lib; - -buildGoPackage rec { +buildGoModule rec { pname = "nats-server"; - version = "2.7.0"; - - goPackagePath = "github.com/nats-io/${pname}"; + version = "2.7.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao="; + sha256 = "0w4hjz1x6zwcxhnd1y3874agyn8nsdra4fky6kc2rrfikjcw003y"; }; - meta = { + vendorSha256 = "1gvvjwx1g8mhcqi3ssb3k5ylkz0afpmnf6h2zfny9rc4dk2cp2dy"; + + doCheck = false; + + passthru.tests.nats = nixosTests.nats; + + meta = with lib; { description = "High-Performance server for NATS"; license = licenses.asl20; maintainers = with maintainers; [ swdunlop derekcollison ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a530a58e9000..735bfdeafb18 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,18 +46,18 @@ in { ''; nextcloud21 = generic { - version = "21.0.8"; - sha256 = "00c37wp6fsnpm40bbhk6r6xycacfa5zk7arzc3i4xmhm89cyvm6z"; + version = "21.0.9"; + sha256 = "sha256-p6bvgTXmmjGN3TRQpG88f3YPksh0QzWG9j9KnEjcrqE="; }; nextcloud22 = generic { - version = "22.2.4"; - sha256 = "0vnf2j1hz0d7lxby73r2mq2rjm72nq55xajzm8sipj6wlbys15zl"; + version = "22.2.5"; + sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8="; }; nextcloud23 = generic { - version = "23.0.1"; - sha256 = "047pnkp49rf0a9gl03dwkkdgzmdsf88m79mzq04bwmgkb3a3qxay"; + version = "23.0.2"; + sha256 = "sha256-ngJGLTjqq2RX/KgHe9Rv54w6qtRC6RpuEuMvp9UbxO4="; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/nosql/eventstore/create-deps.sh b/pkgs/servers/nosql/eventstore/create-deps.sh index 8001fea4d26f..afeee592de3d 100755 --- a/pkgs/servers/nosql/eventstore/create-deps.sh +++ b/pkgs/servers/nosql/eventstore/create-deps.sh @@ -8,7 +8,7 @@ set -euo pipefail # this script is inspired: # - pkgs/servers/nosql/eventstore/create-deps.sh # - pkgs/development/dotnet-modules/python-language-server/create_deps.sh -# - pkgs/misc/emulators/ryujinx/updater.sh +# - pkgs/applications/emulators/ryujinx/updater.sh cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fb07bc39154d..1b8b1eb1108f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -10,6 +10,7 @@ , bzip2, lz4, lzo, snappy, xz, zlib, zstd , cracklib, judy, libevent, libxml2 , linux-pam, numactl, pmdk +, fmt_8 , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: @@ -173,7 +174,8 @@ in stdenv.mkDerivation (common // { ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv - ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]; + ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] + ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; patches = common.patches; @@ -235,17 +237,27 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.22"; - sha256 = "000ca1hdnj2jg051cjgdd2ralgwgh2p8nwb1x6b85202xdpc7ga4"; + version = "10.4.24"; + sha256 = "0ipqilri8isn0mfvwg8imwf36zm3jsw0wf2yx905c2bznd8mb5zy"; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.13"; - sha256 = "0n0w1pyypv6wsknaqyykj3lc9zv6smji4q5jcf90w4rid330iw0n"; + version = "10.5.15"; + sha256 = "0nfvyxb157qsbl0d1i5gfzr2hb1nm0iv58f7qcbk5kkhz0vyv049"; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.5"; - sha256 = "13qaqb2h6kysfdi3h1l9zbb2qlpjgxb1n8mxnj5jm96r50209gp0"; + version = "10.6.7"; + sha256 = "1idjnkjfkjvyr6r899xbiwq9wwbs84cm85mbc725yxjshqghzvkm"; + }; + mariadb_107 = mariadbPackage { + # Supported until 2023-02 + version = "10.7.3"; + sha256 = "1m2wa67vvdm61ap8spl18b9vqkmsnq4rfd0248l17jf9zwcnja6s"; + }; + mariadb_108 = mariadbPackage { + # Supported until 2023-05 + version = "10.8.2"; + sha256 = "0v4mms3mihylnqlc0ifvwzykah6lkdd39lmxbv5vnhbsh7wggq0l"; }; } diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 5a79dcd7d2cd..d124664dd7b5 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.10"; + version = "26.4.11"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "sha256-v3fKadoHCAKHZGPjuh/uLnmAaaPESrax73GEI/mH39g="; + sha256 = "sha256-zAS/YCUNSgkjehUXJpa+FyPC6zHnx3Nmlx0m7hbuZo0="; fetchSubmodules = true; }; diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch new file mode 100644 index 000000000000..c8840db42e7b --- /dev/null +++ b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch @@ -0,0 +1,10 @@ +--- a/plugins/GeoIp2/config/config.php ++++ b/plugins/GeoIp2/config/config.php +@@ -1,5 +1,5 @@ + DI\string('{path.root}/misc/'), ++ 'path.geoip2' => PIWIK_USER_PATH . '/misc/', + ]; +\ Pas de fin de ligne à la fin du fichier diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index ad8dc85f70fa..aa371223cf0c 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -32,14 +32,19 @@ let nativeBuildInputs = [ makeWrapper ]; - # make-localhost-default-database-server.patch: - # This changes the default value of the database server field - # from 127.0.0.1 to localhost. - # unix socket authentication only works with localhost, - # but password-based SQL authentication works with both. - # TODO: is upstream interested in this? - # -> discussion at https://github.com/matomo-org/matomo/issues/12646 - patches = [ ./make-localhost-default-database-host.patch ]; + patches = [ + # This changes the default value of the database server field + # from 127.0.0.1 to localhost. + # unix socket authentication only works with localhost, + # but password-based SQL authentication works with both. + # TODO: is upstream interested in this? + # -> discussion at https://github.com/matomo-org/matomo/issues/12646 + ./make-localhost-default-database-host.patch + + # This changes the default config for path.geoip2 so that it doesn't point + # to the nix store. + ./change-path-geoip2.patch + ]; # this bootstrap.php adds support for getting PIWIK_USER_PATH # from an environment variable. Point it to a mutable location @@ -73,6 +78,7 @@ let "misc/composer/build-xhprof.sh" "misc/composer/clean-xhprof.sh" "misc/cron/archive.sh" + "plugins/GeoIp2/config/config.php" "plugins/Installation/FormDatabaseSetup.php" "vendor/pear/archive_tar/sync-php4" "vendor/szymach/c-pchart/coverage.sh" diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 0f3dd4e24f60..412995b710f6 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -10,15 +10,15 @@ let in buildGoModule rec { pname = "datadog-agent"; - version = "7.33.0"; + version = "7.33.1"; src = fetchFromGitHub { inherit owner repo; rev = version; - sha256 = "sha256-8QwXJrhuONdmM0oneGip4BhYkfuaNoYQn+MjlIpCk98="; + sha256 = "sha256-H8apgLdm90/gVsqcCSc3gymgUUP2AWcNPgV9394UUeQ="; }; - vendorSha256 = "sha256-3caBX+Z1SbX0u5yfh/218HH2jEvKV1IM6fd3HkYHTGk="; + vendorSha256 = "sha256-qIm9ZIQTNmKUtTMBsGzH0t4MrIAvksea9t7p5cC6ykk="; subPackages = [ "cmd/agent" diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index b88275731b36..0c791bbf80fb 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-Sh+nAeFd163nr8h3jBJbfDiMt+8+6bi/B1OOVVGMTXo="; + sha256 = "sha256-KWLZdFpRwtdP17x71IU2MGFwd1SNnTRcgTUoW1p5Px4="; }; - cargoSha256 = "sha256-QPp/vO4ZBvxbBtXbvU1ZRLPXOmzMCaJ1/mtuTpL6UYw="; + cargoSha256 = "sha256-CTaEWANx3s7YCm8pqGWuvGqR362YtVjmbnc9V3kC8pI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 8a797e8ab13c..79f829ffdfb1 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -16,14 +16,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.33.0"; + version = "1.33.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-/1rLcfWbrg8gq5AnoSD5cBusc0WGJBc+i/sLyLwM/eY="; + sha256 = "sha256-4rx8EHtOSd/lHcSHZCtiXkjJjL7B175cVGvFOZ9Bzi8="; fetchSubmodules = true; }; diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index c0b9c43436f5..41ddcfac50a4 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "0.3.12"; + version = "1.0.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1j3u9r5TjdewAyzuCwCkXl/A2yI9L/AS5QGRpz30N7U="; + sha256 = "sha256-tllwFUC+Si3PsYPmiO86D3PNdInuIxxhZW5dAuU4K14="; }; - cargoSha256 = "sha256-Z+LnWXvVfZa8Mtr9LrieqCBGxaQE1vj1joSttYM5Xhs="; + cargoSha256 = "sha256-j9CwldmxjWYVuiWfAHIV0kr5k/p1BFWHzZiVrv8m7uI="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6ef604a9691..0176033cf62a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -255,11 +255,11 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - cen64 = callPackage ../misc/emulators/cen64 { }; + cen64 = callPackage ../applications/emulators/cen64 { }; btdu = callPackage ../tools/misc/btdu { }; - uxn = callPackage ../misc/emulators/uxn { }; + uxn = callPackage ../applications/emulators/uxn { }; cereal = callPackage ../development/libraries/cereal { }; @@ -377,7 +377,7 @@ with pkgs; protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; - proton-caller = callPackage ../misc/emulators/proton-caller { }; + proton-caller = callPackage ../applications/emulators/proton-caller { }; ptags = callPackage ../development/tools/misc/ptags { }; @@ -2313,7 +2313,7 @@ with pkgs; boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/virtualization/bochs { + bochs = callPackage ../applications/emulators/bochs { wxGTK = wxGTK30; }; @@ -2369,9 +2369,9 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - py65 = python3Packages.callPackage ../misc/emulators/py65 { }; + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - simh = callPackage ../misc/emulators/simh { }; + simh = callPackage ../applications/emulators/simh { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -2496,19 +2496,19 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; - cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; + cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; - craftos-pc = callPackage ../misc/emulators/craftos-pc { }; + craftos-pc = callPackage ../applications/emulators/craftos-pc { }; - gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; - image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; cbor-diag = callPackage ../development/tools/cbor-diag { }; @@ -2876,9 +2876,9 @@ with pkgs; djv = callPackage ../applications/graphics/djv { }; - dlx = callPackage ../misc/emulators/dlx { }; + dlx = callPackage ../applications/emulators/dlx { }; - dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; + dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; @@ -3673,7 +3673,7 @@ with pkgs; ropgadget = with python3Packages; toPythonApplication ropgadget; - ryujinx = callPackage ../misc/emulators/ryujinx { }; + ryujinx = callPackage ../applications/emulators/ryujinx { }; scour = with python3Packages; toPythonApplication scour; @@ -3695,7 +3695,7 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - simplenes = callPackage ../misc/emulators/simplenes { }; + simplenes = callPackage ../applications/emulators/simplenes { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -4161,7 +4161,7 @@ with pkgs; citrix_workspace_21_12_0 ; - citra = libsForQt5.callPackage ../misc/emulators/citra { }; + citra = libsForQt5.callPackage ../applications/emulators/citra { }; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -4789,11 +4789,11 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphin-emu = callPackage ../misc/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { + dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; + dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; - dolphin-emu-primehack = qt5.callPackage ../misc/emulators/dolphin-emu/primehack.nix { + dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -5171,7 +5171,7 @@ with pkgs; epstool = callPackage ../tools/graphics/epstool { }; - epsxe = callPackage ../misc/emulators/epsxe { }; + epsxe = callPackage ../applications/emulators/epsxe { }; escrotum = callPackage ../tools/graphics/escrotum { }; @@ -5391,7 +5391,7 @@ with pkgs; fio = callPackage ../tools/system/fio { }; - firebird-emu = libsForQt5.callPackage ../misc/emulators/firebird-emu { }; + firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; flamerobin = callPackage ../applications/misc/flamerobin { }; @@ -7363,7 +7363,7 @@ with pkgs; nodejs = nodejs-14_x; }; - np2kai = callPackage ../misc/emulators/np2kai { }; + np2kai = callPackage ../applications/emulators/np2kai { }; openipmi = callPackage ../tools/system/openipmi { }; @@ -7794,11 +7794,11 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../misc/emulators/mednafen { }; + mednafen = callPackage ../applications/emulators/mednafen { }; - mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; + mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe { }; + mednaffe = callPackage ../applications/emulators/mednaffe { }; megacli = callPackage ../tools/misc/megacli { }; @@ -7814,7 +7814,7 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; microdnf = callPackage ../tools/package-management/microdnf { }; @@ -8034,7 +8034,7 @@ with pkgs; nerdfonts = callPackage ../data/fonts/nerdfonts { }; - nestopia = callPackage ../misc/emulators/nestopia { }; + nestopia = callPackage ../applications/emulators/nestopia { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -9274,7 +9274,7 @@ with pkgs; repseek = callPackage ../applications/science/biology/repseek { }; - reicast = callPackage ../misc/emulators/reicast { }; + reicast = callPackage ../applications/emulators/reicast { }; reredirect = callPackage ../tools/misc/reredirect { }; @@ -9460,7 +9460,7 @@ with pkgs; rubocop = rubyPackages.rubocop; - ruffle = callPackage ../misc/emulators/ruffle { }; + ruffle = callPackage ../applications/emulators/ruffle { }; runningx = callPackage ../tools/X11/runningx { }; @@ -10312,7 +10312,7 @@ with pkgs; tiledb = callPackage ../development/libraries/tiledb { }; - tilem = callPackage ../misc/emulators/tilem { }; + tilem = callPackage ../applications/emulators/tilem { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -10336,9 +10336,9 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; + tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyemu = callPackage ../applications/emulators/tinyemu { }; tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; @@ -14094,7 +14094,7 @@ with pkgs; mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; - resim = callPackage ../misc/emulators/resim {}; + resim = callPackage ../applications/emulators/resim {}; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; @@ -15898,11 +15898,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - aprutil = callPackage ../development/libraries/apr-util { - db = if stdenv.isFreeBSD then db4 else db; - # XXX: only the db_185 interface was available through - # apr with db58 on freebsd (nov 2015), for unknown reasons - }; + aprutil = callPackage ../development/libraries/apr-util { }; aravis = callPackage ../development/libraries/aravis { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; @@ -16383,7 +16379,7 @@ with pkgs; duckdb = callPackage ../development/libraries/duckdb {}; - duckstation = libsForQt5.callPackage ../misc/emulators/duckstation {}; + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; @@ -18335,7 +18331,7 @@ with pkgs; hdf5 = hdf5_1_10; }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; libmkv = callPackage ../development/libraries/libmkv { }; @@ -21536,6 +21532,8 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 + mariadb_107 + mariadb_108 ; mariadb = mariadb_106; @@ -24057,7 +24055,7 @@ with pkgs; poppler_data = callPackage ../data/misc/poppler-data { }; - qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../applications/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -24164,7 +24162,7 @@ with pkgs; fonts = [ "Terminus" ]; }; - termtekst = callPackage ../misc/emulators/termtekst { }; + termtekst = callPackage ../applications/emulators/termtekst { }; tex-gyre = callPackages ../data/fonts/tex-gyre { }; @@ -25131,7 +25129,7 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - dynamips = callPackage ../applications/virtualization/dynamips { }; + dynamips = callPackage ../applications/emulators/dynamips { }; exploitdb = callPackage ../tools/security/exploitdb { }; @@ -26175,7 +26173,7 @@ with pkgs; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; - hercules = callPackage ../applications/virtualization/hercules { }; + hercules = callPackage ../applications/emulators/hercules { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -26715,7 +26713,7 @@ with pkgs; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; + kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; kepubify = callPackage ../tools/misc/kepubify { }; @@ -26887,7 +26885,7 @@ with pkgs; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; - lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lambda-delta = callPackage ../applications/emulators/lambda-delta { }; lame = callPackage ../development/libraries/lame { }; @@ -27020,7 +27018,7 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; - libdsk = callPackage ../misc/emulators/libdsk { }; + libdsk = callPackage ../applications/emulators/libdsk { }; liblinphone = callPackage ../development/libraries/liblinphone { }; @@ -27205,7 +27203,7 @@ with pkgs; melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; - melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { }; + melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; @@ -27851,7 +27849,7 @@ with pkgs; obconf = callPackage ../tools/X11/obconf { }; - oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; + oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {}; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); @@ -28002,9 +28000,9 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - pcsxr = callPackage ../misc/emulators/pcsxr { }; + pcsxr = callPackage ../applications/emulators/pcsxr { }; - pcsx2 = callPackage ../misc/emulators/pcsx2 { + pcsx2 = callPackage ../applications/emulators/pcsx2 { wxGTK = wxGTK30-gtk3; }; @@ -28534,7 +28532,7 @@ with pkgs; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -28575,7 +28573,7 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; - sameboy = callPackage ../misc/emulators/sameboy { }; + sameboy = callPackage ../applications/emulators/sameboy { }; sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; @@ -28705,7 +28703,7 @@ with pkgs; curses = ncurses; }; - stella = callPackage ../misc/emulators/stella { }; + stella = callPackage ../applications/emulators/stella { }; linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; @@ -29823,7 +29821,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = - callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { }; + callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; xca = libsForQt5.callPackage ../applications/misc/xca { }; @@ -31662,6 +31660,8 @@ with pkgs; plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; + plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {}; + plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { }; inherit (callPackages ../applications/misc/redshift { @@ -32269,7 +32269,7 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - caprice32 = callPackage ../misc/emulators/caprice32 { }; + caprice32 = callPackage ../applications/emulators/caprice32 { }; cubicle = callPackage ../applications/science/logic/cubicle { ocamlPackages = ocaml-ng.ocamlPackages_4_05; @@ -32782,11 +32782,11 @@ with pkgs; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - ares = callPackage ../misc/emulators/ares { }; + ares = callPackage ../applications/emulators/ares { }; - atari800 = callPackage ../misc/emulators/atari800 { }; + atari800 = callPackage ../applications/emulators/atari800 { }; - ataripp = callPackage ../misc/emulators/atari++ { }; + ataripp = callPackage ../applications/emulators/atari++ { }; atlantis = callPackage ../applications/networking/cluster/atlantis { }; @@ -32800,7 +32800,7 @@ with pkgs; swt = swt_jdk8; }; - attract-mode = callPackage ../misc/emulators/attract-mode { }; + attract-mode = callPackage ../applications/emulators/attract-mode { }; autotiling = python3Packages.callPackage ../misc/autotiling { }; @@ -32822,7 +32822,7 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; - ccemux = callPackage ../misc/emulators/ccemux { }; + ccemux = callPackage ../applications/emulators/ccemux { }; click = callPackage ../applications/networking/cluster/click { }; @@ -32900,13 +32900,13 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darcnes = callPackage ../misc/emulators/darcnes { }; + darcnes = callPackage ../applications/emulators/darcnes { }; darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../misc/emulators/desmume { }; + desmume = callPackage ../applications/emulators/desmume { }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -32922,11 +32922,11 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; - dosbox = callPackage ../misc/emulators/dosbox { }; + dosbox = callPackage ../applications/emulators/dosbox { }; - dosbox-staging = callPackage ../misc/emulators/dosbox-staging { }; + dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - emu2 = callPackage ../misc/emulators/emu2 { }; + emu2 = callPackage ../applications/emulators/emu2 { }; apt = callPackage ../tools/package-management/apt { }; @@ -32938,7 +32938,7 @@ with pkgs; ecdsatool = callPackage ../tools/security/ecdsatool { }; - emulationstation = callPackage ../misc/emulators/emulationstation { }; + emulationstation = callPackage ../applications/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -32948,7 +32948,7 @@ with pkgs; glee = callPackage ../tools/graphics/glee { }; - fakenes = callPackage ../misc/emulators/fakenes { }; + fakenes = callPackage ../applications/emulators/fakenes { }; faust = res.faust2; @@ -32982,7 +32982,7 @@ with pkgs; faustStk = callPackage ../applications/audio/faustStk { }; - fceux = libsForQt5.callPackage ../misc/emulators/fceux { }; + fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; @@ -32998,7 +32998,7 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; + fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; @@ -33007,7 +33007,7 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; + gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { }; @@ -33033,9 +33033,9 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gxemul = callPackage ../misc/emulators/gxemul { }; + gxemul = callPackage ../applications/emulators/gxemul { }; - hatari = callPackage ../misc/emulators/hatari { }; + hatari = callPackage ../applications/emulators/hatari { }; hck = callPackage ../tools/text/hck { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -33146,7 +33146,7 @@ with pkgs; loop = callPackage ../tools/misc/loop { }; - maiko = callPackage ../misc/emulators/maiko { inherit (xorg) libX11; }; + maiko = callPackage ../applications/emulators/maiko { inherit (xorg) libX11; }; mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; @@ -33154,7 +33154,7 @@ with pkgs; mamba = callPackage ../applications/audio/mamba { }; - mame = libsForQt514.callPackage ../misc/emulators/mame { + mame = libsForQt514.callPackage ../applications/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -33174,7 +33174,7 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + mupen64plus = callPackage ../applications/emulators/mupen64plus { }; muse = libsForQt5.callPackage ../applications/audio/muse { }; @@ -33511,7 +33511,7 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pcem = callPackage ../misc/emulators/pcem { }; + pcem = callPackage ../applications/emulators/pcem { }; pgmanage = callPackage ../applications/misc/pgmanage { }; @@ -33541,13 +33541,13 @@ with pkgs; pounce = callPackage ../servers/pounce { }; - ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; + ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; protocol = python3Packages.callPackage ../applications/networking/protocol { }; - punes = libsForQt5.callPackage ../misc/emulators/punes { }; + punes = libsForQt5.callPackage ../applications/emulators/punes { }; pykms = callPackage ../tools/networking/pykms { }; @@ -33557,11 +33557,11 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; - uae = callPackage ../misc/emulators/uae { }; + uae = callPackage ../applications/emulators/uae { }; - fsuae = callPackage ../misc/emulators/fs-uae { }; + fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { }; + fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; @@ -33587,12 +33587,12 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; - retroarchBare = callPackage ../misc/emulators/retroarch { + retroarchBare = callPackage ../applications/emulators/retroarch { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; }; - wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { + wrapRetroArch = { retroarch }: callPackage ../applications/emulators/retroarch/wrapper.nix { inherit retroarch; }; @@ -33605,11 +33605,11 @@ with pkgs; (builtins.attrValues libretro); }; - libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { + libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { retroarch = retroarchBare; }); - retrofe = callPackage ../misc/emulators/retrofe { }; + retrofe = callPackage ../applications/emulators/retrofe { }; rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; @@ -33918,11 +33918,11 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { }; + vbam = callPackage ../applications/emulators/vbam { }; vgmstream = callPackage ../applications/audio/vgmstream { }; - vice = callPackage ../misc/emulators/vice { }; + vice = callPackage ../applications/emulators/vice { }; viddy = callPackage ../tools/misc/viddy { }; @@ -34022,7 +34022,7 @@ with pkgs; wineRelease = "wayland"; }); - winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { inherit (gnome) zenity; }; @@ -34112,7 +34112,7 @@ with pkgs; yabai = callPackage ../os-specific/darwin/yabai { }; - yabause = libsForQt5.callPackage ../misc/emulators/yabause { + yabause = libsForQt5.callPackage ../applications/emulators/yabause { freeglut = null; openal = null; }; @@ -34135,11 +34135,11 @@ with pkgs; yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu-mainline = import ../misc/emulators/yuzu { + yuzu-mainline = import ../applications/emulators/yuzu { branch = "mainline"; inherit libsForQt5 fetchFromGitHub; }; - yuzu-ea = import ../misc/emulators/yuzu { + yuzu-ea = import ../applications/emulators/yuzu { branch = "early-access"; inherit libsForQt5 fetchFromGitHub; }; @@ -34162,34 +34162,34 @@ with pkgs; zoneminder = callPackage ../servers/zoneminder { }; - zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; + zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; xcp = callPackage ../tools/misc/xcp { }; - xcpc = callPackage ../misc/emulators/xcpc { }; + xcpc = callPackage ../applications/emulators/xcpc { }; zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; - openmsx = callPackage ../misc/emulators/openmsx { + openmsx = callPackage ../applications/emulators/openmsx { python = python3; }; - higan = callPackage ../misc/emulators/higan { }; + higan = callPackage ../applications/emulators/higan { }; - bsnes-hd = callPackage ../misc/emulators/bsnes-hd { + bsnes-hd = callPackage ../applications/emulators/bsnes-hd { inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }; - yapesdl = callPackage ../misc/emulators/yapesdl { }; + yapesdl = callPackage ../applications/emulators/yapesdl { }; - x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../misc/emulators/commanderx16/rom.nix { }; - x16-run = (callPackage ../misc/emulators/commanderx16/run.nix { }) { + x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; + x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; + x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { emulator = x16-emulator; rom = x16-rom; }; @@ -34549,7 +34549,7 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; - zesarux = callPackage ../misc/emulators/zesarux { }; + zesarux = callPackage ../applications/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3e38ce116a45..65a81e82a096 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -438,7 +438,7 @@ in { veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; - vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + vhba = callPackage ../applications/emulators/cdemu/vhba.nix { }; virtualbox = callPackage ../os-specific/linux/virtualbox { virtualbox = pkgs.virtualboxHardened; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 4f993bdf082c..62a2278bd4f1 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,8 +1,8 @@ { stdenv, config, callPackage, wineBuild }: rec { - fonts = callPackage ../misc/emulators/wine/fonts.nix {}; - minimal = callPackage ../misc/emulators/wine { + fonts = callPackage ../applications/emulators/wine/fonts.nix {}; + minimal = callPackage ../applications/emulators/wine { wineRelease = config.wine.release or "stable"; inherit wineBuild; };