diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 8c4bc7355190..0954017c98f7 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -79,6 +79,12 @@
services.filebeat.
+
+
+ apfs,
+ a kernel module for mounting the Apple File System (APFS).
+
+
FRRouting, a
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index cfff3afd81c1..b47d4ef470b1 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -27,6 +27,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable).
+- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS).
+
- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.ffr.babel.enable)
- [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable).
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 065cea470fbb..31aeaad80d60 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,7 +1,7 @@
{
- x86_64-linux = "/nix/store/hapw7q1fkjxvprnkcgw9ppczavg4daj2-nix-2.4";
- i686-linux = "/nix/store/8qlvh8pp5j8wgrzj3is2jlbhgrwgsiy9-nix-2.4";
- aarch64-linux = "/nix/store/h48lkygcqj4hdibbdnpl67q7ks6vkrd6-nix-2.4";
- x86_64-darwin = "/nix/store/c3mvzszvyzakvcp9spnjvsb8m2bpjk7m-nix-2.4";
- aarch64-darwin = "/nix/store/hbfqs62r0hga2yr4zi5kc7fzhf71bq9n-nix-2.4";
+ x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0";
+ i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0";
+ aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0";
+ x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0";
+ aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0";
}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7593a5037db1..a66832688394 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1164,6 +1164,7 @@
./tasks/cpu-freq.nix
./tasks/encrypted-devices.nix
./tasks/filesystems.nix
+ ./tasks/filesystems/apfs.nix
./tasks/filesystems/bcachefs.nix
./tasks/filesystems/btrfs.nix
./tasks/filesystems/cifs.nix
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index f86d4641228c..8fcc1f029723 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -282,6 +282,9 @@ checkFS() {
# Don't check resilient COWs as they validate the fs structures at mount time
if [ "$fsType" = btrfs -o "$fsType" = zfs -o "$fsType" = bcachefs ]; then return 0; fi
+ # Skip fsck for apfs as the fsck utility does not support repairing the filesystem (no -a option)
+ if [ "$fsType" = apfs ]; then return 0; fi
+
# Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem.
if [ "$fsType" = nilfs2 ]; then return 0; fi
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 225bcbe58e01..f3da6771197e 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -250,7 +250,7 @@ in
environment.etc.fstab.text =
let
- fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ];
+ fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ];
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
diff --git a/nixos/modules/tasks/filesystems/apfs.nix b/nixos/modules/tasks/filesystems/apfs.nix
new file mode 100644
index 000000000000..2f2be351df61
--- /dev/null
+++ b/nixos/modules/tasks/filesystems/apfs.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ inInitrd = any (fs: fs == "apfs") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+ config = mkIf (any (fs: fs == "apfs") config.boot.supportedFilesystems) {
+
+ system.fsPackages = [ pkgs.apfsprogs ];
+
+ boot.extraModulePackages = [ config.boot.kernelPackages.apfs ];
+
+ boot.initrd.kernelModules = mkIf inInitrd [ "apfs" ];
+
+ # Don't copy apfsck into the initramfs since it does not support repairing the filesystem
+ };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b0e7702e9b86..b75cbf4d10b9 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -35,6 +35,7 @@ in
agda = handleTest ./agda.nix {};
airsonic = handleTest ./airsonic.nix {};
amazon-init-shell = handleTest ./amazon-init-shell.nix {};
+ apfs = handleTest ./apfs.nix {};
apparmor = handleTest ./apparmor.nix {};
atd = handleTest ./atd.nix {};
atop = handleTest ./atop.nix {};
@@ -355,6 +356,7 @@ in
nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };
node-red = handleTest ./node-red.nix {};
nomad = handleTest ./nomad.nix {};
+ noto-fonts = handleTest ./noto-fonts.nix {};
novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {};
nsd = handleTest ./nsd.nix {};
nzbget = handleTest ./nzbget.nix {};
diff --git a/nixos/tests/apfs.nix b/nixos/tests/apfs.nix
new file mode 100644
index 000000000000..a82886cbe731
--- /dev/null
+++ b/nixos/tests/apfs.nix
@@ -0,0 +1,54 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "apfs";
+ meta.maintainers = with pkgs.lib.maintainers; [ Luflosi ];
+
+ machine = { pkgs, ... }: {
+ virtualisation.emptyDiskImages = [ 1024 ];
+
+ boot.supportedFilesystems = [ "apfs" ];
+ };
+
+ testScript = ''
+ machine.wait_for_unit("basic.target")
+ machine.succeed("mkdir /tmp/mnt")
+
+ with subtest("mkapfs refuses to work with a label that is too long"):
+ machine.fail( "mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F' /dev/vdb")
+
+ with subtest("mkapfs works with the maximum label length"):
+ machine.succeed("mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7' /dev/vdb")
+
+ with subtest("Enable case sensitivity and normalization sensitivity"):
+ machine.succeed(
+ "mkapfs -s -z /dev/vdb",
+ # Triggers a bug, see https://github.com/linux-apfs/linux-apfs-rw/issues/15
+ # "mount -o cknodes,readwrite /dev/vdb /tmp/mnt",
+ "mount -o readwrite /dev/vdb /tmp/mnt",
+ "echo 'Hello World 1' > /tmp/mnt/test.txt",
+ "[ ! -f /tmp/mnt/TeSt.TxT ] || false", # Test case sensitivity
+ "echo 'Hello World 1' | diff - /tmp/mnt/test.txt",
+ "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt",
+ "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt",
+ "[ ! -f /tmp/mnt/\u00e1.txt ] || false", # Test Unicode normalization sensitivity
+ "umount /tmp/mnt",
+ "apfsck /dev/vdb",
+ )
+ with subtest("Disable case sensitivity and normalization sensitivity"):
+ machine.succeed(
+ "mkapfs /dev/vdb",
+ "mount -o readwrite /dev/vdb /tmp/mnt",
+ "echo 'bla bla bla' > /tmp/mnt/Test.txt",
+ "echo -n 'Hello World' > /tmp/mnt/test.txt",
+ "echo ' 1' >> /tmp/mnt/TEST.TXT",
+ "umount /tmp/mnt",
+ "apfsck /dev/vdb",
+ "mount -o readwrite /dev/vdb /tmp/mnt",
+ "echo 'Hello World 1' | diff - /tmp/mnt/TeSt.TxT", # Test case insensitivity
+ "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt",
+ "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt",
+ "echo 'Hello World 2' | diff - /tmp/mnt/\u00e1.txt", # Test Unicode normalization
+ "umount /tmp/mnt",
+ "apfsck /dev/vdb",
+ )
+ '';
+})
diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix
new file mode 100644
index 000000000000..049dc766bd3b
--- /dev/null
+++ b/nixos/tests/noto-fonts.nix
@@ -0,0 +1,44 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ name = "noto-fonts";
+ meta = {
+ maintainers = with lib.maintainers; [ nickcao midchildan ];
+ };
+
+ machine = {
+ imports = [ ./common/x11.nix ];
+ environment.systemPackages = [ pkgs.gnome.gedit ];
+ fonts = {
+ enableDefaultFonts = false;
+ fonts = with pkgs;[
+ noto-fonts
+ noto-fonts-cjk-sans
+ noto-fonts-cjk-serif
+ noto-fonts-emoji
+ ];
+ fontconfig.defaultFonts = {
+ serif = [ "Noto Serif" "Noto Serif CJK SC" ];
+ sansSerif = [ "Noto Sans" "Noto Sans CJK SC" ];
+ monospace = [ "Noto Sans Mono" "Noto Sans Mono CJK SC" ];
+ emoji = [ "Noto Color Emoji" ];
+ };
+ };
+ };
+
+ testScript =
+ # extracted from http://www.clagnut.com/blog/2380/
+ let testText = builtins.toFile "test.txt" ''
+ the quick brown fox jumps over the lazy dog
+ 視野無限廣，窗外有藍天
+ Eĥoŝanĝo ĉiuĵaŭde.
+ いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす
+ 다람쥐 헌 쳇바퀴에 타고파
+ 中国智造，慧及全球
+ ''; in
+ ''
+ machine.wait_for_x()
+ machine.succeed("gedit ${testText} >&2 &")
+ machine.wait_for_window(".* - gedit")
+ machine.sleep(10)
+ machine.screenshot("screen")
+ '';
+})
diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix
index 93a9ce258544..6a308ba74c43 100644
--- a/pkgs/applications/audio/munt/default.nix
+++ b/pkgs/applications/audio/munt/default.nix
@@ -1,50 +1,52 @@
{ lib
-, mkDerivation
, stdenv
+, mkDerivation
, fetchFromGitHub
-, makeDesktopItem
+, alsa-lib
, cmake
+, glib
, pkg-config
, qtbase
-, glib
-, alsa-lib
, withJack ? stdenv.hostPlatform.isUnix, jack
}:
-let
- mainProgram = "mt32emu-qt";
-in
mkDerivation rec {
pname = "munt";
- version = "2.5.0";
+ version = "2.5.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "munt_${lib.replaceChars [ "." ] [ "_" ] version}";
- sha256 = "1lknq2a72gv1ddhzr7f967wpa12lh805jj4gjacdnamgrc1h22yn";
+ rev = "libmt32emu_${lib.replaceChars [ "." ] [ "_" ] version}";
+ hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4=";
};
dontFixCmake = true;
- nativeBuildInputs = [ cmake pkg-config ];
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
- buildInputs = [ qtbase glib ]
- ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
- ++ lib.optional withJack jack;
+ buildInputs = [
+ glib
+ qtbase
+ ]
+ ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
+ ++ lib.optional withJack jack;
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir $out/Applications
- mv $out/bin/${mainProgram}.app $out/Applications/
- ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram}
+ mv $out/bin/${meta.mainProgram}.app $out/Applications/
+ ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram}
'';
meta = with lib; {
- inherit mainProgram;
- description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices";
homepage = "http://munt.sourceforge.net/";
+ description = "An emulator of Roland MT-32, CM-32L, CM-64 and LAPC-I devices";
license = with licenses; [ lgpl21 gpl3 ];
- platforms = platforms.all;
maintainers = with maintainers; [ OPNA2608 ];
+ platforms = platforms.all;
+ mainProgram = "mt32emu-qt";
};
}
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index ec4f9b59e919..268f3174b44d 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -9,8 +9,8 @@ let
inherit buildFHSUserEnv;
};
stableVersion = {
- version = "2020.3.1.26"; # "Android Studio Arctic Fox (2020.3.1)"
- sha256Hash = "NE2FgjXtXTCVrCWRakqPhzAGn3blpf0OugJSKviPVBs=";
+ version = "2021.1.1.20"; # "Android Studio Bumblebee (2021.1.1)"
+ sha256Hash = "LwG5IDJBFpdlspDoTNpbi1togri2fvEOEDbkkiYvrJE=";
};
betaVersion = {
version = "2021.1.1.18"; # "Android Studio Bumblebee (2021.1.1) Beta 5"
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 72c753745168..45a86a73d029 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -161,12 +161,9 @@ let
krb5
]) ++ additionalPkgs pkgs;
- # restore desktop item icons
+ # symlink shared assets, including icons and desktop entries
extraInstallCommands = ''
- mkdir -p "$out/share/applications"
- for item in ${unwrapped}/share/applications/*.desktop; do
- ln -s "$item" "$out/share/applications/"
- done
+ ln -s "${unwrapped}/share" "$out/"
'';
runScript = "${unwrapped}/bin/${executableName}";
diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix
new file mode 100644
index 000000000000..7133c914b66a
--- /dev/null
+++ b/pkgs/applications/graphics/pixinsight/default.nix
@@ -0,0 +1,132 @@
+{ stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot
+, mime-types, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig
+, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim
+# Qt 5 subpackages
+, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pixinsight";
+ version = "1.8.8-12";
+
+ src = requireFile rec {
+ name = "PI-linux-x64-${version}-20211229-c.tar.xz";
+ url = "https://pixinsight.com/";
+ sha256 = "7095b83a276f8000c9fe50caadab4bf22a248a880e77b63e0463ad8d5469f617";
+ message = ''
+ PixInsight is available from ${url} and requires a commercial (or trial) license.
+ After a license has been obtained, PixInsight can be downloaded from the software distribution
+ (choose Linux 64bit).
+ The PixInsight tarball must be added to the nix-store, i.e. via
+ nix-prefetch-url --type sha256 file:///path/to/${name}
+ '';
+ };
+ sourceRoot = ".";
+
+ nativeBuildInputs = [
+ unixtools.script
+ fakeroot
+ wrapQtAppsHook
+ autoPatchelfHook
+ mime-types
+ libudev0-shim
+ ];
+
+ buildInputs = [
+ stdenv.cc.cc.lib
+ stdenv.cc
+ libGL
+ libpulseaudio
+ alsa-lib
+ nss
+ gd
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ nspr
+ expat
+ fontconfig
+ dbus
+ glib
+ zlib
+ openssl
+ libdrm
+ wayland
+ cups
+ avahi-compat
+ # Qt stuff
+ qt3d
+ mlt
+ qtbase
+ qtgamepad
+ qtserialport
+ qtserialbus
+ qtvirtualkeyboard
+ qtmultimedia
+ qtwebkit
+ ] ++ (with xorg; [
+ libX11
+ libXdamage
+ xrandr
+ libXtst
+ libXcomposite
+ libXext
+ libXfixes
+ libXrandr
+ ]);
+
+ postPatch = ''
+ patchelf ./installer \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath ${stdenv.cc.cc.lib}/lib
+ '';
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ mkdir -p $out/bin $out/opt/PixInsight $out/share/{applications,mime/packages,icons/hicolor}
+
+ fakeroot script -ec "./installer \
+ --yes \
+ --install-dir=$out/opt/PixInsight \
+ --install-desktop-dir=$out/share/applications \
+ --install-mime-dir=$out/share/mime \
+ --install-icons-dir=$out/share/icons/hicolor \
+ --no-bin-launcher \
+ --no-remove"
+
+ rm -rf $out/opt/PixInsight-old-0
+ ln -s $out/opt/PixInsight/bin/PixInsight $out/bin/.
+ '';
+
+ # Some very exotic Qt libraries are not available in nixpkgs
+ autoPatchelfIgnoreMissingDeps = true;
+
+ # This mimics what is happening in PixInsight.sh and adds on top the libudev0-shim, which
+ # without PixInsight crashes at startup.
+ qtWrapperArgs = [
+ "--prefix LD_LIBRARY_PATH : ${libudev0-shim}/lib"
+ "--set LC_ALL en_US.utf8"
+ "--set AVAHI_COMPAT_NOWARN 1"
+ "--set QT_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins"
+ "--set QT_QPA_PLATFORM_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins/platforms"
+ "--set QT_AUTO_SCREEN_SCALE_FACTOR 0"
+ "--set QT_ENABLE_HIGHDPI_SCALING 0"
+ "--set QT_SCALE_FACTOR 1"
+ "--set QT_LOGGING_RULES '*=false'"
+ "--set QTWEBENGINEPROCESS_PATH $out/opt/PixInsight/bin/libexec/QtWebEngineProcess"
+ ];
+ dontWrapQtApps = true;
+ postFixup = ''
+ wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString qtWrapperArgs}
+ '';
+
+ meta = with lib; {
+ description = "Scientific image processing program for astrophotography";
+ homepage = "https://pixinsight.com/";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = [ maintainers.sheepforce ];
+ mainProgram = "PixInsight";
+ };
+}
diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix
index e8bfa00406e2..0fd6e72a57ec 100644
--- a/pkgs/applications/misc/inherd-quake/default.nix
+++ b/pkgs/applications/misc/inherd-quake/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "inherd-quake";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "phodal";
repo = "quake";
rev = "v${version}";
- sha256 = "UujcsvjbXda1DdV4hevUP4PbdbOKHQ3O/FBDlhAjfq0=";
+ sha256 = "sha256-OkgrkjO6IS6P2ZyFFbOprROPzDfQcHYCwaTKFsjjVo8=";
};
- cargoSha256 = "HkdF7hLgThOWExociNgxvTxF4qL3F5CPK/j/ZKLg/m4=";
+ cargoSha256 = "sha256-EMRaChFwjMYZKSX5OvXYLSiwWo1m1H/tHVqc8RXX52A=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix
new file mode 100644
index 000000000000..a93436362adf
--- /dev/null
+++ b/pkgs/applications/misc/swaynotificationcenter/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, vala
+, gtk3
+, glib
+, gtk-layer-shell
+, dbus
+, dbus-glib
+, json-glib
+, librsvg
+, libhandy
+, gobject-introspection
+, gdk-pixbuf
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "SwayNotificationCenter";
+ version = "0.3";
+
+ src = fetchFromGitHub {
+ owner = "ErikReider";
+ repo = "SwayNotificationCenter";
+ rev = "v${version}";
+ hash = "sha256-gXo/V2FHkHZBRmaimqJCzi0BqS4tP9IniIlubBmK5u0=";
+ };
+
+ nativeBuildInputs = [ gobject-introspection meson ninja pkg-config vala wrapGAppsHook ];
+
+ buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 json-glib libhandy librsvg ];
+
+ meta = with lib; {
+ description = "Simple notification daemon with a GUI built for Sway";
+ homepage = "https://github.com/ErikReider/SwayNotificationCenter";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.berbiche ];
+ };
+}
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index a012e9ba6981..e29d58039a04 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "wtf";
- version = "0.40.0";
+ version = "0.41.0";
src = fetchFromGitHub {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
- sha256 = "0hd5gnydxfncsmm7c58lvhkpnyxknvicc8f58xfh74azf363wcvm";
+ sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y=";
};
- vendorSha256 = "166dpxli2qyls4b9s0nv9vbwiwkp7jh32lkm35qz6s5w9zp6yjfb";
+ vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0=";
doCheck = false;
diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/applications/misc/xdg-launch/default.nix
index 973acbbf65a5..bf5b0484c867 100644
--- a/pkgs/applications/misc/xdg-launch/default.nix
+++ b/pkgs/applications/misc/xdg-launch/default.nix
@@ -12,7 +12,7 @@
}:
stdenv.mkDerivation rec {
pname = "xdg-launch";
- version = "1.11";
+ version = "1.12";
postPatch = ''
# fix gettext configuration
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "bbidulock";
repo = pname;
rev = version;
- sha256 = "sha256-qrBxyJ3dUNdnE1nANLKKL0cXw/Hc4qxDoY1anIRN+VA=";
+ sha256 = "sha256-S/0Wn1T5MSOPN6QXkzfmygHL6XTAnnMJr5Z3fBzsHEw=";
};
preConfigure = "./autogen.sh";
diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh
index 0bb0d784167c..463064887148 100755
--- a/pkgs/applications/networking/instant-messengers/slack/update.sh
+++ b/pkgs/applications/networking/instant-messengers/slack/update.sh
@@ -22,7 +22,7 @@ if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_versi
exit 0
fi
-linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb"
+linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb"
mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg"
linux_sha256=$(nix-prefetch-url ${linux_url})
mac_sha256=$(nix-prefetch-url ${mac_url})
diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix
index 435474fbdce8..f548cf01fcd5 100644
--- a/pkgs/applications/office/vnote/default.nix
+++ b/pkgs/applications/office/vnote/default.nix
@@ -8,14 +8,14 @@
mkDerivation rec {
pname = "vnote";
- version = "3.12.0";
+ version = "3.12.888";
src = fetchFromGitHub {
owner = "vnotex";
repo = pname;
fetchSubmodules = true;
rev = "v${version}";
- sha256 = "sha256-hlB/G7qFYbkdIk9f2N+q1Do3V1ON8UUQZ6AUmBfK8x0=";
+ sha256 = "sha256-l9oFixyEM0aAfvrC5rrQMzv7n8rUHECRzhuIQJ/szjc=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 59aba526c3fd..21781c423b2b 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-RFKS6fHh+rX5S31MvAQpJUNgaI6loiUw0FNkdsMFqlQ=";
+ sha256 = "sha256-zQHFLXcsIFMqMCJp7+3Abc0WbSWKJyfAAE+TTJGRRmY=";
};
- vendorSha256 = "sha256-6owFzn+NAhlHjTJEur1H5oZY87ZoptvAnF2w6kafix8=";
+ vendorSha256 = "sha256-yMc3Czo7gTb2ZSWjj0yyId+qyro4mU1C+FOgEjZEhBY=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix
index 3550facfc114..1b0b03383664 100644
--- a/pkgs/data/fonts/cozette/default.nix
+++ b/pkgs/data/fonts/cozette/default.nix
@@ -1,14 +1,14 @@
{ lib, fetchzip }:
let
- version = "1.8.3";
+ version = "1.13.0";
in
fetchzip rec {
name = "Cozette-${version}";
url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip";
- sha256 = "1nc4zk6n7cbv9vwlhpm3ady5lc4d4ic1klyywwfg27w8j0jv57hx";
+ sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM=";
postFetch = ''
mkdir -p $out/share/fonts
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index a0d3b34c85cd..9c9996db39e0 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -4,6 +4,7 @@
, fetchFromGitHub
, fetchurl
, cairo
+, nixosTests
, python3
, pkg-config
, pngquant
@@ -70,12 +71,15 @@ let
owner = "googlefonts";
repo = "noto-cjk";
inherit rev sha256;
+ sparseCheckout = "${typeface}/OTC";
};
installPhase = ''
install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc
'';
+ passthru.tests.noto-fonts = nixosTests.noto-fonts;
+
meta = with lib; {
description = "Beautiful and free fonts for CJK languages";
homepage = "https://www.google.com/get/noto/help/cjk/";
@@ -113,14 +117,14 @@ in
typeface = "Sans";
version = "2.004";
rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
- sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik=";
+ sha256 = "sha256-pNC/WJCYHSlU28E/CSFsrEMbyCe/6tjevDlOvDK9RwU=";
};
noto-fonts-cjk-serif = mkNotoCJK {
typeface = "Serif";
version = "2.000";
rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
- sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik=";
+ sha256 = "sha256-Iy4lmWj5l+/Us/dJJ/Jl4MEojE9mrFnhNQxX2zhVngY=";
};
noto-fonts-emoji = let
diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix
new file mode 100644
index 000000000000..4252136cf46b
--- /dev/null
+++ b/pkgs/data/icons/phinger-cursors/default.nix
@@ -0,0 +1,28 @@
+{ lib, stdenvNoCC, fetchurl }:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "phinger-cursors";
+ version = "1.1";
+
+ src = fetchurl {
+ url = "https://github.com/phisch/phinger-cursors/releases/download/v${version}/phinger-cursors-variants.tar.bz2";
+ sha256 = "sha256-II+1x+rcjGRRVB8GYkVwkKVHNHcNaBKRb6C613901oc=";
+ };
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/share/icons
+ cp -r ./ $out/share/icons
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "The most over-engineered cursor theme";
+ homepage = "https://github.com/phisch/phinger-cursors";
+ platforms = platforms.unix;
+ license = licenses.cc-by-sa-40;
+ maintainers = with maintainers; [ fortuneteller2k ];
+ };
+}
diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix
new file mode 100644
index 000000000000..f440208e947b
--- /dev/null
+++ b/pkgs/development/compilers/uasm/default.nix
@@ -0,0 +1,50 @@
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
+
+stdenv.mkDerivation rec {
+ pname = "uasm";
+ version = "2.53";
+
+ src = fetchFromGitHub {
+ owner = "Terraspace";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-Aohwrcb/KTKUFFpfmqVDPNjJh1dMYSNnBJ2eFaP20pM=";
+ };
+
+ # https://github.com/Terraspace/UASM/pull/154
+ patches = [
+ # fix `invalid operands to binary - (have 'char *' and 'uint_8 *' {aka 'unsigned char *'})`
+ (fetchpatch {
+ name = "fix_pointers_compare.patch";
+ url = "https://github.com/clouds56/UASM/commit/9cd3a400990e230571e06d4c758bd3bd35f90ab6.patch";
+ sha256 = "sha256-8mY36dn+g2QNJ1JbWt/y4p0Ha9RSABnOE3vlWANuhsA=";
+ })
+ # fix `dbgcv.c:*:*: fatal error: direct.h: No such file or directory`
+ (fetchpatch {
+ name = "fix_build_dbgcv_c_on_unix.patch";
+ url = "https://github.com/clouds56/UASM/commit/806d54cf778246c96dcbe61a4649bf0aebcb0eba.patch";
+ sha256 = "sha256-uc1LaizdYEh1Ry55Cq+6wrCa1OeBPFo74H5iBpmteAE=";
+ })
+ ];
+
+ enableParallelBuilding = true;
+
+ makefile = "gccLinux64.mak";
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dt "$out/bin" -m0755 GccUnixR/uasm
+ install -Dt "$out/share/doc/${pname}" -m0644 {Readme,History}.txt Doc/*
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ homepage = "http://www.terraspace.co.uk/uasm.html";
+ description = "A free MASM-compatible assembler based on JWasm";
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ thiagokokada ];
+ license = licenses.watcom;
+ };
+}
diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix
index 6b2c6203a392..71f3c884868b 100644
--- a/pkgs/development/embedded/arduino/arduino-core/default.nix
+++ b/pkgs/development/embedded/arduino/arduino-core/default.nix
@@ -79,33 +79,33 @@ let
in
stdenv.mkDerivation rec {
pname = (if withTeensyduino then "teensyduino" else "arduino") + lib.optionalString (!withGui) "-core";
- version = "1.8.16";
+ version = "1.8.19";
src = fetchFromGitHub {
owner = "arduino";
repo = "Arduino";
rev = version;
- sha256 = "sha256-6d+y0Lgr+h0qYpCsa/ihvSMNuAdRMNQRuxZFpkWLDvg=";
+ sha256 = "sha256-I+PvfGc5F8H/NJOGRa18z7dKyKcO8I8Cg7Tj5yxkYAQ=";
};
- teensyduino_version = "155";
+ teensyduino_version = "156";
teensyduino_src = fetchurl {
url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}";
sha256 = {
- linux64 = "sha256-DypCbCm4RKYgnFJRwoHyPht6dFG48YvWM4RzEDdJE6U=";
- linux32 = "sha256-MJ4xsTAZPO8BhO/VWSjBAjBVLrKM+3PNi1fiF8dsuVQ=";
- linuxarm = "sha256-x5JdYflLThohos9RTAWt4XrzvksB7VWfXTKqgXZ1d6Q=";
- linuxaarch64 = "sha256-N18nvavEMhvt2jOrdI+tsXtbWIdsj1n4aMVeaaBlcT4=";
+ linux64 = "sha256-4DbhmmYrx+rCBpDrYFaC0A88Qv9UEeNlQAkFi3zAstk=";
+ linux32 = "sha256-DlRPOtDxmMPv2Qzhib7vNZdKNZCxmm9YmVNnwUKXK/E=";
+ linuxarm = "sha256-d+DbpER/4lFPcPDFeMG5f3WaUGn8pFchdIDo7Hm0XWs=";
+ linuxaarch64 = "sha256-8keQzhWq7QlAGIbfHEe3lfxpJleMMvBORuPaNrLmM6Y=";
}.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");
};
# Used because teensyduino requires jars be a specific size
arduino_dist_src = fetchurl {
url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz";
sha256 = {
- linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po=";
- linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE=";
- linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM=";
- linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ=";
+ linux64 = "sha256-62i93B0cASC+L8oTUKA+40Uxzzf1GEeyEhC25wVFvJs=";
+ linux32 = "sha256-wSxtx3BqXMQCeWQDK8PHkWLlQqQM1Csao8bIk98FrFg=";
+ linuxarm = "sha256-lJ/R1ePq7YtDk3bvloFcn8jswrJH+L63tvH5QpTqfXs=";
+ linuxaarch64 = "sha256-gm8cDjLKNfpcaeO7fw6Kyv1TnWV/ZmH4u++nun9X6jo=";
}.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");
};
diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix
index efac8148a72a..78e160058b23 100644
--- a/pkgs/development/python-modules/shtab/default.nix
+++ b/pkgs/development/python-modules/shtab/default.nix
@@ -5,6 +5,7 @@
, pytestCheckHook
, pythonOlder
, setuptools-scm
+, bashInteractive
}:
buildPythonPackage rec {
@@ -28,6 +29,7 @@ buildPythonPackage rec {
];
checkInputs = [
+ bashInteractive
pytest-timeout
pytestCheckHook
];
@@ -37,11 +39,6 @@ buildPythonPackage rec {
--replace " --cov=shtab --cov-report=term-missing --cov-report=xml" ""
'';
- disabledTests = [
- # bash tests are failing
- "bash"
- ];
-
pythonImportsCheck = [
"shtab"
];
diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/development/tools/java/sawjap/default.nix
index 13532c48d401..b4c682bbd220 100644
--- a/pkgs/development/tools/java/sawjap/default.nix
+++ b/pkgs/development/tools/java/sawjap/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
inherit (sawja) src version;
- sourceRoot = "source/test";
+ prePatch = "cd test";
buildInputs = [ ocaml findlib sawja ];
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index 79c726c27964..410660cb459d 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -2,15 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
- version = "0.10.5";
+ version = "0.10.7";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = version;
- sha256 = "sha256-PbWV8It/ubDbZooJdt/KWihnp221Pexs0U6zMa8KSMw=";
+ sha256 = "sha256-53dyy/jpmQCjOoZ9Wvec0iQMWKVVrt1WQDCGhXH53Mg=";
};
- cargoSha256 = "sha256-VRfk6566SNmvCxtD9EdDxDdBvQuEfjPVggXzt4VoYRg=";
+
+ cargoSha256 = "sha256-cDwuhOJ5/SFCQKJqmN6rPYahW/ctjE0hFr6SpgVzyis=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix
index ba4f88dbcad0..383e943ff246 100644
--- a/pkgs/misc/emulators/dosbox/default.nix
+++ b/pkgs/misc/emulators/dosbox/default.nix
@@ -1,4 +1,16 @@
-{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }:
+{ lib
+, stdenv
+, fetchurl
+, SDL
+, SDL_net
+, SDL_sound
+, copyDesktopItems
+, graphicsmagick
+, libGL
+, libGLU
+, libpng
+, makeDesktopItem
+}:
stdenv.mkDerivation rec {
pname = "dosbox";
@@ -6,31 +18,40 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/dosbox/dosbox-${version}.tar.gz";
- sha256 = "02i648i50dwicv1vaql15rccv4g8h5blf5g6inv67lrfxpbkvlf0";
+ hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo=";
};
+ nativeBuildInputs = [
+ copyDesktopItems
+ graphicsmagick
+ ];
+
+ buildInputs = [
+ SDL
+ SDL_net
+ SDL_sound
+ libGL
+ libGLU
+ libpng
+ ];
+
hardeningDisable = [ "format" ];
- buildInputs = [ SDL SDL_net SDL_sound libGLU libGL libpng ];
-
- nativeBuildInputs = [ graphicsmagick ];
-
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
- desktopItem = makeDesktopItem {
- name = "dosbox";
- exec = "dosbox";
- icon = "dosbox";
- comment = "x86 emulator with internal DOS";
- desktopName = "DOSBox";
- genericName = "DOS emulator";
- categories = "Emulator;";
- };
+ desktopItems = [
+ (makeDesktopItem {
+ name = "dosbox";
+ exec = "dosbox";
+ icon = "dosbox";
+ comment = "x86 dos emulator";
+ desktopName = "DOSBox";
+ genericName = "DOS emulator";
+ categories = "Emulator;Game;";
+ })
+ ];
postInstall = ''
- mkdir -p $out/share/applications
- cp ${desktopItem}/share/applications/* $out/share/applications
-
mkdir -p $out/share/icons/hicolor/256x256/apps
gm convert src/dosbox.ico $out/share/icons/hicolor/256x256/apps/dosbox.png
'';
@@ -40,8 +61,15 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://www.dosbox.com/";
description = "A DOS emulator";
- platforms = platforms.unix;
+ longDescription = ''
+ DOSBox is an emulator that recreates a MS-DOS compatible environment
+ (complete with Sound, Input, Graphics and even basic networking). This
+ environment is complete enough to run many classic MS-DOS games completely
+ unmodified. In order to utilize all of DOSBox's features you need to first
+ understand some basic concepts about the MS-DOS environment.
+ '';
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ matthewbauer ];
- license = licenses.gpl2;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix
index 14161b5d5a3f..9b896cd2a116 100644
--- a/pkgs/servers/roon-bridge/default.nix
+++ b/pkgs/servers/roon-bridge/default.nix
@@ -2,71 +2,80 @@
, alsa-utils
, autoPatchelfHook
, fetchurl
+, ffmpeg
, lib
, makeWrapper
+, openssl
, stdenv
, zlib
}:
-let
- inherit (stdenv.targetPlatform) system;
- throwSystem = throw "Unsupported system: ${system}";
-in
stdenv.mkDerivation rec {
pname = "roon-bridge";
- version = "1.8-814";
+ version = "1.8-880";
src =
let
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version;
+ inherit (stdenv.targetPlatform) system;
+ noSuchSystem = throw "Unsupposed system: ${system}";
in
{
x86_64-linux = fetchurl {
url = "http://download.roonlabs.com/builds/RoonBridge_linuxx64_${urlVersion}.tar.bz2";
- sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A=";
+ sha256 = "sha256-YTLy3D1CQR1hlsGw2MmZtxHT82T0PCYZxD4adt2m1+o=";
};
aarch64-linux = fetchurl {
url = "http://download.roonlabs.com/builds/RoonBridge_linuxarmv8_${urlVersion}.tar.bz2";
- sha256 = "sha256-zZj7PkLUYYHo3dngqErv1RqynSXi6/D5VPZWfrppX5U=";
+ sha256 = "sha256-aCQtYMUIzwhmYJW4a8cFzIRuxyMVIkeaJH4w1Lasp3M=";
};
- }.${system} or throwSystem;
+ }.${system} or noSuchSystem;
+
+ dontConfigure = true;
+ dontBuild = true;
buildInputs = [
alsa-lib
- alsa-utils
zlib
+ stdenv.cc.cc.lib
];
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
- installPhase = ''
- runHook preInstall
- mkdir -p $out
- mv * $out
- runHook postInstall
- '';
-
- postFixup =
+ installPhase =
let
- linkFix = bin: ''
- sed -i '/ulimit/d' ${bin}
- sed -i '/ln -sf/d' ${bin}
- ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin}
- '';
- wrapFix = bin: ''
- wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils ]}
+ fixBin = binPath: ''
+ (
+ sed -i '/ulimit/d' ${binPath}
+ sed -i 's@^SCRIPT=.*@SCRIPT="$(basename "${binPath}")"@' ${binPath}
+ wrapProgram ${binPath} \
+ --argv0 "$(basename ${binPath})" \
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib ffmpeg openssl ]}" \
+ --prefix PATH : "${lib.makeBinPath [ alsa-utils ffmpeg ]}"
+ )
'';
in
''
- ${linkFix "$out/Bridge/RAATServer"}
- ${linkFix "$out/Bridge/RoonBridge"}
- ${linkFix "$out/Bridge/RoonBridgeHelper"}
+ runHook preInstall
+ mkdir -p $out
+ mv * $out
- ${wrapFix "$out/check.sh"}
- ${wrapFix "$out/start.sh"}
+ rm $out/check.sh
+ rm $out/start.sh
+ rm $out/VERSION
+
+ ${fixBin "${placeholder "out"}/Bridge/RAATServer"}
+ ${fixBin "${placeholder "out"}/Bridge/RoonBridge"}
+ ${fixBin "${placeholder "out"}/Bridge/RoonBridgeHelper"}
+
+ mkdir -p $out/bin
+ makeWrapper "$out/Bridge/RoonBridge" "$out/bin/RoonBridge" --run "cd $out"
+
+ runHook postInstall
'';
meta = with lib; {
description = "The music player for music lovers";
+ changelog = "https://community.roonlabs.com/c/roon/software-release-notes/18";
homepage = "https://roonlabs.com";
license = licenses.unfree;
maintainers = with maintainers; [ lovesegfault ];
diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix
index e62f0a9dfd95..4a6195397766 100644
--- a/pkgs/servers/roon-server/default.nix
+++ b/pkgs/servers/roon-server/default.nix
@@ -15,7 +15,7 @@
}:
stdenv.mkDerivation rec {
pname = "roon-server";
- version = "1.8-880";
+ version = "1.8-898";
src =
let
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
in
fetchurl {
url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";
- sha256 = "sha256-Td3iRYGmTg8Vx9c4e4ugIIbAqhDFPax9vR2BsCIQCZA=";
+ sha256 = "sha256-khp2E5BYb7bGEW6xfCKEqYDqAdElOFLbAkaHjILfyqo=";
};
dontConfigure = true;
diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix
index f5344a63f494..c93a750e48f0 100644
--- a/pkgs/tools/archivers/7zz/default.nix
+++ b/pkgs/tools/archivers/7zz/default.nix
@@ -1,5 +1,14 @@
-{ stdenv, lib, fetchurl, p7zip }:
+{ stdenv, lib, fetchurl, p7zip, uasm, useUasm ? stdenv.isx86_64 }:
+let
+ inherit (stdenv.hostPlatform) system;
+ platformSuffix =
+ if useUasm then
+ {
+ x86_64-linux = "_x64";
+ }.${system} or (throw "`useUasm` is not supported for system ${system}")
+ else "";
+in
stdenv.mkDerivation rec {
pname = "7zz";
version = "21.07";
@@ -11,19 +20,18 @@ stdenv.mkDerivation rec {
sourceRoot = "CPP/7zip/Bundles/Alone2";
- # we need https://github.com/nidud/asmc/tree/master/source/asmc/linux in order
- # to build with the optimized assembler but that doesn't support building with
- # GCC: https://github.com/nidud/asmc/issues/8
- makefile = "../../cmpl_gcc.mak"; # "../../cmpl_gcc_x64.mak";
+ makeFlags = lib.optionals useUasm [ "MY_ASM=uasm" ];
- nativeBuildInputs = [ p7zip ];
+ makefile = "../../cmpl_gcc${platformSuffix}.mak";
+
+ nativeBuildInputs = [ p7zip ] ++ lib.optionals useUasm [ uasm ];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
- install -Dm555 -t $out/bin b/g/7zz
+ install -Dm555 -t $out/bin b/g${platformSuffix}/7zz
install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt
runHook postInstall
@@ -37,7 +45,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Command line archiver utility";
- homepage = "https://7zip.org";
+ homepage = "https://7-zip.org";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ anna328p peterhoeg ];
platforms = platforms.linux;
diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix
index 8d01cd2531aa..9df8b37f7032 100644
--- a/pkgs/tools/misc/duf/default.nix
+++ b/pkgs/tools/misc/duf/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "duf";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "muesli";
repo = "duf";
rev = "v${version}";
- sha256 = "sha256-Usdu7f3XPTIT39H23vfP0XBlvNPgPA+3BMyOzFOyLHQ=";
+ sha256 = "sha256-FZ4NplvCc1c+wPy1NSs2qwfWVtCPNHs6JquubGnwiEY=";
};
- vendorSha256 = "sha256-6PV/v+rk63FIR2M0Q7EzqjVvWIwHtK6TQpEYxkXLQ50=";
+ vendorSha256 = "sha256-VLGsfazTD7hSNXPxuGJJwyqvUlqk5wuz8NqFHs/jyZc=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix
index 7945cd168d42..52c481e3c7e1 100644
--- a/pkgs/tools/networking/mqttui/default.nix
+++ b/pkgs/tools/networking/mqttui/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "mqttui";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "EdJoPaTo";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-taGpVLO9K5VmthWadstQcujcLHTb3fhEWDxKGd3Pj+E=";
+ sha256 = "sha256-ScB0zJXyk8bPEDCxdymMqNmlhe/skNHr6IRmJpme+qQ=";
};
- cargoSha256 = "sha256-aAMDl8GZ+XqA4uBiDm2eHQsNFiqCrMBO66X0ruEjpJg=";
+ cargoSha256 = "sha256-736UYTCs4d1DcpHWl5AejEaW+SYzlgElozC3t/RU41g=";
buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index f389da8b4b0b..ffbe598b9291 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -62,8 +62,7 @@ in lib.makeExtensible (self: {
sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=";
};
- # FIXME: nix_2_6 is broken on aarch64-darwin for now.
- stable = self.nix_2_5;
+ stable = self.nix_2_6;
unstable = lib.lowPrio (common rec {
version = "2.7";
diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 058ed8d1487a..d8773080b9d6 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, substituteAll, lib, buildGoPackage, fetchFromGitHub
+{ stdenv, substituteAll, lib, buildGoModule, fetchFromGitHub
, AVFoundation, AudioToolbox, ImageIO, CoreMedia
-, Foundation, CoreGraphics, MediaToolbox
-, gnupg
+, Foundation, CoreGraphics, MediaToolbox, gnupg
}:
-buildGoPackage rec {
+buildGoModule rec {
pname = "keybase";
- version = "5.8.1";
+ version = "5.9.1";
- goPackagePath = "github.com/keybase/client";
- subPackages = [ "go/kbnm" "go/keybase" ];
+ modRoot = "go";
+ subPackages = [ "kbnm" "keybase" ];
dontRenameImports = true;
@@ -17,8 +16,9 @@ buildGoPackage rec {
owner = "keybase";
repo = "client";
rev = "v${version}";
- sha256 = "sha256-SeBZtrRsWTv5yBBsp18daKCNAr70OalH3shlKf+aiEU=";
+ sha256 = "sha256-WAI/rl6awVLbXqdqYAq8fyABAO2qet+GYucuiwClylI=";
};
+ vendorSha256 = "sha256-ZZTM1s/kFHkCjnaDYuP7xCrkW2an3I6kvcMXMy63ySE=";
patches = [
(substituteAll {
@@ -30,12 +30,13 @@ buildGoPackage rec {
buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ];
tags = [ "production" ];
+ ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://www.keybase.io/";
description = "The Keybase official command-line utility and service";
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne ];
+ maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne shofius ];
license = licenses.bsd3;
};
}
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 8912961e3520..d5f04099f756 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -4,16 +4,16 @@
, runtimeShell, gsettings-desktop-schemas }:
let
- versionSuffix = "20210930160723.fefa22edc1";
+ versionSuffix = "20220120174718.95a3939b3a";
in
stdenv.mkDerivation rec {
pname = "keybase-gui";
- version = "5.8.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+ version = "5.9.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
src = fetchurl {
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
- sha256 = "cqbGvnJ6wx5boVe78Ju8CimH1H08DfkM5nmwbV0uKG0=";
+ sha256 = "sha256-Wdl5pZFIz+mDkkE0EDpLGH/eGWYoBbLV05LYJgkwpI4=";
};
nativeBuildInputs = [
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.keybase.io/";
description = "The Keybase official GUI";
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne ];
+ maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne shofius ];
license = licenses.bsd3;
};
}
diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix
index dc49f9d9e77d..52fedf3feef4 100644
--- a/pkgs/tools/security/keybase/kbfs.nix
+++ b/pkgs/tools/security/keybase/kbfs.nix
@@ -1,22 +1,21 @@
-{ lib, buildGoPackage, fetchFromGitHub, keybase }:
+{ lib, buildGoModule, fetchFromGitHub, keybase }:
-buildGoPackage {
+buildGoModule {
pname = "kbfs";
- inherit (keybase) src version;
+ inherit (keybase) src version vendorSha256;
- goPackagePath = "github.com/keybase/client";
- subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/redirector" "go/kbfs/kbfsgit/git-remote-keybase" ];
-
- dontRenameImports = true;
+ modRoot = "go";
+ subPackages = [ "kbfs/kbfsfuse" "kbfs/redirector" "kbfs/kbfsgit/git-remote-keybase" ];
tags = [ "production" ];
+ ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://keybase.io/docs/kbfs";
description = "The Keybase filesystem";
platforms = platforms.unix;
- maintainers = with maintainers; [ avaq rvolosatovs bennofs np ];
+ maintainers = with maintainers; [ avaq rvolosatovs bennofs np shofius ];
license = licenses.bsd3;
};
}
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile
index 9e65ac43afa1..cfeefff2f0a3 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile
+++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile
@@ -5,6 +5,7 @@ gem 'asciidoctor-diagram'
gem 'asciidoctor-epub3'
gem 'asciidoctor-html5s'
gem 'asciidoctor-mathematical'
+gem 'asciidoctor-multipage'
gem 'asciidoctor-pdf'
gem 'asciidoctor-revealjs'
gem 'asciidoctor-rouge'
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
index 98418e183d45..5b0e79aa2bd5 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
+++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2)
- asciidoctor (2.0.16)
+ asciidoctor (2.0.17)
asciidoctor-bibtex (0.8.0)
asciidoctor (~> 2.0)
bibtex-ruby (~> 5.1)
@@ -30,7 +30,9 @@ GEM
asciidoctor (~> 2.0)
asciimath (~> 2.0)
mathematical (~> 1.6.0)
- asciidoctor-pdf (1.6.1)
+ asciidoctor-multipage (0.0.15)
+ asciidoctor (>= 2.0.11, < 2.1)
+ asciidoctor-pdf (1.6.2)
asciidoctor (~> 2.0)
concurrent-ruby (~> 1.1)
prawn (~> 2.4.0)
@@ -62,7 +64,7 @@ GEM
rexml
csl-styles (1.0.1.11)
csl (~> 1.0)
- css_parser (1.10.0)
+ css_parser (1.11.0)
addressable
gepub (1.0.15)
nokogiri (>= 1.8.2, < 2.0)
@@ -75,14 +77,14 @@ GEM
ruby-enum (~> 0.4)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2021.1115)
- mini_portile2 (2.6.1)
+ mime-types-data (3.2022.0105)
+ mini_portile2 (2.7.1)
namae (1.1.1)
- nokogiri (1.12.5)
- mini_portile2 (~> 2.6.1)
+ nokogiri (1.13.1)
+ mini_portile2 (~> 2.7.0)
racc (~> 1.4)
pdf-core (0.9.0)
- pdf-reader (2.6.0)
+ pdf-reader (2.8.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
@@ -104,10 +106,10 @@ GEM
pdf-reader (~> 2.0)
prawn (~> 2.2)
public_suffix (4.0.6)
- pygments.rb (2.2.0)
+ pygments.rb (2.3.0)
racc (1.6.0)
rexml (3.2.5)
- rouge (3.26.1)
+ rouge (3.27.0)
ruby-enum (0.9.0)
i18n
ruby-rc4 (0.1.5)
@@ -128,6 +130,7 @@ DEPENDENCIES
asciidoctor-epub3
asciidoctor-html5s
asciidoctor-mathematical
+ asciidoctor-multipage
asciidoctor-pdf
asciidoctor-revealjs
asciidoctor-rouge
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
index 6bb0eac62f12..c4aa7fa4a271 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
+++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
@@ -10,8 +10,9 @@ bundlerApp {
exes = [
"asciidoctor"
- "asciidoctor-pdf"
"asciidoctor-epub3"
+ "asciidoctor-multipage"
+ "asciidoctor-pdf"
"asciidoctor-revealjs"
];
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
index e88f9701d0d3..498653c12f2e 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
@@ -35,10 +35,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2";
+ sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd";
type = "gem";
};
- version = "2.0.16";
+ version = "2.0.17";
};
asciidoctor-bibtex = {
dependencies = ["asciidoctor" "bibtex-ruby" "citeproc-ruby" "csl-styles" "latex-decode"];
@@ -115,16 +115,27 @@
};
version = "0.3.5";
};
+ asciidoctor-multipage = {
+ dependencies = ["asciidoctor"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1372213kxw1b9k120dmyackafzsk80h1y2n0r1hmfrri26kczgfb";
+ type = "gem";
+ };
+ version = "0.0.15";
+ };
asciidoctor-pdf = {
dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "treetop"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk";
+ sha256 = "1inl7cykm542jb7a6kraxkgfqn4y3185wrabh5pd5m68rdv56f04";
type = "gem";
};
- version = "1.6.1";
+ version = "1.6.2";
};
asciidoctor-revealjs = {
dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"];
@@ -239,10 +250,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5";
+ sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.0";
};
gepub = {
dependencies = ["nokogiri" "rubyzip"];
@@ -313,20 +324,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27";
+ sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
type = "gem";
};
- version = "3.2021.1115";
+ version = "3.2022.0105";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";
+ sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z";
type = "gem";
};
- version = "2.6.1";
+ version = "2.7.1";
};
namae = {
groups = ["default"];
@@ -344,10 +355,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";
+ sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11";
type = "gem";
};
- version = "1.12.5";
+ version = "1.13.1";
};
pdf-core = {
groups = ["default"];
@@ -365,10 +376,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz";
+ sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y";
type = "gem";
};
- version = "2.6.0";
+ version = "2.8.0";
};
polyglot = {
groups = ["default"];
@@ -450,10 +461,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mshqjh8v0v8k29f8annqfr4qlgkp39nbwx3sgm69aymv4skfddb";
+ sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac";
type = "gem";
};
- version = "2.2.0";
+ version = "2.3.0";
};
racc = {
groups = ["default"];
@@ -480,10 +491,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf";
+ sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k";
type = "gem";
};
- version = "3.26.1";
+ version = "3.27.0";
};
ruby-enum = {
dependencies = ["i18n"];
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index 5c607d269b22..7652239b998d 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -5,8 +5,8 @@ GEM
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
afm (0.2.2)
- asciidoctor (2.0.16)
- asciidoctor-pdf (1.6.1)
+ asciidoctor (2.0.17)
+ asciidoctor-pdf (1.6.2)
asciidoctor (~> 2.0)
concurrent-ruby (~> 1.1)
prawn (~> 2.4.0)
@@ -18,11 +18,11 @@ GEM
treetop (~> 1.6.0)
coderay (1.1.3)
concurrent-ruby (1.1.9)
- css_parser (1.10.0)
+ css_parser (1.11.0)
addressable
hashery (2.1.2)
pdf-core (0.9.0)
- pdf-reader (2.6.0)
+ pdf-reader (2.8.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
@@ -44,9 +44,9 @@ GEM
pdf-reader (~> 2.0)
prawn (~> 2.2)
public_suffix (4.0.6)
- pygments.rb (2.2.0)
+ pygments.rb (2.3.0)
rexml (3.2.5)
- rouge (3.26.1)
+ rouge (3.27.0)
ruby-rc4 (0.1.5)
safe_yaml (1.0.5)
treetop (1.6.11)
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix
index b57d1e5ac4ad..d87c6c1fa995 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -35,10 +35,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2";
+ sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd";
type = "gem";
};
- version = "2.0.16";
+ version = "2.0.17";
};
asciidoctor-pdf = {
dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "treetop"];
@@ -46,10 +46,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk";
+ sha256 = "1inl7cykm542jb7a6kraxkgfqn4y3185wrabh5pd5m68rdv56f04";
type = "gem";
};
- version = "1.6.1";
+ version = "1.6.2";
};
coderay = {
groups = ["default"];
@@ -77,10 +77,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5";
+ sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.0";
};
hashery = {
groups = ["default"];
@@ -108,10 +108,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz";
+ sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y";
type = "gem";
};
- version = "2.6.0";
+ version = "2.8.0";
};
polyglot = {
groups = ["default"];
@@ -193,10 +193,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mshqjh8v0v8k29f8annqfr4qlgkp39nbwx3sgm69aymv4skfddb";
+ sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac";
type = "gem";
};
- version = "2.2.0";
+ version = "2.3.0";
};
rexml = {
groups = ["default"];
@@ -213,10 +213,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf";
+ sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k";
type = "gem";
};
- version = "3.26.1";
+ version = "3.27.0";
};
ruby-rc4 = {
groups = ["default"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b553430a6a5a..96fee403acbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13408,6 +13408,8 @@ with pkgs;
bupc = callPackage ../development/compilers/bupc { };
+ uasm = callPackage ../development/compilers/uasm { };
+
urn = callPackage ../development/compilers/urn { };
urweb = callPackage ../development/compilers/urweb {
@@ -24149,6 +24151,8 @@ with pkgs;
publicsuffix-list = callPackage ../data/misc/publicsuffix-list { };
+ phinger-cursors = callPackage ../data/icons/phinger-cursors { };
+
qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { };
qogir-theme = callPackage ../data/themes/qogir { };
@@ -26475,6 +26479,8 @@ with pkgs;
pixeluvo = callPackage ../applications/graphics/pixeluvo { };
+ pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { };
+
pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { };
shepherd = nodePackages."@nerdwallet/shepherd";
@@ -26535,6 +26541,8 @@ with pkgs;
swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { };
+ swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { };
+
tiramisu = callPackage ../applications/misc/tiramisu { };
rootbar = callPackage ../applications/misc/rootbar {};