···703703 <literal>skip-kernel-setup true</literal> and takes care of setting forwarding and rp_filter sysctls by itself as well
704704 as for each interface in <varname>services.babeld.interfaces</varname>.
705705 </para>
706706+ </listitem>
707707+ <listitem>
708708+ <para>
709709+ The <option>services.zigbee2mqtt.config</option> option has been renamed to <option>services.zigbee2mqtt.settings</option> and
710710+ now follows <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC 0042</link>.
711711+ </para>
706712 </listitem>
707713 </itemizedlist>
708714 </section>
···3535 ''
3636 #! ${pkgs.runtimeShell} -e
37373838+ # Exit early if we're asked to shut down.
3939+ trap "exit 0" SIGRTMIN+3
4040+3841 # Initialise the container side of the veth pair.
3942 if [ -n "$HOST_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] ||
4043 [ -n "$LOCAL_ADDRESS" ] || [ -n "$LOCAL_ADDRESS6" ] ||
···60636164 ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
62656363- # Start the regular stage 1 script.
6464- exec "$1"
6666+ # Start the regular stage 2 script.
6767+ # We source instead of exec to not lose an early stop signal, which is
6868+ # also the only _reliable_ shutdown signal we have since early stop
6969+ # does not execute ExecStop* commands.
7070+ set +e
7171+ . "$1"
6572 ''
6673 );
6774···127134 ''}
128135129136 # Run systemd-nspawn without startup notification (we'll
130130- # wait for the container systemd to signal readiness).
137137+ # wait for the container systemd to signal readiness)
138138+ # Kill signal handling means systemd-nspawn will pass a system-halt signal
139139+ # to the container systemd when it receives SIGTERM for container shutdown;
140140+ # containerInit and stage2 have to handle this as well.
131141 exec ${config.systemd.package}/bin/systemd-nspawn \
132142 --keep-unit \
133143 -M "$INSTANCE" -D "$root" $extraFlags \
134144 $EXTRA_NSPAWN_FLAGS \
135145 --notify-ready=yes \
146146+ --kill-signal=SIGRTMIN+3 \
136147 --bind-ro=/nix/store \
137148 --bind-ro=/nix/var/nix/db \
138149 --bind-ro=/nix/var/nix/daemon-socket \
···259270 Slice = "machine.slice";
260271 Delegate = true;
261272262262- # Hack: we don't want to kill systemd-nspawn, since we call
263263- # "machinectl poweroff" in preStop to shut down the
264264- # container cleanly. But systemd requires sending a signal
265265- # (at least if we want remaining processes to be killed
266266- # after the timeout). So send an ignored signal.
273273+ # We rely on systemd-nspawn turning a SIGTERM to itself into a shutdown
274274+ # signal (SIGRTMIN+3) for the inner container.
267275 KillMode = "mixed";
268268- KillSignal = "WINCH";
276276+ KillSignal = "TERM";
269277270278 DevicePolicy = "closed";
271279 DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices;
···746754 script = startScript dummyConfig;
747755748756 postStart = postStartScript dummyConfig;
749749-750750- preStop = "machinectl poweroff $INSTANCE";
751757752758 restartIfChanged = false;
753759
+20
nixos/tests/containers-imperative.nix
···111111 machine.succeed(f"nixos-container stop {id1}")
112112 machine.succeed(f"nixos-container start {id1}")
113113114114+ # clear serial backlog for next tests
115115+ machine.succeed("logger eat console backlog 3ea46eb2-7f82-4f70-b810-3f00e3dd4c4d")
116116+ machine.wait_for_console_text(
117117+ "eat console backlog 3ea46eb2-7f82-4f70-b810-3f00e3dd4c4d"
118118+ )
119119+120120+ with subtest("Stop a container early"):
121121+ machine.succeed(f"nixos-container stop {id1}")
122122+ machine.succeed(f"nixos-container start {id1} &")
123123+ machine.wait_for_console_text("Stage 2")
124124+ machine.succeed(f"nixos-container stop {id1}")
125125+ machine.wait_for_console_text(f"Container {id1} exited successfully")
126126+ machine.succeed(f"nixos-container start {id1}")
127127+128128+ with subtest("Stop a container without machined (regression test for #109695)"):
129129+ machine.systemctl("stop systemd-machined")
130130+ machine.succeed(f"nixos-container stop {id1}")
131131+ machine.wait_for_console_text(f"Container {id1} has been shut down")
132132+ machine.succeed(f"nixos-container start {id1}")
133133+114134 with subtest("tmpfiles are present"):
115135 machine.log("creating container tmpfiles")
116136 machine.succeed(
···33, stdenv
44, fetchurl
55, fetchpatch
66-, libX11
77-, wxGTK
88-, libiconv
66+, boost
77+, ffmpeg
88+, ffms
99+, fftw
910, fontconfig
1011, freetype
1111-, libGLU
1212+, icu
1313+, intltool
1214, libGL
1515+, libGLU
1616+, libX11
1317, libass
1414-, fftw
1515-, ffms
1616-, ffmpeg_3
1818+, libiconv
1719, pkg-config
2020+, wxGTK
1821, zlib
1919-, icu
2020-, boost
2121-, intltool
22222323, spellcheckSupport ? true
2424, hunspell ? null
···4646assert pulseaudioSupport -> (libpulseaudio != null);
4747assert portaudioSupport -> (portaudio != null);
48484949-with lib;
5050-stdenv.mkDerivation
5151- rec {
4949+let
5050+ inherit (lib) optional;
5151+in
5252+stdenv.mkDerivation rec {
5253 pname = "aegisub";
5354 version = "3.2.2";
54555556 src = fetchurl {
5657 url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz";
5757- sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
5858+ hash = "sha256-xV4zlFuC2FE8AupueC8Ncscmrc03B+lbjAAi9hUeaIU=";
5859 };
59606061 patches = [
6162 # Compatibility with ICU 59
6263 (fetchpatch {
6364 url = "https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721f6ff16a49.patch";
6464- sha256 = "07qqlckiyy64lz8zk1as0vflk9kqnjb340420lp9f0xj93ncssj7";
6565+ sha256 = "sha256-R2rN7EiyA5cuBYIAMpa0eKZJ3QZahfnRp8R4HyejGB8=";
6566 })
66676768 # Compatbility with Boost 1.69
6869 (fetchpatch {
6970 url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch";
7070- sha256 = "1n8wmjka480j43b1pr30i665z8hdy6n3wdiz1ls81wyv7ai5yygf";
7171+ sha256 = "sha256-7nlfojrb84A0DT82PqzxDaJfjIlg5BvWIBIgoqasHNk=";
7172 })
72737374 # Compatbility with make 4.3
7475 (fetchpatch {
7576 url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch";
7676- sha256 = "1s9cc5rikrqb9ivjbag4b8yxcyjsmmmw744394d5xq8xi4k12vxc";
7777+ sha256 = "sha256-rG8RJokd4V4aSYOQw2utWnrWPVrkqSV3TAvnGXNhLOk=";
7778 })
7879 ];
79808081 nativeBuildInputs = [
8181- pkg-config
8282 intltool
8383+ pkg-config
8384 ];
8484-8585- buildInputs = with lib; [
8686- libX11
8787- wxGTK
8585+ buildInputs = [
8686+ boost
8787+ ffmpeg
8888+ ffms
8989+ fftw
8890 fontconfig
8991 freetype
9090- libGLU
9292+ icu
9193 libGL
9494+ libGLU
9595+ libX11
9296 libass
9393- fftw
9494- ffms
9595- ffmpeg_3
9797+ libiconv
9898+ wxGTK
9699 zlib
9797- icu
9898- boost
9999- libiconv
100100 ]
101101- ++ optional spellcheckSupport hunspell
102102- ++ optional automationSupport lua
103103- ++ optional openalSupport openal
104104- ++ optional alsaSupport alsaLib
105105- ++ optional pulseaudioSupport libpulseaudio
106106- ++ optional portaudioSupport portaudio
107107- ;
101101+ ++ optional alsaSupport alsaLib
102102+ ++ optional automationSupport lua
103103+ ++ optional openalSupport openal
104104+ ++ optional portaudioSupport portaudio
105105+ ++ optional pulseaudioSupport libpulseaudio
106106+ ++ optional spellcheckSupport hunspell
107107+ ;
108108109109 enableParallelBuilding = true;
110110111111- hardeningDisable = [ "bindnow" "relro" ];
111111+ hardeningDisable = [
112112+ "bindnow"
113113+ "relro"
114114+ ];
112115113113- # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
116116+ # compat with icu61+
117117+ # https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
114118 CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
115119116120 # this is fixed upstream though not yet in an officially released version,
···119123120124 postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
121125122122- meta = {
126126+ meta = with lib; {
127127+ homepage = "https://github.com/Aegisub/Aegisub";
123128 description = "An advanced subtitle editor";
124129 longDescription = ''
125130 Aegisub is a free, cross-platform open source tool for creating and
···127132 audio, and features many powerful tools for styling them, including a
128133 built-in real-time video preview.
129134 '';
130130- homepage = "http://www.aegisub.org/";
131131- # The Aegisub sources are itself BSD/ISC,
132132- # but they are linked against GPL'd softwares
133133- # - so the resulting program will be GPL
135135+ # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd
136136+ # softwares - so the resulting program will be GPL
134137 license = licenses.bsd3;
135138 maintainers = [ maintainers.AndersonTorres ];
136139 platforms = [ "i686-linux" "x86_64-linux" ];
137140 };
138141}
142142+# TODO [ AndersonTorres ]: update to fork release
+79-56
pkgs/applications/video/dvdstyler/default.nix
···11-{ lib, stdenv, fetchurl, pkg-config
22-, flex, bison, gettext
33-, xineUI, wxSVG
11+{ lib
22+, stdenv
33+, fetchurl
44+, bison
55+, cdrtools
66+, docbook5
77+, dvdauthor
88+, dvdplusrwtools
99+, flex
410, fontconfig
55-, xmlto, docbook5, zip
66-, cdrtools, dvdauthor, dvdplusrwtools
1111+, gettext
1212+, makeWrapper
1313+, pkg-config
1414+, wxSVG
1515+, xine-ui
1616+, xmlto
1717+, zip
1818+719, dvdisasterSupport ? true, dvdisaster ? null
820, thumbnailSupport ? true, libgnomeui ? null
921, udevSupport ? true, udev ? null
1022, dbusSupport ? true, dbus ? null
1111-, makeWrapper }:
2323+}:
12241313-with lib;
1414-stdenv.mkDerivation rec {
1515-2525+let
2626+ inherit (lib) optionals makeBinPath;
2727+in stdenv.mkDerivation rec {
1628 pname = "dvdstyler";
1717- srcName = "DVDStyler-${version}";
1829 version = "3.1.2";
19302031 src = fetchurl {
2121- url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2";
3232+ url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2";
2233 sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4";
2334 };
24352525- nativeBuildInputs =
2626- [ pkg-config ];
2727-2828- packagesToBinPath =
2929- [ cdrtools dvdauthor dvdplusrwtools ];
3030-3131- buildInputs =
3232- [ flex bison gettext xineUI
3333- wxSVG fontconfig xmlto
3434- docbook5 zip makeWrapper ]
3535- ++ packagesToBinPath
3636+ nativeBuildInputs = [
3737+ pkg-config
3838+ ];
3939+ buildInputs = [
4040+ bison
4141+ cdrtools
4242+ docbook5
4343+ dvdauthor
4444+ dvdplusrwtools
4545+ flex
4646+ fontconfig
4747+ gettext
4848+ makeWrapper
4949+ wxSVG
5050+ xine-ui
5151+ xmlto
5252+ zip
5353+ ]
3654 ++ optionals dvdisasterSupport [ dvdisaster ]
3755 ++ optionals udevSupport [ udev ]
3856 ++ optionals dbusSupport [ dbus ]
3957 ++ optionals thumbnailSupport [ libgnomeui ];
40584141- binPath = makeBinPath packagesToBinPath;
42594343- postInstall = ''
4444- wrapProgram $out/bin/dvdstyler \
4545- --prefix PATH ":" "${binPath}"
4646- '';
6060+ postInstall = let
6161+ binPath = makeBinPath [
6262+ cdrtools
6363+ dvdauthor
6464+ dvdplusrwtools
6565+ ]; in
6666+ ''
6767+ wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}"
6868+ '';
47694870 meta = with lib; {
7171+ homepage = "https://www.dvdstyler.org/";
4972 description = "A DVD authoring software";
5073 longDescription = ''
5151- DVDStyler is a cross-platform free DVD authoring application for the
5252- creation of professional-looking DVDs. It allows not only burning of video
5353- files on DVD that can be played practically on any standalone DVD player,
5454- but also creation of individually designed DVD menus. It is Open Source
5555- Software and is completely free.
7474+ DVDStyler is a cross-platform free DVD authoring application for the
7575+ creation of professional-looking DVDs. It allows not only burning of video
7676+ files on DVD that can be played practically on any standalone DVD player,
7777+ but also creation of individually designed DVD menus. It is Open Source
7878+ Software and is completely free.
56795757- Some of its features include:
5858- - create and burn DVD video with interactive menus
5959- - design your own DVD menu or select one from the list of ready to use menu
6060- templates
6161- - create photo slideshow
6262- - add multiple subtitle and audio tracks
6363- - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats
6464- - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and
6565- video formats
6666- - support of multi-core processor
6767- - use MPEG and VOB files without reencoding
6868- - put files with different audio/video format on one DVD (support of
6969- titleset)
7070- - user-friendly interface with support of drag & drop
7171- - flexible menu creation on the basis of scalable vector graphic
7272- - import of image file for background
7373- - place buttons, text, images and other graphic objects anywhere on the menu
7474- screen
7575- - change the font/color and other parameters of buttons and graphic objects
7676- - scale any button or graphic object
7777- - copy any menu object or whole menu
7878- - customize navigation using DVD scripting
8080+ Some of its features include:
8181+8282+ - create and burn DVD video with interactive menus
8383+ - design your own DVD menu or select one from the list of ready to use menu
8484+ templates
8585+ - create photo slideshow
8686+ - add multiple subtitle and audio tracks
8787+ - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats
8888+ - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and
8989+ video formats
9090+ - support of multi-core processor
9191+ - use MPEG and VOB files without reencoding
9292+ - put files with different audio/video format on one DVD (support of
9393+ titleset)
9494+ - user-friendly interface with support of drag & drop
9595+ - flexible menu creation on the basis of scalable vector graphic
9696+ - import of image file for background
9797+ - place buttons, text, images and other graphic objects anywhere on the menu
9898+ screen
9999+ - change the font/color and other parameters of buttons and graphic objects
100100+ - scale any button or graphic object
101101+ - copy any menu object or whole menu
102102+ - customize navigation using DVD scripting
79103 '';
8080- homepage = "http://www.dvdstyler.org/";
8181- license = with licenses; gpl2;
104104+ license = licenses.gpl2Plus;
82105 maintainers = with maintainers; [ AndersonTorres ];
83106 platforms = with platforms; linux;
84107 };
···3434 export PYARROW_PARALLEL=$NIX_BUILD_CORES
3535 '';
36363737- # Deselect a single test because pyarrow prints a 2-line error message where
3838- # only a single line is expected. The additional line of output comes from
3939- # the glog library which is an optional dependency of arrow-cpp that is
4040- # enabled in nixpkgs.
4141- # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
4242- pytestFlagsArray = [ "--deselect=pyarrow/tests/test_memory.py::test_env_var" ];
3737+ pytestFlagsArray = [
3838+ # Deselect a single test because pyarrow prints a 2-line error message where
3939+ # only a single line is expected. The additional line of output comes from
4040+ # the glog library which is an optional dependency of arrow-cpp that is
4141+ # enabled in nixpkgs.
4242+ # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393
4343+ "--deselect=pyarrow/tests/test_memory.py::test_env_var"
4444+ # Deselect the parquet dataset write test because it erroneously fails to find the
4545+ # pyarrow._dataset module.
4646+ "--deselect=pyarrow/tests/parquet/test_dataset.py::test_write_to_dataset_filesystem"
4747+ ];
43484449 dontUseSetuptoolsCheck = true;
4550 preCheck = ''
···11-{lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python3, libiberty, libopcodes}:
11+{ lib
22+, stdenv
33+, fetchFromGitHub
44+, cmake
55+, pkg-config
66+, zlib
77+, curl
88+, elfutils
99+, python3
1010+, libiberty
1111+, libopcodes
1212+, runCommand
1313+, gcc
1414+, rustc
1515+}:
21633-stdenv.mkDerivation rec {
44- pname = "kcov";
55- version = "36";
1717+let
1818+ self =
1919+ stdenv.mkDerivation rec {
2020+ pname = "kcov";
2121+ version = "38";
62277- src = fetchFromGitHub {
88- owner = "SimonKagstrom";
99- repo = "kcov";
1010- rev = "v${version}";
1111- sha256 = "1q1mw5mxz041lr6qc2v4280rmx13pg1bx5r3bxz9bzs941r405r3";
1212- };
2323+ src = fetchFromGitHub {
2424+ owner = "SimonKagstrom";
2525+ repo = "kcov";
2626+ rev = "v${version}";
2727+ sha256 = "sha256-6LoIo2/yMUz8qIpwJVcA3qZjjF+8KEM1MyHuyHsQD38=";
2828+ };
13291414- preConfigure = "patchShebangs src/bin-to-c-source.py";
1515- nativeBuildInputs = [ cmake pkg-config python3 ];
3030+ preConfigure = "patchShebangs src/bin-to-c-source.py";
3131+ nativeBuildInputs = [ cmake pkg-config python3 ];
16321717- buildInputs = [ curl zlib elfutils libiberty libopcodes ];
3333+ buildInputs = [ curl zlib elfutils libiberty libopcodes ];
18341919- strictDeps = true;
3535+ strictDeps = true;
20362121- meta = with lib; {
2222- description = "Code coverage tester for compiled programs, Python scripts and shell scripts";
3737+ passthru.tests = {
3838+ works-on-c = runCommand "works-on-c" {} ''
3939+ set -ex
4040+ cat - > a.c <<EOF
4141+ int main() {}
4242+ EOF
4343+ ${gcc}/bin/gcc a.c -o a.out
4444+ ${self}/bin/kcov /tmp/kcov ./a.out
4545+ test -e /tmp/kcov/index.html
4646+ touch $out
4747+ set +x
4848+ '';
23492424- longDescription = ''
2525- Kcov is a code coverage tester for compiled programs, Python
2626- scripts and shell scripts. It allows collecting code coverage
2727- information from executables without special command-line
2828- arguments, and continuosly produces output from long-running
2929- applications.
3030- '';
5050+ works-on-rust = runCommand "works-on-rust" {} ''
5151+ set -ex
5252+ cat - > a.rs <<EOF
5353+ fn main() {}
5454+ EOF
5555+ # Put gcc in the path so that `cc` is found
5656+ PATH=${gcc}/bin:$PATH ${rustc}/bin/rustc a.rs -o a.out
5757+ ${self}/bin/kcov /tmp/kcov ./a.out
5858+ test -e /tmp/kcov/index.html
5959+ touch $out
6060+ set +x
6161+ '';
6262+ };
31633232- homepage = "http://simonkagstrom.github.io/kcov/index.html";
3333- license = licenses.gpl2;
6464+ meta = with lib; {
6565+ description = "Code coverage tester for compiled programs, Python scripts and shell scripts";
34663535- maintainers = with maintainers; [ gal_bolle ekleog ];
3636- platforms = platforms.linux;
3737- };
3838-}
6767+ longDescription = ''
6868+ Kcov is a code coverage tester for compiled programs, Python
6969+ scripts and shell scripts. It allows collecting code coverage
7070+ information from executables without special command-line
7171+ arguments, and continuosly produces output from long-running
7272+ applications.
7373+ '';
7474+7575+ homepage = "http://simonkagstrom.github.io/kcov/index.html";
7676+ license = licenses.gpl2;
7777+ changelog = "https://github.com/SimonKagstrom/kcov/blob/master/ChangeLog";
7878+7979+ maintainers = with maintainers; [ gal_bolle ekleog ];
8080+ platforms = platforms.linux;
8181+ };
8282+ };
8383+in
8484+self
+2-2
pkgs/games/steam/runtime.nix
···8899 pname = "steam-runtime";
1010 # from https://repo.steampowered.com/steamrt-images-scout/snapshots/
1111- version = "0.20201203.1";
1111+ version = "0.20210317.0";
12121313 src = fetchurl {
1414 url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz";
1515- sha256 = "sha256-hOHfMi0x3K82XM3m/JmGYbVk5RvuHG+m275eAC0MoQc=";
1515+ sha256 = "061z2r33n2017prmhdxm82cly3qp3bma2q70pqs57adl65yvg7vw";
1616 name = "scout-runtime-${version}.tar.gz";
1717 };
1818
+46-19
pkgs/misc/emulators/mgba/default.nix
···11-{ lib, stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkg-config
22-, cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick
33-, qtbase, qtmultimedia, qttools, minizip }:
11+{ lib
22+, stdenv
33+, fetchFromGitHub
44+, SDL2
55+, cmake
66+, epoxy
77+, ffmpeg
88+, imagemagick
99+, libedit
1010+, libelf
1111+, libzip
1212+, makeDesktopItem
1313+, minizip
1414+, pkg-config
1515+, qtbase
1616+, qtmultimedia
1717+, qttools
1818+, wrapQtAppsHook
1919+}:
420521let
622 desktopItem = makeDesktopItem {
···2137 owner = "mgba-emu";
2238 repo = "mgba";
2339 rev = version;
2424- sha256 = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs=";
4040+ hash = "sha256-JVauGyHJVfiXVG4Z+Ydh1lRypy5rk9SKeTbeHFNFYJs=";
2541 };
26422727- nativeBuildInputs = [ wrapQtAppsHook pkg-config cmake ];
2828-4343+ nativeBuildInputs = [
4444+ cmake
4545+ pkg-config
4646+ wrapQtAppsHook
4747+ ];
2948 buildInputs = [
3030- epoxy libzip libelf libedit ffmpeg_3 SDL2 imagemagick
3131- qtbase qtmultimedia qttools minizip
4949+ SDL2
5050+ epoxy
5151+ ffmpeg
5252+ imagemagick
5353+ libedit
5454+ libelf
5555+ libzip
5656+ minizip
5757+ qtbase
5858+ qtmultimedia
5959+ qttools
3260 ];
33613462 postInstall = ''
···3866 meta = with lib; {
3967 homepage = "https://mgba.io";
4068 description = "A modern GBA emulator with a focus on accuracy";
4141-4269 longDescription = ''
4370 mGBA is a new Game Boy Advance emulator written in C.
44714545- The project started in April 2013 with the goal of being fast
4646- enough to run on lower end hardware than other emulators
4747- support, without sacrificing accuracy or portability. Even in
4848- the initial version, games generally play without problems. It
4949- is loosely based on the previous GBA.js emulator, although very
5050- little of GBA.js can still be seen in mGBA.
7272+ The project started in April 2013 with the goal of being fast enough to
7373+ run on lower end hardware than other emulators support, without
7474+ sacrificing accuracy or portability. Even in the initial version, games
7575+ generally play without problems. It is loosely based on the previous
7676+ GBA.js emulator, although very little of GBA.js can still be seen in mGBA.
51775252- Other goals include accurate enough emulation to provide a
5353- development environment for homebrew software, a good workflow
5454- for tool-assist runners, and a modern feature set for emulators
5555- that older emulators may not support.
7878+ Other goals include accurate enough emulation to provide a development
7979+ environment for homebrew software, a good workflow for tool-assist
8080+ runners, and a modern feature set for emulators that older emulators may
8181+ not support.
5682 '';
57835884 license = licenses.mpl20;
···6086 platforms = platforms.linux;
6187 };
6288}
8989+# TODO [ AndersonTorres ]: use desktopItem functions
···1717 sha256 = "sha256-nH2xAqWfMT+Brv3z9Aw6nbvYqArEZjpM28rKsRPihqA=";
1818 };
19192020- # by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..."
2121- # This is a better way to do the same, and takes advantage of the existing Nix python environments
2220 patches = [
2121+ (fetchpatch {
2222+ name = "support-for-keepass-4.0.0.patch";
2323+ url = "https://github.com/roddhjav/pass-import/commit/86cfb1bb13a271fefe1e70f24be18e15a83a04d8.patch";
2424+ sha256 = "0mrlblqlmwl9gqs2id4rl4sivrcclsv6zyc6vjqi78kkqmnwzhxh";
2525+ })
2626+ # by default, tries to install scripts/pimport, which is a bash wrapper around "python -m pass_import ..."
2727+ # This is a better way to do the same, and takes advantage of the existing Nix python environments
2328 # from https://github.com/roddhjav/pass-import/pull/138
2429 (fetchpatch {
2530 name = "pass-import-pr-138-pimport-entrypoint.patch";
+3-3
pkgs/tools/system/logcheck/default.nix
···2233stdenv.mkDerivation rec {
44 pname = "logcheck";
55- version = "1.3.22";
55+ version = "1.3.23";
66 _name = "logcheck_${version}";
7788 src = fetchurl {
99 url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
1010- sha256 = "sha256-e7XeRNlFsexlVskK2OnLTmNV/ES2xWU+/+AElexV6E4=";
1010+ sha256 = "sha256-ohiLpUn/9EEsggdLJxiE/2bSXz/bKkGRboF85naFWyk=";
1111 };
12121313 prePatch = ''
···4242 Logcheck was part of the Abacus Project of security tools, but this version has been rewritten.
4343 '';
4444 homepage = "https://salsa.debian.org/debian/logcheck";
4545- license = licenses.gpl2;
4545+ license = licenses.gpl2Plus;
4646 maintainers = [ maintainers.bluescreen303 ];
4747 };
4848}
+2
pkgs/top-level/aliases.nix
···853853 xbmcPlain = kodiPlain; # added 2018-04-25
854854 xbmcPlugins = kodiPackages; # added 2018-04-25
855855 kodiPlugins = kodiPackages; # added 2021-03-09;
856856+ xineLib = xine-lib; # added 2021-04-27
857857+ xineUI = xine-ui; # added 2021-04-27
856858 xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
857859 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
858860 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";