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: 3d6cdfa24bd7
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: 82b54d490663
Choose a head ref

Commits on Feb 1, 2020

  1. rclone: install completions

    marsam committed Feb 1, 2020
    Copy the full SHA
    08dc02a View commit details

Commits on Mar 1, 2020

  1. bacula: 9.4.4 -> 9.6.2

    r-ryantm committed Mar 1, 2020
    Copy the full SHA
    1439ba6 View commit details

Commits on Mar 2, 2020

  1. liblo: 0.30 -> 0.31

    r-ryantm committed Mar 2, 2020
    Copy the full SHA
    55247e7 View commit details
  2. Copy the full SHA
    e633927 View commit details

Commits on Mar 3, 2020

  1. Copy the full SHA
    0c85510 View commit details
  2. Copy the full SHA
    6212e0a View commit details
  3. snd: 20.0 -> 20.1

    r-ryantm committed Mar 3, 2020
    Copy the full SHA
    18f7b5e View commit details
  4. Copy the full SHA
    c7b428d View commit details

Commits on Mar 4, 2020

  1. Copy the full SHA
    51b6f9c View commit details
  2. randoop: 4.2.1 -> 4.2.2

    r-ryantm committed Mar 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    Copy the full SHA
    e3461b7 View commit details
  3. workcraft: 3.2.5 -> 3.2.6

    r-ryantm committed Mar 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    Copy the full SHA
    86e6080 View commit details
  4. bazel_0: init at 0.26.0

    andir committed Mar 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    Copy the full SHA
    1c0de27 View commit details
  5. pythonPackages.tensorflow: use bazel_0

    This allows us to get rid of the compatibility hacks that we had to add
    (tf-1.15-bazel-1.0.patch) and also fixes #77626.
    andir committed Mar 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    Copy the full SHA
    c7adb4e View commit details
  6. Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    Copy the full SHA
    c5f077c View commit details
  7. Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    Copy the full SHA
    c522b86 View commit details
  8. Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    Copy the full SHA
    9c8b500 View commit details
  9. Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    Copy the full SHA
    f14ee5b View commit details
  10. Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    Copy the full SHA
    983a77a View commit details
  11. argo: 2.6.0 -> 2.6.1

    groodt committed Mar 4, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    e468301 View commit details
  12. graylog: 3.2.1 -> 3.2.2

    r-ryantm committed Mar 4, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    2954d55 View commit details
  13. chezmoi: 1.7.13 -> 1.7.16

    marsam committed Mar 4, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    70296be View commit details
  14. fwts: 19.11.00 -> 20.02.00

    r-ryantm committed Mar 4, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    Copy the full SHA
    248f387 View commit details
  15. gromacs: 2020 -> 2020.1

    r-ryantm committed Mar 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ttuegel Thomas Tuegel
    Copy the full SHA
    adcdd7b View commit details
  16. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    cde784a View commit details
  17. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8ca769e View commit details

Commits on Mar 5, 2020

  1. gmsh: 4.5.2 -> 4.5.4

    r-ryantm committed Mar 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9974067 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7de490a View commit details
  3. flyway: 6.2.2 -> 6.2.4

    r-ryantm committed Mar 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    cc92c86 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1262818 View commit details
  5. joker: 0.14.1 -> 0.14.2

    r-ryantm committed Mar 5, 2020
    Copy the full SHA
    94c7f25 View commit details
  6. jruby: 9.2.10.0 -> 9.2.11.0

    r-ryantm committed Mar 5, 2020
    Copy the full SHA
    d08fb3b View commit details
  7. procs: 0.9.11 -> 0.9.18

    bhipple committed Mar 5, 2020
    Copy the full SHA
    c882a90 View commit details
  8. Copy the full SHA
    ebd9854 View commit details
  9. Copy the full SHA
    706f13a View commit details
  10. Merge pull request #81808 from r-ryantm/auto-update/link-grammar

    link-grammar: 5.7.0 -> 5.8.0
    jtojnar authored Mar 5, 2020
    Copy the full SHA
    ede0fff View commit details
  11. Merge pull request #81704 from primeos/chromium

    chromium: 80.0.3987.122 -> 80.0.3987.132
    primeos authored Mar 5, 2020
    Copy the full SHA
    19595b3 View commit details
  12. Merge pull request #81779 from r-ryantm/auto-update/gnome-shell-exten…

    …sion-sound-output-device-chooser
    
    gnomeExtensions.sound-output-device-chooser: 24 -> 25
    jtojnar authored Mar 5, 2020
    Copy the full SHA
    c4f21fd View commit details
  13. Copy the full SHA
    05e6cc4 View commit details
  14. Merge pull request #81790 from r-ryantm/auto-update/joker

    joker: 0.14.1 -> 0.14.2
    marsam authored Mar 5, 2020
    Copy the full SHA
    1193f8e View commit details
  15. Merge pull request #81792 from r-ryantm/auto-update/jruby

    jruby: 9.2.10.0 -> 9.2.11.0
    marsam authored Mar 5, 2020
    Copy the full SHA
    a9368df View commit details
  16. Merge pull request #81777 from ngerstle/fix-kube3d-1.6.0

    kube3d: correct k3s version tag
    marsam authored Mar 5, 2020
    Copy the full SHA
    e2ec8dc View commit details
  17. Merge pull request #81765 from zowoq/conmon

    conmon: 2.0.10 -> 2.0.11
    marsam authored Mar 5, 2020
    Copy the full SHA
    8ec339d View commit details
  18. Merge pull request #81776 from r-ryantm/auto-update/gallery_dl

    gallery-dl: 1.12.3 -> 1.13.1
    marsam authored Mar 5, 2020
    Copy the full SHA
    11754a7 View commit details
  19. Merge pull request #81763 from r-ryantm/auto-update/eventstat

    eventstat: 0.04.08 -> 0.04.09
    marsam authored Mar 5, 2020
    Copy the full SHA
    19b958b View commit details
  20. Merge pull request #81767 from groodt/groodt-argo-2.6.1

    argo: 2.6.0 -> 2.6.1
    marsam authored Mar 5, 2020
    Copy the full SHA
    e033b00 View commit details
  21. Merge pull request #81749 from r-ryantm/auto-update/closure-compiler

    closurecompiler: 20200204 -> 20200224
    marsam authored Mar 5, 2020
    Copy the full SHA
    b50c396 View commit details
  22. Merge pull request #81771 from r-ryantm/auto-update/fwts

    fwts: 19.11.00 -> 20.02.00
    marsam authored Mar 5, 2020
    Copy the full SHA
    2d3c017 View commit details
  23. Merge pull request #81773 from r-ryantm/auto-update/gromacs

    gromacs: 2020 -> 2020.1
    marsam authored Mar 5, 2020
    Copy the full SHA
    c596f1f View commit details
  24. Merge pull request #81617 from r-ryantm/auto-update/python2.7-spotipy

    python27Packages.spotipy: 2.7.1 -> 2.9.0
    marsam authored Mar 5, 2020
    Copy the full SHA
    70a865c View commit details
  25. Merge pull request #81712 from r-ryantm/auto-update/randoop

    randoop: 4.2.1 -> 4.2.2
    marsam authored Mar 5, 2020
    Copy the full SHA
    e5fd322 View commit details
Showing with 693 additions and 346 deletions.
  1. +1 −1 nixos/doc/manual/release-notes/rl-2003.xml
  2. +3 −3 pkgs/applications/audio/snd/default.nix
  3. +3 −3 pkgs/applications/misc/gallery-dl/default.nix
  4. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  5. +2 −2 pkgs/applications/networking/browsers/palemoon/default.nix
  6. +2 −2 pkgs/applications/networking/browsers/vivaldi/default.nix
  7. +2 −2 pkgs/applications/networking/cluster/argo/default.nix
  8. +1 −1 pkgs/applications/networking/cluster/kube3d/default.nix
  9. +4 −3 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
  10. +8 −2 pkgs/applications/networking/remote/wayvnc/default.nix
  11. +14 −4 pkgs/applications/networking/sync/rclone/default.nix
  12. +3 −3 pkgs/applications/science/logic/workcraft/default.nix
  13. +2 −2 pkgs/applications/science/math/gmsh/default.nix
  14. +3 −3 pkgs/applications/science/molecular-dynamics/gromacs/default.nix
  15. +4 −4 pkgs/applications/version-management/gitlab/data.json
  16. +2 −2 pkgs/applications/version-management/gitlab/gitaly/default.nix
  17. +2 −2 pkgs/applications/version-management/gitlab/gitaly/deps.nix
  18. +8 −9 pkgs/applications/virtualization/conmon/default.nix
  19. +17 −4 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
  20. +22 −0 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
  21. +3 −3 pkgs/development/compilers/closure/default.nix
  22. +3 −3 pkgs/development/interpreters/joker/default.nix
  23. +3 −3 pkgs/development/interpreters/jruby/default.nix
  24. +4 −4 pkgs/development/libraries/liblo/default.nix
  25. +2 −2 pkgs/development/python-modules/ROPGadget/default.nix
  26. +2 −2 pkgs/development/python-modules/msal/default.nix
  27. +31 −0 pkgs/development/python-modules/sapi-python-client/default.nix
  28. +3 −3 pkgs/development/python-modules/spotipy/default.nix
  29. +7 −6 pkgs/development/python-modules/tensorflow/default.nix
  30. +0 −213 pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch
  31. +3 −3 pkgs/development/tools/analysis/randoop/default.nix
  32. +375 −0 pkgs/development/tools/build-managers/bazel/bazel_0/default.nix
  33. +78 −0 pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch
  34. +13 −0 pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch
  35. +2 −2 pkgs/development/tools/continuous-integration/jenkins/default.nix
  36. +4 −4 pkgs/development/tools/documentation/mdsh/default.nix
  37. +2 −2 pkgs/development/tools/flyway/default.nix
  38. +2 −2 pkgs/development/web/nodejs/v13.nix
  39. +2 −2 pkgs/os-specific/linux/eventstat/default.nix
  40. +2 −2 pkgs/os-specific/linux/fwts/default.nix
  41. +3 −3 pkgs/shells/bash/nix-bash-completions/default.nix
  42. +3 −3 pkgs/shells/zsh/oh-my-zsh/default.nix
  43. +3 −3 pkgs/tools/admin/procs/default.nix
  44. +3 −3 pkgs/tools/backup/bacula/default.nix
  45. +5 −5 pkgs/tools/misc/chezmoi/default.nix
  46. +3 −3 pkgs/tools/misc/graylog/default.nix
  47. +3 −3 pkgs/tools/networking/eternal-terminal/default.nix
  48. +3 −3 pkgs/tools/text/fanficfare/default.nix
  49. +3 −3 pkgs/tools/text/link-grammar/default.nix
  50. +9 −0 pkgs/top-level/all-packages.nix
  51. +2 −0 pkgs/top-level/python-packages.nix
2 changes: 1 addition & 1 deletion nixos/doc/manual/release-notes/rl-2003.xml
Original file line number Diff line number Diff line change
@@ -154,7 +154,7 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
</listitem>
<listitem>
<para>
The <literal>99-main.network</literal> file was removed. Maching all
The <literal>99-main.network</literal> file was removed. Matching all
network interfaces caused many breakages, see
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/18962">#18962</link>
and <link xlink:href="https://github.com/NixOS/nixpkgs/pull/71106">#71106</link>.
6 changes: 3 additions & 3 deletions pkgs/applications/audio/snd/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
}:

stdenv.mkDerivation rec {
name = "snd-20.0";
name = "snd-20.1";

src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
sha256 = "195j0mkxvkb0znwhc0pjp4r0r8j4i12i27nxbkq27wg9rck6likc";
sha256 = "0v7zhavkkbh1bagzy3l08kb235hhdqn28y0m4znkd3k31p4l4dz8";
};

nativeBuildInputs = [ pkgconfig ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

meta = {
description = "Sound editor";
homepage = http://ccrma.stanford.edu/software/snd;
homepage = "http://ccrma.stanford.edu/software/snd";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [ ];
6 changes: 3 additions & 3 deletions pkgs/applications/misc/gallery-dl/default.nix
Original file line number Diff line number Diff line change
@@ -2,19 +2,19 @@

python3Packages.buildPythonApplication rec {
pname = "gallery_dl";
version = "1.12.3";
version = "1.13.1";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "06q6vmbliy935zlf4bbnfgiqyrx9vskz3fsks4jpxi47xs80rqkz";
sha256 = "0a5k7gcs3vn6x1f2qg3ajpqsl39pmw2hsj2srd5y2l1xw7mkkqj6";
};

doCheck = false;
propagatedBuildInputs = with python3Packages; [ requests ];

meta = {
description = "Command-line program to download image-galleries and -collections from several image hosting sites";
homepage = https://github.com/mikf/gallery-dl;
homepage = "https://github.com/mikf/gallery-dl";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ dawidsowa ];
};
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "1bahnvn6i08gg10r9p012n7xjwhnjk1xq4c70kw6sqr4p53423mn";
sha256bin64 = "066lvnh18k5982dv9481g9i31g9pq6a8q92g93xkqgj2bipbv6si";
version = "81.0.4044.26";
sha256 = "1yam7lg38dbpvmva7pc3bw3npvgi3d1v6im8ld4z92gjgniwsjh2";
sha256bin64 = "0vsly218wv9x2nv5i82slz8pmb0hmdcl1z2mlhf2j5adnsxn9c5z";
version = "81.0.4044.34";
};
dev = {
sha256 = "0k35sa1qq54cixybb12nyzkjyrwb4cbjfffwfvr5dl859i5bz1kk";
sha256bin64 = "0ckbgk6jw3zq3gqvvwdlcrqlm110hkvija6jfh9dk0ip1wdx8wkm";
version = "82.0.4062.3";
sha256 = "0pxvwjvkajlidk5m7jiqk69mxnxg3h56dr7vpi916r51w17pds0l";
sha256bin64 = "1jdyp0f2ig4251155db3m7lzd4jlmczcjqqnvdj5nwl2bn3ykc3s";
version = "82.0.4068.4";
};
stable = {
sha256 = "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8";
sha256bin64 = "0kipzd0q3p3wwklcl1fb937xhklc0s76apsfrjwy0jcmcy47blzf";
version = "80.0.3987.122";
sha256 = "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c";
sha256bin64 = "00xhacrs74ks3nrpsnnbqm5vk0r9ydyxrq5ifajzviqqyk2n24b8";
version = "80.0.3987.132";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/palemoon/default.nix
Original file line number Diff line number Diff line change
@@ -13,13 +13,13 @@ let

in stdenv.mkDerivation rec {
pname = "palemoon";
version = "28.8.2.1";
version = "28.8.4";

src = fetchFromGitHub {
owner = "MoonchildProductions";
repo = "UXP";
rev = "PM${version}_Release";
sha256 = "1m7dfgy5vjw1ndjsh0aksvsp0ii2kj7gxn0sp3h0xgwi0yq7lwyb";
sha256 = "1k2j4rlgjwkns3a592pbiwwhrpja3fachvzby1his3d1mhdvyc6f";
};

desktopItem = makeDesktopItem {
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/vivaldi/default.nix
Original file line number Diff line number Diff line change
@@ -17,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "2.11.1811.44-1";
version = "2.11.1811.47-1";

src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
sha256 = "1hzlcvbp056nzxdiig91rsm5f0s0cjqs0imlgn7822jadp9wwnwn";
sha256 = "16fw6v00xy66mxkkq0b4k49jd0wwlyyvxaaml2gglfk7swxy7i02";
};

unpackPhase = ''
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/argo/default.nix
Original file line number Diff line number Diff line change
@@ -19,13 +19,13 @@ let
in
buildGoModule rec {
pname = "argo";
version = "2.6.0";
version = "2.6.1";

src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "0hlvsi706jwlf43mdwic6j7iriii4daxjr82qgi80ac4h4x0z3h2";
sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf";
};

modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45";
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/kube3d/default.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
buildGoModule rec {
pname = "kube3d";
version = "1.6.0";
k3sVersion = "1.17.3+k3s1";
k3sVersion = "1.17.3-k3s1";

goPackagePath = "github.com/rancher/k3d";

Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.31.0"; # Please backport all updates to the stable channel.
version = "1.32.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "19vsv7jv30xvfgq1nr3091b6x4agymy9afpy9r9mxzgn0xfb0ap9";
sha256 = "1ggblpw2xxhm78sqadswcv0314zagksj34z8pywjnr8h9zkcyiap";
};

nativeBuildInputs = [
@@ -127,7 +127,8 @@ in stdenv.mkDerivation rec {
Signal Desktop is an Electron application that links with your
"Signal Android" or "Signal iOS" app.
'';
homepage = https://signal.org/;
homepage = "https://signal.org/";
changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ixmatus primeos equirosa ];
platforms = [ "x86_64-linux" ];
10 changes: 8 additions & 2 deletions pkgs/applications/networking/remote/wayvnc/default.nix
Original file line number Diff line number Diff line change
@@ -4,15 +4,20 @@

stdenv.mkDerivation rec {
pname = "wayvnc";
version = "0.1.0";
version = "0.1.1";

src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
sha256 = "17c30c33zzhhlqzc4a5dd1y74ch7c8gsm98wvcn4n1fv50fbmpbd";
sha256 = "1qk8xrqd8ls2hpkj7g4aknr73x3lbzzdjpja16rbp2r0m4iv95ld";
};

postPatch = ''
substituteInPlace meson.build \
--replace "version: '0.1.0'" "version: '${version}'"
'';

nativeBuildInputs = [ meson pkg-config ninja ];
buildInputs = [ pixman libuv libGL libxkbcommon wayland neatvnc libdrm libX11 ];

@@ -26,6 +31,7 @@ stdenv.mkDerivation rec {
display attached.
'';
inherit (src.meta) homepage;
changelog = "https://github.com/any1/wayvnc/releases/tag/v${version}";
license = licenses.isc;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
18 changes: 14 additions & 4 deletions pkgs/applications/networking/sync/rclone/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages }:

buildGoPackage rec {
pname = "rclone";
@@ -17,9 +17,19 @@ buildGoPackage rec {

outputs = [ "bin" "out" "man" ];

postInstall = ''
install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
'';
postInstall =
let
rcloneBin =
if stdenv.buildPlatform == stdenv.hostPlatform
then "$bin"
else stdenv.lib.getBin buildPackages.rclone;
in
''
install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
mkdir -p $bin/share/zsh/site-functions $bin/share/bash-completion/completions/
${rcloneBin}/bin/rclone genautocomplete zsh $bin/share/zsh/site-functions/_rclone
${rcloneBin}/bin/rclone genautocomplete bash $bin/share/bash-completion/completions/rclone.bash
'';

meta = with stdenv.lib; {
description = "Command line program to sync files and directories to and from major cloud storage";
6 changes: 3 additions & 3 deletions pkgs/applications/science/logic/workcraft/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "workcraft";
version = "3.2.5";
version = "3.2.6";

src = fetchurl {
url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
sha256 = "11dk00b17yhk7cv8zms4nlffc0qwgsapimzr8csb89qmgabd7rj3";
sha256 = "1sfbxmk71gp7paw4l5azqr0lsgsyp4308gx2jz8w4k3nasfshz25";
};

buildInputs = [ makeWrapper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';

meta = {
homepage = https://workcraft.org/;
homepage = "https://workcraft.org/";
description = "Framework for interpreted graph modeling, verification and synthesis";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.mit;
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/gmsh/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "gmsh";
version = "4.5.2";
version = "4.5.4";

src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
sha256 = "10i6i1s68lkccnl73lzr04cf1hc5rd8b7dpiaxs1vzrj1ljgw801";
sha256 = "1k9f7qxlwja9i40qy55070sjnr21bl165677mdqw7qyb8d7wgy6c";
};

buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@
}:

stdenv.mkDerivation {
name = "gromacs-2020";
name = "gromacs-2020.1";

src = fetchurl {
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.tar.gz";
sha256 = "00ds83n5wnm7g7wq91jycp8h82vnam5b4rwg3fv9rk9x5ca5czj7";
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz";
sha256 = "1kwrk3i1dxp8abhqqsl049lh361n4910h0415g052f8shdc6arp1";
};

nativeBuildInputs = [ cmake ];
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/gitlab/data.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"version": "12.8.1",
"repo_hash": "1h844a79scf3an5rv0wi332lrf7mv1zcv2mg6zllk82f7nf341gn",
"version": "12.8.2",
"repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.8.1-ee",
"rev": "v12.8.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "12.8.1",
"GITALY_SERVER_VERSION": "12.8.2",
"GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.21.0"
Original file line number Diff line number Diff line change
@@ -28,14 +28,14 @@ let
};
});
in buildGoPackage rec {
version = "12.8.1";
version = "12.8.2";
pname = "gitaly";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "0sjkh0j36dpakqmq7l5gd1ydmx1kxgij53bjvvn37r19liqdijnx";
sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic";
};

# Fix a check which assumes that hook files are writeable by their
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions pkgs/applications/virtualization/conmon/default.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
{ stdenv
, fetchFromGitHub
, pkgconfig
, pkg-config
, glib
, glibc
, systemd
}:

stdenv.mkDerivation rec {
project = "conmon";
name = "${project}-${version}";
version = "2.0.10";
pname = "conmon";
version = "2.0.11";

src = fetchFromGitHub {
owner = "containers";
repo = project;
repo = pname;
rev = "v${version}";
sha256 = "194wach3yrkvll2xaj0x77hzlngk2016mflgnd5k8knjn2b9dgvl";
sha256 = "1mdnfkbbv41g590a1ja4rfw69z6kp03znyhikdmg6zqp4qsv32ib";
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib systemd ] ++
stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];

installPhase = "install -Dm755 bin/${project} $out/bin/${project}";
installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}";

meta = with stdenv.lib; {
homepage = https://github.com/containers/conmon;
homepage = "https://github.com/containers/conmon";
description = "An OCI container runtime monitor";
license = licenses.asl20;
maintainers = with maintainers; [ vdemeester saschagrunert ];
Loading