Browse Source

Merge branch 'master' of github.com:NixOS/nixpkgs

openssl
Marco Maggesi 1 year ago
parent
commit
2b05a35e08
100 changed files with 976 additions and 694 deletions
  1. 1
    14
      doc/languages-frameworks/beam.xml
  2. 6
    0
      maintainers/maintainer-list.nix
  3. 1
    0
      maintainers/scripts/luarocks-packages.csv
  4. 2
    2
      nixos/doc/manual/man-configuration.xml
  5. 2
    2
      nixos/doc/manual/man-nixos-build-vms.xml
  6. 2
    2
      nixos/doc/manual/man-nixos-enter.xml
  7. 2
    2
      nixos/doc/manual/man-nixos-generate-config.xml
  8. 2
    2
      nixos/doc/manual/man-nixos-install.xml
  9. 2
    2
      nixos/doc/manual/man-nixos-option.xml
  10. 2
    2
      nixos/doc/manual/man-nixos-rebuild.xml
  11. 2
    2
      nixos/doc/manual/man-nixos-version.xml
  12. 11
    0
      nixos/doc/manual/release-notes/rl-1909.xml
  13. 8
    0
      nixos/doc/manual/release-notes/rl-2003.xml
  14. 11
    3
      nixos/lib/make-disk-image.nix
  15. 1
    3
      nixos/modules/config/system-environment.nix
  16. 0
    3
      nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
  17. 18
    1
      nixos/modules/installer/cd-dvd/iso-image.nix
  18. 20
    0
      nixos/modules/installer/tools/nixos-generate-config.pl
  19. 1
    0
      nixos/modules/installer/tools/tools.nix
  20. 2
    2
      nixos/modules/misc/ids.nix
  21. 0
    1
      nixos/modules/module-list.nix
  22. 0
    27
      nixos/modules/programs/blcr.nix
  23. 3
    0
      nixos/modules/rename.nix
  24. 1
    0
      nixos/modules/services/databases/memcached.nix
  25. 34
    0
      nixos/modules/services/monitoring/thanos.nix
  26. 33
    59
      nixos/modules/services/networking/zeronet.nix
  27. 11
    0
      nixos/modules/services/web-apps/documize.nix
  28. 2
    0
      nixos/modules/services/x11/desktop-managers/gnome3.nix
  29. 3
    2
      nixos/modules/services/x11/desktop-managers/pantheon.nix
  30. 5
    1
      nixos/modules/services/x11/desktop-managers/xfce4-14.nix
  31. 10
    0
      nixos/modules/services/x11/display-managers/gdm.nix
  32. 27
    0
      nixos/modules/system/boot/stage-1-init.sh
  33. 8
    4
      nixos/modules/tasks/network-interfaces-systemd.nix
  34. 5
    0
      nixos/modules/tasks/network-interfaces.nix
  35. 7
    0
      nixos/modules/virtualisation/containers.nix
  36. 18
    5
      nixos/tests/networking.nix
  37. 1
    0
      nixos/tests/predictable-interface-names.nix
  38. 1
    0
      nixos/tests/systemd-networkd-wireguard.nix
  39. 44
    0
      pkgs/applications/audio/friture/default.nix
  40. 13
    0
      pkgs/applications/audio/friture/factorial.patch
  41. 2
    2
      pkgs/applications/audio/kid3/default.nix
  42. 2
    2
      pkgs/applications/audio/snd/default.nix
  43. 2
    2
      pkgs/applications/audio/spotifyd/default.nix
  44. 3
    3
      pkgs/applications/editors/android-studio/default.nix
  45. 2
    2
      pkgs/applications/editors/nano/default.nix
  46. 3
    1
      pkgs/applications/editors/neovim/default.nix
  47. 6
    6
      pkgs/applications/editors/sublime/3/packages.nix
  48. 3
    3
      pkgs/applications/editors/vscode/generic.nix
  49. 6
    2
      pkgs/applications/editors/vscode/vscodium.nix
  50. 2
    2
      pkgs/applications/graphics/kodelife/default.nix
  51. 0
    4
      pkgs/applications/graphics/openscad/default.nix
  52. 2
    2
      pkgs/applications/graphics/pdfcpu/default.nix
  53. 57
    0
      pkgs/applications/misc/cipher/default.nix
  54. 1
    0
      pkgs/applications/misc/cmatrix/default.nix
  55. 2
    2
      pkgs/applications/misc/dbeaver/default.nix
  56. 8
    2
      pkgs/applications/misc/ddgr/default.nix
  57. 10
    2
      pkgs/applications/misc/font-manager/default.nix
  58. 2
    2
      pkgs/applications/misc/gpxsee/default.nix
  59. 3
    0
      pkgs/applications/misc/grip/default.nix
  60. 2
    1
      pkgs/applications/misc/gxneur/default.nix
  61. 2
    2
      pkgs/applications/misc/jgmenu/default.nix
  62. 6
    0
      pkgs/applications/misc/mysql-workbench/default.nix
  63. 2
    2
      pkgs/applications/misc/overmind/default.nix
  64. 11
    7
      pkgs/applications/misc/pdfpc/default.nix
  65. 2
    2
      pkgs/applications/misc/syncthingtray/default.nix
  66. 2
    2
      pkgs/applications/networking/browsers/ephemeral/default.nix
  67. 373
    373
      pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
  68. 2
    2
      pkgs/applications/networking/browsers/firefox/packages.nix
  69. 6
    6
      pkgs/applications/networking/gns3/default.nix
  70. 2
    2
      pkgs/applications/networking/gns3/gui.nix
  71. 4
    32
      pkgs/applications/networking/gns3/server.nix
  72. 2
    2
      pkgs/applications/networking/instant-messengers/rambox/pro.nix
  73. 2
    2
      pkgs/applications/networking/instant-messengers/signal-cli/default.nix
  74. 11
    10
      pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
  75. 9
    9
      pkgs/applications/networking/remote/anydesk/default.nix
  76. 2
    2
      pkgs/applications/networking/remote/teamviewer/default.nix
  77. 2
    2
      pkgs/applications/networking/sync/onedrive/default.nix
  78. 5
    5
      pkgs/applications/networking/znc/modules.nix
  79. 2
    2
      pkgs/applications/office/qownnotes/default.nix
  80. 2
    2
      pkgs/applications/office/timetable/default.nix
  81. 3
    3
      pkgs/applications/science/astronomy/gildas/default.nix
  82. 2
    2
      pkgs/applications/science/math/cbc/default.nix
  83. 16
    3
      pkgs/applications/science/math/cntk/default.nix
  84. 13
    12
      pkgs/applications/science/molecular-dynamics/gromacs/default.nix
  85. 2
    0
      pkgs/applications/version-management/git-and-tools/default.nix
  86. 22
    0
      pkgs/applications/version-management/git-and-tools/delta/default.nix
  87. 2
    2
      pkgs/applications/version-management/git-and-tools/hub/default.nix
  88. 2
    1
      pkgs/applications/version-management/gitlab/gitaly/default.nix
  89. 4
    3
      pkgs/applications/version-management/sourcehut/core.nix
  90. 2
    2
      pkgs/applications/version-management/src/default.nix
  91. 1
    1
      pkgs/applications/virtualization/OVMF/default.nix
  92. 3
    3
      pkgs/applications/virtualization/lkl/default.nix
  93. 2
    2
      pkgs/applications/virtualization/podman/default.nix
  94. 2
    2
      pkgs/applications/window-managers/2bwm/default.nix
  95. 2
    2
      pkgs/data/fonts/ibm-plex/default.nix
  96. 2
    2
      pkgs/data/fonts/nerdfonts/default.nix
  97. 2
    2
      pkgs/data/icons/elementary-xfce-icon-theme/default.nix
  98. 3
    3
      pkgs/data/icons/numix-icon-theme-circle/default.nix
  99. 2
    2
      pkgs/data/icons/numix-icon-theme-square/default.nix
  100. 0
    0
      pkgs/data/icons/numix-icon-theme/default.nix

+ 1
- 14
doc/languages-frameworks/beam.xml View File

@@ -55,20 +55,7 @@
55 55
    <title>Rebar3</title>
56 56
 
57 57
    <para>
58
-    By default, Rebar3 wants to manage its own dependencies. This is perfectly acceptable in the normal, non-Nix setup, but in the Nix world, it is not. To rectify this, we provide two versions of Rebar3:
59
-    <itemizedlist>
60
-     <listitem>
61
-      <para>
62
-       <literal>rebar3</literal>: patched to remove the ability to download anything. When not running it via <literal>nix-shell</literal> or <literal>nix-build</literal>, it's probably not going to work as desired.
63
-      </para>
64
-     </listitem>
65
-     <listitem>
66
-      <para>
67
-       <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should work exactly as would any other version of Rebar3. Any Erlang package should rely on <literal>rebar3</literal> instead. See <xref
68
-            linkend="rebar3-packages"/>.
69
-      </para>
70
-     </listitem>
71
-    </itemizedlist>
58
+    We provide a version of Rebar3, which is the normal, unmodified Rebar3, under <literal>rebar3</literal>. We also provide a helper to fetch Rebar3 dependencies from a lockfile under <literal>fetchRebar3Deps</literal>.
72 59
    </para>
73 60
   </section>
74 61
 

+ 6
- 0
maintainers/maintainer-list.nix View File

@@ -5904,6 +5904,12 @@
5904 5904
     githubId = 819413;
5905 5905
     name = "Benedict Aas";
5906 5906
   };
5907
+  shyim = {
5908
+    email = "s.sayakci@gmail.com";
5909
+    github = "shyim";
5910
+    githubId = 6224096;
5911
+    name = "Soner Sayakci";
5912
+  };
5907 5913
   siddharthist = {
5908 5914
     email = "langston.barrett@gmail.com";
5909 5915
     github = "langston-barrett";

+ 1
- 0
maintainers/scripts/luarocks-packages.csv View File

@@ -68,3 +68,4 @@ say,,,,,
68 68
 std__debug,std._debug,,,,
69 69
 std_normalize,std.normalize,,,,
70 70
 stdlib,,,,,vyp
71
+pulseaudio,,,,,doronbehar

+ 2
- 2
nixos/doc/manual/man-configuration.xml View File

@@ -8,8 +8,8 @@
8 8
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
9 9
  </refmeta>
10 10
  <refnamediv>
11
-  <refname><filename>configuration.nix</filename>
12
-  </refname><refpurpose>NixOS system configuration specification</refpurpose>
11
+  <refname><filename>configuration.nix</filename></refname>
12
+  <refpurpose>NixOS system configuration specification</refpurpose>
13 13
  </refnamediv>
14 14
  <refsection>
15 15
   <title>Description</title>

+ 2
- 2
nixos/doc/manual/man-nixos-build-vms.xml View File

@@ -8,8 +8,8 @@
8 8
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
9 9
  </refmeta>
10 10
  <refnamediv>
11
-  <refname><command>nixos-build-vms</command>
12
-  </refname><refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
11
+  <refname><command>nixos-build-vms</command></refname>
12
+  <refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
13 13
  </refnamediv>
14 14
  <refsynopsisdiv>
15 15
   <cmdsynopsis>

+ 2
- 2
nixos/doc/manual/man-nixos-enter.xml View File

@@ -8,8 +8,8 @@
8 8
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
9 9
  </refmeta>
10 10
  <refnamediv>
11
-  <refname><command>nixos-enter</command>
12
-  </refname><refpurpose>run a command in a NixOS chroot environment</refpurpose>
11
+  <refname><command>nixos-enter</command></refname>
12
+  <refpurpose>run a command in a NixOS chroot environment</refpurpose>
13 13
  </refnamediv>
14 14
  <refsynopsisdiv>
15 15
   <cmdsynopsis>

+ 2
- 2
nixos/doc/manual/man-nixos-generate-config.xml View File

@@ -8,8 +8,8 @@
8 8
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
9 9
  </refmeta>
10 10
  <refnamediv>
11
-  <refname><command>nixos-generate-config</command>
12
-  </refname><refpurpose>generate NixOS configuration modules</refpurpose>
11
+  <refname><command>nixos-generate-config</command></refname>
12
+  <refpurpose>generate NixOS configuration modules</refpurpose>
13 13
  </refnamediv>
14 14
  <refsynopsisdiv>
15 15
   <cmdsynopsis>

+ 2
- 2
nixos/doc/manual/man-nixos-install.xml View File

@@ -8,8 +8,8 @@
8 8
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
9 9
  </refmeta>
10 10
  <refnamediv>
11
-  <refname><command>nixos-install</command>
12
-  </refname><refpurpose>install bootloader and NixOS</refpurpose>
11
+  <refname><command>nixos-install</command></refname>
12
+  <refpurpose>install bootloader and NixOS</refpurpose>
13 13
  </refnamediv>
14 14
  <refsynopsisdiv>
15 15
   <cmdsynopsis>

+ 2
- 2
nixos/doc/manual/man-nixos-option.xml View File

@@ -8,8 +8,8 @@
8 8
 <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
9 9
  </refmeta>
10 10
  <refnamediv>
11
-  <refname><command>nixos-option</command>
12
-  </refname><refpurpose>inspect a NixOS configuration</refpurpose>
11
+  <refname><command>nixos-option</command></refname>
12
+  <refpurpose>inspect a NixOS configuration</refpurpose>
13 13
  </refnamediv>
14 14
  <refsynopsisdiv>
15 15
   <cmdsynopsis>

+ 2
- 2
nixos/doc/manual/man-nixos-rebuild.xml View File

@@ -9,8 +9,8 @@
9 9
  </refmeta>
10 10
 
11 11
  <refnamediv>
12
-  <refname><command>nixos-rebuild</command>
13
-  </refname><refpurpose>reconfigure a NixOS machine</refpurpose>
12
+  <refname><command>nixos-rebuild</command></refname>
13
+  <refpurpose>reconfigure a NixOS machine</refpurpose>
14 14
  </refnamediv>
15 15
 
16 16
  <refsynopsisdiv>

+ 2
- 2
nixos/doc/manual/man-nixos-version.xml View File

@@ -7,8 +7,8 @@
7 7
   <refmiscinfo class="source">NixOS</refmiscinfo>
8 8
  </refmeta>
9 9
  <refnamediv>
10
-  <refname><command>nixos-version</command>
11
-  </refname><refpurpose>show the NixOS version</refpurpose>
10
+  <refname><command>nixos-version</command></refname>
11
+  <refpurpose>show the NixOS version</refpurpose>
12 12
  </refnamediv>
13 13
  <refsynopsisdiv>
14 14
   <cmdsynopsis>

+ 11
- 0
nixos/doc/manual/release-notes/rl-1909.xml View File

@@ -512,6 +512,12 @@
512 512
        is set to <literal>/var/lib/gitlab/state</literal>, <literal>gitlab</literal> and all parent directories
513 513
        must be owned by either <literal>root</literal> or the user specified in <option>services.gitlab.user</option>.
514 514
      </para>
515
+     <para>
516
+      The <option>networking.useDHCP</option> option is unsupported in combination with
517
+      <option>networking.useNetworkd</option> in anticipation of defaulting to it by default.
518
+      It has to be set to <literal>false</literal> and enabled per
519
+      interface with <option>networking.interfaces.&lt;name&gt;.useDHCP = true;</option>
520
+    </para>
515 521
    </listitem>
516 522
    <listitem>
517 523
      <para>
@@ -519,6 +525,11 @@
519 525
        Please use the fork <literal>cawbird</literal> instead which has been adapted to the API changes and is still maintained.
520 526
      </para>
521 527
    </listitem>
528
+   <listitem>
529
+     <para>
530
+      The <literal>nodejs-11_x</literal> package has been removed as it's EOLed by upstream.
531
+     </para>
532
+   </listitem>
522 533
   </itemizedlist>
523 534
  </section>
524 535
 

+ 8
- 0
nixos/doc/manual/release-notes/rl-2003.xml View File

@@ -28,6 +28,14 @@
28 28
      Postgresql for NixOS service now defaults to v11.
29 29
     </para>
30 30
    </listitem>
31
+   <listitem>
32
+    <para>
33
+     The graphical installer image starts the graphical session automatically.
34
+     Before you'd be greeted by a tty and asked to enter <command>systemctl start display-manager</command>.
35
+     It is now possible to disable the display-manager from running by selecting the <literal>Disable display-manager</literal>
36
+     quirk in the boot menu.
37
+    </para>
38
+   </listitem>
31 39
   </itemizedlist>
32 40
  </section>
33 41
 

+ 11
- 3
nixos/lib/make-disk-image.nix View File

@@ -180,9 +180,17 @@ let format' = format; in let
180 180
     export NIX_STATE_DIR=$TMPDIR/state
181 181
     nix-store --load-db < ${closureInfo}/registration
182 182
 
183
-    echo "running nixos-install..."
184
-    nixos-install --root $root --no-bootloader --no-root-passwd \
185
-      --system ${config.system.build.toplevel} --channel ${channelSources} --substituters ""
183
+    mkdir -m 0755 -p "$root/etc"
184
+    touch "$root/etc/NIXOS"
185
+
186
+    echo "copying system..."
187
+    nix-env --store "$root" --substituters "auto?trusted=1" \
188
+        -p "$root/nix/var/nix/profiles/system" --set "${config.system.build.toplevel}" --quiet
189
+
190
+    echo "copying channel..."
191
+    mkdir -p "$root/nix/var/nix/profiles/per-user/root"
192
+    nix-env --store "$root" --substituters "auto?trusted=1" \
193
+        -p "$root/nix/var/nix/profiles/per-user/root/channels" --set "${channelSources}" --quiet
186 194
 
187 195
     echo "copying staging root to image..."
188 196
     cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* /

+ 1
- 3
nixos/modules/config/system-environment.nix View File

@@ -78,9 +78,7 @@ in
78 78
         # We're trying to use the same syntax for PAM variables and env variables.
79 79
         # That means we need to map the env variables that people might use to their
80 80
         # equivalent PAM variable.
81
-        # Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have 
82
-        # different syntax.
83
-        replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["\${HOME}" "@{PAM_USER}"];
81
+        replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"];
84 82
 
85 83
         pamVariable = n: v:
86 84
           ''${n}   DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"'';

+ 0
- 3
nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix View File

@@ -25,9 +25,6 @@ with lib;
25 25
   services.xserver = {
26 26
     enable = true;
27 27
 
28
-    # Don't start the X server by default.
29
-    autorun = mkForce false;
30
-
31 28
     # Automatically login as nixos.
32 29
     displayManager.slim = {
33 30
       enable = true;

+ 18
- 1
nixos/modules/installer/cd-dvd/iso-image.nix View File

@@ -24,7 +24,7 @@ let
24 24
         # Name appended to menuentry defaults to params if no specific name given.
25 25
         option.name or (if option ? params then "(${option.params})" else "")
26 26
         }' ${if option ? class then " --class ${option.class}" else ""} {
27
-          linux ${defaults.image} ${defaults.params} ${
27
+          linux ${defaults.image} \''${isoboot} ${defaults.params} ${
28 28
             option.params or ""
29 29
           }
30 30
           initrd ${defaults.initrd}
@@ -268,6 +268,12 @@ let
268 268
     set timeout=10
269 269
     ${grubMenuCfg}
270 270
 
271
+    # If the parameter iso_path is set, append the findiso parameter to the kernel
272
+    # line. We need this to allow the nixos iso to be booted from grub directly.
273
+    if [ \''${iso_path} ] ; then
274
+      set isoboot="findiso=\''${iso_path}"
275
+    fi
276
+
271 277
     #
272 278
     # Menu entries
273 279
     #
@@ -284,6 +290,14 @@ let
284 290
         ${buildMenuAdditionalParamsGrub2 config "video=1920x1080@60"}
285 291
       }
286 292
 
293
+      # If we boot into a graphical environment where X is autoran
294
+      # and always crashes, it makes the media unusable. Allow the user
295
+      # to disable this.
296
+      submenu "Disable display-manager" --class quirk-disable-displaymanager {
297
+        ${grubMenuCfg}
298
+        ${buildMenuAdditionalParamsGrub2 config "systemd.mask=display-manager.service"}
299
+      }
300
+
287 301
       # Some laptop and convertibles have the panel installed in an
288 302
       # inconvenient way, rotated away from the keyboard.
289 303
       # Those entries makes it easier to use the installer.
@@ -616,6 +630,9 @@ in
616 630
         { source = "${efiDir}/EFI";
617 631
           target = "/EFI";
618 632
         }
633
+        { source = pkgs.writeText "loopback.cfg" "source /EFI/boot/grub.cfg";
634
+          target = "/boot/grub/loopback.cfg";
635
+        }
619 636
       ] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [
620 637
         { source = "${pkgs.memtest86plus}/memtest.bin";
621 638
           target = "/boot/memtest.bin";

+ 20
- 0
nixos/modules/installer/tools/nixos-generate-config.pl View File

@@ -563,6 +563,24 @@ $fsAndSwap
563 563
 ${\join "", (map { "  $_\n" } (uniq @attrs))}}
564 564
 EOF
565 565
 
566
+sub generateNetworkingDhcpConfig {
567
+    my $config = <<EOF;
568
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
569
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
570
+  # replicates the default behaviour.
571
+  networking.useDHCP = false;
572
+EOF
573
+
574
+    foreach my $path (glob "/sys/class/net/*") {
575
+        my $dev = basename($path);
576
+        if ($dev ne "lo") {
577
+            $config .= "  networking.interfaces.$dev.useDHCP = true;\n";
578
+        }
579
+    }
580
+
581
+    return $config;
582
+}
583
+
566 584
 
567 585
 if ($showHardwareConfig) {
568 586
     print STDOUT $hwConfig;
@@ -606,6 +624,8 @@ EOF
606 624
 EOF
607 625
         }
608 626
 
627
+        my $networkingDhcpConfig = generateNetworkingDhcpConfig();
628
+
609 629
         write_file($fn, <<EOF);
610 630
 @configuration@
611 631
 EOF

+ 1
- 0
nixos/modules/installer/tools/tools.nix View File

@@ -96,6 +96,7 @@ in
96 96
         # networking.hostName = "nixos"; # Define your hostname.
97 97
         # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
98 98
 
99
+      $networkingDhcpConfig
99 100
         # Configure network proxy if necessary
100 101
         # networking.proxy.default = "http://user:password\@proxy:port/";
101 102
         # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";

+ 2
- 2
nixos/modules/misc/ids.nix View File

@@ -328,7 +328,7 @@
328 328
       qemu-libvirtd = 301;
329 329
       # kvm = 302; # unused
330 330
       # render = 303; # unused
331
-      zeronet = 304;
331
+      # zeronet = 304; # removed 2019-01-03
332 332
       lirc = 305;
333 333
       lidarr = 306;
334 334
       slurm = 307;
@@ -629,7 +629,7 @@
629 629
       qemu-libvirtd = 301;
630 630
       kvm = 302; # default udev rules from systemd requires these
631 631
       render = 303; # default udev rules from systemd requires these
632
-      zeronet = 304;
632
+      # zeronet = 304; # removed 2019-01-03
633 633
       lirc = 305;
634 634
       lidarr = 306;
635 635
       slurm = 307;

+ 0
- 1
nixos/modules/module-list.nix View File

@@ -98,7 +98,6 @@
98 98
   ./programs/autojump.nix
99 99
   ./programs/bash/bash.nix
100 100
   ./programs/bcc.nix
101
-  ./programs/blcr.nix
102 101
   ./programs/browserpass.nix
103 102
   ./programs/captive-browser.nix
104 103
   ./programs/ccache.nix

+ 0
- 27
nixos/modules/programs/blcr.nix View File

@@ -1,27 +0,0 @@
1
-{ config, lib, ... }:
2
-
3
-let
4
-  inherit (lib) mkOption mkIf;
5
-  cfg = config.environment.blcr;
6
-  blcrPkg = config.boot.kernelPackages.blcr;
7
-in
8
-
9
-{
10
-  ###### interface
11
-
12
-  options = {
13
-    environment.blcr.enable = mkOption {
14
-      default = false;
15
-      description =
16
-        "Whether to enable support for the BLCR checkpointing tool.";
17
-    };
18
-  };
19
-
20
-  ###### implementation
21
-
22
-  config = mkIf cfg.enable {
23
-    boot.kernelModules = [ "blcr" "blcr_imports" ];
24
-    boot.extraModulePackages = [ blcrPkg ];
25
-    environment.systemPackages = [ blcrPkg ];
26
-  };
27
-}

+ 3
- 0
nixos/modules/rename.nix View File

@@ -275,6 +275,9 @@ with lib;
275 275
     (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
276 276
     (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
277 277
 
278
+    # BLCR
279
+    (mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed")
280
+
278 281
     # Redis
279 282
     (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
280 283
     (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")

+ 1
- 0
nixos/modules/services/databases/memcached.nix View File

@@ -67,6 +67,7 @@ in
67 67
     users.users = optional (cfg.user == "memcached") {
68 68
       name = "memcached";
69 69
       description = "Memcached server user";
70
+      isSystemUser = true;
70 71
     };
71 72
 
72 73
     environment.systemPackages = [ memcached ];

+ 34
- 0
nixos/modules/services/monitoring/thanos.nix View File

@@ -126,6 +126,8 @@ let
126 126
           '';
127 127
           description = ''
128 128
             Path to YAML file that contains tracing configuration.
129
+
130
+            See format details: <link xlink:href="https://thanos.io/tracing.md/#configuration"/>
129 131
           '';
130 132
         };
131 133
       };
@@ -141,6 +143,8 @@ let
141 143
             <option>tracing.config-file</option> will default to its path.
142 144
 
143 145
             If <option>tracing.config-file</option> is set this option has no effect.
146
+
147
+            See format details: <link xlink:href="https://thanos.io/tracing.md/#configuration"/>
144 148
           '';
145 149
         };
146 150
     };
@@ -187,6 +191,8 @@ let
187 191
           '';
188 192
           description = ''
189 193
             Path to YAML file that contains object store configuration.
194
+
195
+            See format details: <link xlink:href="https://thanos.io/storage.md/#configuration"/>
190 196
           '';
191 197
         };
192 198
       };
@@ -202,6 +208,8 @@ let
202 208
             <option>objstore.config-file</option> will default to its path.
203 209
 
204 210
             If <option>objstore.config-file</option> is set this option has no effect.
211
+
212
+            See format details: <link xlink:href="https://thanos.io/storage.md/#configuration"/>
205 213
           '';
206 214
         };
207 215
     };
@@ -276,6 +284,24 @@ let
276 284
       block-sync-concurrency = mkParamDef types.int 20 ''
277 285
         Number of goroutines to use when syncing blocks from object storage.
278 286
       '';
287
+
288
+      min-time = mkParamDef types.str "0000-01-01T00:00:00Z" ''
289
+        Start of time range limit to serve.
290
+
291
+        Thanos Store serves only metrics, which happened later than this
292
+        value. Option can be a constant time in RFC3339 format or time duration
293
+        relative to current time, such as -1d or 2h45m. Valid duration units are
294
+        ms, s, m, h, d, w, y.
295
+      '';
296
+
297
+      max-time = mkParamDef types.str "9999-12-31T23:59:59Z" ''
298
+        End of time range limit to serve.
299
+
300
+        Thanos Store serves only blocks, which happened eariler than this
301
+        value. Option can be a constant time in RFC3339 format or time duration
302
+        relative to current time, such as -1d or 2h45m. Valid duration units are
303
+        ms, s, m, h, d, w, y.
304
+      '';
279 305
     };
280 306
 
281 307
     query = params.common cfg.query // {
@@ -560,6 +586,14 @@ let
560 586
         '';
561 587
       };
562 588
 
589
+      downsampling.disable = mkFlagParam ''
590
+        Disables downsampling.
591
+
592
+        This is not recommended as querying long time ranges without
593
+        non-downsampled data is not efficient and useful e.g it is not possible
594
+        to render all samples for a human eye anyway
595
+      '';
596
+
563 597
       block-sync-concurrency = mkParamDef types.int 20 ''
564 598
         Number of goroutines to use when syncing block metadata from object storage.
565 599
       '';

+ 33
- 59
nixos/modules/services/networking/zeronet.nix View File

@@ -1,44 +1,39 @@
1 1
 { config, lib, pkgs, ... }:
2 2
 
3 3
 let
4
+  inherit (lib) generators literalExample mkEnableOption mkIf mkOption recursiveUpdate types;
4 5
   cfg = config.services.zeronet;
5
-
6
-  zConfFile = pkgs.writeTextFile {
7
-    name = "zeronet.conf";
8
-
9
-    text = ''
10
-      [global]
11
-      data_dir = ${cfg.dataDir}
12
-      log_dir = ${cfg.logDir}
13
-    '' + lib.optionalString (cfg.port != null) ''
14
-      ui_port = ${toString cfg.port}
15
-    '' + lib.optionalString (cfg.fileserverPort != null) ''
16
-      fileserver_port = ${toString cfg.fileserverPort}
17
-    '' + lib.optionalString (cfg.torAlways) ''
18
-      tor = always
19
-    '' + cfg.extraConfig;
6
+  dataDir = "/var/lib/zeronet";
7
+  configFile = pkgs.writeText "zeronet.conf" (generators.toINI {} (recursiveUpdate defaultSettings cfg.settings));
8
+
9
+  defaultSettings = {
10
+    global = {
11
+      data_dir = dataDir;
12
+      log_dir = dataDir;
13
+      ui_port = cfg.port;
14
+      fileserver_port = cfg.fileserverPort;
15
+      tor = if !cfg.tor then "disable" else if cfg.torAlways then "always" else "enable";
16
+    };
20 17
   };
21 18
 in with lib; {
22 19
   options.services.zeronet = {
23 20
     enable = mkEnableOption "zeronet";
24 21
 
25
-    dataDir = mkOption {
26
-      type = types.path;
27
-      default = "/var/lib/zeronet";
28
-      example = "/home/okina/zeronet";
29
-      description = "Path to the zeronet data directory.";
30
-    };
22
+    settings = mkOption {
23
+      type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
24
+      default = {};
25
+      example = literalExample "global.tor = enable;";
31 26
 
32
-    logDir = mkOption {
33
-      type = types.path;
34
-      default = "/var/log/zeronet";
35
-      example = "/home/okina/zeronet/log";
36
-      description = "Path to the zeronet log directory.";
27
+      description = ''
28
+        <filename>zeronet.conf</filename> configuration. Refer to
29
+        <link xlink:href="https://zeronet.readthedocs.io/en/latest/faq/#is-it-possible-to-use-a-configuration-file"/>
30
+        for details on supported values;
31
+      '';
37 32
     };
38 33
 
39 34
     port = mkOption {
40
-      type = types.nullOr types.int;
41
-      default = null;
35
+      type = types.int;
36
+      default = 43110;
42 37
       example = 43110;
43 38
       description = "Optional zeronet web UI port.";
44 39
     };
@@ -63,22 +58,13 @@ in with lib; {
63 58
       default = false;
64 59
       description = "Use TOR for all zeronet traffic.";
65 60
     };
66
-
67
-    extraConfig = mkOption {
68
-      type = types.lines;
69
-      default = "";
70
-
71
-      description = ''
72
-        Extra configuration. Contents will be added verbatim to the
73
-        configuration file at the end.
74
-      '';
75
-    };
76 61
   };
77 62
 
78 63
   config = mkIf cfg.enable {
79 64
     services.tor = mkIf cfg.tor {
80 65
       enable = true;
81 66
       controlPort = 9051;
67
+
82 68
       extraConfig = ''
83 69
         CacheDirectoryGroupReadable 1
84 70
         CookieAuthentication 1
@@ -86,37 +72,25 @@ in with lib; {
86 72
       '';
87 73
     };
88 74
 
89
-    systemd.tmpfiles.rules = [
90
-      "d '${cfg.dataDir}' 750 zeronet zeronet - -"
91
-      "d '${cfg.logDir}' 750 zeronet zeronet - -"
92
-    ];
93
-
94 75
     systemd.services.zeronet = {
95 76
       description = "zeronet";
96 77
       after = [ "network.target" (optionalString cfg.tor "tor.service") ];
97 78
       wantedBy = [ "multi-user.target" ];
98 79
 
99 80
       serviceConfig = {
100
-        PrivateTmp = "yes";
101 81
         User = "zeronet";
102
-        Group = "zeronet";
103
-        ExecStart = "${pkgs.zeronet}/bin/zeronet --config_file ${zConfFile}";
104
-      };
105
-    };
106
-
107
-    users = {
108
-      groups.zeronet.gid = config.ids.gids.zeronet;
109
-
110
-      users.zeronet = {
111
-        description = "zeronet service user";
112
-        home = cfg.dataDir;
113
-        createHome = true;
114
-        group = "zeronet";
115
-        extraGroups = mkIf cfg.tor [ "tor" ];
116
-        uid = config.ids.uids.zeronet;
82
+        DynamicUser = true;
83
+        StateDirectory = "zeronet";
84
+        SupplementaryGroups = mkIf cfg.tor [ "tor" ];
85
+        ExecStart = "${pkgs.zeronet}/bin/zeronet --config_file ${configFile}";
117 86
       };
118 87
     };
119 88
   };
120 89
 
90
+  imports = [
91
+    (mkRemovedOptionModule [ "services" "zeronet" "dataDir" ] "Zeronet will store data by default in /var/lib/zeronet")
92
+    (mkRemovedOptionModule [ "services" "zeronet" "logDir" ] "Zeronet will log by default in /var/lib/zeronet")
93
+  ];
94
+
121 95
   meta.maintainers = with maintainers; [ chiiruno ];
122 96
 }

+ 11
- 0
nixos/modules/services/web-apps/documize.nix View File

@@ -14,6 +14,15 @@ in {
14 14
   options.services.documize = {
15 15
     enable = mkEnableOption "Documize Wiki";
16 16
 
17
+    stateDirectoryName = mkOption {
18
+      type = types.str;
19
+      default = "documize";
20
+      description = ''
21
+        The name of the directory below <filename>/var/lib/private</filename>
22
+        where documize runs in and stores, for example, backups.
23
+      '';
24
+    };
25
+
17 26
     package = mkOption {
18 27
       type = types.package;
19 28
       default = pkgs.documize-community;
@@ -132,6 +141,8 @@ in {
132 141
         ];
133 142
         Restart = "always";
134 143
         DynamicUser = "yes";
144
+        StateDirectory = cfg.stateDirectoryName;
145
+        WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}";
135 146
       };
136 147
     };
137 148
   };

+ 2
- 0
nixos/modules/services/x11/desktop-managers/gnome3.nix View File

@@ -28,6 +28,8 @@ let
28 28
         (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n")
29 29
         (defaultPackages ++ cfg.extraGSettingsOverridePackages)}
30 30
 
31
+     cp -f ${pkgs.gnome3.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
32
+
31 33
      chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
32 34
      cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
33 35
        [org.gnome.desktop.background]

+ 3
- 2
nixos/modules/services/x11/desktop-managers/pantheon.nix View File

@@ -109,8 +109,9 @@ in
109 109
     services.pantheon.files.enable = mkDefault true;
110 110
     services.tumbler.enable = mkDefault true;
111 111
     services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
112
-    services.dbus.packages = [
113
-      pkgs.pantheon.switchboard-plug-power
112
+    services.dbus.packages = with pkgs.pantheon; [
113
+      switchboard-plug-power
114
+      elementary-default-settings
114 115
     ];
115 116
     services.pantheon.contractor.enable = mkDefault true;
116 117
     services.gnome3.at-spi2-core.enable = true;

+ 5
- 1
nixos/modules/services/x11/desktop-managers/xfce4-14.nix View File

@@ -91,7 +91,11 @@ in
91 91
       ++ optional config.powerManagement.enable xfce4-power-manager
92 92
       ++ optionals config.hardware.pulseaudio.enable [
93 93
         pavucontrol
94
-        xfce4-pulseaudio-plugin
94
+        # volume up/down keys support:
95
+        # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
96
+        # but can only be used with xfce4-panel, so for no-desktop usage we still include
97
+        # xfce4-volumed-pulse
98
+        (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
95 99
       ] ++ optionals cfg.enableXfwm [
96 100
         xfwm4
97 101
         xfwm4-themes

+ 10
- 0
nixos/modules/services/x11/display-managers/gdm.nix View File

@@ -152,6 +152,7 @@ in
152 152
           chown -R gdm:gdm /run/gdm/.config
153 153
         '' + optionalString config.services.gnome3.gnome-initial-setup.enable ''
154 154
           # Create stamp file for gnome-initial-setup to prevent run.
155
+          mkdir -p /run/gdm/.config
155 156
           cat - > /run/gdm/.config/gnome-initial-setup-done <<- EOF
156 157
           yes
157 158
           EOF
@@ -165,9 +166,15 @@ in
165 166
       "systemd-machined.service"
166 167
       "systemd-user-sessions.service"
167 168
       "getty@tty1.service"
169
+      "plymouth-quit.service"
170
+      "plymouth-start.service"
168 171
     ];
169 172
     systemd.services.display-manager.conflicts = [
170 173
       "getty@tty1.service"
174
+      "plymouth-quit.service"
175
+    ];
176
+    systemd.services.display-manager.onFailure = [
177
+      "plymouth-quit.service"
171 178
     ];
172 179
 
173 180
     systemd.services.display-manager.serviceConfig = {
@@ -177,6 +184,9 @@ in
177 184
       BusName = "org.gnome.DisplayManager";
178 185
       StandardOutput = "syslog";
179 186
       StandardError = "inherit";
187
+      ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
188
+      KeyringMode = "shared";
189
+      EnvironmentFile = "-/etc/locale.conf";
180 190
     };
181 191
 
182 192
     systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];

+ 27
- 0
nixos/modules/system/boot/stage-1-init.sh View File

@@ -183,6 +183,12 @@ for o in $(cat /proc/cmdline); do
183 183
         copytoram)
184 184
             copytoram=1
185 185
             ;;
186
+        findiso=*)
187
+            # if an iso name is supplied, try to find the device where
188
+            # the iso resides on
189
+            set -- $(IFS==; echo $o)
190
+            isoPath=$2
191
+            ;;
186 192
     esac
187 193
 done
188 194
 
@@ -442,6 +448,27 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then
442 448
     fi
443 449
 fi
444 450
 
451
+# If we have a path to an iso file, find the iso and link it to /dev/root
452
+if [ -n "$isoPath" ]; then
453
+  mkdir -p /findiso
454
+
455
+  for delay in 5 10; do
456
+    blkid | while read -r line; do
457
+      device=$(echo "$line" | sed 's/:.*//')
458
+      type=$(echo "$line" | sed 's/.*TYPE="\([^"]*\)".*/\1/')
459
+
460
+      mount -t "$type" "$device" /findiso
461
+      if [ -e "/findiso$isoPath" ]; then
462
+        ln -sf "/findiso$isoPath" /dev/root
463
+        break 2
464
+      else
465
+        umount /findiso
466
+      fi
467
+    done
468
+
469
+    sleep "$delay"
470
+  done
471
+fi
445 472
 
446 473
 # Try to find and mount the root device.
447 474
 mkdir -p $targetRoot

+ 8
- 4
nixos/modules/tasks/network-interfaces-systemd.nix View File

@@ -38,6 +38,12 @@ in
38 38
     } {
39 39
       assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null;
40 40
       message = "networking.defaultGateway6.interface is not supported by networkd.";
41
+    } {
42
+      assertion = cfg.useDHCP == false;
43
+      message = ''
44
+        networking.useDHCP is not supported by networkd.
45
+        Please use per interface configuration and set the global option to false.
46
+      '';
41 47
     } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: {
42 48
       assertion = !rstp;
43 49
       message = "networking.bridges.${n}.rstp is not supported by networkd.";
@@ -56,9 +62,7 @@ in
56 62
         genericNetwork = override:
57 63
           let gateway = optional (cfg.defaultGateway != null) cfg.defaultGateway.address
58 64
             ++ optional (cfg.defaultGateway6 != null) cfg.defaultGateway6.address;
59
-          in {
60
-            DHCP = override (dhcpStr cfg.useDHCP);
61
-          } // optionalAttrs (gateway != [ ]) {
65
+          in optionalAttrs (gateway != [ ]) {
62 66
             routes = override [
63 67
               {
64 68
                 routeConfig = {
@@ -97,7 +101,7 @@ in
97 101
         networks."40-${i.name}" = mkMerge [ (genericNetwork mkDefault) {
98 102
           name = mkDefault i.name;
99 103
           DHCP = mkForce (dhcpStr
100
-            (if i.useDHCP != null then i.useDHCP else cfg.useDHCP && interfaceIps i == [ ]));
104
+            (if i.useDHCP != null then i.useDHCP else false));
101 105
           address = forEach (interfaceIps i)
102 106
             (ip: "${ip.address}/${toString ip.prefixLength}");
103 107
           networkConfig.IPv6PrivacyExtensions = "kernel";

+ 5
- 0
nixos/modules/tasks/network-interfaces.nix View File

@@ -903,6 +903,11 @@ in
903 903
         Whether to use DHCP to obtain an IP address and other
904 904
         configuration for all network interfaces that are not manually
905 905
         configured.
906
+
907
+        Using this option is highly discouraged and also incompatible with
908
+        <option>networking.useNetworkd</option>. Please use
909
+        <option>networking.interfaces.&lt;name&gt;.useDHCP</option> instead
910
+        and set this to false.
906 911
       '';
907 912
     };
908 913
 

+ 7
- 0
nixos/modules/virtualisation/containers.nix View File

@@ -824,5 +824,12 @@ in
824 824
     '';
825 825
 
826 826
     environment.systemPackages = [ pkgs.nixos-container ];
827
+
828
+    boot.kernelModules = [
829
+      "bridge"
830
+      "macvlan"
831
+      "tap"
832
+      "tun"
833
+    ];
827 834
   });
828 835
 }

+ 18
- 5
nixos/tests/networking.nix View File

@@ -72,6 +72,7 @@ let
72 72
   testCases = {
73 73
     loopback = {
74 74
       name = "Loopback";
75
+      machine.networking.useDHCP = false;
75 76
       machine.networking.useNetworkd = networkd;
76 77
       testScript = ''
77 78
         startAll;
@@ -139,14 +140,16 @@ let
139 140
         virtualisation.vlans = [ 1 2 ];
140 141
         networking = {
141 142
           useNetworkd = networkd;
142
-          useDHCP = true;
143
+          useDHCP = false;
143 144
           interfaces.eth1 = {
144 145
             ipv4.addresses = mkOverride 0 [ ];
145 146
             ipv6.addresses = mkOverride 0 [ ];
147
+            useDHCP = true;
146 148
           };
147 149
           interfaces.eth2 = {
148 150
             ipv4.addresses = mkOverride 0 [ ];
149 151
             ipv6.addresses = mkOverride 0 [ ];
152
+            useDHCP = true;
150 153
           };
151 154
         };
152 155
       };
@@ -320,13 +323,19 @@ let
320 323
         virtualisation.vlans = [ 1 ];
321 324
         networking = {
322 325
           useNetworkd = networkd;
326
+          useDHCP = false;
323 327
           firewall.logReversePathDrops = true; # to debug firewall rules
324 328
           # reverse path filtering rules for the macvlan interface seem
325 329
           # to be incorrect, causing the test to fail. Disable temporarily.
326 330
           firewall.checkReversePath = false;
327
-          useDHCP = true;
328 331
           macvlans.macvlan.interface = "eth1";
329
-          interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
332
+          interfaces.eth1 = {
333
+            ipv4.addresses = mkOverride 0 [ ];
334
+            useDHCP = true;
335
+          };
336
+          interfaces.macvlan = {
337
+            useDHCP = true;
338
+          };
330 339
         };
331 340
       };
332 341
       testScript = { ... }:
@@ -440,6 +449,7 @@ let
440 449
     virtual = {
441 450
       name = "Virtual";
442 451
       machine = {
452
+        networking.useNetworkd = networkd;
443 453
         networking.interfaces.tap0 = {
444 454
           ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
445 455
           ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ];
@@ -489,6 +499,7 @@ let
489 499
         boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
490 500
         networking = {
491 501
           useNetworkd = networkd;
502
+          useDHCP = false;
492 503
           interfaces.eth1.ipv6.addresses = singleton {
493 504
             address = "fd00:1234:5678:1::1";
494 505
             prefixLength = 64;
@@ -514,11 +525,12 @@ let
514 525
         virtualisation.vlans = [ 1 ];
515 526
         networking = {
516 527
           useNetworkd = networkd;
517
-          useDHCP = true;
528
+          useDHCP = false;
518 529
           interfaces.eth1 = {
519 530
             preferTempAddress = true;
520 531
             ipv4.addresses = mkOverride 0 [ ];
521 532
             ipv6.addresses = mkOverride 0 [ ];
533
+            useDHCP = true;
522 534
           };
523 535
         };
524 536
       };
@@ -526,11 +538,12 @@ let
526 538
         virtualisation.vlans = [ 1 ];
527 539
         networking = {
528 540
           useNetworkd = networkd;
529
-          useDHCP = true;
541
+          useDHCP = false;
530 542
           interfaces.eth1 = {
531 543
             preferTempAddress = false;
532 544
             ipv4.addresses = mkOverride 0 [ ];
533 545
             ipv6.addresses = mkOverride 0 [ ];
546
+            useDHCP = true;
534 547
           };
535 548
         };
536 549
       };

+ 1
- 0
nixos/tests/predictable-interface-names.nix View File

@@ -16,6 +16,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
16 16
       networking.usePredictableInterfaceNames = lib.mkForce predictable;
17 17
       networking.useNetworkd = withNetworkd;
18 18
       networking.dhcpcd.enable = !withNetworkd;
19
+      networking.useDHCP = !withNetworkd;
19 20
     };
20 21
 
21 22
     testScript = ''

+ 1
- 0
nixos/tests/systemd-networkd-wireguard.nix View File

@@ -2,6 +2,7 @@ let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ...
2 2
       imports = [ common/user-account.nix ];
3 3
       systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
4 4
       networking.useNetworkd = true;
5
+      networking.useDHCP = false;
5 6
       networking.firewall.enable = false;
6 7
       virtualisation.vlans = [ 1 ];
7 8
       environment.systemPackages = with pkgs; [ wireguard-tools ];

+ 44
- 0
pkgs/applications/audio/friture/default.nix View File

@@ -0,0 +1,44 @@
1
+{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
2
+
3
+let
4
+  py = python3Packages;
5
+in py.buildPythonApplication rec {
6
+  pname = "friture";
7
+  version = "0.36";
8
+
9
+  src = fetchFromGitHub {
10
+    owner = "tlecomte";
11
+    repo = "friture";
12
+    rev = "v${version}";
13
+    sha256 = "1pz8v0qbzqq3ig9w33cp027s6c8rj316x5sy8pqs5nsiny9ddnk6";
14
+  };
15
+
16
+  # module imports scipy.misc.factorial, but it has been removed since scipy
17
+  # 1.3.0; use scipy.special.factorial instead
18
+  patches = [ ./factorial.patch ];
19
+
20
+  nativeBuildInputs = (with py; [ numpy cython scipy ]) ++
21
+    [ wrapQtAppsHook ];
22
+
23
+  propagatedBuildInputs = with py; [
24
+    sounddevice
25
+    pyopengl
26
+    docutils
27
+    numpy
28
+    pyqt5
29
+    appdirs
30
+    pyrr
31
+  ];
32
+
33
+  postFixup = ''
34
+    wrapQtApp $out/bin/friture
35
+    wrapQtApp $out/bin/.friture-wrapped
36
+  '';
37
+
38
+  meta = with lib; {
39
+    description = "A real-time audio analyzer";
40
+    homepage = http://friture.org/;
41
+    license = licenses.gpl3;
42
+    maintainers = [ maintainers.laikq ];
43
+  };
44
+}

+ 13
- 0
pkgs/applications/audio/friture/factorial.patch View File

@@ -0,0 +1,13 @@
1
+diff --git a/friture/filter_design.py b/friture/filter_design.py
2
+index 9876c43..1cc749a 100644
3
+--- a/friture/filter_design.py
4
++++ b/friture/filter_design.py
5
+@@ -2,7 +2,7 @@
6
+ from numpy import pi, exp, arange, cos, sin, sqrt, zeros, ones, log, arange, set_printoptions
7
+ # the three following lines are a workaround for a bug with scipy and py2exe
8
+ # together. See http://www.pyinstaller.org/ticket/83 for reference.
9
+-from scipy.misc import factorial
10
++from scipy.special import factorial
11
+ import scipy
12
+ scipy.factorial = factorial
13
+ 

+ 2
- 2
pkgs/applications/audio/kid3/default.nix View File

@@ -9,11 +9,11 @@
9 9
 stdenv.mkDerivation rec {
10 10
 
11 11
   pname = "kid3";
12
-  version = "3.7.1";
12
+  version = "3.8.0";
13 13
 
14 14
   src = fetchurl {
15 15
     url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
16
-    sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8";
16
+    sha256 = "1a6ixkkdp1fl3arylx06w73mwf26i0ibyplwwcn2kw5xsfxmbjp6";
17 17
   };
18 18
 
19 19
   nativeBuildInputs = [ wrapQtAppsHook ];

+ 2
- 2
pkgs/applications/audio/snd/default.nix View File

@@ -4,11 +4,11 @@
4 4
 }:
5 5
 
6 6
 stdenv.mkDerivation rec {
7
-  name = "snd-19.6";
7
+  name = "snd-19.7";
8 8
 
9 9
   src = fetchurl {
10 10
     url = "mirror://sourceforge/snd/${name}.tar.gz";
11
-    sha256 = "0s2qv8sznvw6559bi39qj9p072azh9qcb2b86w6w8clz2azjaa76";
11
+    sha256 = "1pr3l9iadvwinmxfl9a2lsm67yi7w3rhxglidpd41m2ni8jf2rlm";
12 12
   };
13 13
 
14 14
   nativeBuildInputs = [ pkgconfig ];

+ 2
- 2
pkgs/applications/audio/spotifyd/default.nix View File

@@ -6,13 +6,13 @@
6 6
 
7 7
 rustPlatform.buildRustPackage rec {
8 8
   pname = "spotifyd";
9
-  version = "0.2.16";
9
+  version = "0.2.18";
10 10
 
11 11
   src = fetchFromGitHub {
12 12
     owner = "Spotifyd";
13 13
     repo = "spotifyd";
14 14
     rev = "v${version}";
15
-    sha256 = "097hg18h7gya2w0wl5jkav79nb3qzcc4ycsryq7nhxa0h1agvinc";
15
+    sha256 = "12826b0wf31m9vw1s7bcd1hb4ygb1xn4sdknn1y9kzc68brsq94v";
16 16
   };
17 17
 
18 18
   cargoSha256 = "0ar4bfwn3qxa6wsz2hd7nv1wr824h74jy3xqba2qsy0rsfwy1bmm";

+ 3
- 3
pkgs/applications/editors/android-studio/default.nix View File

@@ -8,9 +8,9 @@ let
8 8
     inherit (gnome2) GConf gnome_vfs;
9 9
   };
10 10
   stableVersion = {
11
-    version = "3.5.0.21"; # "Android Studio 3.5"
12
-    build = "191.5791312";
13
-    sha256Hash = "0vvk2vhklxg9wfi4lv4sahs5ahhb1mki1msy3yixmr56vipgv52p";
11
+    version = "3.5.1.0"; # "Android Studio 3.5.1"
12
+    build = "191.5900203";
13
+    sha256Hash = "0afxlif8pkrl6m1lhiqri1qv4vf5mfm1yg6qk5rad0442hm3kz4l";
14 14
   };
15 15
   betaVersion = stableVersion;
16 16
   latestVersion = { # canary & dev

+ 2
- 2
pkgs/applications/editors/nano/default.nix View File

@@ -20,11 +20,11 @@ let
20 20
 
21 21
 in stdenv.mkDerivation rec {
22 22
   pname = "nano";
23
-  version = "4.4";
23
+  version = "4.5";
24 24
 
25 25
   src = fetchurl {
26 26
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
27
-    sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia";
27
+    sha256 = "0czmz1yq8s5qcxcmfjdxzg9nkhbmlc9q1nz04jvf57fdbs7w7mfy";
28 28
   };
29 29
 
30 30
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

+ 3
- 1
pkgs/applications/editors/neovim/default.nix View File

@@ -79,9 +79,11 @@ in
79 79
 
80 80
     cmakeFlags = [
81 81
       "-DGPERF_PRG=${gperf}/bin/gperf"
82
-      "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so"
83 82
       "-DLUA_PRG=${neovimLuaEnv.interpreter}"
84 83
     ]
84
+    # FIXME: this is verry messy and strange.
85
+    ++ optional (!stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so"
86
+    ++ optional (stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv.libluv}/lib/lua/${lua.luaversion}/libluv.dylib"
85 87
     ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
86 88
     ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
87 89
     ;

+ 6
- 6
pkgs/applications/editors/sublime/3/packages.nix View File

@@ -5,15 +5,15 @@ let
5 5
 in
6 6
   {
7 7
     sublime3-dev = common {
8
-      buildVersion = "3208";
8
+      buildVersion = "3210";
9 9
       dev = true;
10
-      x32sha256 = "09k04fjryc0dc6173i6nwhi5xaan89n4lp0n083crvkqwp0qlf2i";
11
-      x64sha256 = "12pn3yfm452m75dlyl0lyf82956j8raz2dglv328m81hbafflrj8";
10
+      x32sha256 = "1ngr4c8h2mafy96mi8dd3g8mg5r9ha1cpcd8p3gz7jwpbypvkkbv";
11
+      x64sha256 = "0j65a4ylgga1qzc74wf3k5craghahma8hwqg3zs1rgzz601nl693";
12 12
     } {};
13 13
 
14 14
     sublime3 = common {
15
-      buildVersion = "3207";
16
-      x32sha256 = "14hfb8x8zb49zjq0pd8s73xk333gmf38h5b7g979czcmbhdxiyqy";
17
-      x64sha256 = "1i1q9592sc8idvlpygksdkclh7h506hsz5l0i02g1814w0flzdmc";
15
+      buildVersion = "3211";
16
+      x32sha256 = "0w9hba1nl2hv1mri418n7v0m321b6wqphb1knll23ldv5fb0j1j8";
17
+      x64sha256 = "1vkldmimyjhbgplcd6r27gvk64rr7cparfd44hy6qdyzwsjqqg0b";
18 18
     } {};
19 19
   }

+ 3
- 3
pkgs/applications/editors/vscode/generic.nix View File

@@ -69,9 +69,9 @@ in
69 69
 
70 70
     installPhase =
71 71
       if system == "x86_64-darwin" then ''
72
-        mkdir -p $out/lib/vscode $out/bin
73
-        cp -r ./* $out/lib/vscode
74
-        ln -s $out/lib/vscode/Contents/Resources/app/bin/${executableName} $out/bin
72
+        mkdir -p "$out/Applications/${longName}.app" $out/bin
73
+        cp -r ./* "$out/Applications/${longName}.app"
74
+        ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName}
75 75
       '' else ''
76 76
         mkdir -p $out/lib/vscode $out/bin
77 77
         cp -r ./* $out/lib/vscode

+ 6
- 2
pkgs/applications/editors/vscode/vscodium.nix View File

@@ -14,8 +14,14 @@ let
14 14
     x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb";
15 15
     x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5";
16 16
   }.${system};
17
+
18
+  sourceRoot = {
19
+    x86_64-linux = ".";
20
+    x86_64-darwin = "";
21
+  }.${system};
17 22
 in
18 23
   callPackage ./generic.nix rec {
24
+    inherit sourceRoot;
19 25
 
20 26
     version = "1.38.1";
21 27
     pname = "vscodium";
@@ -29,8 +35,6 @@ in
29 35
       inherit sha256;
30 36
     };
31 37
 
32
-    sourceRoot = ".";
33
-
34 38
     meta = with stdenv.lib; {
35 39
       description = ''
36 40
         Open source source code editor developed by Microsoft for Windows,

+ 2
- 2
pkgs/applications/graphics/kodelife/default.nix View File

@@ -9,11 +9,11 @@
9 9
 
10 10
 stdenv.mkDerivation rec {
11 11
   pname = "kodelife";
12
-  version = "0.8.3.93";
12
+  version = "0.8.5.99";
13 13
 
14 14
   src = fetchzip {
15 15
     url = "https://hexler.net/pub/${pname}/${pname}-${version}-linux-x86_64.zip";
16
-    sha256 = "1gidh0745g5mc8h5ypm2wamv1paymnrq3nh3yx1j70jwjg8v2v7g";
16
+    sha256 = "189i2j6kaygjb5pccynxv4pwqpy67jf9nfi7fjfhbrmjpqnmkp90";
17 17
   };
18 18
 
19 19
   dontConfigure = true;

+ 0
- 4
pkgs/applications/graphics/openscad/default.nix View File

@@ -53,10 +53,6 @@ mkDerivation rec {
53 53
   # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory
54 54
   enableParallelBuilding = false; # true by default due to qmake
55 55
 
56
-  preBuild = ''
57
-    sed -re 's/qscintilla2_qt5/qscintilla2/g' -i Makefile
58
-  '';
59
-
60 56
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
61 57
     mkdir $out/Applications
62 58
     mv $out/bin/*.app $out/Applications

+ 2
- 2
pkgs/applications/graphics/pdfcpu/default.nix View File

@@ -2,13 +2,13 @@
2 2
 
3 3
 buildGoModule rec {
4 4
   pname = "pdfcpu";
5
-  version = "0.2.4";
5
+  version = "0.2.5";
6 6
 
7 7
   src = fetchFromGitHub {
8 8
     owner = "pdfcpu";
9 9
     repo = pname;
10 10
     rev = "v${version}";
11
-    sha256 = "0inlwrpv5zkcv48g5gq1xdrvd7w1zkhf8p57fpr2cpd7hd3am7n8";
11
+    sha256 = "0fgdq8byb9pp9wiq3dm0vxw32kbspczqnk41agxpzjf303zmv75y";
12 12
   };
13 13
 
14 14
   modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs";

+ 57
- 0
pkgs/applications/misc/cipher/default.nix View File

@@ -0,0 +1,57 @@
1
+{ stdenv
2
+, fetchFromGitHub
3
+, meson
4
+, ninja
5
+, pkgconfig
6
+, pantheon
7
+, python3
8
+, gettext
9
+, glib
10
+, gtk3
11
+, libgee
12
+, xdg_utils
13
+, wrapGAppsHook }:
14
+
15
+stdenv.mkDerivation rec {
16
+  pname = "cipher";
17
+  version = "2.0.0";
18
+
19
+  src = fetchFromGitHub {
20
+    owner = "arshubham";
21
+    repo = "cipher";
22
+    rev = version;
23
+    sha256 = "0n5aigcyxnl4k52mdmavbxx6afc1ixymn3k3l2ryhyzi5q31x0x3";
24
+  };
25
+
26
+  nativeBuildInputs = [
27
+    gettext
28
+    meson
29
+    ninja
30
+    pantheon.vala
31
+    pkgconfig
32
+    python3
33
+    wrapGAppsHook
34
+  ];
35
+
36
+  buildInputs = [
37
+    glib
38
+    gtk3
39
+    pantheon.granite
40
+    libgee
41
+  ];
42
+
43
+  postPatch = ''
44
+  	substituteInPlace data/com.github.arshubham.cipher.desktop.in \
45
+  		--replace xdg-open ${xdg_utils}/bin/xdg-open
46
+    chmod +x post_install.py
47
+    patchShebangs post_install.py
48
+  '';
49
+
50
+  meta = with stdenv.lib; {
51
+    description = "A simple application for encoding and decoding text, designed for elementary OS";
52
+    homepage = "https://github.com/arshubham/cipher";
53
+    maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
54
+    platforms = platforms.linux;
55
+    license = licenses.gpl3Plus;
56
+  };
57
+}

+ 1
- 0
pkgs/applications/misc/cmatrix/default.nix View File

@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
16 16
 
17 17
   meta = with stdenv.lib; {
18 18
     description = "Simulates the falling characters theme from The Matrix movie";
19
+    license = licenses.gpl3;
19 20
     longDescription = ''
20 21
       CMatrix simulates the display from "The Matrix" and is based
21 22
       on the screensaver from the movie's website.

+ 2
- 2
pkgs/applications/misc/dbeaver/default.nix View File

@@ -7,7 +7,7 @@
7 7
 
8 8
 stdenv.mkDerivation rec {
9 9
   pname = "dbeaver-ce";
10
-  version = "6.2.1";
10
+  version = "6.2.2";
11 11
 
12 12
   desktopItem = makeDesktopItem {
13 13
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
30 30
 
31 31
   src = fetchurl {
32 32
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
33
-    sha256 = "1ix6isahpk7zk741wdx5cf4i13wc5gp0j1gj4ja80bzfswbc38na";
33
+    sha256 = "0qpa0wh5lr5lxk9cdv5p1cmbdk1kw1lfqmsfgqxvgfysc1mgjgp1";
34 34
   };
35 35
 
36 36
   installPhase = ''

+ 8
- 2
pkgs/applications/misc/ddgr/default.nix View File

@@ -1,20 +1,26 @@
1 1
 {stdenv, fetchFromGitHub, python3}:
2 2
 
3 3
 stdenv.mkDerivation rec {
4
-  version = "1.6";
4
+  version = "1.7";
5 5
   pname = "ddgr";
6 6
 
7 7
   src = fetchFromGitHub {
8 8
     owner = "jarun";
9 9
     repo = "ddgr";
10 10
     rev = "v${version}";
11
-    sha256 = "04ybbjsf9hpn2p5cjjm15cwvv0mwrmdi19iifrym6ps3rmll0p3c";
11
+    sha256 = "0kcl8z9w8iwn3pxay1pfahhw6vs2l1dp60yfv3i19in4ac9va7m0";
12 12
   };
13 13
 
14 14
   buildInputs = [ python3 ];
15 15
 
16 16
   makeFlags = "PREFIX=$(out)";
17 17
 
18
+  preBuild = ''
19
+    # Version 1.7 was released as 1.6
20
+    # https://github.com/jarun/ddgr/pull/95
21
+    sed -i "s/_VERSION_ = '1.6'/_VERSION_ = '1.7'/" ddgr
22
+  '';
23
+
18 24
   postInstall = ''
19 25
     mkdir -p "$out/share/bash-completion/completions/"
20 26
     cp "auto-completion/bash/ddgr-completion.bash" "$out/share/bash-completion/completions/"

+ 10
- 2
pkgs/applications/misc/font-manager/default.nix View File

@@ -1,4 +1,4 @@
1
-{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
1
+{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
2 2
   pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
3 3
   vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
4 4
 }:
@@ -42,6 +42,15 @@ stdenv.mkDerivation rec {
42 42
     "-Ddisable_pycompile=true"
43 43
   ];
44 44
 
45
+  patches = [
46
+    # fix build with Vala 0.46
47
+    (fetchpatch {
48
+      url = "https://github.com/FontManager/font-manager/commit/c73b40de11f376f4515a0edfe97fb3721a264b35.patch";
49
+      sha256 = "0lacwsifgvda2r3z6j2a0svdqr6mgav7zkvih35xa8155y8wfpnw";
50
+      excludes = [ "fedora/font-manager.spec" ];
51
+    })
52
+  ];
53
+
45 54
   postPatch = ''
46 55
     chmod +x meson_post_install.py
47 56
     patchShebangs meson_post_install.py
@@ -60,7 +69,6 @@ stdenv.mkDerivation rec {
60 69
       Font Manager is NOT a professional-grade font management solution.
61 70
     '';
62 71
     license = licenses.gpl3;
63
-    repositories.git = https://github.com/FontManager/master;
64 72
     platforms = platforms.unix;
65 73
     maintainers = [ maintainers.romildo ];
66 74
   };

+ 2
- 2
pkgs/applications/misc/gpxsee/default.nix View File

@@ -2,13 +2,13 @@
2 2
 
3 3
 mkDerivation rec {
4 4
   pname = "gpxsee";
5
-  version = "7.14";
5
+  version = "7.15";
6 6
 
7 7
   src = fetchFromGitHub {
8 8
     owner = "tumic0";
9 9
     repo = "GPXSee";
10 10
     rev = version;
11
-    sha256 = "13lxjbc54mw2d5jn0q61wjzm0hk2f6vmbvw11n7z8p62n8q30nvb";
11
+    sha256 = "036g17479nqy3kvy3dy3cn7yi7r57rsp28gkcay0qhf9h0az76p3";
12 12
   };
13 13
 
14 14
   nativeBuildInputs = [ qmake ];

+ 3
- 0
pkgs/applications/misc/grip/default.nix View File

@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
15 15
 
16 16
   hardeningDisable = [ "format" ];
17 17
 
18
+  # glib-2.62 deprecations
19
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
20
+
18 21
   meta = {
19 22
     description = "GTK-based audio CD player/ripper";
20 23
     homepage = http://nostatic.org/grip;

+ 2
- 1
pkgs/applications/misc/gxneur/default.nix View File

@@ -8,7 +8,8 @@ stdenv.mkDerivation {
8 8
     sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";
9 9
   };
10 10
 
11
-  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
11
+  # glib-2.62 deprecations
12
+  NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
12 13
 
13 14
   nativeBuildInputs = [ pkgconfig intltool ];
14 15
   buildInputs = [

+ 2
- 2
pkgs/applications/misc/jgmenu/default.nix View File

@@ -2,13 +2,13 @@
2 2
 
3 3
 stdenv.mkDerivation rec {
4 4
   pname = "jgmenu";
5
-  version = "3.3";
5
+  version = "3.4";
6 6
 
7 7
   src = fetchFromGitHub {
8 8
     owner = "johanmalm";
9 9
     repo = pname;
10 10
     rev = "v${version}";
11
-    sha256 = "02qpvlmcis7217hkqilhszza4g1smb4byx4gihgp5207aj8qhz0l";
11
+    sha256 = "1cikndf71wi17qld3rwp38gk0q7zic707zzz0mr7cgn86dc4if3d";
12 12
   };
13 13
 
14 14
   nativeBuildInputs = [

+ 6
- 0
pkgs/applications/misc/mysql-workbench/default.nix View File

@@ -37,6 +37,12 @@ in stdenv.mkDerivation rec {
37 37
     })
38 38
   ];
39 39
 
40
+  # have it look for 4.7.2 instead of 4.7.1
41
+  preConfigure = ''
42
+    substituteInPlace CMakeLists.txt \
43
+      --replace "antlr-4.7.1-complete.jar" "antlr-4.7.2-complete.jar"
44
+  '';
45
+
40 46
   nativeBuildInputs = [
41 47
     cmake ninja pkgconfig jre swig wrapGAppsHook
42 48
   ];

+ 2
- 2
pkgs/applications/misc/overmind/default.nix View File

@@ -2,7 +2,7 @@
2 2
 
3 3
 buildGoPackage rec {
4 4
   pname = "overmind";
5
-  version = "2.0.2";
5
+  version = "2.0.3";
6 6
   goPackagePath = "github.com/DarthSim/overmind";
7 7
 
8 8
   nativeBuildInputs = [ makeWrapper ];
@@ -15,7 +15,7 @@ buildGoPackage rec {
15 15
     owner = "DarthSim";
16 16
     repo = pname;
17 17
     rev = "v${version}";
18
-    sha256 = "0cns19gqkfxsiiyfxhb05cjp1iv2fb40x47gp8djrwwzcd1r6zxh";
18
+    sha256 = "0c551c240lqxdjg0jj01rh2fyhwls02k5lczlxacj05prp1plz9p";
19 19
   };
20 20
 
21 21
   meta = with lib; {

+ 11
- 7
pkgs/applications/misc/pdfpc/default.nix View File

@@ -1,5 +1,5 @@
1
-{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
2
-, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection }:
1
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch
2
+, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection, wrapGAppsHook }:
3 3
 
4 4
 stdenv.mkDerivation rec {
5 5
   name = "${product}-${version}";
@@ -17,16 +17,20 @@ stdenv.mkDerivation rec {
17 17
     cmake pkgconfig vala
18 18
     # For setup hook
19 19
     gobject-introspection
20
+    wrapGAppsHook
20 21
   ];
21 22
   buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
22
-    libpthreadstubs makeWrapper librsvg pcre ];
23
+    libpthreadstubs librsvg pcre ];
23 24
 
24 25
   cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF";
25 26
 
26
-  postInstall = ''
27
-    wrapProgram $out/bin/pdfpc \
28
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
29
-  '';
27
+  patches = [
28
+    # Fix build vala 0.46
29
+    (fetchpatch {
30
+      url = "https://github.com/pdfpc/pdfpc/commit/bbc16b97ecbdcdd22c2dc827a5c0e8b569073312.patch";
31
+      sha256 = "0wi1rqcvg65cxnxvmvavcvghqyksnpijq1p91m57jaby3hb0pdcy";
32
+    })
33
+  ];
30 34
 
31 35
   meta = with stdenv.lib; {
32 36
     description = "A presenter console with multi-monitor support for PDF files";

+ 2
- 2
pkgs/applications/misc/syncthingtray/default.nix View File

@@ -20,14 +20,14 @@
20 20
 }:
21 21
 
22 22
 mkDerivation rec {
23
-  version = "0.10.0";
23
+  version = "0.10.1";
24 24
   pname = "syncthingtray";
25 25
 
26 26
   src = fetchFromGitHub {
27 27
     owner = "Martchus";
28 28
     repo = "syncthingtray";
29 29
     rev = "v${version}";
30
-    sha256 = "18h6z6baaiyr0wr7kyz6ysg45zb12550m63j3vqiap4hfrrwhly5";
30
+    sha256 = "107w6dlr1m5g60j342p2b6ipfn1r8kyad8av58nh8ibzycghbfv2";
31 31
   };
32 32
 
33 33
   buildInputs = [ qtbase cpp-utilities qtutilities ]

+ 2
- 2
pkgs/applications/networking/browsers/ephemeral/default.nix View File

@@ -19,13 +19,13 @@
19 19
 
20 20
 stdenv.mkDerivation rec {
21 21
   pname = "ephemeral";
22
-  version = "5.3.0";
22
+  version = "5.4.0";
23 23
 
24 24
   src = fetchFromGitHub {
25 25
     owner = "cassidyjames";
26 26
     repo = "ephemeral";
27 27
     rev = version;
28
-    sha256 = "1xglhv4rpl6vqryvliyvr9y8mqli4x4bjcfjsl1v8gdxkzkwfy39";
28
+    sha256 = "1bl5x79nvzq49azcghc2sx9l709524zixh7py8ddccfnhrq641w8";
29 29
   };
30 30
 
31 31
   nativeBuildInputs = [

+ 373
- 373
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
File diff suppressed because it is too large
View File


+ 2
- 2
pkgs/applications/networking/browsers/firefox/packages.nix View File

@@ -17,10 +17,10 @@ rec {
17 17
 
18 18
   firefox = common rec {
19 19
     pname = "firefox";
20
-    ffversion = "69.0.1";
20
+    ffversion = "69.0.2";
21 21
     src = fetchurl {
22 22
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
23
-      sha512 = "0zvjwn17accmp9m55a9s12mw3cflsplysizfrpa3hy02na20w39g974d42fmxpk4zq4zqy4m17v2rpibibb0g7giy9rywndhaw3xrl9";
23
+      sha512 = "2ag1syrvlkch7vl151hkq8abf86p9v6b6gmgcbh26b8wfva1p1ss1x09h4w50zmcc6jq4q5mcxgf1sd9zna552jl90k1y4rqvrrzwl6";
24 24
     };
25 25
 
26 26
     patches = [

+ 6
- 6
pkgs/applications/networking/gns3/default.nix View File

@@ -1,16 +1,16 @@
1 1
 { callPackage }:
2 2
 
3 3
 let
4
-  stableVersion = "2.1.21";
5
-  previewVersion = "2.2.0rc5";
4
+  stableVersion = "2.2.0";
5
+  previewVersion = "2.2.0";
6 6
   addVersion = args:
7 7
     let version = if args.stable then stableVersion else previewVersion;
8 8
         branch = if args.stable then "stable" else "preview";
9 9
     in args // { inherit version branch; };
10 10
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
11 11
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
12
-  guiSrcHash = "1ydmib302r1cpm2z9pzsfp4ygxrbmskwszsip397n92qx3l9a9v3";
13
-  serverSrcHash = "1ahn1xq1f0wx46i0c8idz96dxfbakk37pqi6amy91594mdlp8yr4";
12
+  guiSrcHash = "0xghldzk126ly49y7drp241w7c0h9fb0ags9blk0rlq99i72as78";
13
+  serverSrcHash = "0iphs0w6r9s85cgd95bh6jd0224ywilrzb7a4jjwi38z7a7id4gk";
14 14
 in {
15 15
   guiStable = mkGui {
16 16
     stable = true;
@@ -18,7 +18,7 @@ in {
18 18
   };
19 19
   guiPreview = mkGui {
20 20
     stable = false;
21
-    sha256Hash = "0x4sp6yjnvzpk8cxdqlf51njckmvvkijdb7rvcb4hvqq1ab6gb2x";
21
+    sha256Hash = guiSrcHash;
22 22
   };
23 23
 
24 24
   serverStable = mkServer {
@@ -27,6 +27,6 @@ in {
27 27
   };
28 28
   serverPreview = mkServer {
29 29
     stable = false;
30
-    sha256Hash = "0inj6fac0683s1sxaba3ljia90cfach0y42xylzgzza36wpyqpqg";
30
+    sha256Hash = serverSrcHash;
31 31
   };
32 32
 }

+ 2
- 2
pkgs/applications/networking/gns3/gui.nix View File

@@ -19,8 +19,8 @@ in pythonPackages.buildPythonPackage rec {
19 19
   propagatedBuildInputs = with pythonPackages; [
20 20
     raven psutil jsonschema # tox for check
21 21
     # Runtime dependencies
22
-    sip (pyqt5.override { withWebSockets = true; })
23
-  ] ++ stdenv.lib.optional (!stable) pythonPackages.distro;
22
+    sip (pyqt5.override { withWebSockets = true; }) distro setuptools
23
+  ];
24 24
 
25 25
   doCheck = false; # Failing
26 26
 

+ 4
- 32
pkgs/applications/networking/gns3/server.nix View File

@@ -3,35 +3,7 @@
3 3
 { stdenv, python3, fetchFromGitHub }:
4 4
 
5 5
 let
6
-  python = if stable then python3.override {
7
-    packageOverrides = self: super: {
8
-      async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
9
-        version = "2.0.1";
10
-        src = oldAttrs.src.override {
11
-          inherit version;
12
-          sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0";
13
-        };
14
-      });
15
-      aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
16
-        version = "2.3.10";
17
-        src = oldAttrs.src.override {
18
-          inherit version;
19
-          sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
20
-        };
21
-        propagatedBuildInputs = with self; [ async-timeout attrs chardet multidict yarl idna-ssl ];
22
-        doCheck = false;
23
-      });
24
-      aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec {
25
-        version = "0.6.0";
26
-        src = oldAttrs.src.override {
27
-          inherit version;
28
-          sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4";
29
-        };
30
-        propagatedBuildInputs = with self; [ aiohttp ]
31
-          ++ stdenv.lib.optional (pythonOlder "3.5") typing;
32
-      });
33
-    };
34
-  } else python3;
6
+  python = python3;
35 7
 
36 8
 in python.pkgs.buildPythonPackage {
37 9
   pname = "gns3-server";
@@ -50,10 +22,10 @@ in python.pkgs.buildPythonPackage {
50 22
   '';
51 23
 
52 24
   propagatedBuildInputs = with python.pkgs; [
53
-    aiohttp-cors yarl aiohttp multidict
54
-    jinja2 psutil zipstream raven jsonschema
25
+    aiohttp-cors yarl aiohttp multidict setuptools
26
+    jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles
55 27
     (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
56
-  ] ++ stdenv.lib.optional (!stable) [ distro async_generator aiofiles ];
28
+  ];
57 29
 
58 30
   # Requires network access
59 31
   doCheck = false;

+ 2
- 2
pkgs/applications/networking/instant-messengers/rambox/pro.nix View File

@@ -2,7 +2,7 @@
2 2
 
3 3
 stdenv.mkDerivation rec {
4 4
   pname = "rambox-pro";
5
-  version = "1.1.6";
5
+  version = "1.1.7";
6 6
 
7 7
   dontBuild = true;
8 8
   dontStrip = true;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
12 12
 
13 13
   src = fetchurl {
14 14
     url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
15
-    sha256 = "1jdamjdl649315ms5g1c7m7gpy04rv7xpy6bsvink242adaq2pjz";
15
+    sha256 = "1d84hlac3qwrbi8khp6r3bm5y25zcz52l6z54k7jmyplay46r5as";
16 16
   };
17 17
 
18 18
   installPhase = ''

+ 2
- 2
pkgs/applications/networking/instant-messengers/signal-cli/default.nix View File

@@ -2,12 +2,12 @@
2 2
 
3 3
 stdenv.mkDerivation rec {
4 4
   pname = "signal-cli";
5
-  version = "0.6.2";
5
+  version = "0.6.3";
6 6
 
7 7
   # Building from source would be preferred, but is much more involved.
8 8
   src = fetchurl {
9 9
     url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
10
-    sha256 = "050nizf7v10jlrwr8f4awzi2368qr01pzpvl2qkrwhdk25r505yr";
10
+    sha256 = "1gvdifscyxmxn2dwlkqi684ahy5kbcj84mqda0m8l4aa8iaq1d59";
11 11
   };
12 12
 
13 13
   buildInputs = [ makeWrapper ];

+ 11
- 10
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix View File

@@ -8,7 +8,7 @@ with lib;
8 8
 
9 9
 mkDerivation rec {
10 10
   pname = "telegram-desktop";
11
-  version = "1.8.9";
11
+  version = "1.8.13";
12 12
   # Note: Due to our strong dependency on the Arch patches it's probably best
13 13
   # to also wait for the Arch update (especially if the patches don't apply).
14 14
 
@@ -17,7 +17,7 @@ mkDerivation rec {
17 17
     owner = "telegramdesktop";
18 18
     repo = "tdesktop";
19 19
     rev = "v${version}";
20
-    sha256 = "0b1c903ah3fhxr9qjg23p8x9k895k3cxkzz5ckcr7r4pmmbnnvkp";
20
+    sha256 = "19p4cjzk7jyhrd4sd8dq1r1zksff23zyg5rh5vlr3kqd372bffzz";
21 21
     fetchSubmodules = true;
22 22
   };
23 23
 
@@ -25,8 +25,8 @@ mkDerivation rec {
25 25
   archPatches = fetchsvn {
26 26
     url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
27 27
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
28
-    rev = "509240";
29
-    sha256 = "1sf4mspbsqsnjzp9ys9l0asrx1bhj273d163i2bv1zhl4mmgpl3k";
28
+    rev = "512849";
29
+    sha256 = "1hl7znvv6qr4cwpkj8wlplpa63i1lhk2iax7hb4l1s1a4mijx9ls";
30 30
   };
31 31
   privateHeadersPatch = fetchpatch {
32 32
     url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch";
@@ -38,8 +38,10 @@ mkDerivation rec {
38 38
   patches = [
39 39
     "${archPatches}/tdesktop.patch"
40 40
     "${archPatches}/no-gtk2.patch"
41
-    # "${archPatches}/Use-system-wide-font.patch"
41
+    "${archPatches}/Revert-Disable-DemiBold-fallback-for-Semibold.patch"
42 42
     "${archPatches}/tdesktop_lottie_animation_qtdebug.patch"
43
+    # "${archPatches}/Revert-Change-some-private-header-includes.patch"
44
+    # "${archPatches}/Use-system-wide-font.patch"
43 45
   ];
44 46
 
45 47
   postPatch = ''
@@ -87,7 +89,6 @@ mkDerivation rec {
87 89
 
88 90
   preConfigure = ''
89 91
     # Patches to revert:
90
-    patch -R -Np1 -i "${archPatches}/demibold.patch"
91 92
     patch -R -Np1 -i "${privateHeadersPatch}"
92 93
 
93 94
     # Patches to apply:
@@ -98,17 +99,17 @@ mkDerivation rec {
98 99
     # disable static-qt for rlottie
99 100
     sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp"
100 101
 
101
-    sed -i Telegram/gyp/telegram_linux.gypi \
102
+    sed -i Telegram/gyp/telegram/linux.gypi \
102 103
       -e 's,/usr,/does-not-exist,g' \
103 104
       -e 's,appindicator-0.1,appindicator3-0.1,g' \
104 105
       -e 's,-flto,,g'
105 106
 
106
-    sed -i Telegram/gyp/qt.gypi \
107
+    sed -i Telegram/gyp/modules/qt.gypi \
107 108
       -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
108 109
       -e 's,\d+",\d+" | head -n1,g'
109
-    sed -i Telegram/gyp/qt_moc.gypi \
110
+    sed -i Telegram/gyp/modules/qt_moc.gypi \
110 111
       -e "s,/usr/bin/moc,moc,g"
111
-    sed -i Telegram/gyp/qt_rcc.gypi \
112
+    sed -i Telegram/gyp/modules/qt_rcc.gypi \
112 113
       -e "s,/usr/bin/rcc,rcc,g"
113 114
 
114 115
     # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out

+ 9
- 9
pkgs/applications/networking/remote/anydesk/default.nix View File

@@ -4,22 +4,22 @@
4 4
 
5 5
 let
6 6
   sha256 = {
7
-    x86_64-linux = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2";
8
-    i686-linux   = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2";
7
+    x86_64-linux = "0mixw2sk7li1hjagibwzdgbfnrih5acricczqmfks1gsinjqrn82";
8
+    i386-linux   = "1gshd4vm8ysn636r1z44vmzdzrgybsmj8ma4zdabvs9jsbm2da3c";
9 9
   }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
10 10
 
11 11
   arch = {
12 12
     x86_64-linux = "amd64";
13
-    i686-linux   = "i686";
13
+    i386-linux   = "i386";
14 14
   }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
15 15
 
16 16
   description = "Desktop sharing application, providing remote support and online meetings";
17 17
 
18 18
   desktopItem = makeDesktopItem {
19
-    name = "anydesk";
19
+    name = "AnyDesk";
20 20
     exec = "@out@/bin/anydesk";
21 21
     icon = "anydesk";
22
-    desktopName = "anydesk";
22
+    desktopName = "AnyDesk";
23 23
     genericName = description;
24 24
     categories = "Application;Network;";
25 25
     startupNotify = "false";
@@ -27,7 +27,7 @@ let
27 27
 
28 28
 in stdenv.mkDerivation rec {
29 29
   pname = "anydesk";
30
-  version = "4.0.1";
30
+  version = "5.1.2";
31 31
 
32 32
   src = fetchurl {
33 33
     url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz";
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
40 40
     pangox_compat polkit polkit_gnome
41 41
   ] ++ (with xorg; [
42 42
     libxcb libX11 libXdamage libXext libXfixes libXi libXmu
43
-    libXrandr libXtst libXt libICE libSM
43
+    libXrandr libXtst libXt libICE libSM libXrender
44 44
   ]);
45 45
 
46 46
   nativeBuildInputs = [ makeWrapper ];
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
50 50
 
51 51
     mkdir -p $out/bin $out/share/{applications,doc/anydesk,icons/hicolor}
52 52
     install -m755 anydesk $out/bin/anydesk
53
-    cp changelog copyright README $out/share/doc/anydesk
53
+    cp copyright README $out/share/doc/anydesk
54 54
     cp -r icons/* $out/share/icons/hicolor/
55 55
     cp ${desktopItem}/share/applications/*.desktop $out/share/applications
56 56
 
@@ -75,6 +75,6 @@ in stdenv.mkDerivation rec {
75 75
     homepage = https://www.anydesk.com;
76 76
     license = licenses.unfree;
77 77
     platforms = platforms.linux;
78
-    maintainers = with maintainers; [ peterhoeg ];
78
+    maintainers = with maintainers; [ shyim ];
79 79
   };
80 80
 }

+ 2
- 2
pkgs/applications/networking/remote/teamviewer/default.nix View File

@@ -6,11 +6,11 @@
6 6
 
7 7
 mkDerivation rec {
8 8
   pname = "teamviewer";
9
-  version = "14.5.1691";
9
+  version = "14.6.2452";
10 10
 
11 11
   src = fetchurl {
12 12
     url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb";
13
-    sha256 = "1dzvjyvcqcah6z1dvw4zvmbdn8iks9j2909slbkksavn1rp3akxc";
13
+    sha256 = "0j677bqwvlczbja9msayqpdgandb2mvyvcr0vasc3hhnmnk70ahw";
14 14
   };
15 15
 
16 16
   unpackPhase = ''

+ 2
- 2
pkgs/applications/networking/sync/onedrive/default.nix View File

@@ -8,13 +8,13 @@
8 8
 
9 9
 stdenv.mkDerivation rec {
10 10
   pname = "onedrive";
11
-  version = "2.3.9";
11
+  version = "2.3.10";
12 12
 
13 13
   src = fetchFromGitHub {
14 14
     owner = "abraunegg";
15 15
     repo = "onedrive";
16 16
     rev = "v${version}";
17
-    sha256 = "0fg2zzhhd1wl8z416px432xynx6whnzdamzdckc8rmm1cvghgb0f";
17
+    sha256 = "0ks22anxih63zwlc11z0gi531wvcricbkv1wlkrgfihi58l8fhfk";
18 18
   };
19 19
 
20 20
   nativeBuildInputs = [

+ 5
- 5
pkgs/applications/networking/znc/modules.nix View File

@@ -79,15 +79,15 @@ in {
79 79
 
80 80
   fish = zncDerivation rec {
81 81
     name = "znc-fish-${version}";
82
-    version = "git-2014-10-10";
82
+    version = "git-2017-06-26";
83 83
     module_name = "fish";
84 84
 
85 85
     src = fetchFromGitHub {
86
-      # this fork works with ZNC 1.6
87
-      owner = "jarrydpage";
86
+      # this fork works with ZNC 1.7
87
+      owner = "oilslump";
88 88
       repo = "znc-fish";
89
-      rev = "9c580e018a1a08374e814fc06f551281cff827de";
90
-      sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl";
89
+      rev = "7d91467dbb195f7b591567911210523c6087662e";
90
+      sha256 = "1ky5xg17k5f393whrv5iv8zsmdvdyk2f7z5qdsmxcwy3pdxy6vsm";
91 91
     };
92 92
 
93 93
     meta = {

+ 2
- 2
pkgs/applications/office/qownnotes/default.nix View File

@@ -2,13 +2,13 @@
2 2
 
3 3
 mkDerivation rec {
4 4
   pname = "qownnotes";
5
-  version = "19.8.6";
5
+  version = "19.9.16";
6 6
 
7 7
   src = fetchurl {
8 8
     url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
9 9
     # Can grab official version like so:
10 10
     # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
11
-    sha256 = "a242dd15dc484baad39e737fe1af8529411f49a0d74994e6c78cf6bad4b733b6";
11
+    sha256 = "01ja4a9z87y8wdf1p9pdjdhr2h4hlyf28iqh1wlcapfq8f53zq42";
12 12
   };
13 13
 
14 14
   nativeBuildInputs = [ qmake qttools ];

+ 2
- 2
pkgs/applications/office/timetable/default.nix View File

@@ -16,13 +16,13 @@
16 16
 
17 17
 stdenv.mkDerivation rec {
18 18
   pname = "timetable";
19
-  version = "1.0.8";
19
+  version = "1.0.9";
20 20
 
21 21
   src = fetchFromGitHub {
22 22
     owner = "lainsce";
23 23
     repo = pname;
24 24
     rev = version;
25
-    sha256 = "0s825al10s0hwfzl90bplwwasx89wx28n41sg2md71l9hfqy296q";
25
+    sha256 = "1n02y7vpi4lb888iic06xifc86n2xirk50s1ssf84vlc5md1kq9f";
26 26
   };
27 27
 
28 28
   nativeBuildInputs = [

+ 3
- 3
pkgs/applications/science/astronomy/gildas/default.nix View File

@@ -7,8 +7,8 @@ let
7 7
 in
8 8
 
9 9
 stdenv.mkDerivation rec {
10
-  srcVersion = "sep19a";
11
-  version = "20190901_a";
10
+  srcVersion = "oct19a";
11
+  version = "20191001_a";
12 12
   pname = "gildas";
13 13
 
14 14
   src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
16 16
     # source code of the previous release to a different directory
17 17
     urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
18 18
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
19
-    sha256 = "0l4jfzzxp1ab70a920qfbxiphgnc06m46wfwv0jlsq2mfk7cxac1";
19
+    sha256 = "0h6g16ra7v8x15j21z5hnb3midwm0asc7bjm9gs5v5sw66vn3wc1";
20 20
   };
21 21
 
22 22
   enableParallelBuilding = true;

+ 2
- 2
pkgs/applications/science/math/cbc/default.nix View File

@@ -2,11 +2,11 @@
2 2
 
3 3
 stdenv.mkDerivation rec {
4 4
   pname = "cbc";
5
-  version = "2.10.2";
5
+  version = "2.10.3";
6 6
 
7 7
   src = fetchurl {
8 8
     url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz";
9
-    sha256 = "0frbxkh6nbh46kaxsx5bmzridgip3v7aq75l8yak5npiiq4jlwv3";
9
+    sha256 = "1zzcg40ky5v96s7br2hqlkqdspwrn43kf3757g6c35wl29bq6f5d";
10 10
   };
11 11
 
12 12
   configureFlags = [ "-C" ];

+ 16
- 3
pkgs/applications/science/math/cntk/default.nix View File

@@ -1,7 +1,7 @@
1
-{ config, lib, stdenv, fetchgit, fetchFromGitHub, cmake
1
+{ lib, stdenv, fetchgit, fetchFromGitHub, cmake
2 2
 , openblas, opencv3, libzip, boost, protobuf, openmpi
3 3
 , onebitSGDSupport ? false
4
-, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
4
+, cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11
5 5
 , cudnnSupport ? cudaSupport, cudnn
6 6
 }:
7 7
 
@@ -27,7 +27,10 @@ in stdenv.mkDerivation rec {
27 27
     sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns";
28 28
   };
29 29
 
30
-  nativeBuildInputs = [ cmake ];
30
+  nativeBuildInputs = [ cmake ] ++ lib.optional cudaSupport addOpenGLRunpath;
31
+
32
+  # Force OpenMPI to use g++ in PATH.
33
+  OMPI_CXX = "g++";
31 34
 
32 35
   buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ]
33 36
              ++ lib.optional cudaSupport cudatoolkit
@@ -69,6 +72,7 @@ in stdenv.mkDerivation rec {
69 72
       ln -s ${cudnn}/include cuda
70 73
       export configureFlags="$configureFlags --with-cudnn=$PWD"
71 74
     ''}
75
+
72 76
     ../configure $configureFlags
73 77
   '';
74 78
 
@@ -79,9 +83,18 @@ in stdenv.mkDerivation rec {
79 83
     cp bin/cntk $out/bin
80 84
   '';
81 85
 
86
+  postFixup = lib.optionalString cudaSupport ''
87
+    for lib in $out/lib/*; do
88
+      addOpenGLRunpath "$lib"
89
+    done
90
+  '';
91
+
82 92
   enableParallelBuilding = true;
83 93
 
84 94
   meta = with lib; {
95
+    # Newer cub is included with cudatoolkit now and it breaks the build.
96
+    # https://github.com/Microsoft/CNTK/issues/3191
97
+    broken = cudaSupport;
85 98
     homepage = https://github.com/Microsoft/CNTK;
86 99
     description = "An open source deep-learning toolkit";
87 100
     license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit;

+ 13
- 12
pkgs/applications/science/molecular-dynamics/gromacs/default.nix View File

@@ -1,27 +1,28 @@
1
-
2
-{ stdenv, fetchurl, cmake,
3
-  singlePrec ? true,
4
-  mpiEnabled ? false,
5
-  fftw,
6
-  openmpi
1
+{ stdenv, fetchurl, cmake
2
+, singlePrec ? true
3
+, mpiEnabled ? false
4
+, fftw
5
+, openmpi
6
+, perl
7 7
 }:
8 8
 
9 9
 
10 10
 stdenv.mkDerivation {
11
-  name = "gromacs-2019.3";
11
+  name = "gromacs-2019.4";
12 12
 
13 13
   src = fetchurl {
14
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.3.tar.gz";
15
-    sha256 = "0wvm6lj4hbasl2qkjcpicqjh7abxji4196dd2hmwlyivpycaa4a2";
14
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.4.tar.gz";
15
+    sha256 = "0rqqrbjrdhprlw2z6cqid59xwxfdx05ikvywppvdp8f8vzp6chxs";
16 16
   };
17 17
 
18
-  buildInputs = [cmake fftw]
18
+  nativeBuildInputs = [ cmake ];
19
+  buildInputs = [ fftw perl ]
19 20
   ++ (stdenv.lib.optionals mpiEnabled [ openmpi ]);
20 21
 
21 22
   cmakeFlags = ''
22 23
     ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"}
23
-    ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE 
24
-                          -DGMX_CPU_ACCELERATION:STRING=SSE4.1 
24
+    ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE
25
+                          -DGMX_CPU_ACCELERATION:STRING=SSE4.1
25 26
                           -DGMX_OPENMP:BOOL=TRUE
26 27
                           -DGMX_THREAD_MPI:BOOL=FALSE"
27 28
                      else "-DGMX_MPI:BOOL=FALSE" }

+ 2
- 0
pkgs/applications/version-management/git-and-tools/default.nix View File

@@ -24,6 +24,8 @@ let
24 24
 
25 25
   darcsToGit = callPackage ./darcs-to-git { };
26 26
 
27
+  delta = callPackage ./delta { };
28
+
27 29
   diff-so-fancy = callPackage ./diff-so-fancy { };
28 30
 
29 31
   ghq = callPackage ./ghq { };

+ 22
- 0
pkgs/applications/version-management/git-and-tools/delta/default.nix View File

@@ -0,0 +1,22 @@
1
+{ lib, fetchFromGitHub, rustPlatform }:
2
+
3
+rustPlatform.buildRustPackage rec {
4
+  pname = "delta";
5
+  version = "0.0.12";
6
+
7
+  src = fetchFromGitHub {
8
+    owner = "dandavison";
9
+    repo = pname;
10
+    rev = version;
11
+    sha256 = "10jmawxzqgz7gjg1xdna9q2v6l1qlf83ybbqxcbx6941s15lgs7x";
12
+  };
13
+
14
+  cargoSha256 = "1888bvkpalfcw9bc9zmf9bmil6x35l9ia31x6mx1h2dvrfpw3bb1";
15
+
16
+  meta = with lib; {
17
+    homepage = "https://github.com/dandavison/delta";
18
+    description = "A syntax-highlighting pager for git";
19
+    license = licenses.mit;
20
+    maintainers = [ maintainers.marsam ];
21
+  };
22
+}

+ 2
- 2
pkgs/applications/version-management/git-and-tools/hub/default.nix View File

@@ -2,7 +2,7 @@
2 2
 
3 3
 buildGoPackage rec {
4 4
   pname = "hub";
5
-  version = "2.12.7";
5
+  version = "2.12.8";
6 6
 
7 7
   goPackagePath = "github.com/github/hub";
8 8
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
13 13
     owner = "github";
14 14
     repo = pname;
15 15
     rev = "v${version}";
16
-    sha256 = "028hc2cgjgqmi9kvxhck4nvq02p095bp1d8qxc6q38aynwfmmhk5";
16
+    sha256 = "0a2dpg0w29nblk1dba9a35bpwwyf0zbqcgrwn4a8diyx27b77x3x";
17 17
   };
18 18
 
19 19
   nativeBuildInputs = [ groff utillinux ];

+ 2
- 1
pkgs/applications/version-management/gitlab/gitaly/default.nix View File

@@ -53,7 +53,8 @@ in buildGoPackage rec {
53 53
   outputs = [ "bin" "out" "ruby" ];
54 54
 
55 55
   meta = with stdenv.lib; {
56
-    homepage = http://www.gitlab.com/;
56
+    homepage = https://gitlab.com/gitlab-org/gitaly;
57
+    description = "A Git RPC service for handling all the git calls made by GitLab";
57 58
     platforms = platforms.unix;
58 59
     maintainers = with maintainers; [ roblabla globin fpletz ];
59 60
     license = licenses.mit;

+ 4
- 3
pkgs/applications/version-management/sourcehut/core.nix View File

@@ -1,7 +1,7 @@
1 1
 { stdenv, fetchgit, fetchNodeModules, buildPythonPackage
2 2
 , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests
3 3
 , sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic
4
-, sassc, nodejs-11_x
4
+, sassc, nodejs
5 5
 , writeText }:
6 6
 
7 7
 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
16 16
 
17 17
   node_modules = fetchNodeModules {
18 18
     src = "${src}/srht";
19
-    nodejs = nodejs-11_x;
19
+    nodejs = nodejs;
20 20
     sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p";
21 21
   };
22 22
 
@@ -26,7 +26,7 @@ buildPythonPackage rec {
26 26
 
27 27
   nativeBuildInputs = [
28 28
     sassc
29
-    nodejs-11_x
29
+    nodejs
30 30
   ];
31 31
 
32 32
   propagatedBuildInputs = [
@@ -75,6 +75,7 @@ buildPythonPackage rec {
75 75
     homepage = https://git.sr.ht/~sircmpwn/srht;
76 76
     description = "Core modules for sr.ht";
77 77
     license = licenses.bsd3;
78
+    broken = true;
78 79
     maintainers = with maintainers; [ eadwu ];
79 80
   };
80 81
 }

+ 2
- 2
pkgs/applications/version-management/src/default.nix View File

@@ -2,11 +2,11 @@
2 2
 
3 3
 stdenv.mkDerivation rec {
4 4
   pname = "src";
5
-  version = "1.26";
5
+  version = "1.27";
6 6
 
7 7
   src = fetchurl {
8 8
     url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz";
9
-    sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23";
9
+    sha256 = "0764kcyh54plzmvfyhh086wpszh67nv1nsxgk95n9bxxinr7sn3x";
10 10
   };
11 11
 
12 12
   nativeBuildInputs = [ makeWrapper ];

+ 1
- 1
pkgs/applications/virtualization/OVMF/default.nix View File

@@ -42,7 +42,7 @@ edk2.mkDerivation projectDscPath {
42 42
     mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
43 43
 
44 44
     # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec
45
-    # FIXME: why is it different from Debian dir layout? https://anonscm.debian.org/cgit/pkg-qemu/edk2.git/tree/debian/rules
45
+    # FIXME: why is it different from Debian dir layout? https://salsa.debian.org/qemu-team/edk2/blob/debian/debian/rules
46 46
     dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=/dev/zero bs=1M    count=64
47 47
     dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=$fd/FV/QEMU_EFI.fd conv=notrunc
48 48
     dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M    count=64

+ 3
- 3
pkgs/applications/virtualization/lkl/default.nix View File

@@ -3,8 +3,8 @@
3 3
 
4 4
 stdenv.mkDerivation rec {
5 5
   pname = "lkl";
6
-  version = "2019-06-20";
7
-  rev  = "0a4ebeadad12b94db665b8daf30e44e949a02d90";
6
+  version = "2019-10-04";
7
+  rev  = "06ca3ddb74dc5b84fa54fa1746737f2df502e047";
8 8
 
9 9
   outputs = [ "dev" "lib" "out" ];
10 10
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
16 16
     inherit rev;
17 17
     owner  = "lkl";
18 18
     repo   = "linux";
19
-    sha256 = "09y9ci3j0lp3z74h577ng2s9a4n4glqpqndyc9iy6wdqaj764gm6";
19
+    sha256 = "0qjp0r338bwgrqdsvy5mkdh7ryas23m47yvxfwdknfyl0k3ylq62";
20 20
   };
21 21
 
22 22
   # Fix a /usr/bin/env reference in here that breaks sandboxed builds

+ 2
- 2
pkgs/applications/virtualization/podman/default.nix View File

@@ -5,13 +5,13 @@
5 5
 
6 6
 buildGoPackage rec {
7 7
   pname = "podman";
8
-  version = "1.5.1";
8
+  version = "1.6.1";
9 9
 
10 10
   src = fetchFromGitHub {
11 11
     owner  = "containers";
12 12
     repo   = "libpod";
13 13
     rev    = "v${version}";
14
-    sha256 = "1jg7fdshqz0x71339i0wndskb17x1k5rwpkjiwd463f96fnbfp4x";
14
+    sha256 = "0s9jxcjx9bkml606rn29358pfavd85m6zshra4qkpbc1iwa6hgr9";
15 15
   };
16 16
 
17 17
   goPackagePath = "github.com/containers/libpod";

+ 2
- 2
pkgs/applications/window-managers/2bwm/default.nix View File

@@ -3,14 +3,14 @@
3 3
 , libX11, xcbutil, xcbutilxrm }:
4 4
 
5 5
 stdenv.mkDerivation rec {
6
-  version = "0.2";
6
+  version = "0.3";
7 7
   pname = "2bwm";
8 8
 
9 9
   src = fetchFromGitHub {
10 10
     owner  = "venam";
11 11
     repo   = "2bwm";
12 12
     rev    = "v${version}";
13
-    sha256 = "1la1ixpm5knsj2gvdcmxzj1jfbzxvhmgzps4f5kbvx5047xc6ici";
13
+    sha256 = "1xwib612ahv4rg9yl5injck89dlpyp5475xqgag0ydfd0r4sfld7";
14 14
   };
15 15
 
16 16
   # Allow users set their own list of patches

+ 2
- 2
pkgs/data/fonts/ibm-plex/default.nix View File

@@ -1,7 +1,7 @@
1 1
 { lib, fetchzip }:
2 2
 
3 3
 let
4
-  version = "2.0.0";
4
+  version = "3.0.0";
5 5
 in fetchzip {
6 6
   name = "ibm-plex-${version}";
7 7
   url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
@@ -9,7 +9,7 @@ in fetchzip {
9 9
     mkdir -p $out/share/fonts
10 10
     unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
11 11
   '';
12
-  sha256 = "0m4paww4349d37s7j20a00hp514p1jq54xrnz45wyrafb8pkah4g";
12
+  sha256 = "1vv0lf2fn0y0ln14s4my8x2mykq1lwqpmkjkhs6cm48mzf740nhs";
13 13
 
14 14
   meta = with lib; {
15 15
     description = "IBM Plex Typeface";

+ 2
- 2
pkgs/data/fonts/nerdfonts/default.nix View File

@@ -1,4 +1,4 @@
1
-{ stdenv, fetchFromGitHub, bash, which, withFont ? "" }:
1
+{ stdenv, fetchFromGitHub, which, withFont ? "" }:
2 2
 
3 3
 stdenv.mkDerivation rec {
4 4
   version = "2.0.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
12 12
   dontPatchShebangs = true;
13 13
   buildInputs = [ which ];
14 14
   patchPhase = ''
15
-    sed -i -e 's|/bin/bash|${bash}/bin/bash|g' install.sh
15
+    patchShebangs install.sh
16 16
     sed -i -e 's|font_dir="\$HOME/.local/share/fonts|font_dir="$out/share/fonts/truetype|g' install.sh
17 17
   '';
18 18
   installPhase = ''

+ 2
- 2
pkgs/data/icons/elementary-xfce-icon-theme/default.nix View File

@@ -2,13 +2,13 @@
2 2
 
3 3
 stdenv.mkDerivation rec {
4 4
   pname = "elementary-xfce-icon-theme";
5
-  version = "0.13.1";
5
+  version = "0.14";
6 6
 
7 7
   src = fetchFromGitHub {
8 8
     owner = "shimmerproject";
9 9
     repo = "elementary-xfce";
10 10
     rev = "v${version}";
11
-    sha256 = "16msdrazhbv80cvh5ffvgj13xmkpf87r7mq6xz071fza6nv7g0jn";
11
+    sha256 = "00sk6sv0kkfb3q0jqwcllzawi30rw8nfkkfn5l1qwqha48izw3r4";
12 12
   };
13 13
 
14 14
   nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 hicolor-icon-theme ];

+ 3
- 3
pkgs/data/icons/numix-icon-theme-circle/default.nix View File

@@ -2,13 +2,13 @@
2 2
 
3 3
 stdenv.mkDerivation rec {
4 4
   pname = "numix-icon-theme-circle";
5
-  version = "19.05.07";
5
+  version = "19.09.20";
6 6
 
7 7
   src = fetchFromGitHub {
8 8
     owner = "numixproject";
9 9
     repo = pname;
10 10
     rev = version;
11
-    sha256 = "04h7kp1895rkfaqrgzrpqjmqamkxv3dkmhslgm2cxsa6qc0wammg";
11
+    sha256 = "1pmz2dy1580ln5m57xw3vhqrjhviayisgbs2km3i77hyx66hiivi";
12 12
   };
13 13
 
14 14
   nativeBuildInputs = [ gtk3 numix-icon-theme ];
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
30 30
     license = licenses.gpl3;
31 31
     # darwin cannot deal with file names differing only in case
32 32
     platforms = platforms.linux;
33
-    maintainers = with maintainers; [ ];
33
+    maintainers = with maintainers; [ romildo ];
34 34
   };
35 35
 }

+ 2
- 2
pkgs/data/icons/numix-icon-theme-square/default.nix View File

@@ -2,13 +2,13 @@
2 2
 
3 3
 stdenv.mkDerivation rec {
4 4
   pname = "numix-icon-theme-square";
5