From dd61fdf45ca8f0d01e5b7e0aa3f05f56bf44499a Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 20 May 2019 23:53:29 +0000 Subject: [PATCH 01/70] xfce4-13: 4.13.x -> 4.14pre1 --- pkgs/desktops/xfce4-13/exo/default.nix | 9 ++- pkgs/desktops/xfce4-13/garcon/12700.patch | 37 --------- pkgs/desktops/xfce4-13/garcon/13785.patch | 75 ------------------- pkgs/desktops/xfce4-13/garcon/default.nix | 10 +-- pkgs/desktops/xfce4-13/gigolo/default.nix | 9 ++- pkgs/desktops/xfce4-13/libxfce4ui/default.nix | 5 +- .../xfce4-13/libxfce4util/default.nix | 5 +- pkgs/desktops/xfce4-13/parole/default.nix | 4 +- pkgs/desktops/xfce4-13/ristretto/default.nix | 4 +- .../xfce4-13/thunar-volman/default.nix | 5 +- pkgs/desktops/xfce4-13/thunar/default.nix | 5 +- pkgs/desktops/xfce4-13/tumbler/default.nix | 5 +- .../xfce4-13/xfce4-appfinder/default.nix | 5 +- .../xfce4-13/xfce4-battery-plugin/default.nix | 4 +- .../xfce4-13/xfce4-clipman-plugin/default.nix | 4 +- .../xfce4-13/xfce4-cpufreq-plugin/default.nix | 4 +- pkgs/desktops/xfce4-13/xfce4-dict/default.nix | 4 +- .../xfce4-13/xfce4-notifyd/default.nix | 4 +- .../desktops/xfce4-13/xfce4-panel/default.nix | 5 +- .../xfce4-13/xfce4-power-manager/default.nix | 5 +- .../xfce4-13/xfce4-screenshooter/default.nix | 4 +- .../xfce4-13/xfce4-session/default.nix | 5 +- .../xfce4-13/xfce4-settings/default.nix | 5 +- .../xfce4-13/xfce4-taskmanager/default.nix | 16 ++-- .../xfce4-whiskermenu-plugin/default.nix | 4 +- pkgs/desktops/xfce4-13/xfconf/default.nix | 5 +- pkgs/desktops/xfce4-13/xfdesktop/default.nix | 5 +- pkgs/desktops/xfce4-13/xfwm4/default.nix | 15 ++-- 28 files changed, 82 insertions(+), 185 deletions(-) delete mode 100644 pkgs/desktops/xfce4-13/garcon/12700.patch delete mode 100644 pkgs/desktops/xfce4-13/garcon/13785.patch diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix index 1096996ee6d5..fa66b5c08e78 100644 --- a/pkgs/desktops/xfce4-13/exo/default.nix +++ b/pkgs/desktops/xfce4-13/exo/default.nix @@ -1,15 +1,16 @@ -{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3 +{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation rec { category = "xfce"; pname = "exo"; - version = "0.12.2"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "1b4hl9yxvf8b8akqf2zngq3m93yqnqcmxqqds1dwzm9vm5sqydgh"; + sha256 = "1gf9fb48nkafb4jj0hmm2s00mpl32dp5iqxfaxm5i1nc6884hipw"; nativeBuildInputs = [ libxslt perlPackages.URI ]; - buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ]; + buildInputs = [ gtk3 libxfce4ui libxfce4util ]; postPatch = '' substituteInPlace docs/reference/Makefile.am \ diff --git a/pkgs/desktops/xfce4-13/garcon/12700.patch b/pkgs/desktops/xfce4-13/garcon/12700.patch deleted file mode 100644 index fda36d696510..000000000000 --- a/pkgs/desktops/xfce4-13/garcon/12700.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Yegor Timoshenko -Date: Thu, 14 Dec 2017 21:13:02 +0000 -Subject: [PATCH] Decrement allocation counter on item unref (#12700) - -diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c -index 2017180..355e520 100644 ---- a/garcon/garcon-menu-item-pool.c -+++ b/garcon/garcon-menu-item-pool.c -@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id, - g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE); - g_return_val_if_fail (node != NULL, FALSE); - -- return garcon_menu_node_tree_rule_matches (node, item); -+ gboolean matches = garcon_menu_node_tree_rule_matches (node, item); -+ -+ if (matches) -+ garcon_menu_item_increment_allocated (item); -+ -+ return matches; - } - - -diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c -index ca8cb63..b44acfe 100644 ---- a/garcon/garcon-menu-item.c -+++ b/garcon/garcon-menu-item.c -@@ -1908,6 +1908,8 @@ garcon_menu_item_unref (GarconMenuItem *item) - { - g_return_if_fail (GARCON_IS_MENU_ITEM (item)); - -+ garcon_menu_item_decrement_allocated (item); -+ - /* Decrement the reference counter */ - g_object_unref (G_OBJECT (item)); - } --- -2.15.1 diff --git a/pkgs/desktops/xfce4-13/garcon/13785.patch b/pkgs/desktops/xfce4-13/garcon/13785.patch deleted file mode 100644 index 1b723d21d60a..000000000000 --- a/pkgs/desktops/xfce4-13/garcon/13785.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001 -From: Stefan Berzl -Date: Mon, 21 Aug 2017 18:39:07 +0300 -Subject: [PATCH] fix: some menu icons are too big (Bug #13785) - -Some packages only provide icons in sizes much bigger than the standard -GTK menu size of 16px. - -The clipboard manager qlipper for example provides the following icon: -/usr/share/icons/hicolor/128x128/apps/qlipper.png - -In GTK 3.22.18 the function gtk_image_new_from_icon_name when given -GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128. - -The patch I have supplied uses existing code to scale such an image. - -Signed-off-by: Eric Koegel ---- - garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++-------------- - 1 file changed, 19 insertions(+), 14 deletions(-) - -diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c -index 41990f2..f31a1ed 100644 ---- a/garcon-gtk/garcon-gtk-menu.c -+++ b/garcon-gtk/garcon-gtk-menu.c -@@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); - size = MIN (w, h); - -- if (! gtk_icon_theme_has_icon (icon_theme, icon_name)) -+ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) -+ { -+ pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);; -+ } -+ else - { - if (g_path_is_absolute (icon_name)) - { -@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) - g_free (name); - } - } -+ } - -- /* Turn the pixbuf into a gtk_image */ -- if (G_LIKELY (pixbuf)) -- { -- /* scale the pixbuf down if it needs it */ -- GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); -- g_object_unref (pixbuf); -- pixbuf = tmp; -+ /* Turn the pixbuf into a gtk_image */ -+ if (G_LIKELY (pixbuf)) -+ { -+ /* scale the pixbuf down if it needs it */ -+ GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); -+ g_object_unref (G_OBJECT (pixbuf)); - -- image = gtk_image_new_from_pixbuf (pixbuf); -- g_object_unref (G_OBJECT (pixbuf)); -- } -+ image = gtk_image_new_from_pixbuf (pixbuf_scaled); -+ g_object_unref (G_OBJECT (pixbuf_scaled)); -+ } -+ else -+ { -+ /* display the placeholder at least */ -+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - } -- -- if (image == NULL) -- image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - - return image; - } diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-13/garcon/default.nix index a88d64702a1a..487e384358a9 100644 --- a/pkgs/desktops/xfce4-13/garcon/default.nix +++ b/pkgs/desktops/xfce4-13/garcon/default.nix @@ -1,12 +1,12 @@ -{ mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }: +{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }: mkXfceDerivation rec { category = "xfce"; pname = "garcon"; - version = "0.6.1"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8"; + sha256 = "0gmvi6m3iww7m3xxx5wiqd8vsi18igzhcpjfzknfc8z741vc38yj"; - patches = [ ./12700.patch ./13785.patch ]; - buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ]; + buildInputs = [ gtk3 libxfce4ui libxfce4util ]; } diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-13/gigolo/default.nix index 0d7b2210b12c..46b659b11d03 100644 --- a/pkgs/desktops/xfce4-13/gigolo/default.nix +++ b/pkgs/desktops/xfce4-13/gigolo/default.nix @@ -1,11 +1,12 @@ -{ mkXfceDerivation, gtk2, libX11 }: +{ mkXfceDerivation, exo, gtk3 }: mkXfceDerivation rec { category = "apps"; pname = "gigolo"; - version = "0.4.2"; + version = "0.4.91"; - sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1"; + sha256 = "1r075hw1jxbpv7jxzyqgfmd2rsw1lykd7snnx736gm55v84k15i7"; - buildInputs = [ gtk2 libX11 ]; + nativeBuildInputs = [ exo ]; + buildInputs = [ gtk3 ]; } diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix index f6997551262e..d760ed8bc710 100644 --- a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix @@ -4,9 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "libxfce4ui"; - version = "4.13.4"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy"; + sha256 = "0z4sadqwp71b3qmxlbms26d8vnxd9cks84mr2f1qaiww6rp7v69y"; buildInputs = [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix index 6a3b633cd09d..1539b3f88d7d 100644 --- a/pkgs/desktops/xfce4-13/libxfce4util/default.nix +++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "libxfce4util"; - version = "4.13.2"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0sb6pzhmh0qzfdhixj1ard56zi68318k86z3a1h3f2fhqy7gyf98"; + sha256 = "13cqv4b34rmr9h7nr9gmk3x2mi2y0v91xzwrwhikd1lmz9ir5lkf"; buildInputs = [ gobject-introspection ]; diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-13/parole/default.nix index e720791f1c47..f3a4561826e8 100644 --- a/pkgs/desktops/xfce4-13/parole/default.nix +++ b/pkgs/desktops/xfce4-13/parole/default.nix @@ -8,9 +8,9 @@ mkXfceDerivation rec { category = "apps"; pname = "parole"; - version = "1.0.1"; + version = "1.0.2"; - sha256 = "0zq1imbjqmwfk3yrsha2s7lclzbh8xgggz0rbksa51siqk73swbb"; + sha256 = "11i20pvbrcf1jbn77skb1cg72jdmdd0jvmf5khfn91slqky8gcbl"; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-13/ristretto/default.nix index b4b0778e9824..b2da81399301 100644 --- a/pkgs/desktops/xfce4-13/ristretto/default.nix +++ b/pkgs/desktops/xfce4-13/ristretto/default.nix @@ -4,7 +4,7 @@ mkXfceDerivation rec { category = "apps"; pname = "ristretto"; - version = "0.8.3"; + version = "0.8.4"; postPatch = '' automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS @@ -14,5 +14,5 @@ mkXfceDerivation rec { nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ]; - sha256 = "02i61ddzpv0qjwahkksnzla57zdmkywyg1qrqs57z4bzj6l4nmkx"; + sha256 = "0vnivwl0xwhzpflys9zwds6x9gqd3v069qn04afmakhi2m8qr6hf"; } diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-13/thunar-volman/default.nix index 0055d0d82179..47900f344b3f 100644 --- a/pkgs/desktops/xfce4-13/thunar-volman/default.nix +++ b/pkgs/desktops/xfce4-13/thunar-volman/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "thunar-volman"; - version = "0.9.0"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; - sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7"; + sha256 = "1g784yjhjacjnkhr8m62xyhnxlfbwk0fwb366p9kkz035k51idrv"; } diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix index dbeb80ac9bd2..5dbea2146c5d 100644 --- a/pkgs/desktops/xfce4-13/thunar/default.nix +++ b/pkgs/desktops/xfce4-13/thunar/default.nix @@ -4,9 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "thunar"; - version = "1.8.1"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "00n5iinhg3xgzj2rcy7zl6g9449i59x2l09cnlkhyrjzghb4k5ha"; + sha256 = "13l1nw526jz80p0ynhxqd3a8flp561z0321z7h4rvnidicvdr32n"; postPatch = '' substituteInPlace docs/Makefile.am \ diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-13/tumbler/default.nix index 05a4f4ecde3c..27f76fbcaaba 100644 --- a/pkgs/desktops/xfce4-13/tumbler/default.nix +++ b/pkgs/desktops/xfce4-13/tumbler/default.nix @@ -6,9 +6,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "tumbler"; - version = "0.2.3"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "1gb4dav6q9bn64c2ayi4896cr79lb8k63ja2sm3lwsjxgg1r4hw9"; + sha256 = "1bvcxqs3391dkf36gpfr0hbylsk84nqhv6kf3lf1hq6p7s9f9z3z"; buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix index 65941fee4c4a..d511f76ec1bd 100644 --- a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.13.0"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy"; + sha256 = "02ds3s7wbpxka7qnliq4c5p428ricdf0jwv01dkfg88gpgqgvswg"; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix index b4b5ff7b7148..376551b09c0f 100644 --- a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-battery-plugin"; - version = "1.1.0"; + version = "1.1.2"; rev = version; - sha256 = "0mz0lj3wjrsj9n4wcqrvv08430g38nkjbdimxdy8316n6bqgngfn"; + sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix index 28f63a6769d7..74628a325d41 100644 --- a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.4.2"; + version = "1.4.3"; rev = version; - sha256 = "1c2h1cs7pycf1rhpirmvb0l0dfvlacb7xgm31q9rxmhihnycd2na"; + sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq"; buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix index e17204c0cd55..84cb74276997 100644 --- a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; - version = "1.2.0"; - sha256 = "0zhs7b7py1njczmpnib4532fwpnd3vnpqfhss2r136cfgy72kp6g"; + version = "1.2.1"; + sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix index 1236b60175d0..603863264efc 100644 --- a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "apps"; pname = "xfce4-dict"; - version = "0.8.1"; + version = "0.8.2"; - sha256 = "0kxirzqmpp7qlr8220i8kipz4bgzkam7h1lpx7yzld5xf7wdzvaf"; + sha256 = "1zbb0k0984ny7wy4gbk6ymkh87rbfakpim54yq4r3h5ymslx7iv7"; patches = [ ./configure-gio.patch ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix index bac258785079..98ed6882a024 100644 --- a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation rec { category = "apps"; pname = "xfce4-notifyd"; - version = "0.4.2"; + version = "0.4.4"; - sha256 = "1zxwzigrhms74crasbqpnzidmq2mnyxpmc9pqr4p4qj14yw4sam9"; + sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai"; buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix index 27c8e1e58c71..c7551a7e6daf 100644 --- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-panel"; - version = "4.13.4"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "13hnzh31d2b1331lnsbfaxg4fqhqa7hmdwkiqsl9hyr8pqimjb2g"; + sha256 = "03jyglimm4wgpmg5a128fshrygzwmpf5wdw26l9azqj8b6iz55al"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix index 5389af668820..0307738aee28 100644 --- a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix @@ -4,9 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-power-manager"; - version = "1.6.1"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0b32m46v3dv1ln3xwlpqbnpflknm4gyfk2w6gn7xjx1k7igcjym3"; + sha256 = "1n9i62jh5ldf8g9n64mm6nh1182abbf96444j14dppb82r94q077"; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix index 0dfad21d07ba..95af146903b1 100644 --- a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.2"; + version = "1.9.5"; - sha256 = "1zl16xcmgrb1s6rsrn37mpl5w522i1i9s7x167xf2d092x333yx2"; + sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06"; nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system" buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-session/default.nix b/pkgs/desktops/xfce4-13/xfce4-session/default.nix index ecf1f6ac505e..6104f6324396 100644 --- a/pkgs/desktops/xfce4-13/xfce4-session/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-session/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-session"; - version = "4.13.0"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0d6h1kgqq6g084jrxx4jxw98h5g0vwsxqrvk0bmapyxh2sbrg07y"; + sha256 = "14bn3wn5qrciy2nbhbx634bz0d6lnxb135bx1qglcf35wn6f0hqk"; buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix index 6eb917fd76fd..7e885c526d15 100644 --- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix @@ -5,9 +5,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-settings"; - version = "4.13.4"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0qnnpvcs2hpfq3n4byjwq343p95i9xw96rq7ym4md4mahnk176dy"; + sha256 = "0q6jh3fqw9n9agp018xiwidrld445irnli5jgwpszi9hc435dbpc"; postPatch = '' automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix index d9a5991598bc..776b3797f769 100644 --- a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix @@ -1,18 +1,12 @@ -{ lib, mkXfceDerivation, exo, gtk2, gtk3 ? null, libwnck3 ? null, libXmu }: +{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }: -let - inherit (lib) enableFeature; -in - -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.2.1"; + version = "1.2.2"; - sha256 = "1p0496r1fb5zqvn6c41kb6rjqwlqghqahgg6hkzw0gjy911im99w"; + sha256 = "03js0pmhrybxa7hrp3gx4rm7j061ansv0bp2dwhnbrdpmzjysysc"; nativeBuildInputs = [ exo ]; - buildInputs = [ gtk2 gtk3 libwnck3 libXmu ]; - - configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; + buildInputs = [ gtk3 libwnck3 libXmu ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix index 41a1ef82932b..41cd491a7dc2 100644 --- a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.2.0"; + version = "2.3.2"; rev = "v${version}"; - sha256 = "1d35xxkdzw8pl3d5ps226mmrrjk0hqczsbvl5smh7l7jbwfambjm"; + sha256 = "0ha6c259d7a0wzpf87ynyzpj3y178iwhpcb87m9zxm66i513qmbs"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-13/xfconf/default.nix index def60bcfe21c..691fc70644c9 100644 --- a/pkgs/desktops/xfce4-13/xfconf/default.nix +++ b/pkgs/desktops/xfce4-13/xfconf/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfconf"; - version = "4.13.5"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0xpnwb04yw5qdn0bj8b740a7rmiy316vhja5pp8p6sdiqm32yi8a"; + sha256 = "0n9cjiz3mj011p3w4jv0n2ifz38whmykdl888mczc26l1gflxnr3"; buildInputs = [ libxfce4util ]; } diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix index 0209b7913602..2d87c6ac987b 100644 --- a/pkgs/desktops/xfce4-13/xfdesktop/default.nix +++ b/pkgs/desktops/xfce4-13/xfdesktop/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfdesktop"; - version = "4.13.2"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0v6dlhraqh9v20qciyj03cbjmg3jb6gvmf0hqzavxqi2di3mv5fl"; + sha256 = "1mni8gzgglhwicaw093i2vpk8q2vilmgg5qbr3izbb8ighhr09jl"; buildInputs = [ exo diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix index 97d414d66932..c8106c8ec174 100644 --- a/pkgs/desktops/xfce4-13/xfwm4/default.nix +++ b/pkgs/desktops/xfce4-13/xfwm4/default.nix @@ -1,25 +1,26 @@ -{ mkXfceDerivation, exo, dbus-glib, epoxy, gtk2, libXdamage -, libstartup_notification, libxfce4ui, libxfce4util, libwnck +{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage +, libstartup_notification, libxfce4ui, libxfce4util, libwnck3 , libXpresent, xfconf }: mkXfceDerivation rec { category = "xfce"; pname = "xfwm4"; - version = "4.13.0"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "19ikyls4xawsbz07qdz60g5yl2jbvpb90sfy5zql7ghypd69cgn9"; + sha256 = "0kdlkpb7phcrsqhyhnw82f03fzmd5xb4w9fdj94frfprfja0b468"; - nativeBuildInputs = [ exo ]; + nativeBuildInputs = [ exo librsvg ]; buildInputs = [ dbus-glib epoxy - gtk2 + gtk3 libXdamage libstartup_notification libxfce4ui libxfce4util - libwnck + libwnck3 libXpresent xfconf ]; From 86fd8c910db9856ca0a2932c379e02bcc915bf57 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 23 Feb 2019 16:05:53 -0500 Subject: [PATCH 02/70] nixos/charybdis: replace deprecated usage of PermissionsStartOnly --- nixos/modules/services/networking/charybdis.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix index 3d02dc8d1375..e3aba063f87b 100644 --- a/nixos/modules/services/networking/charybdis.nix +++ b/nixos/modules/services/networking/charybdis.nix @@ -83,6 +83,10 @@ in gid = config.ids.gids.ircd; }; + systemd.tmpfiles.rules = [ + "d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -" + ]; + systemd.services.charybdis = { description = "Charybdis IRC daemon"; wantedBy = [ "multi-user.target" ]; @@ -93,12 +97,7 @@ in ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}"; Group = cfg.group; User = cfg.user; - PermissionsStartOnly = true; # preStart needs to run with root permissions }; - preStart = '' - ${coreutils}/bin/mkdir -p ${cfg.statedir} - ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir} - ''; }; } From 9fc6955abc34f3454d4a991b8e729f4785ff2a96 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 23 Feb 2019 16:11:22 -0500 Subject: [PATCH 03/70] nixos/couchpotato: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/misc/couchpotato.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix index 70aa895f76d8..528af486b414 100644 --- a/nixos/modules/services/misc/couchpotato.nix +++ b/nixos/modules/services/misc/couchpotato.nix @@ -19,16 +19,11 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -p /var/lib/couchpotato - chown -R couchpotato:couchpotato /var/lib/couchpotato - ''; - serviceConfig = { Type = "simple"; User = "couchpotato"; Group = "couchpotato"; - PermissionsStartOnly = "true"; + StateDirectory = "couchpotato"; ExecStart = "${pkgs.couchpotato}/bin/couchpotato"; Restart = "on-failure"; }; From a8defe81d1c7d0c078d4f531033ac7ebbd725878 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 23 Feb 2019 16:15:58 -0500 Subject: [PATCH 04/70] nixos/mopidy: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/audio/mopidy.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index e2f4ec39f94c..a534b692f177 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -70,25 +70,25 @@ in { config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - mopidy mopidy - -" + ]; + systemd.services.mopidy = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "sound.target" ]; description = "mopidy music player daemon"; - preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}"; serviceConfig = { ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}"; User = "mopidy"; - PermissionsStartOnly = true; }; }; systemd.services.mopidy-scan = { description = "mopidy local files scanner"; - preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}"; serviceConfig = { ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan"; User = "mopidy"; - PermissionsStartOnly = true; Type = "oneshot"; }; }; @@ -98,7 +98,7 @@ in { group = "mopidy"; extraGroups = [ "audio" ]; description = "Mopidy daemon user"; - home = "${cfg.dataDir}"; + home = cfg.dataDir; }; users.groups.mopidy.gid = gid; From 73342be85bc28e8ab0e420554a3a5f0b83d164e5 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 23 Feb 2019 17:23:28 -0500 Subject: [PATCH 05/70] nixos/riemann-dash: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/monitoring/riemann-dash.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix index 7eb4d888b0cc..16eb83008509 100644 --- a/nixos/modules/services/monitoring/riemann-dash.nix +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -59,18 +59,20 @@ in { group = "riemanndash"; }; + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - riemanndash riemanndash - -" + ]; + systemd.services.riemann-dash = { wantedBy = [ "multi-user.target" ]; wants = [ "riemann.service" ]; after = [ "riemann.service" ]; preStart = '' - mkdir -p ${cfg.dataDir}/config - chown -R riemanndash:riemanndash ${cfg.dataDir} + mkdir -p '${cfg.dataDir}/config' ''; serviceConfig = { User = "riemanndash"; ExecStart = "${launcher}/bin/riemann-dash"; - PermissionsStartOnly = true; }; }; From 191e4b075547c46449eaefd23b600d42e76d26e8 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 23 Feb 2019 17:45:28 -0500 Subject: [PATCH 06/70] nixos/heartbeat: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/logging/heartbeat.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixos/modules/services/logging/heartbeat.nix index b595ac07bf5e..56fb4deabda5 100644 --- a/nixos/modules/services/logging/heartbeat.nix +++ b/nixos/modules/services/logging/heartbeat.nix @@ -54,16 +54,18 @@ in config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.stateDir}' - nobody nogroup - -" + ]; + systemd.services.heartbeat = with pkgs; { description = "heartbeat log shipper"; wantedBy = [ "multi-user.target" ]; preStart = '' mkdir -p "${cfg.stateDir}"/{data,logs} - chown nobody:nogroup "${cfg.stateDir}"/{data,logs} ''; serviceConfig = { User = "nobody"; - PermissionsStartOnly = true; AmbientCapabilities = "cap_net_raw"; ExecStart = "${pkgs.heartbeat}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\""; }; From 74b34535fc576d40b432549f97ff720751b672f4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 23 Feb 2019 18:00:03 -0500 Subject: [PATCH 07/70] nixos/gollum: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/misc/gollum.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index d1823bc6d4df..7653b415bf09 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -75,27 +75,24 @@ in users.groups.gollum = { }; + systemd.tmpfiles.rules = [ + "d '${cfg.stateDir}' - ${config.users.users.gollum.name} ${config.users.groups.gollum.name} - -" + ]; + systemd.services.gollum = { description = "Gollum wiki"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.git ]; - preStart = let - userName = config.users.users.gollum.name; - groupName = config.users.groups.gollum.name; - in '' - # All of this is safe to be run on an existing repo - mkdir -p ${cfg.stateDir} + preStart = '' + # This is safe to be run on an existing repo git init ${cfg.stateDir} - chmod 755 ${cfg.stateDir} - chown -R ${userName}:${groupName} ${cfg.stateDir} ''; serviceConfig = { User = config.users.users.gollum.name; Group = config.users.groups.gollum.name; - PermissionsStartOnly = true; ExecStart = '' ${pkgs.gollum}/bin/gollum \ --port ${toString cfg.port} \ From 93235b8a858cd673822fcf310962857059caf6b5 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 07:17:37 -0500 Subject: [PATCH 08/70] nixos/minidlna: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/networking/minidlna.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 1858f03cac1f..ed0c1044a570 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -98,16 +98,10 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" "local-fs.target" ]; - preStart = - '' - mkdir -p /var/cache/minidlna - chown -R minidlna:minidlna /var/cache/minidlna - ''; - serviceConfig = { User = "minidlna"; Group = "minidlna"; - PermissionsStartOnly = true; + CacheDirectory = "minidlna"; RuntimeDirectory = "minidlna"; PIDFile = "/run/minidlna/pid"; ExecStart = From c7481e6340a4eb771d2cc0a057ef4676a377486e Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 07:23:11 -0500 Subject: [PATCH 09/70] nixos/hbase: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/databases/hbase.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 52f2d95b4e00..589c8cf5ec80 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -94,6 +94,11 @@ in { config = mkIf config.services.hbase.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -" + "d '${cfg.logDir}' - ${cfg.user} ${cfg.group} - -" + ]; + systemd.services.hbase = { description = "HBase Server"; wantedBy = [ "multi-user.target" ]; @@ -103,19 +108,7 @@ in { HBASE_LOG_DIR = cfg.logDir; }; - preStart = - '' - mkdir -p ${cfg.dataDir}; - mkdir -p ${cfg.logDir}; - - if [ "$(id -u)" = 0 ]; then - chown ${cfg.user}:${cfg.group} ${cfg.dataDir} - chown ${cfg.user}:${cfg.group} ${cfg.logDir} - fi - ''; - serviceConfig = { - PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; ExecStart = "${cfg.package}/bin/hbase --config ${configDir} master start"; From 4a4d3a2e047ab744eb35c4440e42fa42ce6a3303 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 07:39:53 -0500 Subject: [PATCH 10/70] nixos/zeronet: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/networking/zeronet.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix index 611a51c74ce2..f4988a902685 100644 --- a/nixos/modules/services/networking/zeronet.nix +++ b/nixos/modules/services/networking/zeronet.nix @@ -86,20 +86,17 @@ in with lib; { ''; }; + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' 750 zeronet zeronet - -" + "d '${cfg.logDir}' 750 zeronet zeronet - -" + ]; + systemd.services.zeronet = { description = "zeronet"; after = [ "network.target" (optionalString cfg.tor "tor.service") ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - # Ensure folder exists or create it and permissions are correct - mkdir -p ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir} - chmod 750 ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir} - chown zeronet:zeronet ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir} - ''; - serviceConfig = { - PermissionsStartOnly = true; PrivateTmp = "yes"; User = "zeronet"; Group = "zeronet"; From 0b7305e7830683300fdc9bd3e83000bc9fa2a27b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 07:57:19 -0500 Subject: [PATCH 11/70] nixos/unifi: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/networking/unifi.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index c82e0af2803d..9057a1e12b33 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -146,6 +146,11 @@ in where = where; }) mountPoints; + systemd.tmpfiles.rules = [ + "e '${stateDir}' 0700 unifi - - -" + "e '${stateDir}/data' 0700 unifi - - -" + ]; + systemd.services.unifi = { description = "UniFi controller daemon"; wantedBy = [ "multi-user.target" ]; @@ -157,14 +162,9 @@ in environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib"; preStart = '' - # Ensure privacy of state and data. - chown unifi "${stateDir}" "${stateDir}/data" - chmod 0700 "${stateDir}" "${stateDir}/data" - # Create the volatile webapps rm -rf "${stateDir}/webapps" mkdir -p "${stateDir}/webapps" - chown unifi "${stateDir}/webapps" ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT" ''; @@ -177,7 +177,6 @@ in ExecStart = "${(removeSuffix "\n" cmd)} start"; ExecStop = "${(removeSuffix "\n" cmd)} stop"; User = "unifi"; - PermissionsStartOnly = true; UMask = "0077"; WorkingDirectory = "${stateDir}"; }; From dd9598cf5489303f5d02adb00669bc75c179cef3 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 08:16:35 -0500 Subject: [PATCH 12/70] nixos/teamspeak3: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/networking/teamspeak3.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix index 9ea9c83e37cd..fadb32dcd777 100644 --- a/nixos/modules/services/networking/teamspeak3.nix +++ b/nixos/modules/services/networking/teamspeak3.nix @@ -111,16 +111,15 @@ in gid = config.ids.gids.teamspeak; }; + systemd.tmpfiles.rules = [ + "d '${cfg.logPath}' - ${user} ${group} - -" + ]; + systemd.services.teamspeak3-server = { description = "Teamspeak3 voice communication server daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -p ${cfg.logPath} - chown ${user}:${group} ${cfg.logPath} - ''; - serviceConfig = { ExecStart = '' ${ts3}/bin/ts3server \ @@ -135,7 +134,6 @@ in WorkingDirectory = cfg.dataDir; User = user; Group = group; - PermissionsStartOnly = true; }; }; }; From 307a99bb01ed30f5a3c690c0b1f5fc3204d269ce Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 08:26:36 -0500 Subject: [PATCH 13/70] nixos/squid: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/networking/squid.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index b220c21b604f..9d063b92aa1e 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -159,11 +159,10 @@ in serviceConfig = { Type="forking"; PIDFile="/run/squid.pid"; - PermissionsStartOnly = true; ExecStart = "${pkgs.squid}/bin/squid -YCs -f ${squidConfig}"; }; }; }; -} \ No newline at end of file +} From d33c64eec862abe88fd4fdce6177c48d6f195bf8 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 08:34:02 -0500 Subject: [PATCH 14/70] nixos/slimserver: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/audio/slimserver.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix index 640403d2c97d..8f94a2b49404 100644 --- a/nixos/modules/services/audio/slimserver.nix +++ b/nixos/modules/services/audio/slimserver.nix @@ -42,15 +42,17 @@ in { config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - slimserver slimserver - -" + ]; + systemd.services.slimserver = { after = [ "network.target" ]; description = "Slim Server for Logitech Squeezebox Players"; wantedBy = [ "multi-user.target" ]; - preStart = "mkdir -p ${cfg.dataDir} && chown -R slimserver:slimserver ${cfg.dataDir}"; serviceConfig = { User = "slimserver"; - PermissionsStartOnly = true; # Issue 40589: Disable broken image/video support (audio still works!) ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo"; }; From cdcc50484812443b38f8dd23b7aa429b6da41b6a Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 08:34:52 -0500 Subject: [PATCH 15/70] nixos/scollector: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/monitoring/scollector.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index fbded746a5f7..dc0899c7e684 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -116,7 +116,6 @@ in { path = [ pkgs.coreutils pkgs.iproute ]; serviceConfig = { - PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}"; From 780ff9a4eb9c4017e65b3d847224d5fcc1997ddc Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 08:38:32 -0500 Subject: [PATCH 16/70] nixos/riemann-tools: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/monitoring/riemann-tools.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix index 4e8832dadc5e..9c400a1e3e46 100644 --- a/nixos/modules/services/monitoring/riemann-tools.nix +++ b/nixos/modules/services/monitoring/riemann-tools.nix @@ -54,7 +54,6 @@ in { serviceConfig = { User = "riemanntools"; ExecStart = "${healthLauncher}/bin/riemann-health"; - PermissionsStartOnly = true; }; }; From 46a5db08105f98cef5464dfb4f3318555958689e Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 08:56:36 -0500 Subject: [PATCH 17/70] nixos/quassel: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/networking/quassel.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index b223a48e0550..b495b3948fb5 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -104,6 +104,10 @@ in gid = config.ids.gids.quassel; }]; + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${user} - - -" + ]; + systemd.services.quassel = { description = "Quassel IRC client daemon"; @@ -111,11 +115,6 @@ in after = [ "network.target" ] ++ optional config.services.postgresql.enable "postgresql.service" ++ optional config.services.mysql.enable "mysql.service"; - preStart = '' - mkdir -p ${cfg.dataDir} - chown ${user} ${cfg.dataDir} - ''; - serviceConfig = { ExecStart = concatStringsSep " " ([ @@ -126,7 +125,6 @@ in ] ++ optional cfg.requireSSL "--require-ssl" ++ optional (cfg.certificateFile != null) "--ssl-cert=${cfg.certificateFile}"); User = user; - PermissionsStartOnly = true; }; }; From ff2fdc294eddaf4b75066b32e5a07978345b4e88 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 12:39:56 -0500 Subject: [PATCH 18/70] nixos/kapacitor: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/monitoring/kapacitor.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/kapacitor.nix b/nixos/modules/services/monitoring/kapacitor.nix index a4bdfa8f8053..9966ffd500e8 100644 --- a/nixos/modules/services/monitoring/kapacitor.nix +++ b/nixos/modules/services/monitoring/kapacitor.nix @@ -163,6 +163,10 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.kapacitor ]; + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -" + ]; + systemd.services.kapacitor = { description = "Kapacitor Real-Time Stream Processing Engine"; wantedBy = [ "multi-user.target" ]; @@ -171,12 +175,7 @@ in ExecStart = "${pkgs.kapacitor}/bin/kapacitord -config ${kapacitorConf}"; User = "kapacitor"; Group = "kapacitor"; - PermissionsStartOnly = true; }; - preStart = '' - mkdir -p ${cfg.dataDir} - chown ${cfg.user}:${cfg.group} ${cfg.dataDir} - ''; }; users.users.kapacitor = { From 2c350782ba394eb8b50586781d3fa28abc930db3 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 12:52:36 -0500 Subject: [PATCH 19/70] nixos/alerta: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/monitoring/alerta.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/alerta.nix b/nixos/modules/services/monitoring/alerta.nix index 8f4258e26ded..2a6afac119e1 100644 --- a/nixos/modules/services/monitoring/alerta.nix +++ b/nixos/modules/services/monitoring/alerta.nix @@ -83,6 +83,10 @@ in }; config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.logDir}' - alerta alerta - -" + ]; + systemd.services.alerta = { description = "Alerta Monitoring System"; wantedBy = [ "multi-user.target" ]; @@ -94,12 +98,7 @@ in ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}"; User = "alerta"; Group = "alerta"; - PermissionsStartOnly = true; }; - preStart = '' - mkdir -p ${cfg.logDir} - chown alerta:alerta ${cfg.logDir} - ''; }; environment.systemPackages = [ pkgs.python36Packages.alerta ]; From b6bfb874ecb52d7d3cadcd8c22edc3303ebd5a13 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 12:56:12 -0500 Subject: [PATCH 20/70] nixos/apache-kafka: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/misc/apache-kafka.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 363ac4411e11..9eeae9556992 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -131,6 +131,8 @@ in { home = head cfg.logDirs; }; + systemd.tmpfiles.rules = map (logDir: "d '${logDir} 0700 apache-kafka - - -") cfg.logDirs; + systemd.services.apache-kafka = { description = "Apache Kafka Daemon"; wantedBy = [ "multi-user.target" ]; @@ -145,15 +147,8 @@ in { ${serverConfig} ''; User = "apache-kafka"; - PermissionsStartOnly = true; SuccessExitStatus = "0 143"; }; - preStart = '' - mkdir -m 0700 -p ${concatStringsSep " " cfg.logDirs} - if [ "$(id -u)" = 0 ]; then - chown apache-kafka ${concatStringsSep " " cfg.logDirs}; - fi - ''; }; }; From e85d03e52b05b4aae4c95f1941ea6e1880be55e4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 13:02:10 -0500 Subject: [PATCH 21/70] nixos/aria2: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/networking/aria2.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix index 98eb00861016..53829bf18863 100644 --- a/nixos/modules/services/networking/aria2.nix +++ b/nixos/modules/services/networking/aria2.nix @@ -102,22 +102,19 @@ in users.groups.aria2.gid = config.ids.gids.aria2; + systemd.tmpfiles.rules = [ + "d '${homeDir}' 0770 aria2 aria2 - -" + "d '${config.services.aria2.downloadDir}' 0770 aria2 aria2 - -" + ]; + systemd.services.aria2 = { description = "aria2 Service"; after = [ "local-fs.target" "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - mkdir -m 0770 -p "${homeDir}" - chown aria2:aria2 "${homeDir}" - if [[ ! -d "${config.services.aria2.downloadDir}" ]] - then - mkdir -m 0770 -p "${config.services.aria2.downloadDir}" - chown aria2:aria2 "${config.services.aria2.downloadDir}" - fi if [[ ! -e "${sessionFile}" ]] then touch "${sessionFile}" - chown aria2:aria2 "${sessionFile}" fi cp -f "${settingsFile}" "${settingsDir}/aria2.conf" ''; @@ -128,7 +125,6 @@ in ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "aria2"; Group = "aria2"; - PermissionsStartOnly = true; }; }; }; From e734494a5971564bb7169afe43634da8493e32ee Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 13:04:19 -0500 Subject: [PATCH 22/70] nixos/autossh: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/networking/autossh.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/networking/autossh.nix b/nixos/modules/services/networking/autossh.nix index 9ea17469870d..a098a155e991 100644 --- a/nixos/modules/services/networking/autossh.nix +++ b/nixos/modules/services/networking/autossh.nix @@ -99,7 +99,6 @@ in serviceConfig = { User = "${s.user}"; - PermissionsStartOnly = true; # AutoSSH may exit with 0 code if the SSH session was # gracefully terminated by either local or remote side. Restart = "on-success"; From 8ac5973610e39ff3bd1d8a94a375c036ac7eef8a Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 13:05:44 -0500 Subject: [PATCH 23/70] nixos/boinc: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/computing/boinc/client.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index 8abe3c5b8c9b..7022751b3f01 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -105,19 +105,18 @@ in isSystemUser = true; }; + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - boinc - - -" + ]; + systemd.services.boinc = { description = "BOINC Client"; after = ["network.target" "local-fs.target"]; wantedBy = ["multi-user.target"]; - preStart = '' - mkdir -p ${cfg.dataDir} - chown boinc ${cfg.dataDir} - ''; script = '' ${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag} ''; serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root User = "boinc"; Nice = 10; }; From 99f74c268bf17523d22b92e12f7488eaf2feb3be Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 15:30:57 -0500 Subject: [PATCH 24/70] nixos/confluence: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- .../services/web-apps/atlassian/confluence.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index 15744d90cc79..cf163271d276 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -149,6 +149,17 @@ in users.groups."${cfg.group}" = {}; + systemd.tmpfiles.rules = [ + "d '${cfg.home}' - ${cfg.user} - - -" + "d /run/confluence - - - - -" + + "L+ /run/confluence/home - - - - ${cfg.home}" + "L+ /run/confluence/logs - - - - ${cfg.home}/logs" + "L+ /run/confluence/temp - - - - ${cfg.home}/temp" + "L+ /run/confluence/work - - - - ${cfg.home}/work" + "L+ /run/confluence/server.xml - - - - ${cfg.home}/server.xml" + ]; + systemd.services.confluence = { description = "Atlassian Confluence"; @@ -167,12 +178,6 @@ in preStart = '' mkdir -p ${cfg.home}/{logs,work,temp,deploy} - mkdir -p /run/confluence - ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/confluence - ln -sf ${cfg.home} /run/confluence/home - - chown ${cfg.user} ${cfg.home} - sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' -e 's,protocol="org.apache.coyote.http11.Http11NioProtocol",protocol="org.apache.coyote.http11.Http11NioProtocol" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}",' \ @@ -184,7 +189,6 @@ in User = cfg.user; Group = cfg.group; PrivateTmp = true; - PermissionsStartOnly = true; ExecStart = "${pkg}/bin/start-confluence.sh -fg"; ExecStop = "${pkg}/bin/stop-confluence.sh"; }; From 204be045312a1167d81fee023d3b817c762cbd74 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 15:35:59 -0500 Subject: [PATCH 25/70] nixos/crowd: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- .../services/web-apps/atlassian/crowd.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index c144b21bdaf2..020ca8d89dbb 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -117,6 +117,16 @@ in users.groups."${cfg.group}" = {}; + systemd.tmpfiles.rules = [ + "d '${cfg.home}' - ${cfg.user} ${cfg.group} - -" + "d /run/atlassian-crowd - - - - -" + + "L+ /run/atlassian-crowd/database - - - - ${cfg.home}/database" + "L+ /run/atlassian-crowd/logs - - - - ${cfg.home}/logs" + "L+ /run/atlassian-crowd/work - - - - ${cfg.home}/work" + "L+ /run/atlassian-crowd/server.xml - - - - ${cfg.home}/server.xml" + ]; + systemd.services.atlassian-crowd = { description = "Atlassian Crowd"; @@ -136,12 +146,6 @@ in rm -rf ${cfg.home}/work mkdir -p ${cfg.home}/{logs,database,work} - mkdir -p /run/atlassian-crowd - ln -sf ${cfg.home}/{database,logs,work,server.xml} /run/atlassian-crowd - - chown ${cfg.user}:${cfg.group} ${cfg.home} - chown ${cfg.user}:${cfg.group} ${cfg.home}/{logs,database,work} - sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \ @@ -153,7 +157,6 @@ in User = cfg.user; Group = cfg.group; PrivateTmp = true; - PermissionsStartOnly = true; ExecStart = "${pkg}/start_crowd.sh -fg"; }; }; From 4775c595282ac0531ced5884f4485a1ae834446f Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 16:01:23 -0500 Subject: [PATCH 26/70] nixos/dspam: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/mail/dspam.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix index 167b5aeccc84..72b8c4c08b92 100644 --- a/nixos/modules/services/mail/dspam.nix +++ b/nixos/modules/services/mail/dspam.nix @@ -113,19 +113,14 @@ in { Group = cfg.group; RuntimeDirectory = optional (cfg.domainSocket == defaultSock) "dspam"; RuntimeDirectoryMode = optional (cfg.domainSocket == defaultSock) "0750"; - PermissionsStartOnly = true; + StateDirectory = "dspam"; + StateDirectoryMode = "0750"; + LogsDirectory = "dspam"; + LogsDirectoryMode = "0750"; # DSPAM segfaults on just about every error Restart = "on-abort"; RestartSec = "1s"; }; - - preStart = '' - mkdir -m750 -p /var/lib/dspam - chown -R "${cfg.user}:${cfg.group}" /var/lib/dspam - - mkdir -m750 -p /var/log/dspam - chown -R "${cfg.user}:${cfg.group}" /var/log/dspam - ''; }; } From 8034dac42fe97afe17f64d77d2b606b09384ddb3 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 16:10:08 -0500 Subject: [PATCH 27/70] nixos/firebird: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/databases/firebird.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index cc81b440450b..042c9841df54 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -95,6 +95,11 @@ in environment.systemPackages = [cfg.package]; + systemd.tmpfiles.rules = [ + "d '${dataDir}' 0700 ${cfg.user} - - -" + "d '${systemDir}' 0700 ${cfg.user} - - -" + ]; + systemd.services.firebird = { description = "Firebird Super-Server"; @@ -104,21 +109,16 @@ in # is a better way preStart = '' - mkdir -m 0700 -p \ - "${dataDir}" \ - "${systemDir}" \ - /var/log/firebird - if ! test -e "${systemDir}/security2.fdb"; then cp ${firebird}/security2.fdb "${systemDir}" fi - chown -R ${cfg.user} "${dataDir}" "${systemDir}" /var/log/firebird chmod -R 700 "${dataDir}" "${systemDir}" /var/log/firebird ''; - serviceConfig.PermissionsStartOnly = true; # preStart must be run as root serviceConfig.User = cfg.user; + serviceConfig.LogsDirectory = "firebird"; + serviceConfig.LogsDirectoryMode = "0700"; serviceConfig.ExecStart = ''${firebird}/bin/fbserver -d''; # TODO think about shutdown From 65f449fe333ae24d9ea39928be8d28694a52c106 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 16:23:57 -0500 Subject: [PATCH 28/70] nixos/graylog: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/logging/graylog.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index 74a7b3c9b470..ee5668254981 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -134,6 +134,10 @@ in }; }; + systemd.tmpfiles.rules = [ + "d '${cfg.messageJournalDir}' - ${cfg.user} - - -" + ]; + systemd.services.graylog = with pkgs; { description = "Graylog Server"; wantedBy = [ "multi-user.target" ]; @@ -143,8 +147,6 @@ in }; path = [ pkgs.jre_headless pkgs.which pkgs.procps ]; preStart = '' - mkdir -p /var/lib/graylog -m 755 - rm -rf /var/lib/graylog/plugins || true mkdir -p /var/lib/graylog/plugins -m 755 @@ -154,14 +156,10 @@ in for includedplugin in `ls ${cfg.package}/plugin/`; do ln -s ${cfg.package}/plugin/$includedplugin /var/lib/graylog/plugins/$includedplugin || true done - chown -R ${cfg.user} /var/lib/graylog - - mkdir -p ${cfg.messageJournalDir} -m 755 - chown -R ${cfg.user} ${cfg.messageJournalDir} ''; serviceConfig = { User="${cfg.user}"; - PermissionsStartOnly=true; + StateDirectory = "graylog"; ExecStart = "${cfg.package}/bin/graylogctl run"; }; }; From 114bd801f478a6cd75ba3909fd31b04086296757 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 16:29:33 -0500 Subject: [PATCH 29/70] nixos/jira: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- .../services/web-apps/atlassian/jira.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 0b3a5722d6c8..b0019e77ac27 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -155,6 +155,17 @@ in users.groups."${cfg.group}" = {}; + systemd.tmpfiles.rules = [ + "d '${cfg.home}' - ${cfg.user} - - -" + "d /run/atlassian-jira - - - - -" + + "L+ /run/atlassian-jira/home - - - - ${cfg.home}" + "L+ /run/atlassian-jira/logs - - - - ${cfg.home}/logs" + "L+ /run/atlassian-jira/work - - - - ${cfg.home}/work" + "L+ /run/atlassian-jira/temp - - - - ${cfg.home}/temp" + "L+ /run/atlassian-jira/server.xml - - - - ${cfg.home}/server.xml" + ]; + systemd.services.atlassian-jira = { description = "Atlassian JIRA"; @@ -174,12 +185,6 @@ in preStart = '' mkdir -p ${cfg.home}/{logs,work,temp,deploy} - mkdir -p /run/atlassian-jira - ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/atlassian-jira - ln -sf ${cfg.home} /run/atlassian-jira/home - - chown ${cfg.user} ${cfg.home} - sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' -e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \ @@ -191,7 +196,6 @@ in User = cfg.user; Group = cfg.group; PrivateTmp = true; - PermissionsStartOnly = true; ExecStart = "${pkg}/bin/start-jira.sh -fg"; ExecStop = "${pkg}/bin/stop-jira.sh"; }; From fbe59432379249bc94e6bf7bafd925f4299596db Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 09:06:38 -0500 Subject: [PATCH 30/70] nixos/opendkim: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/mail/opendkim.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index 7855efb46c73..253823cbaf9c 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -101,13 +101,16 @@ in { environment.systemPackages = [ pkgs.opendkim ]; + systemd.tmpfiles.rules = [ + "d '${cfg.keyPath}' - ${cfg.user} ${cfg.group} - -" + ]; + systemd.services.opendkim = { description = "OpenDKIM signing and verification daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - mkdir -p "${cfg.keyPath}" cd "${cfg.keyPath}" if ! test -f ${cfg.selector}.private; then ${pkgs.opendkim}/bin/opendkim-genkey -s ${cfg.selector} -d all-domains-generic-key @@ -116,7 +119,6 @@ in { cat ${cfg.selector}.txt echo "-------------------------------------------------------------" fi - chown ${cfg.user}:${cfg.group} ${cfg.selector}.private ''; serviceConfig = { @@ -124,7 +126,6 @@ in { User = cfg.user; Group = cfg.group; RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim"; - PermissionsStartOnly = true; }; }; From 12dec599058036f88f72ec553ee33a3df1f91c49 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 09:08:21 -0500 Subject: [PATCH 31/70] nixos/octoprint: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/misc/octoprint.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index baa7c3ade52e..2e17f671a512 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -97,6 +97,10 @@ in gid = config.ids.gids.octoprint; }); + systemd.tmpfiles.rules = [ + "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" + ]; + systemd.services.octoprint = { description = "OctoPrint, web interface for 3D printers"; wantedBy = [ "multi-user.target" ]; @@ -105,7 +109,6 @@ in environment.PYTHONPATH = makeSearchPathOutput "lib" pkgs.python.sitePackages [ pluginsEnv ]; preStart = '' - mkdir -p "${cfg.stateDir}" if [ -e "${cfg.stateDir}/config.yaml" ]; then ${pkgs.yaml-merge}/bin/yaml-merge "${cfg.stateDir}/config.yaml" "${cfgUpdate}" > "${cfg.stateDir}/config.yaml.tmp" mv "${cfg.stateDir}/config.yaml.tmp" "${cfg.stateDir}/config.yaml" @@ -113,14 +116,12 @@ in cp "${cfgUpdate}" "${cfg.stateDir}/config.yaml" chmod 600 "${cfg.stateDir}/config.yaml" fi - chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}" ''; serviceConfig = { ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; - PermissionsStartOnly = true; }; }; From fff8b9bcaa353dd61ac258408cfe190096c4c45f Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 09:23:26 -0500 Subject: [PATCH 32/70] nixos/netdata: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/monitoring/netdata.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index a49555cf677f..12a0961c4068 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -143,7 +143,6 @@ in { User = cfg.user; Group = cfg.group; Environment="PYTHONPATH=${pkgs.netdata}/libexec/netdata/python.d/python_modules"; - PermissionsStartOnly = true; ExecStart = "${pkgs.netdata}/bin/netdata -D -c ${configFile}"; TimeoutStopSec = 60; }; From 89dae4b1aed2228960872e2ac23b6c0d23ba8fe7 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 24 Feb 2019 11:16:35 -0500 Subject: [PATCH 33/70] nixos/murmur: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/networking/murmur.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index a6e90feff7ea..d91552a18875 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -257,13 +257,7 @@ in Restart = "always"; User = "murmur"; ExecStart = "${pkgs.murmur}/bin/murmurd -ini ${configFile}"; - PermissionsStartOnly = true; }; - - preStart = '' - mkdir -p /var/log/murmur - chown -R murmur /var/log/murmur - ''; }; }; } From 1540a85458a65fbec09d9a2b84fa4ed6989930ab Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 18 Mar 2019 20:20:17 -0400 Subject: [PATCH 34/70] nixos/frab: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- nixos/modules/services/web-apps/frab.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix index fb95e024817c..e885dc69b3c0 100644 --- a/nixos/modules/services/web-apps/frab.nix +++ b/nixos/modules/services/web-apps/frab.nix @@ -182,16 +182,16 @@ in users.groups = [ { name = cfg.group; } ]; + systemd.tmpfiles.rules = [ + "d '${cfg.statePath}/system/attachments' - ${cfg.user} ${cfg.group} - -" + ]; + systemd.services.frab = { after = [ "network.target" "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; environment = frabEnv; preStart = '' - mkdir -p ${cfg.statePath}/system/attachments - chown ${cfg.user}:${cfg.group} -R ${cfg.statePath} - - mkdir /run/frab -p ln -sf ${pkgs.writeText "frab-database.yml" databaseConfig} /run/frab/database.yml ln -sf ${cfg.statePath}/system /run/frab/system @@ -204,7 +204,6 @@ in ''; serviceConfig = { - PermissionsStartOnly = true; PrivateTmp = true; PrivateDevices = true; Type = "simple"; @@ -213,6 +212,7 @@ in TimeoutSec = "300s"; Restart = "on-failure"; RestartSec = "10s"; + RuntimeDirectory = "frab"; WorkingDirectory = "${package}/share/frab"; ExecStart = "${frab-rake}/bin/frab-bundle exec rails server " + "--binding=${cfg.listenAddress} --port=${toString cfg.listenPort}"; From de6e5ea8152b29c975096d7d4b7d0938874ee37a Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 25 May 2019 18:30:50 -0400 Subject: [PATCH 35/70] nixos/foundationdb: replace deprecated usage of PermissionsStartOnly see https://github.com/NixOS/nixpkgs/issues/53852 --- .../services/databases/foundationdb.nix | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 490c5e9d005a..6182da5e7d65 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -359,6 +359,13 @@ in } ]; + systemd.tmpfiles.rules = [ + "d /etc/foundationdb 0755 ${cfg.user} ${cfg.group} - -" + "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -" + "d '${cfg.logDir}' 0770 ${cfg.user} ${cfg.group} - -" + "F '${cfg.pidFile}' - ${cfg.user} ${cfg.group} - -" + ]; + systemd.services.foundationdb = { description = "FoundationDB Service"; @@ -396,25 +403,12 @@ in path = [ pkg pkgs.coreutils ]; preStart = '' - rm -f ${cfg.pidfile} && \ - touch ${cfg.pidfile} && \ - chown -R ${cfg.user}:${cfg.group} ${cfg.pidfile} - - for x in "${cfg.logDir}" "${cfg.dataDir}"; do - [ ! -d "$x" ] && mkdir -m 0770 -vp "$x"; - chown -R ${cfg.user}:${cfg.group} "$x"; - done - - [ ! -d /etc/foundationdb ] && \ - mkdir -m 0775 -vp /etc/foundationdb && \ - chown -R ${cfg.user}:${cfg.group} "/etc/foundationdb" - if [ ! -f /etc/foundationdb/fdb.cluster ]; then cf=/etc/foundationdb/fdb.cluster desc=$(tr -dc A-Za-z0-9 /dev/null | head -c8) rand=$(tr -dc A-Za-z0-9 /dev/null | head -c8) echo ''${desc}:''${rand}@${initialIpAddr}:${builtins.toString cfg.listenPortStart} > $cf - chmod 0664 $cf && chown -R ${cfg.user}:${cfg.group} $cf + chmod 0664 $cf touch "${cfg.dataDir}/.first_startup" fi ''; From f6d2ebe313067f72696e1607dfc135bacffd10f4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 31 May 2019 22:15:17 -0400 Subject: [PATCH 36/70] Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000000..bbaabf93c7a9 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: https://nixos.org/nixos/foundation.html From 99bade5fdb39e49d3b90c0f759213fb6d19871bb Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Mon, 17 Jun 2019 10:57:35 +0200 Subject: [PATCH 37/70] vulnix: 1.8.1 -> 1.8.2 --- pkgs/tools/security/vulnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 96c3e78b6a7c..2f7986c128b5 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "vulnix"; - version = "1.8.1"; + version = "1.8.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1kpwqsnz7jisi622halzl4s5q42d76nbq6ra800gscnfx48hqw9r"; + sha256 = "0zn21j15vd1z7s40s45zr5wri3r770yvazxqmm60fqpzc5sg552y"; }; outputs = [ "out" "doc" "man" ]; From e955576b43e56cb30a6ccbebef0f7fa25effe80e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 17 Jun 2019 06:09:16 +0000 Subject: [PATCH 38/70] merkaartor: fix build Merkaartor is not compatible with current version of Qt5 (5.12) but is known to work with version 5.9 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fecf53c3f4d6..78a47b668be5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18986,7 +18986,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt59.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; From 462c43881a4a74932c403005b501d7243c6a131b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 17 Jun 2019 16:00:42 +0000 Subject: [PATCH 39/70] merkaartor: fix run-time loading of Qt 5 platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this patch, running merkaartor fails with the following message: “This application failed to start because it could not find or load the Qt platform plugin "xcb"”. --- pkgs/applications/misc/merkaartor/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 70a6efb90ddc..0833464f2c25 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj +{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj , qtbase, qtsvg, qtwebkit }: stdenv.mkDerivation rec { @@ -12,12 +12,17 @@ stdenv.mkDerivation rec { sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ]; enableParallelBuilding = true; + postInstall = '' + wrapProgram $out/bin/merkaartor \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms + ''; + meta = with stdenv.lib; { description = "OpenStreetMap editor"; homepage = http://merkaartor.be/; From c932a4de6d56ceb1706d7d66e3f7fc8e1ccb3dd7 Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Tue, 11 Jun 2019 19:45:56 -0600 Subject: [PATCH 40/70] drm_info: init at 2.1.0 --- pkgs/development/tools/drm_info/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/drm_info/default.nix diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix new file mode 100644 index 000000000000..a97526f85381 --- /dev/null +++ b/pkgs/development/tools/drm_info/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub +, libdrm, json_c +, meson, ninja, pkgconfig +}: + +stdenv.mkDerivation rec { + pname = "drm_info"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "ascent12"; + repo = "drm_info"; + rev = "v${version}"; + sha256 = "1i5bzkgqxjjw34jpj1x1gfdl3sz0sl6i7s787a6mjjslsc5g422l"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ libdrm json_c ]; + + meta = with stdenv.lib; { + description = "Small utility to dump info about DRM devices."; + homepage = "https://github.com/ascent12/drm_info"; + license = licenses.mit; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7134db9c6f2b..ac187542076b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9131,6 +9131,8 @@ in drip = callPackage ../development/tools/drip { }; + drm_info = callPackage ../development/tools/drm_info { }; + drush = callPackage ../development/tools/misc/drush { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; From b28a4b7495ece61a6521a18bb59cecff5fc6eaef Mon Sep 17 00:00:00 2001 From: Ari Becker Date: Thu, 20 Jun 2019 14:03:42 +0300 Subject: [PATCH 41/70] kops: 1.11.1->1.12.1 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index a521f394ebfb..96f3354023cf 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.11.1"; + version = "1.12.1"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "0jia8dhawh786grnbpn64hvsdm6wz5p7hqir01q5xxpd1psnzygj"; + sha256 = "09rmgazdrmnh1lqaayzfbn0ld7mbj9whihs9ijv5gf6si9p0ml9y"; }; buildInputs = [go-bindata]; From 80089545797ce1aae097886c2630549127ea9828 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 22 Jun 2019 16:11:06 +0100 Subject: [PATCH 42/70] pythonPackages.hdbscan: fix build by removing upstream patch, adding joblib joblib is for the benefit of py27, whose scikitlearn doesn't include it. also move cython to nativeBuildInputs --- .../development/python-modules/hdbscan/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 72d818c25d62..02f888b175dc 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -6,7 +6,7 @@ , scipy , scikitlearn , fetchPypi -, fetchpatch +, joblib }: buildPythonPackage rec { @@ -18,18 +18,10 @@ buildPythonPackage rec { sha256 = "5cfdc25375123eb9a72363449979141cc928c1953f220f0f81d7baabcaccec2d"; }; - patches = [ - # Fix Tests. Drop in release >0.8.20 - (fetchpatch { - name = "test-rsl-missing-import.patch"; - url = https://github.com/scikit-learn-contrib/hdbscan/commit/e40ccef139e56e38adf7bd6912cd63efd97598f9.patch; - sha256 = "0cfq4ja7j61h2zwd1jw5gagcz2sg18kjnx29sb0bwa13wfw6fip0"; - }) - ]; - checkInputs = [ nose ]; - propagatedBuildInputs = [ cython numpy scipy scikitlearn ]; + nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ numpy scipy scikitlearn joblib ]; meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; From 98deb873545deae4f475c3f54451cda0693c29e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Sun, 23 Jun 2019 21:33:14 +0200 Subject: [PATCH 43/70] hostapd: Add noscan mode. Applies OpenWRT's noscan patch to hostapd and the relevant option to the hostapd module. This noscan patch adds a new `noscan` option allowing us to create some overlapping BSSs in HT40+/- mode. Note: this option is disabled by default, we leave this up to the end user whether it should be enabled or not. Not being able to create those overlapping BSSs is basically preventing us to use 802.11n in any urban area where chances to overlap with another SSID are extremely high. The patch we are using is a courtesy of the openwrt team and is applied to the defaul hostapd package in both OpenWRT and Archlinux. --- nixos/modules/services/networking/hostapd.nix | 13 +++++++++++-- pkgs/os-specific/linux/hostapd/default.nix | 10 ++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 7add48308f80..a34078884960 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -30,10 +30,11 @@ let ctrl_interface=/run/hostapd ctrl_interface_group=${cfg.group} - ${if cfg.wpa then '' + ${optionalString cfg.wpa '' wpa=2 wpa_passphrase=${cfg.wpaPassphrase} - '' else ""} + ''} + ${optionalString cfg.noScan "noscan=1"} ${cfg.extraConfig} '' ; @@ -69,6 +70,14 @@ in ''; }; + noScan = mkOption { + default = false; + description = '' + Do not scan for overlapping BSSs in HT40+/- mode. + Caution: turning this on will violate regulatory requirements! + ''; + }; + driver = mkOption { default = "nl80211"; example = "hostapd"; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 73174779c8c6..1ec98cb9c517 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,7 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: with stdenv.lib; -stdenv.mkDerivation rec { +let noScanPatch = fetchurl { + url="https://git.telliq.com/gtu/openwrt/raw/master/package/network/services/hostapd/patches/300-noscan.patch"; + sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k"; + }; +in stdenv.mkDerivation rec { name = "hostapd-${version}"; version = "2.8"; @@ -13,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl openssl sqlite ]; + patches = [ noScanPatch ]; + outputs = [ "out" "man" ]; extraConfig = '' @@ -66,7 +72,7 @@ stdenv.mkDerivation rec { repositories.git = git://w1.fi/hostap.git; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom ]; + maintainers = with maintainers; [ phreedom ninjatrappeur ]; platforms = platforms.linux; }; } From 5121f8d1e6a82e949563111843c1f577a9ecf9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Sun, 23 Jun 2019 21:30:51 +0200 Subject: [PATCH 44/70] hostapd: starting hostapd systemd service at boot. --- nixos/modules/services/networking/hostapd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index a34078884960..54a5bed2563f 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -171,6 +171,7 @@ in after = [ "sys-subsystem-net-devices-${escapedInterface}.device" ]; bindsTo = [ "sys-subsystem-net-devices-${escapedInterface}.device" ]; requiredBy = [ "network-link-${cfg.interface}.service" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}"; From 250b31dbfc1f3ae499e61a8a24b04f421e060729 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 24 Jun 2019 13:05:28 -0700 Subject: [PATCH 45/70] rust-bindgen: 0.49.0 -> 0.49.2 Update fixes a checkPhase test on darwin. --- pkgs/development/tools/rust/bindgen/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index d0cd28379d6c..cad237b9cbc9 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; - version = "0.49.0"; + version = "0.49.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = pname; rev = "v${version}"; - sha256 = "0i1lh8z0jpf8gcfqxig8kl6wzjrkwb3jkad5ghb6ppkdkpr94jq4"; + sha256 = "0m9c7zswp87yj7y972ghbx5z7lwbhdxb9qyws5cwiazkl582q0qj"; }; - cargoSha256 = "0v3slbah0s1w75s38x1akvshcxsi1s810yybd9faday7biwmdbmj"; + cargoSha256 = "1311d0wjjj99m59zd2n6r4aq6lwbbpyj54ha2z9g4yd1hn344r91"; libclang = llvmPackages.libclang.lib; #for substituteAll @@ -58,6 +58,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = https://github.com/rust-lang/rust-bindgen; license = with licenses; [ bsd3 ]; + platforms = platforms.unix; maintainers = [ maintainers.ralith ]; }; } From 8cd878c4a595718d595627f3f85dbc142b8a0508 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 24 Jun 2019 13:57:08 -0700 Subject: [PATCH 46/70] cargo-expand: fix darwin build --- pkgs/development/tools/rust/cargo-expand/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 3e2128ff0850..32cd368fb04d 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; @@ -12,6 +12,7 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = with stdenv.lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; From 1681e2c1d4beabf18f151cd360bbc2970e1f886e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 24 Jun 2019 22:04:37 -0500 Subject: [PATCH 47/70] terraform_0_12: 0.12.2 -> 0.12.3 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 2c09a29a377c..34d4858bf4fa 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.2"; - sha256 = "0azgxy31r9jdjj5x2n0sc1n1wjvq9q9zyrgl0rx631ppmjmsz31w"; + version = "0.12.3"; + sha256 = "190bvd1q6h2hgi6s2ca6wnaib4k90rjq5g5l93vcbfjcczcgbv5q"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 09e30a22cf949cf0f766b7ec26190ed86abed82e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 25 Jun 2019 10:29:24 -0400 Subject: [PATCH 48/70] vivaldi: 2.6.1566.40-1 -> 2.6.1566.44-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index c4e7670fca38..d58231efcd44 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,11 +16,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.6.1566.40-1"; + version = "2.6.1566.44-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "03s9kxwyp25nci7jv2zcr7b1s5cqxws49vxg795xgnvq62z5yikv"; + sha256 = "0bqx78bikcgrpg7qg10jylxa582fcxiwah7g2151hadvy8xl15ab"; }; unpackPhase = '' From 18ef383504c23265573f45fcbccea776f42ce755 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 25 Jun 2019 10:30:36 -0400 Subject: [PATCH 49/70] linux: 4.14.129 -> 4.14.130 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 7f69c0ba752b..91fdf0421aae 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.129"; + version = "4.14.130"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1r1njg7vwzssjbn5365zklfcdax2fpz2jkcff977i8df0cmlhj3m"; + sha256 = "0najfj0m8s61hjyag4ll6bvv1y4d03dbgm137fmvfq4szx891ji9"; }; } // (args.argsOverride or {})) From 2077c6afd8d13b2f679ba7cea18906e5078a32bd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 25 Jun 2019 10:31:10 -0400 Subject: [PATCH 50/70] linux: 4.19.55 -> 4.19.56 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 6f94319b9283..de327fffe1e0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.55"; + version = "4.19.56"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ixrc1ryj0xj0pd1cf37gbs08pwjxbw4w0zpm915k34rlz5z01n9"; + sha256 = "1pvbjsy2bd76mmxxv6bf8kh7g6ixlrbj92cm5qq6yjdr2lr989kk"; }; } // (args.argsOverride or {})) From 9952e7142f60243aacfa52ecc58ae5b19a72ebde Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 25 Jun 2019 10:31:42 -0400 Subject: [PATCH 51/70] linux: 5.1.14 -> 5.1.15 --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index 4d13617472a3..d02697e2815d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.14"; + version = "5.1.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0bhiqgfm0wcs0r9al800syrjnxp54bk2n2472ccpwp2nn6mv6dkl"; + sha256 = "168kvin7s7f1rxfy187bw4dfzhm1dr2ypfs4gkrskkl04rq2i8g8"; }; } // (args.argsOverride or {})) From 8c5147af791ba850214709ba7a29fd4382966132 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 25 Jun 2019 17:09:05 +0200 Subject: [PATCH 52/70] weston: 6.0.0 -> 6.0.1 Announcement: https://lists.freedesktop.org/archives/wayland-devel/2019-June/040661.html --- pkgs/applications/window-managers/weston/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 22b6fc30007a..f7f0d4580266 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb +{ stdenv, fetchurl, meson, ninja, pkgconfig +, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null @@ -9,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "weston-${version}"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "04p6hal5kalmdp5dxwh2h5qhkkb4dvbsk7l091zvvcq70slj6qsl"; + sha256 = "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; From 93ff86be32f08aa68849eb9a4b26806a9b684963 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 25 Jun 2019 04:20:00 -0500 Subject: [PATCH 53/70] flow: 0.101.0 -> 0.102.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index ac9680c404c0..62c781e1c9df 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.101.0"; + version = "0.102.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "09m9arpb26fqwc16f2zgjgkrlmjg0gj55zd9rfv2s8x1l0lrx5z6"; + sha256 = "1c49pjzrpcymkvs8vcmb16wd9h1mm62k6w82mibywvhhy8hva1gf"; }; installPhase = '' From 5b4b6b6c24e2756bf5d98eb03974637cd193c076 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 25 Jun 2019 17:33:03 +0200 Subject: [PATCH 54/70] tdesktop: 1.7.7 -> 1.7.10 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5d35da365734..14289a66e259 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.7.7"; - sha256Hash = "0w3jq02qzpx58xlmwaj0lgav5lx6s9hdidnq9v1npp4qmpdnsn75"; + version = "1.7.10"; + sha256Hash = "04if7siv0ib5sbdkdc7vwmxyjy3fnijrshgc8i8m79marfkn3wac"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "480743"; archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7"; From 9472a2ea45858c3e7113d8f25ccc7aee9c181ba3 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Thu, 20 Jun 2019 23:40:01 +0200 Subject: [PATCH 55/70] xtrace: 1.3.1 -> 1.4.0 --- pkgs/tools/X11/xtrace/default.nix | 43 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index 1905ed9752ca..8db15a8f0334 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -1,31 +1,30 @@ -{ stdenv, autoreconfHook, fetchgit, libX11, xauth, makeWrapper }: +{ stdenv, autoreconfHook, fetchFromGitLab, libX11, xauth, makeWrapper }: -let version = "1.3.1"; in -stdenv.mkDerivation { - name = "xtrace-${version}"; - src = fetchgit { - url = "git://git.debian.org/xtrace/xtrace.git"; - rev = "refs/tags/xtrace-1.3.1"; - sha256 = "1g26hr6rl7bbb9cwqk606nbbapslq3wnsy8j28azrgi8hgfqhjfi"; +stdenv.mkDerivation rec { + pname = "xtrace"; + version = "1.4.0"; + + src = fetchFromGitLab rec { + domain = "salsa.debian.org"; + owner = "debian"; + repo = pname; + rev = "xtrace-${version}"; + sha256 = "1yff6x847nksciail9jly41mv70sl8sadh0m5d847ypbjmxcwjpq"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 makeWrapper ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ libX11 ]; - preConfigure = '' - ./autogen.sh + postInstall = '' + wrapProgram "$out/bin/xtrace" \ + --prefix PATH ':' "${xauth}/bin" ''; - postInstall = - '' wrapProgram "$out/bin/xtrace" \ - --prefix PATH ':' "${xauth}/bin" - ''; - - meta = { - homepage = http://xtrace.alioth.debian.org/; + meta = with stdenv.lib; { + homepage = "https://salsa.debian.org/debian/xtrace"; description = "Tool to trace X11 protocol connections"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } From b88ac050bda46b630b85fe91f273f966199fbca3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 25 Jun 2019 12:15:38 -0500 Subject: [PATCH 56/70] bazelisk: 0.0.7 -> 0.0.8 (#63769) --- pkgs/development/tools/bazelisk/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 2ac58203d0d9..27db701ef546 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,20 +2,23 @@ buildGoModule rec { pname = "bazelisk"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { - owner = "philwo"; + owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "177x0mal960gs8578h5ir51vgn1bndm9z091110gqxb9xs9jq8pf"; + sha256 = "16jiy71x8zr3x94p3qms3xbl8632avhwi66i82wv03n4ahkyb6qr"; }; modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl"; meta = with stdenv.lib; { description = "A user-friendly launcher for Bazel"; - homepage = https://github.com/philwo/bazelisk; + longDescription = '' + BEWARE: This package does not work on NixOS. + ''; + homepage = "https://github.com/bazelbuild/bazelisk"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; }; From 71a7fbf613a07c6447087552e95a53efc39b4cb7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 25 Jun 2019 14:17:17 -0500 Subject: [PATCH 57/70] go-tools: 2019.1.1 -> 2019.2 (#63749) --- pkgs/development/tools/go-tools/default.nix | 15 +++++------ pkgs/development/tools/go-tools/deps.nix | 29 --------------------- 2 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/tools/go-tools/deps.nix diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index ee61a745f10b..a5a81cd98c46 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -1,11 +1,11 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { - name = "go-tools-${version}"; - version = "2019.1.1"; +buildGoModule rec { + pname = "go-tools"; + version = "2019.2"; goPackagePath = "honnef.co/go/tools"; excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata''; @@ -13,17 +13,16 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; - rev = "${version}"; - sha256 = "1zwh64x3i32p6f6808q609n63xda3bq888n43wl4alpx1b08spha"; + rev = version; + sha256 = "0gxvrxahfgrx630fq4j629jl177qqw1kyip805k4lw607ph8m7h6"; }; - goDeps = ./deps.nix; + modSha256 = "0ysaq94m7pkziliz4z4dl8ad84mbn17m2hqxvs9wbw4iwhkpi7gz"; meta = with lib; { description = "A collection of tools and libraries for working with Go code, including linters and static analysis."; homepage = https://staticcheck.io; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/go-tools/deps.nix b/pkgs/development/tools/go-tools/deps.nix deleted file mode 100644 index 469d4b9d1530..000000000000 --- a/pkgs/development/tools/go-tools/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2c0ae70061356820330c96810d9483beb9a6da8e"; - sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; - }; - } -] From 43459327624b7e3c8e340c57b0577f3625526f6e Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Tue, 25 Jun 2019 22:00:03 +0200 Subject: [PATCH 58/70] go-protobuf: 2018-01-04 -> 1.3.1 (#63744) --- pkgs/development/tools/go-protobuf/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 750df126e943..e64d61478e66 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -1,19 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { name = "go-protobuf-${version}"; - version = "2018-01-04"; - rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; - - goPackagePath = "github.com/golang/protobuf"; + version = "1.3.1"; src = fetchFromGitHub { - inherit rev; owner = "golang"; repo = "protobuf"; - sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + rev = "v${version}"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; }; + modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + meta = with stdenv.lib; { homepage = "https://github.com/golang/protobuf"; description = " Go bindings for protocol buffer"; From c6078c77be3bdad23274650b31834dad052f15e6 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 25 Jun 2019 22:13:03 +0200 Subject: [PATCH 59/70] home-manager: 2019-05-24 -> 2019-06-25 --- pkgs/tools/package-management/home-manager/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index ca3fa8eca962..ffa9f427dc2f 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2019-05-24"; + version = "2019-06-25"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "d726afd9e45246fe68cfff0af80600ea26bd79fe"; - sha256 = "1pwq475s6bbzhqbdx5v68gnlh02654r7apskl1s9lpxb9s5rg0hf"; + rev = "95d55b8da152f1efffb7713c82ead83a3fcf476d"; + sha256 = "1zbx051rc0b880wjl832m9sliwrhrm1dbdxw8734gvc0pfz6qwn1"; }; nativeBuildInputs = [ makeWrapper ]; From d0683d4a878dbe357a74a92eac7fcbd4bf392da7 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 25 Jun 2019 23:09:55 +0200 Subject: [PATCH 60/70] grafana: 6.2.4 -> 6.2.5 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index fe6ca64f0e68..70ba29dfe033 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.2.4"; + version = "6.2.5"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1xfxvjhq96s3hchvigji7ppz777kggf39gh4dcqjzhls5qy6rm3i"; + sha256 = "03wign7dkc2a9267mmqicvvzgya0g1i9ygr0dz3jvks2k1yhlv2j"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "082mmwksv97r2g8ywvsj5f126ycp3jwxjp21jfq0135l8yz73vwh"; + sha256 = "19zc9x1gkmdr7ijsrhrlln5cib20iyx0vgk0z79d8qyhq69nxfs8"; }; postPatch = '' From 1a50722c04958f93b7279ed560206eed22a3e496 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Wed, 26 Jun 2019 02:12:20 +0200 Subject: [PATCH 61/70] vscode-with-extensions: add missing URL handler The URL handler for VS Code was not copied from the generic version. --- pkgs/applications/editors/vscode/with-extensions.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index c6ba528c3584..074e6b8b12d5 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -68,6 +68,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png" ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" + ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) '' --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" ''} From 6fba2c3565dfc0119943bf80681dbe810bb938f5 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 25 Jun 2019 20:24:58 -0400 Subject: [PATCH 62/70] sd-image-raspberrypi: populateBoot -> populateFirmware Fixes an incomplete change from the last changes. --- nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index cb78bbafecf2..8c9090471dcd 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -22,7 +22,7 @@ in boot.kernelPackages = pkgs.linuxPackages_rpi; sdImage = { - populateBootCommands = let + populateFirmwareCommands = let configTxt = pkgs.writeText "config.txt" '' # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel # when attempting to show low-voltage or overtemperature warnings. From 27170f9619f495d4dfba633be6b6897b8a329ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 25 Jun 2019 22:26:16 -0300 Subject: [PATCH 63/70] deepin.dtkcore: explicitly set DTK_VERSION The build system fails to detect the version to build, defaulting to the minimum one. To circunvent that it has to be explicitly set. --- pkgs/desktops/deepin/dtkcore/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index fe162a2677cd..a0ed5c04e185 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env," ''; - qmakeFlags = [ "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" ]; + qmakeFlags = [ + "DTK_VERSION=${version}" + "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" + ]; postFixup = '' chmod +x $out/lib/dtk2/*.py From 1d964892c495cae2e64ea013baf043b5620ae37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 22 Jun 2019 17:28:29 -0300 Subject: [PATCH 64/70] deepin.dde-launcher: init at 4.6.13 fixup! deepin.dde-launcher: init at 4.6.11 deepin.dde-launcher: 4.6.11 -> 4.6.12 deepin.dde-launcher: 4.6.12 -> 4.6.13 --- pkgs/desktops/deepin/dde-launcher/default.nix | 76 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/desktops/deepin/dde-launcher/default.nix diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix new file mode 100644 index 000000000000..2710393a257c --- /dev/null +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, + dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers, + dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras, + which, xdg_utils, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dde-launcher"; + version = "4.6.13"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1lwwn2qjbd4i7wx18mi8n7hzdh832i3kdadrivr10sbafdank7ky"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + qttools + wrapGAppsHook + deepin.setupHook + ]; + + buildInputs = [ + dde-qt-dbus-factory + dde-session-ui + deepin-desktop-schemas + deepin-wallpapers + dtkcore + dtkwidget + gsettings-qt + qtsvg + qtx11extras + which + xdg_utils + ]; + + postPatch = '' + # debugging + searchHardCodedPaths + + substituteInPlace CMakeLists.txt --replace "/usr/share" "$out/share" + + substituteInPlace src/dbusservices/com.deepin.dde.Launcher.service --replace "/usr" "$out" + + substituteInPlace src/historywidget.cpp --replace "xdg-open" "${xdg_utils}/bin/xdg-open" + substituteInPlace src/widgets/miniframebottombar.cpp --replace "dde-shutdown" "${dde-session-ui}/bin/dde-shutdown" + substituteInPlace src/widgets/miniframerightbar.cpp --replace "which" "${which}/bin/which" + + # Uncomment (and remove space after $) after packaging deepin-manual + #substituteInPlace src/sharedeventfilter.cpp --replace "dman" "$ {deepin-manual}/bin/dman" + + for f in src/boxframe/*.cpp; do + substituteInPlace $f --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg" + done + + # note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0 + ''; + + postFixup = '' + # debugging + searchHardCodedPaths $out + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "Deepin Desktop Environment launcher module"; + homepage = https://github.com/linuxdeepin/dde-launcher; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 49114330f135..6077591bb4f7 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -12,6 +12,7 @@ let dde-daemon = callPackage ./dde-daemon { }; dde-dock = callPackage ./dde-dock { }; dde-file-manager = callPackage ./dde-file-manager { }; + dde-launcher = callPackage ./dde-launcher { }; dde-network-utils = callPackage ./dde-network-utils { }; dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; From b86c7b85689ea452aef5dcc89a5e9de15a2a5e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 22 Jun 2019 17:29:09 -0300 Subject: [PATCH 65/70] nixos/deepin: add dde-launcher usb service --- nixos/modules/services/desktops/deepin/deepin.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix index d9d5d539e422..1e46ad832996 100644 --- a/nixos/modules/services/desktops/deepin/deepin.nix +++ b/nixos/modules/services/desktops/deepin/deepin.nix @@ -35,6 +35,7 @@ pkgs.deepin.dde-calendar pkgs.deepin.dde-daemon pkgs.deepin.dde-dock + pkgs.deepin.dde-launcher pkgs.deepin.dde-file-manager pkgs.deepin.dde-session-ui pkgs.deepin.deepin-anything @@ -47,6 +48,7 @@ pkgs.deepin.dde-calendar pkgs.deepin.dde-daemon pkgs.deepin.dde-dock + pkgs.deepin.dde-launcher pkgs.deepin.dde-file-manager pkgs.deepin.dde-session-ui pkgs.deepin.deepin-anything From f3b94dee34e49d1393de0bfb030451cf90a5f776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Wed, 26 Jun 2019 08:16:44 +0200 Subject: [PATCH 66/70] hostapd: fix hostapd noscan patch url. Something somehow got wrong in #63699; some adjustments made after the review have been discarded :/ --- pkgs/os-specific/linux/hostapd/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 1ec98cb9c517..b2417ebeb47e 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,11 +1,7 @@ { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: with stdenv.lib; -let noScanPatch = fetchurl { - url="https://git.telliq.com/gtu/openwrt/raw/master/package/network/services/hostapd/patches/300-noscan.patch"; - sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "hostapd-${version}"; version = "2.8"; @@ -17,7 +13,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl openssl sqlite ]; - patches = [ noScanPatch ]; + patches = [ + (fetchurl { + # Note: fetchurl seems to be unhappy with openwrt git + # server's URLs containing semicolons. Using the github mirror instead. + url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch"; + sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";}) + ]; outputs = [ "out" "man" ]; From 1e5a8f9dd7aea4d45403e31440dbf25de6b5a157 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 26 Jun 2019 09:26:29 +0200 Subject: [PATCH 67/70] hostapd: remove global with stdenv.lib --- pkgs/os-specific/linux/hostapd/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index b2417ebeb47e..7629a20473b2 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: -with stdenv.lib; stdenv.mkDerivation rec { name = "hostapd-${version}"; version = "2.8"; @@ -50,7 +49,7 @@ stdenv.mkDerivation rec { CONFIG_INTERNETWORKING=y CONFIG_HS20=y CONFIG_ACS=y - '' + optionalString (sqlite != null) '' + '' + stdenv.lib.optionalString (sqlite != null) '' CONFIG_SQLITE=y ''; @@ -69,7 +68,7 @@ stdenv.mkDerivation rec { install -vD hostapd_cli.1 -t $man/share/man/man1 ''; - meta = { + meta = with stdenv.lib; { homepage = http://hostap.epitest.fi; repositories.git = git://w1.fi/hostap.git; description = "A user space daemon for access point and authentication servers"; From ff6eb60c72bcbb6c5d3cce429ae0233467788455 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 26 Jun 2019 11:01:35 +0100 Subject: [PATCH 68/70] conda: 4.3.31 -> 4.6.14 --- pkgs/tools/package-management/conda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index f3021b111d10..ecc520b6e42c 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -28,10 +28,10 @@ # $ conda-shell # $ conda install spyder let - version = "4.3.31"; + version = "4.6.14"; src = fetchurl { url = "https://repo.continuum.io/miniconda/Miniconda3-${version}-Linux-x86_64.sh"; - sha256 = "1rklq81s9v7xz1q0ha99w2sl6kyc5vhk6b21cza0jr3b8cgz0lam"; + sha256 = "1gn43z1y5zw4yv93q1qajwbmmqs83wx5ls5x4i4llaciba4j6sqd"; }; conda = runCommand "conda-install" { buildInputs = [ makeWrapper ]; } From d2c84bb3d1cae127cc4dcfeae42e7db605857d7a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 23 Jun 2019 14:47:19 +0100 Subject: [PATCH 69/70] pythonPackages.execnet: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/execnet/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 7ad1f4267d04..50a5683a571b 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -3,21 +3,21 @@ , buildPythonPackage , isPyPy , fetchPypi -, pytest_3 +, pytest , setuptools_scm , apipkg }: buildPythonPackage rec { pname = "execnet"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a"; + sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm"; }; - checkInputs = [ pytest_3 ]; + checkInputs = [ pytest ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ apipkg ]; @@ -34,9 +34,6 @@ buildPythonPackage rec { py.test testing ''; - # not yet compatible with pytest 4 - doCheck = false; - __darwinAllowLocalNetworking = true; meta = with stdenv.lib; { From 8df753c5983cdd4ca9b454570c7987feba8ebb2a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 23 Jun 2019 00:27:59 +0100 Subject: [PATCH 70/70] pythonPackages.requests-toolbelt: Add missing checkinput pyopenssl --- pkgs/development/python-modules/requests-toolbelt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index ff3a18e7e765..8dba9a91226e 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -5,6 +5,7 @@ , betamax , mock , pytest +, pyopenssl }: buildPythonPackage rec { @@ -16,7 +17,7 @@ buildPythonPackage rec { sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"; }; - checkInputs = [ betamax mock pytest ]; + checkInputs = [ pyopenssl betamax mock pytest ]; propagatedBuildInputs = [ requests ]; checkPhase = ''