Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7c21abdf4ca3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 33496aa3a6f3
Choose a head ref

Commits on Mar 11, 2020

  1. nixos/captive-browser: set chromium's data-dir to a XDG-compliant loc…

    …ation
    
    To quote the XDG specification:
    
         There is a single base directory relative to which user-specific
         data files should be written. This directory is defined by the\
         environment variable $XDG_DATA_HOME.
    
    Rather than adding another directory to $HOME, I think that it's better
    to follow this standard to avoid a cluttered home-dir.
    Ma27 committed Mar 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    f073b74 View commit details

Commits on Mar 19, 2020

  1. ivan: add full iconset

    Free Potion committed Mar 19, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    a35282f View commit details

Commits on Mar 31, 2020

  1. unifiStable: 5.12.35 -> 5.12.66

    bachp committed Mar 31, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    05cc2b1 View commit details

Commits on Apr 4, 2020

  1. nixos/systemd-nspawn: disallow multiple packages with .nspawn-units

    In contrast to `.service`-units, it's not possible to declare an
    `overrides.conf`, however this is done by `generateUnits` for `.nspawn`
    units as well. This change breaks the build if you have two derivations
    configuring one nspawn unit.
    
    This will happen in a case like this:
    
    ``` nix
    { pkgs, ... }: {
      systemd.packages = [
        (pkgs.writeTextDir "etc/systemd/nspawn/container0.nspawn" ''
          [Files]
          Bind=/tmp
        '')
      ];
      systemd.nspawn.container0 = {
        /* ... */
      };
    }
    ```
    Ma27 committed Apr 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    a9e3ec1 View commit details

Commits on Apr 12, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    Copy the full SHA
    a94fedc View commit details

Commits on Apr 13, 2020

  1. offlineimap: 7.3.2 -> 7.3.3

    r-ryantm committed Apr 13, 2020
    Copy the full SHA
    e443f9f View commit details
  2. advancecomp: version number correctly embedded in binaries

    without this fix, binaries report their version number as "vnone"
    which for example stops `image_optim` from using `advpng` (refuses
    to use it not being able to tell what version number it has)
    snicket2100 committed Apr 13, 2020
    Copy the full SHA
    b1c14fb View commit details
  3. nixos/build-vms: propagate file location

    When trying to build a VM using `nixos-build-vms` with a configuration
    that doesn't evaluate, an error "at `<unknown-file>`" is usually shown.
    
    This happens since the `build-vms.nix` creates a VM-network of
    NixOS-configurations that are attr-sets or functions and don't contain
    any file information. This patch manually adds the `_file`-attribute to
    tell the module-system which file contained broken configuration:
    
    ```
    $ cat vm.nix
    { vm.invalid-option = 1; }
    
    $ nixos-build-vms vm.nix
    error: The option `invalid-option' defined in `/home/ma27/Projects/nixpkgs/vm.nix@node-vm' does not exist.
    (use '--show-trace' to show detailed location information)
    ```
    Ma27 committed Apr 13, 2020
    Copy the full SHA
    ec6bac9 View commit details

Commits on Apr 14, 2020

  1. Copy the full SHA
    da9feeb View commit details
  2. Copy the full SHA
    4e60f30 View commit details
  3. nixosTests.flannel: port to python, unbreak

    For reasons yet unknown, the vxlan backend doesn't work (at least inside
    the qemu networking), so this is moved to the udp backend.
    
    Note changing the backend apparently also changes the interface name,
    it's now `flannel0`, not `flannel.1`
    
    fixes #74941
    flokli committed Apr 14, 2020
    Copy the full SHA
    28ef438 View commit details

Commits on Apr 15, 2020

  1. notejot: 1.6.0 -> 1.6.3

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    ff820a1 View commit details
  2. otfcc: 0.9.6 -> 0.10.4

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    913520a View commit details
  3. pgmetrics: 1.8.1 -> 1.9.0

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    cdc3899 View commit details
  4. git: Allow the update script to target non-latest versions

    This came in handy when I wanted to bump a patch version while avoiding
    a new minor version.
    James Ottaway committed Apr 15, 2020
    Copy the full SHA
    4848eef View commit details
  5. rdma-core: 28.0 -> 29.0

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    d6d2b1e View commit details
  6. smarty3: 3.1.34 -> 3.1.35

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    33da4f7 View commit details
  7. Merge pull request #85129 from snicket2100/advancecomp-version-number…

    …-fix
    
    advancecomp: version number correctly embedded in binaries
    7c6f434c authored Apr 15, 2020
    Copy the full SHA
    0f2c233 View commit details
  8. zafiro-icons: 1.0 -> 1.1

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    81a38b0 View commit details
  9. Copy the full SHA
    b8a83a2 View commit details
  10. Merge pull request #85281 from r-ryantm/auto-update/rdma-core

    rdma-core: 28.0 -> 29.0
    markuskowa authored Apr 15, 2020
    Copy the full SHA
    4289160 View commit details
  11. Merge pull request #85109 from marsam/update-victoriametrics

    victoriametrics: 1.34.5 -> 1.34.7
    marsam authored Apr 15, 2020
    Copy the full SHA
    a4d12f7 View commit details
  12. Merge pull request #85274 from r-ryantm/auto-update/pgmetrics

    pgmetrics: 1.8.1 -> 1.9.0
    marsam authored Apr 15, 2020
    Copy the full SHA
    d9bdfd6 View commit details
  13. Copy the full SHA
    0a37de9 View commit details
  14. Copy the full SHA
    924e5cd View commit details
  15. bibclean: 3.03 -> 3.04

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    cf1c924 View commit details
  16. Copy the full SHA
    90bc149 View commit details
  17. Merge pull request #82903 from freepotion/ivan-add-iconset

    ivan: add full iconset
    nh2 authored Apr 15, 2020
    Copy the full SHA
    b5765e6 View commit details
  18. Copy the full SHA
    2dff34b View commit details
  19. Copy the full SHA
    a772bc6 View commit details
  20. common-updater-scripts: add scripts to help update packages

    - updateScript:
      A nix expression that can be used in passThrough to update a package
    
    - list-git-tags:
      A shell script to list available tags in a git repository
    
    - list-archive-two-level-versions:
    
      A shell script to list available versions in a web site in two
      levels: there is a page listing the available major.minor versions,
      and for each of them there is another page listings the patch level
      versions major.minor.patch.
    
      It is suitable for Xfce packages for instance.
    
    How the updater works:
    
    1. collect the available versions from the source repository (using a
    script given as argument)
    
    2. print the collected versions (for debugging)
    
    3. (optionally) apply some transformation to the collected versions to
    make them compatible with the versions used in nixpkgs (for instance,
    tags in the Xfce git repository may be prefixed with the package name,
    and the prefix need to be removed)
    
    4. sort the available versions in decreasing order
    
    5. choose the first version that pass validation:
       - check if the version may be a development version
    
       - if the version IS unstable, skip it and give a warning about
       skipping a development version (for debugging)
    
       - if the version COULD BE unstable, take it and give a warning
       about taking a potential development version (for debugging)
    
       - if the version IS stable, take it
    
    6. update the package version and checksum in its nix expression
    
    7. print the git commands for adding the modified files and for
    committing the changes
    romildo committed Apr 15, 2020
    Copy the full SHA
    827a661 View commit details
  21. Copy the full SHA
    8162d76 View commit details
  22. Copy the full SHA
    06ba312 View commit details
  23. common-updater-scripts: ignore update-git-commits.txt

    It is generated by common-updater/update-script.nix
    romildo committed Apr 15, 2020
    Copy the full SHA
    a097de3 View commit details
  24. Merge pull request #85291 from r-ryantm/auto-update/zafiro-icons

    zafiro-icons: 1.0 -> 1.1
    romildo authored Apr 15, 2020
    Copy the full SHA
    b1325ec View commit details
  25. ocamlPackages.ounit2: init at 2.2.2

    sternenseemann authored and vbgl committed Apr 15, 2020
    Copy the full SHA
    29a98f2 View commit details
  26. Copy the full SHA
    f6a53ee View commit details
  27. Copy the full SHA
    8930a67 View commit details
  28. Copy the full SHA
    dd3cc04 View commit details
  29. Merge pull request #84292 from romildo/xfce.upate-script

    xfce: add update script
    romildo authored Apr 15, 2020
    Copy the full SHA
    2e80fb5 View commit details
  30. bitlbee-discord: 0.4.2 -> 0.4.3

    r-ryantm authored and Lassulus committed Apr 15, 2020
    Copy the full SHA
    a7f013e View commit details
  31. Merge pull request #83537 from puzzlewolf/line-awesome

    line-awesome: init at 1.3.0
    timokau authored Apr 15, 2020
    Copy the full SHA
    c6ca626 View commit details
  32. python27Packages.autopep8: 1.5 -> 1.5.1

    r-ryantm authored and FRidh committed Apr 15, 2020
    Copy the full SHA
    7cfd736 View commit details
  33. higan: 106 -> 110

    AndersonTorres committed Apr 15, 2020
    Copy the full SHA
    1877182 View commit details
  34. Merge pull request #85162 from Ma27/build-vms-file-loc

    nixos/build-vms: propagate file location
    Ma27 authored Apr 15, 2020
    Copy the full SHA
    dca0b71 View commit details
  35. Copy the full SHA
    ccd6892 View commit details
  36. Merge pull request #85238 from ryantm/linode-cli

    linode-cli: remove deprecated perl version, init python version at 2.14.1
    ryantm authored Apr 15, 2020
    Copy the full SHA
    5b36111 View commit details
  37. ocamlPackages.fmt: 0.8.6 -> 0.8.8

    sternenseemann authored and vbgl committed Apr 15, 2020
    Copy the full SHA
    a3cd9c9 View commit details
  38. chirp: 20200213 -> 20200409

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    c446ce3 View commit details
  39. cfdg: 3.2_2 -> 3.3

    r-ryantm committed Apr 15, 2020
    Copy the full SHA
    8e00de9 View commit details
Showing with 1,149 additions and 508 deletions.
  1. +3 −0 .gitignore
  2. +6 −1 nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
  3. +1 −1 nixos/modules/programs/captive-browser.nix
  4. +10 −3 nixos/modules/system/boot/systemd-lib.nix
  5. +1 −1 nixos/modules/system/boot/systemd-nspawn.nix
  6. +19 −18 nixos/tests/flannel.nix
  7. +2 −2 pkgs/applications/misc/notejot/default.nix
  8. +2 −2 pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
  9. +2 −2 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  10. +4 −2 pkgs/applications/networking/ping/default.nix
  11. +2 −2 pkgs/applications/office/atlassian-cli/default.nix
  12. +120 −41 pkgs/applications/office/wpsoffice/default.nix
  13. +2 −2 pkgs/applications/radio/chirp/default.nix
  14. +9 −0 pkgs/applications/science/math/nasc/default.nix
  15. +4 −3 pkgs/applications/version-management/git-and-tools/git/update.sh
  16. +5 −2 pkgs/applications/version-management/git-and-tools/tig/default.nix
  17. +16 −8 pkgs/applications/virtualization/podman/default.nix
  18. +2 −2 pkgs/common-updater/scripts.nix
  19. +35 −0 pkgs/common-updater/scripts/list-archive-two-level-versions
  20. +32 −0 pkgs/common-updater/scripts/list-git-tags
  21. +98 −0 pkgs/common-updater/update-script.nix
  22. +36 −0 pkgs/data/fonts/line-awesome/default.nix
  23. +44 −0 pkgs/data/icons/humanity-icon-theme/default.nix
  24. +2 −2 pkgs/data/icons/zafiro-icons/default.nix
  25. +1 −0 pkgs/desktops/xfce/applications/gigolo/default.nix
  26. +1 −1 pkgs/desktops/xfce/applications/orage/default.nix
  27. +1 −0 pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
  28. +12 −6 pkgs/desktops/xfce/applications/xfce4-volumed/default.nix
  29. +2 −1 pkgs/desktops/xfce/applications/xfdashboard/default.nix
  30. +17 −9 pkgs/desktops/xfce/art/xfce4-icon-theme.nix
  31. +14 −6 pkgs/desktops/xfce/art/xfwm4-themes.nix
  32. +2 −0 pkgs/desktops/xfce/core/thunar-volman/default.nix
  33. +8 −0 pkgs/desktops/xfce/default.nix
  34. +21 −4 pkgs/desktops/xfce/mkXfceDerivation.nix
  35. +3 −2 pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
  36. +1 −2 pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
  37. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
  38. +2 −3 pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
  39. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
  40. +2 −1 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
  41. +15 −7 pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
  42. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
  43. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
  44. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
  45. +5 −5 pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
  46. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
  47. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
  48. +2 −2 pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
  49. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
  50. +17 −9 pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
  51. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
  52. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
  53. +6 −0 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
  54. +2 −2 pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
  55. +19 −11 pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
  56. +2 −2 pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
  57. +11 −5 pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
  58. +2 −2 pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
  59. +1 −2 pkgs/desktops/xfce/thunar-plugins/archive/default.nix
  60. +7 −0 pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
  61. +11 −12 pkgs/development/libraries/gtk-mac-integration/default.nix
  62. +2 −2 pkgs/development/libraries/smarty3/default.nix
  63. +14 −32 pkgs/development/ocaml-modules/asn1-combinators/default.nix
  64. +3 −3 pkgs/development/ocaml-modules/fmt/default.nix
  65. +3 −3 pkgs/development/ocaml-modules/notty/default.nix
  66. +7 −29 pkgs/development/ocaml-modules/ounit/default.nix
  67. +22 −0 pkgs/development/ocaml-modules/ounit2/default.nix
  68. +2 −2 pkgs/development/python-modules/autopep8/default.nix
  69. +62 −12 pkgs/development/tools/rust/cargo-make/Cargo.lock
  70. +3 −3 pkgs/development/tools/rust/cargo-make/default.nix
  71. +3 −3 pkgs/development/tools/selenium/chromedriver/default.nix
  72. +12 −5 pkgs/games/ivan/default.nix
  73. +24 −25 pkgs/misc/emulators/higan/0001-change-flags.diff
  74. +80 −53 pkgs/misc/emulators/higan/default.nix
  75. +2 −2 pkgs/os-specific/linux/rdma-core/default.nix
  76. +3 −1 pkgs/servers/documize-community/default.nix
  77. +3 −1 pkgs/servers/grocy/default.nix
  78. +3 −1 pkgs/servers/nextcloud/default.nix
  79. +6 −5 pkgs/servers/nosql/victoriametrics/default.nix
  80. +2 −2 pkgs/servers/unifi/default.nix
  81. +3 −3 pkgs/tools/admin/eksctl/default.nix
  82. +7 −0 pkgs/tools/compression/advancecomp/default.nix
  83. +2 −2 pkgs/tools/graphics/cfdg/default.nix
  84. +2 −2 pkgs/tools/misc/otfcc/default.nix
  85. +3 −3 pkgs/tools/misc/pgmetrics/default.nix
  86. +3 −1 pkgs/tools/networking/iftop/default.nix
  87. +2 −2 pkgs/tools/networking/offlineimap/default.nix
  88. +2 −2 pkgs/tools/system/acpica-tools/default.nix
  89. +2 −2 pkgs/tools/typesetting/bibclean/default.nix
  90. +55 −27 pkgs/tools/virtualization/linode-cli/default.nix
  91. +6 −2 pkgs/top-level/all-packages.nix
  92. +2 −0 pkgs/top-level/ocaml-packages.nix
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -16,3 +16,6 @@ result-*
/pkgs/development/libraries/qt-5/*/tmp/
/pkgs/desktops/kde-5/*/tmp/
/pkgs/development/mobile/androidenv/xml/*

# generated by pkgs/common-updater/update-script.nix
update-git-commits.txt
7 changes: 6 additions & 1 deletion nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,12 @@
, networkExpr
}:

let nodes = import networkExpr; in
let
nodes = builtins.mapAttrs (vm: module: {
_file = "${networkExpr}@node-${vm}";
imports = [ module ];
}) (import networkExpr);
in

with import ../../../../lib/testing-python.nix {
inherit system;
2 changes: 1 addition & 1 deletion nixos/modules/programs/captive-browser.nix
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ in
browser = mkOption {
type = types.str;
default = concatStringsSep " " [ ''${pkgs.chromium}/bin/chromium''
''--user-data-dir=$HOME/.chromium-captive''
''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive''
''--proxy-server="socks5://$PROXY"''
''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"''
''--no-first-run''
13 changes: 10 additions & 3 deletions nixos/modules/system/boot/systemd-lib.nix
Original file line number Diff line number Diff line change
@@ -114,7 +114,9 @@ in rec {
(if isList value then value else [value]))
as));

generateUnits = type: units: upstreamUnits: upstreamWants:
generateUnits = generateUnits' true;

generateUnits' = allowCollisions: type: units: upstreamUnits: upstreamWants:
pkgs.runCommand "${type}-units"
{ preferLocalBuild = true;
allowSubstitutes = false;
@@ -182,8 +184,13 @@ in rec {
if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
ln -sfn /dev/null $out/$fn
else
mkdir -p $out/$fn.d
ln -s $i/$fn $out/$fn.d/overrides.conf
${if allowCollisions then ''
mkdir -p $out/$fn.d
ln -s $i/$fn $out/$fn.d/overrides.conf
'' else ''
echo "Found multiple derivations configuring $fn!"
exit 1
''}
fi
else
ln -fs $i/$fn $out/
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/systemd-nspawn.nix
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ in {
in
mkMerge [
(mkIf (cfg != {}) {
environment.etc."systemd/nspawn".source = mkIf (cfg != {}) (generateUnits "nspawn" units [] []);
environment.etc."systemd/nspawn".source = mkIf (cfg != {}) (generateUnits' false "nspawn" units [] []);
})
{
systemd.targets.multi-user.wants = [ "machines.target" ];
37 changes: 19 additions & 18 deletions nixos/tests/flannel.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
import ./make-test.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ lib, ...} : {
name = "flannel";

meta = with pkgs.stdenv.lib.maintainers; {
meta = with lib.maintainers; {
maintainers = [ offline ];
};

nodes = let
flannelConfig = {
flannelConfig = { pkgs, ... } : {
services.flannel = {
enable = true;
backend = {
Type = "udp";
Port = 8285;
};
network = "10.1.0.0/16";
iface = "eth1";
etcd.endpoints = ["http://etcd:2379"];
};

networking.firewall.allowedUDPPorts = [ 8472 ];
networking.firewall.allowedUDPPorts = [ 8285 ];
};
in {
etcd = { ... }: {
@@ -32,25 +36,22 @@ import ./make-test.nix ({ pkgs, ...} : {
networking.firewall.allowedTCPPorts = [ 2379 ];
};

node1 = { ... }: {
require = [flannelConfig];
};

node2 = { ... }: {
require = [flannelConfig];
};
node1 = flannelConfig;
node2 = flannelConfig;
};

testScript = ''
startAll;
start_all()
$node1->waitForUnit("flannel.service");
$node2->waitForUnit("flannel.service");
node1.wait_for_unit("flannel.service")
node2.wait_for_unit("flannel.service")
my $ip1 = $node1->succeed("ip -4 addr show flannel.1 | grep -oP '(?<=inet).*(?=/)'");
my $ip2 = $node2->succeed("ip -4 addr show flannel.1 | grep -oP '(?<=inet).*(?=/)'");
node1.wait_until_succeeds("ip l show dev flannel0")
ip1 = node1.succeed("ip -4 addr show flannel0 | grep -oP '(?<=inet).*(?=/)'")
node2.wait_until_succeeds("ip l show dev flannel0")
ip2 = node2.succeed("ip -4 addr show flannel0 | grep -oP '(?<=inet).*(?=/)'")
$node1->waitUntilSucceeds("ping -c 1 $ip2");
$node2->waitUntilSucceeds("ping -c 1 $ip1");
node1.wait_until_succeeds(f"ping -c 1 {ip2}")
node2.wait_until_succeeds(f"ping -c 1 {ip1}")
'';
})
4 changes: 2 additions & 2 deletions pkgs/applications/misc/notejot/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "notejot";
version = "1.6.0";
version = "1.6.3";

src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "1b65m9gvq8ziqqgnw3vgjpjb1qw7bww40ngd3gardsjg9lcwpxaf";
sha256 = "170dzgd6cnf2k3hfifjysmdggpskx6v1pjmblqgbwaj2d3snf3h8";
};

nativeBuildInputs = [
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "bitlbee-discord";
version = "0.4.2";
version = "0.4.3";

src = fetchFromGitHub {
rev = version;
owner = "sm00th";
repo = "bitlbee-discord";
sha256 = "02pigk2vbz0jdz11f96sygdvp1j762yjn62h124fkcsc070g7a2f";
sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;

version = "3.5.383291.0407";
version = "3.5.385850.0413";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
sha256 = "1l560gv1wpfiggxylz3f62mcjjchpq3p0i1j4b2b68ckgc5sj80k";
sha256 = "049kxgkyaxknxpk0hf1a7bxn0c08dk250z3q2ba9pc1xkrn5kdnw";
};
};

6 changes: 4 additions & 2 deletions pkgs/applications/networking/ping/default.nix
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@
, json-glib
, libsoup
, libgee
, wrapGAppsHook }:
, wrapGAppsHook
, vala_0_40
}:

stdenv.mkDerivation rec {
pname = "ping";
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
vala
vala_0_40
pkgconfig
python3
wrapGAppsHook
4 changes: 2 additions & 2 deletions pkgs/applications/office/atlassian-cli/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "atlassian-cli";
version = "9.1.1";
version = "9.2.0";

src = fetchzip {
url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
sha256 = "0mdf4ybp0a6c816210g76lx901qwxw727ipyiph5kbdzl4jlrpgm";
sha256 = "0rdnbx3zfz3lpgka7bb8jzapkr81l2yvgsbmn8hrhva5k61xwx3d";
extraPostFetch = "chmod go-w $out";
};

Loading