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: 448a27759eea
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: f2592c0b946d
Choose a head ref

Commits on Jun 3, 2020

  1. bpython: substituteAll the path to which

    This is used to detect the presence of xclip and other clipboard
    handling tools.
    
    Fixes NixOS/nixpkgs#56941.
    flokli committed Jun 3, 2020
    Copy the full SHA
    7de3d93 View commit details

Commits on Jun 7, 2020

  1. Copy the full SHA
    f87b23a View commit details

Commits on Jun 14, 2020

  1. handbrake: 1.3.2 -> 1.3.3

    M  pkgs/applications/video/handbrake/default.nix
    Anton-Latukha committed Jun 14, 2020
    Copy the full SHA
    3348912 View commit details
  2. Copy the full SHA
    0b1eb52 View commit details
  3. Copy the full SHA
    b254684 View commit details

Commits on Jun 15, 2020

  1. Copy the full SHA
    7439aad View commit details
  2. Copy the full SHA
    a84278a View commit details
  3. spek: 0.8.3 -> unstable-2018-12-29

    Build using the newly introduced wxGTK30-gtk3 in order to drop old gtk2
    and ffmpeg dependencies.
    peterhoeg committed Jun 15, 2020
    Copy the full SHA
    78f5a64 View commit details
  4. limesuite: use wxGTK30-gtk3

    peterhoeg committed Jun 15, 2020
    Copy the full SHA
    154cbde View commit details
  5. cubicsdr: use wxGTK31-gtk3

    peterhoeg committed Jun 15, 2020
    Copy the full SHA
    227561d View commit details
  6. Copy the full SHA
    f49eb2c View commit details
  7. Copy the full SHA
    573d41d View commit details
  8. deno: 1.0.5 -> 1.1.0

    06kellyjac committed Jun 15, 2020
    Copy the full SHA
    10bf0f2 View commit details
  9. deno: fix update script dependency

    nix-prefetch-url comes with nix and isn't a package on it's own
    06kellyjac committed Jun 15, 2020
    Copy the full SHA
    5adbf9a View commit details
  10. Copy the full SHA
    5b99300 View commit details
  11. libgcc: fix Darwin cross compile

    late fallout from 1ac5398: the build variables were changed from infix to suffix notation
    mroi committed Jun 15, 2020
    Copy the full SHA
    9b13828 View commit details
  12. Copy the full SHA
    1484219 View commit details
  13. di: 4.47.3 -> 4.48

    r-ryantm committed Jun 15, 2020
    Copy the full SHA
    efb4e8d View commit details
  14. evince: 3.36.3 -> 3.36.5

    r-ryantm committed Jun 15, 2020
    Copy the full SHA
    4cf34b8 View commit details
  15. Merge pull request #90530 from r-ryantm/auto-update/evince

    evince: 3.36.3 -> 3.36.5
    jtojnar authored Jun 15, 2020
    Copy the full SHA
    8e1b5fb View commit details
  16. Merge pull request #90525 from r-ryantm/auto-update/evolution

    gnome3.evolution: 3.36.2 -> 3.36.3
    jtojnar authored Jun 15, 2020
    Copy the full SHA
    f1603aa View commit details
  17. system-config-printer: Fix ABRT: free(): invalid pointer

    Apply patches picked from upstream as done on debian.
    Will be included in next upstream release.
    maralorn committed Jun 15, 2020
    Copy the full SHA
    fcecf15 View commit details
  18. Copy the full SHA
    e1e3911 View commit details
  19. Merge pull request #89957 from evenbrenden/sof-firmware-v1.5

    sof-firmware: 1.4.2 -> 1.5.1
    Mic92 authored Jun 15, 2020
    Copy the full SHA
    85baf71 View commit details
  20. Merge pull request #90529 from r-ryantm/auto-update/di

    di: 4.47.3 -> 4.48
    Mic92 authored Jun 15, 2020
    Copy the full SHA
    ba085e3 View commit details
  21. Merge pull request #90482 from misuzu/pydantic-tests-fix

    python37Packages.pydantic: fix tests
    Mic92 authored Jun 15, 2020
    Copy the full SHA
    0bb6d7a View commit details
  22. Add c00w as a maintainer

    c00w authored and zowoq committed Jun 15, 2020
    Copy the full SHA
    b586b07 View commit details
  23. maintainers/teams: add golang

    zowoq committed Jun 15, 2020
    Copy the full SHA
    3050bbe View commit details
  24. Merge pull request #89755 from wamserma/luxcorerender-py36

    luxcorerender: dependency: python35 -> python36
    Mic92 authored Jun 15, 2020
    Copy the full SHA
    9dcda45 View commit details
  25. pythonPackages.awkward1: 0.2.22 -> 0.2.23

    This fixes the build. The 0.2.23 is the last version compatible with
    numba 0.49.
    veprbl authored and Jon committed Jun 15, 2020
    Copy the full SHA
    6270712 View commit details
  26. Merge pull request #90537 from maralorn/fix-system-config-printer

    system-config-printer: Fix ABRT: free(): invalid pointer
    flokli authored Jun 15, 2020
    Copy the full SHA
    c09eb57 View commit details
  27. gallery-dl: 1.14.0 -> 1.14.1

    r-ryantm committed Jun 15, 2020
    Copy the full SHA
    7603529 View commit details
  28. Merge pull request #90428 from NixOS/wxgtk_gtk3

    wxGTK3: make gtk2 and gtk3 specific variants
    peterhoeg authored Jun 15, 2020
    Copy the full SHA
    6d95cf3 View commit details
  29. nixos/modules/system/boot/networkd: enable socket activation

    Since cd1deda systemd-networkd has it's
    netlink socket created via a systemd.socket unit. One might think that
    this doesn't make much sense since networkd is just going to create it's
    own socket on startup anyway. The difference here is that we have
    configuration-time control over things like socket buffer sizes vs
    compile-time constants.
    
    For larger setups where networkd has to create a lot of (virtual)
    devices the default buffer size of currently 128MB is not enough.
    
    A good example is a machine with >100 virtual interfaces (e.g.,
    wireguard tunnels, VLANs, …) that all have to be brought up during
    startup. The receive buffer size will spike due to all the generated
    message from the new interfaces. Eventually some of the message will be
    dropped since there is not enough (permitted) buffer space available.
    
    By having networkd start through / with a netlink socket created by
    systemd we can configure the `ReceiveBufferSize` parameter in the socket
    options without recompiling networkd.
    
    Since the actual memory requirements depend on hardware, timing, exact
    configurations etc. it isn't currently possible to infer a good default
    from within the NixOS module system. Administrators are advised to
    monitor the logs of systemd-networkd for `rtnl: kernel receive buffer
    overrun` spam and increase the memory as required.
    
    Note: Increasing the ReceiveBufferSize doesn't allocate any memory.  It
    just increases the upper bound on the kernel side. The memory allocation
    depends on the amount of messages that are queued on the kernel side of
    the netlink socket.
    andir authored and flokli committed Jun 15, 2020
    Copy the full SHA
    55c09a8 View commit details
  30. Merge pull request #89064 from andir/systemd-networkd-socket

    nixos/modules/system/boot/networkd: enable socket activation
    flokli authored Jun 15, 2020
    Copy the full SHA
    550e47c View commit details
  31. Merge pull request #89439 from flokli/bpython-xclip

    bpython: substituteAll the path to `which`
    flokli authored Jun 15, 2020
    Copy the full SHA
    8257210 View commit details
  32. pycurl: Exclude flaky multi_timer_test. Fixes #77304

    nh2 authored and Jon committed Jun 15, 2020
    Copy the full SHA
    ab1ae10 View commit details
  33. hplip: 3.20.3 -> 3.20.5

    dasj19 authored and flokli committed Jun 15, 2020
    Copy the full SHA
    37583e4 View commit details
  34. Merge pull request #89120 from dasj19/hplip-update

    Upgrade hplip & hplip plugin to 3.20.5
    flokli authored Jun 15, 2020
    Copy the full SHA
    fd2627b View commit details
  35. mpv: fix umpv

    dotlambda committed Jun 15, 2020
    Copy the full SHA
    4da94b5 View commit details
  36. Merge pull request #90506 from mroi/patch-libgcc

    libgcc: fix Darwin cross compile
    matthewbauer authored Jun 15, 2020
    Copy the full SHA
    834272d View commit details

Commits on Jun 16, 2020

  1. searx: fix missing dependency version

    Fixes #90060
    danielfullmer committed Jun 16, 2020
    Copy the full SHA
    ac73a60 View commit details
  2. cpplint: 1.3.0 -> 1.5.1

    Jonathan Ringer committed Jun 16, 2020
    Copy the full SHA
    96d1403 View commit details
  3. bdf2sfd: 1.1.1 -> 1.1.2

    r-ryantm authored and Jon committed Jun 16, 2020
    Copy the full SHA
    24c1e9c View commit details
  4. certstrap: 1.1.1 -> 1.2.0

    r-ryantm authored and Jon committed Jun 16, 2020
    Copy the full SHA
    0aa73fd View commit details
  5. Merge pull request #90554 from danielfullmer/searx-dependency

    searx: fix missing dependency version
    marsam authored Jun 16, 2020
    Copy the full SHA
    036cfc5 View commit details
  6. Merge pull request #90302 from Anton-Latukha/upd-handbrake-1.3.3

    handbrake: 1.3.2 -> 1.3.3
    marsam authored Jun 16, 2020
    Copy the full SHA
    7eb2af8 View commit details
  7. Merge pull request #90460 from 06kellyjac/deno_1.1.0

    deno: 1.0.5 -> 1.1.0
    marsam authored Jun 16, 2020
    Copy the full SHA
    4d975b1 View commit details
  8. fluent-bit: 1.4.5 -> 1.4.6

    r-ryantm committed Jun 16, 2020
    Copy the full SHA
    b8c3d5b View commit details
  9. Copy the full SHA
    18154b0 View commit details
Showing with 313 additions and 128 deletions.
  1. +3 −3 doc/languages-frameworks/python.section.md
  2. +6 −0 maintainers/maintainer-list.nix
  3. +14 −0 maintainers/team-list.nix
  4. +32 −0 nixos/doc/manual/release-notes/rl-2009.xml
  5. +13 −12 pkgs/applications/audio/spek/default.nix
  6. +2 −2 pkgs/applications/misc/gallery-dl/default.nix
  7. +30 −0 pkgs/applications/networking/browsers/kristall/default.nix
  8. +3 −9 pkgs/applications/networking/ftp/filezilla/default.nix
  9. +3 −2 pkgs/applications/radio/cubicsdr/default.nix
  10. +10 −14 pkgs/applications/radio/limesuite/default.nix
  11. +2 −2 pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
  12. +3 −3 pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
  13. +2 −2 pkgs/applications/video/handbrake/default.nix
  14. +1 −1 pkgs/applications/video/mpv/wrapper.nix
  15. +2 −2 pkgs/desktops/gnome-3/apps/evolution/default.nix
  16. +2 −2 pkgs/desktops/gnome-3/core/evince/default.nix
  17. +2 −2 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
  18. +1 −1 pkgs/development/compilers/go/1.13.nix
  19. +1 −1 pkgs/development/compilers/go/1.14.nix
  20. +1 −1 pkgs/development/libraries/gcc/libgcc/default.nix
  21. +8 −6 pkgs/development/libraries/wxwidgets/3.0/default.nix
  22. +7 −5 pkgs/development/libraries/wxwidgets/3.1/default.nix
  23. +2 −2 pkgs/development/python-modules/aiohttp/default.nix
  24. +2 −2 pkgs/development/python-modules/awkward1/default.nix
  25. +27 −0 pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch
  26. +16 −1 pkgs/development/python-modules/bpython/default.nix
  27. +2 −1 pkgs/development/python-modules/pycurl/default.nix
  28. +9 −0 pkgs/development/python-modules/pydantic/default.nix
  29. +3 −2 pkgs/development/tools/analysis/cpplint/default.nix
  30. +3 −3 pkgs/development/web/deno/default.nix
  31. +1 −1 pkgs/development/web/deno/update/update.ts
  32. +2 −2 pkgs/games/katago/default.nix
  33. +3 −3 pkgs/misc/drivers/hplip/default.nix
  34. +14 −9 pkgs/os-specific/linux/firmware/sof-firmware/default.nix
  35. +2 −1 pkgs/servers/web-apps/searx/default.nix
  36. +16 −10 pkgs/tools/graphics/luxcorerender/default.nix
  37. +2 −2 pkgs/tools/misc/bdf2sfd/default.nix
  38. +2 −2 pkgs/tools/misc/fluent-bit/default.nix
  39. +2 −2 pkgs/tools/misc/ncdu/default.nix
  40. +15 −2 pkgs/tools/misc/system-config-printer/default.nix
  41. +2 −2 pkgs/tools/security/certstrap/default.nix
  42. +13 −1 pkgs/tools/security/rage/default.nix
  43. +2 −2 pkgs/tools/system/di/default.nix
  44. +25 −8 pkgs/top-level/all-packages.nix
6 changes: 3 additions & 3 deletions doc/languages-frameworks/python.section.md
Original file line number Diff line number Diff line change
@@ -764,9 +764,6 @@ following are specific to `buildPythonPackage`:
* `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs.
* `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment
variable in wrapped programs.
* `installFlags ? []`: A list of strings. Arguments to be passed to `pip
install`. To pass options to `python setup.py install`, use
`--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`.
* `format ? "setuptools"`: Format of the source. Valid options are
`"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`.
`"setuptools"` is for when the source has a `setup.py` and `setuptools` is
@@ -782,6 +779,9 @@ following are specific to `buildPythonPackage`:
* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this
defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications
to `""`.
* `pipInstallFlags ? []`: A list of strings. Arguments to be passed to `pip
install`. To pass options to `python setup.py install`, use
`--install-option`. E.g., `pipInstallFlags=["--install-option='--cpp_implementation'"]`.
* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages
in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
* `preShellHook`: Hook to execute commands before `shellHook`.
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -1157,6 +1157,12 @@
githubId = 24417923;
name = "Renaud";
};
c00w = {
email = "nix@daedrum.net";
github = "c00w";
githubId = 486199;
name = "Colin";
};
c0deaddict = {
email = "josvanbakel@protonmail.com";
github = "c0deaddict";
14 changes: 14 additions & 0 deletions maintainers/team-list.nix
Original file line number Diff line number Diff line change
@@ -34,6 +34,20 @@ with lib.maintainers; {
scope = "Maintain Freedesktop.org packages for graphical desktop.";
};

golang = {
members = [
c00w
cstrahan
Frostman
kalbasit
mic92
orivej
rvolosatovs
zowoq
];
scope = "Maintain Golang compilers.";
};

gnome = {
members = [
hedning
32 changes: 32 additions & 0 deletions nixos/doc/manual/release-notes/rl-2009.xml
Original file line number Diff line number Diff line change
@@ -566,6 +566,38 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
was removed, as udev gained native support to handle FIDO security tokens.
</para>
</listitem>
<listitem>
<para>
With this release <literal>systemd-networkd</literal> (when enabled through <xref linkend="opt-networking.useNetworkd"/>)
has it's netlink socket created through a <literal>systemd.socket</literal> unit. This gives us control over
socket buffer sizes and other parameters. For larger setups where networkd has to create a lot of (virtual)
devices the default buffer size (currently 128MB) is not enough.
</para>
<para>
On a machine with &gt;100 virtual interfaces (e.g., wireguard tunnels, VLANs, …), that all have to
be brought up during system startup, the receive buffer size will spike for a brief period.
Eventually some of the message will be dropped since there is not enough (permitted) buffer
space available.
</para>
<para>
By having <literal>systemd-networkd</literal> start with a netlink socket created by
<literal>systemd</literal> we can configure the <literal>ReceiveBufferSize=</literal> parameter
in the socket options (i.e. <literal>systemd.sockets.systemd-networkd.socketOptions.ReceiveBufferSize</literal>)
without recompiling <literal>systemd-networkd</literal>.
</para>
<para>
Since the actual memory requirements depend on hardware, timing, exact
configurations etc. it isn't currently possible to infer a good default
from within the NixOS module system. Administrators are advised to
monitor the logs of <literal>systemd-networkd</literal> for <literal>rtnl: kernel receive buffer
overrun</literal> spam and increase the memory limit as they see fit.
</para>
<para>
Note: Increasing the <literal>ReceiveBufferSize=</literal> doesn't allocate any memory. It just increases
the upper bound on the kernel side. The memory allocation depends on the amount of messages that are
queued on the kernel side of the netlink socket.
</para>
</listitem>
</itemizedlist>
</section>
</section>
25 changes: 13 additions & 12 deletions pkgs/applications/audio/spek/default.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{ stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }:
{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }:

stdenv.mkDerivation rec {
pname = "spek";
version = "0.8.3";
version = "unstable-2018-12-29";

src = fetchzip {
name = "${pname}-${version}-src";
url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz";
sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv";
src = fetchFromGitHub {
owner = "alexkay";
repo = "spek";
rev = "f071c2956176ad53c7c8059e5c00e694ded31ded";
sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ autoconf automake intltool ffmpeg wxGTK ];
# needed for autoreconfHook
AUTOPOINT="intltoolize --automake --copy";

preConfigure = ''
./autogen.sh
'';
nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ];

buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ];

meta = with stdenv.lib; {
description = "Analyse your audio files by showing their spectrogram";
homepage = "http://spek.cc/";
license = licenses.gpl3;
maintainers = with maintainers; [ bjornfor ];
platforms = platforms.all;
maintainers = [ maintainers.bjornfor ];
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/gallery-dl/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

python3Packages.buildPythonApplication rec {
pname = "gallery_dl";
version = "1.14.0";
version = "1.14.1";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0ckqxibyf14lgl1aj5pv79bmfanacgcc96x6mdwfp2dnbvfjk71b";
sha256 = "0w4zmfbsr7xdymrrmdvcc0kqz11ql8j067ghlr84faqlsnx09z74";
};

doCheck = false;
30 changes: 30 additions & 0 deletions pkgs/applications/networking/browsers/kristall/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ lib, mkDerivation, fetchFromGitHub, qtbase, qtmultimedia }:

mkDerivation rec {
pname = "kristall";
version = "0.2";
src = fetchFromGitHub {
owner = "MasterQ32";
repo = "kristall";
rev = "V" + version;
sha256 = "08k3rg0sa91ra0nzla5rw806nnncnyvq1s7k09k5i74fvcsnpqyp";
};

buildInputs = [ qtbase qtmultimedia ];

qmakeFlags = [ "src/kristall.pro" ];

installPhase = ''
install -Dt $out/bin kristall
install -D Kristall.desktop $out/share/applications/net.random-projects.kristall.desktop
'';

meta = with lib;
src.meta // {
description =
"Graphical small-internet client, supports gemini, http, https, gopher, finger";
homepage = "https://random-projects.net/projects/kristall.gemini";
maintainers = with maintainers; [ ehmry ];
inherit (qtmultimedia.meta) platforms;
};
}
12 changes: 3 additions & 9 deletions pkgs/applications/networking/ftp/filezilla/default.nix
Original file line number Diff line number Diff line change
@@ -10,16 +10,10 @@
, pugixml
, sqlite
, tinyxml
, wxGTK30
, wxGTK30-gtk3
, xdg_utils
}:

let
# we can drop this when wxgtk is built with gtk3 by default
# see: https://github.com/NixOS/nixpkgs/pull/73145
wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; };

in
stdenv.mkDerivation rec {
pname = "filezilla";
version = "3.48.1";
@@ -52,8 +46,8 @@ stdenv.mkDerivation rec {
pugixml
sqlite
tinyxml
wxgtk'
wxgtk'.gtk
wxGTK30-gtk3
wxGTK30-gtk3.gtk
xdg_utils
];

5 changes: 3 additions & 2 deletions pkgs/applications/radio/cubicsdr/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp,
pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }:
pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }:

stdenv.mkDerivation rec {
pname = "cubicsdr";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK ];

buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ];

cmakeFlags = [ "-DUSE_HAMLIB=ON" ]
++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
24 changes: 10 additions & 14 deletions pkgs/applications/radio/limesuite/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{ stdenv, fetchFromGitHub, cmake
, sqlite, wxGTK30, libusb1, soapysdr
, sqlite, wxGTK30-gtk3, libusb1, soapysdr
, mesa_glu, libX11, gnuplot, fltk
} :

let
version = "20.01.0";

in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "limesuite";
inherit version;
version = "20.01.0";

src = fetchFromGitHub {
owner = "myriadrf";
@@ -17,14 +14,16 @@ in stdenv.mkDerivation {
sha256 = "01z4idcby2lm34bbnpbp400ski7p61jjiir6sy6dalnvsl52m7vx";
};

enableParallelBuilding = true;

nativeBuildInputs = [ cmake ];

cmakeFlags = [
"-DOpenGL_GL_PREFERENCE=GLVND"
];

buildInputs = [
libusb1
sqlite
wxGTK30
wxGTK30-gtk3
fltk
gnuplot
libusb1
@@ -34,11 +33,8 @@ in stdenv.mkDerivation {
];

postInstall = ''
mkdir -p $out/lib/udev/rules.d
cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d
mkdir -p $out/share/limesuite
cp bin/Release/lms7suite_mcu/* $out/share/limesuite
install -Dm444 -t $out/lib/udev/rules.d ../udev-rules/64-limesuite.rules
install -Dm444 -t $out/share/limesuite bin/Release/lms7suite_mcu/*
'';

meta = with stdenv.lib; {
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "git-filter-repo";
version = "2.27.0";
version = "2.27.1";

src = fetchurl {
url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "1vry0pqwi0p82m3wflr0wyf88wn75l049w18xf9f5z43xd9vpva1";
sha256 = "07r32n31ryflgz1ds3dz5s3ixv7li3scxwavy9mzbzdhq6bbzl28";
};

buildInputs = [ pythonPackages.python ];
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule rec {
pname = "git-subtrac";
version = "0.02";
version = "0.03";

src = fetchFromGitHub {
owner = "apenwarr";
repo = pname;
rev = "v${version}";
sha256 = "1nj950r38sxzrgw69m1xphm7a4km2g29iw2897gfx4wx57jl957k";
sha256 = "1ky04h18vg1yl9lykbhkmf25qslg0z2qzziy8c7afmvzvvvhm2v5";
};

vendorSha256 = "1ccwbhzwys8sl3m2rs2lp70snzsi2a0ahnnq8kn15rrlvsv5qahf";
@@ -19,4 +19,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
};
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/video/handbrake/default.nix
Original file line number Diff line number Diff line change
@@ -51,13 +51,13 @@ assert stdenv.isDarwin -> AudioToolbox != null

stdenv.mkDerivation rec {
pname = "handbrake";
version = "1.3.2";
version = "1.3.3";

src = fetchFromGitHub {
owner = "HandBrake";
repo = "HandBrake";
rev = version;
sha256 = "04z3hcy7m5yvma849rlrsx2wdqmkilkl1qds9yrzr2ydpw697f85";
sha256 = "0bsmk37543zv3p32a7wxnh2w483am23ha2amj339q3nnb4142krn";
extraPostFetch = ''
echo "DATE=$(date +"%F %T %z" -r $out/NEWS.markdown)" > $out/version.txt
'';
2 changes: 1 addition & 1 deletion pkgs/applications/video/mpv/wrapper.nix
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ let
;
umpvWrapperArgs = lib.strings.escapeShellArgs ([
"--argv0" "'$0'"
"--set" "MPV" "$out/bin/mpv"
"--set" "MPV" "${placeholder "out"}/bin/mpv"
] ++ extraUmpvWrapperArgs)
;
in
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/evolution/default.nix
Original file line number Diff line number Diff line change
@@ -43,11 +43,11 @@

stdenv.mkDerivation rec {
pname = "evolution";
version = "3.36.2";
version = "3.36.3";

src = fetchurl {
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12ii8crp4v4bpdxrc2rkxwdxqz3qjizyfgfrmir9pcyxlg0lh2f5";
sha256 = "00yann3cibbsap7vh6qq08aklvydynmk6gmljkzd80kc52m6rqal";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/evince/default.nix
Original file line number Diff line number Diff line change
@@ -43,13 +43,13 @@

stdenv.mkDerivation rec {
pname = "evince";
version = "3.36.3";
version = "3.36.5";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1clx580n8vb6w0fhdbmcsxs07yczdgidyax1y7280rafyzvvsbmg";
sha256 = "0z79jl0j9xq9wgwkfr0d1w1qrdy4447y8shs407n5srr0vixc3bg";
};

postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "gnome-desktop";
version = "3.36.2";
version = "3.36.3.1";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12f724inw3sv289xqprvwh8r3qw89z67m74j3hyhkbp1n7f99y9q";
sha256 = "0zkbx5inprjpf4abqwn0bxc2d1rwbhv450cjh1wgz82ylagi3vab";
};

nativeBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/development/compilers/go/1.13.nix
Original file line number Diff line number Diff line change
@@ -236,7 +236,7 @@ stdenv.mkDerivation rec {
homepage = "http://golang.org/";
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ];
maintainers = teams.golang.members;
platforms = platforms.linux ++ platforms.darwin;
};
}
Loading