tjh.dev
cdemu: update to 3.2 release
closes https://github.com/NixOS/nixpkgs/pull/58911
(cherry picked from commit 79d653be55eed75294d8644e5d1fb0f4e6024387)
+10
-5
pkgs/misc/emulators/cdemu/analyzer.nix
+10
-5
pkgs/misc/emulators/cdemu/analyzer.nix
···
1
-
{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, gnome3, gdk_pixbuf, librsvg, intltool }:
1
+
{ callPackage, makeWrapper, gobject-introspection, cmake
2
+
, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk_pixbuf, librsvg, intltool, libmirage }:
2
3
let pkg = import ./base.nix {
3
-
version = "3.1.0";
4
+
version = "3.2.2";
4
5
pkgName = "image-analyzer";
5
-
pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2";
6
+
pkgSha256 = "0by3nd5c413cvk3jmv3md6q0axbiidy061g9dhf37qzwgcakcx8j";
6
7
};
7
8
in callPackage pkg {
8
-
buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper
9
-
gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ];
9
+
buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper
10
+
gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool
11
+
python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ];
10
12
drvParams = {
13
+
nativeBuildInputs = [ gobject-introspection cmake ];
11
14
postFixup = ''
12
15
wrapProgram $out/bin/image-analyzer \
16
+
--set PYTHONPATH "$PYTHONPATH" \
17
+
--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
13
18
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
14
19
'';
15
20
};
+4
-4
pkgs/misc/emulators/cdemu/client.nix
+4
-4
pkgs/misc/emulators/cdemu/client.nix
···
1
-
{ callPackage, pythonPackages, intltool, makeWrapper }:
1
+
{ callPackage, python3Packages, intltool, makeWrapper }:
2
2
let pkg = import ./base.nix {
3
-
version = "3.1.0";
3
+
version = "3.2.1";
4
4
pkgName = "cdemu-client";
5
-
pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik";
5
+
pkgSha256 = "1d8m24qvv62xcwafw5zs4yf39vs64kxl4idqcngd8yyjhrb2ykg5";
6
6
};
7
7
in callPackage pkg {
8
-
buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3
8
+
buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3
9
9
intltool makeWrapper ];
10
10
drvParams = {
11
11
postFixup = ''
+4
-4
pkgs/misc/emulators/cdemu/daemon.nix
+4
-4
pkgs/misc/emulators/cdemu/daemon.nix
···
1
-
{ callPackage, glib, libao, intltool }:
1
+
{ callPackage, glib, libao, intltool, libmirage }:
2
2
let pkg = import ./base.nix {
3
-
version = "3.1.0";
3
+
version = "3.2.2";
4
4
pkgName = "cdemu-daemon";
5
-
pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9";
5
+
pkgSha256 = "0himyrhhfjsr4ff5aci7240bpm9x34h20pid412ci8fm16nk929b";
6
6
};
7
7
in callPackage pkg {
8
-
buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ];
8
+
buildInputs = [ glib libao libmirage intltool ];
9
9
}
+6
-4
pkgs/misc/emulators/cdemu/gui.nix
+6
-4
pkgs/misc/emulators/cdemu/gui.nix
···
1
-
{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gnome3, gdk_pixbuf, librsvg }:
1
+
{ callPackage, makeWrapper, gobject-introspection, cmake
2
+
, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk_pixbuf, librsvg }:
2
3
let
3
4
pkg = import ./base.nix {
4
-
version = "3.1.0";
5
+
version = "3.2.1";
5
6
pkgName = "gcdemu";
6
-
pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02";
7
+
pkgSha256 = "0lmyvhbf57wcm8k2a33j2dhy4gblaiycy33q070gdrxi37xk7w5g";
7
8
};
8
-
inherit (pythonPackages) python pygobject3;
9
+
inherit (python3Packages) python pygobject3;
9
10
in callPackage pkg {
10
11
buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
11
12
gnome3.adwaita-icon-theme gdk_pixbuf librsvg ];
12
13
drvParams = {
14
+
nativeBuildInputs = [ gobject-introspection cmake ];
13
15
postFixup = ''
14
16
wrapProgram $out/bin/gcdemu \
15
17
--set PYTHONPATH "$PYTHONPATH" \
+12
-3
pkgs/misc/emulators/cdemu/libmirage.nix
+12
-3
pkgs/misc/emulators/cdemu/libmirage.nix
···
1
-
{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool }:
1
+
{ callPackage, gobject-introspection, cmake, pkgconfig
2
+
, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool
3
+
, pcre, utillinux, libselinux, libsepol }:
4
+
2
5
let pkg = import ./base.nix {
3
-
version = "3.1.0";
6
+
version = "3.2.2";
4
7
pkgName = "libmirage";
5
-
pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn";
8
+
pkgSha256 = "0gwrfia0fyhi0b3p2pfyyvrcfcb0qysfzgpdqsqjqbx4xaqx5wpi";
6
9
};
7
10
in callPackage pkg {
8
11
buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ];
12
+
drvParams = {
13
+
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
14
+
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
15
+
nativeBuildInputs = [ cmake gobject-introspection pkgconfig ];
16
+
propagatedBuildInputs = [ pcre utillinux libselinux libsepol ];
17
+
};
9
18
}