Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b095078f4430
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0fe33caad37a
Choose a head ref
15 contributors

Commits on Dec 11, 2020

  1. autoconf: license is GPLv3+ 

    2.64 was the last GPLv2+ release.
    @alyssais
    alyssais committed Dec 11, 2020
    Copy the full SHA
    bbaed0d View commit details

Commits on Dec 19, 2020

  1. qrcodegen: init at 1.6.0

    @mcbeth
    mcbeth committed Dec 19, 2020
    Copy the full SHA
    a3dd6cd View commit details

Commits on Dec 30, 2020

  1. python3.pkgs.wordcloud: 1.6.0 -> 1.8.1 

    Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
    @Mic92 @SuperSandro2000
    3 people committed Dec 30, 2020
    Copy the full SHA
    5d84589 View commit details

  2. desync: 0.4.0 -> 0.9.0

    @charles-dyfis-net
    charles-dyfis-net committed Dec 30, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4f8057e View commit details

  3. chiaki: 1.3.0 -> 2.0.1 

    Also switch the upstream repository from github to git.sr.ht, since the
project has been moved to sourcehut.

Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
    @Emantor
    Emantor committed Dec 30, 2020
    Copy the full SHA
    536a40c View commit details

Commits on Dec 31, 2020

  1. brave: add update script 

    The Brave package often seems to get very outdated. This is bad for a
browser, where vulnerabilities are high impact.

This change adds an update script, so that r-ryantm will suggest
updates. We find the latest version using their Debian package
database (since we are using the Debian package anyway).
    @danieldk
    danieldk committed Dec 31, 2020
    Copy the full SHA
    4d9d826 View commit details

  2. brave: 1.18.75 -> 1.18.77 

    Changelog:
https://community.brave.com/t/release-channel-1-18-77/191009
    @danieldk
    danieldk committed Dec 31, 2020
    Copy the full SHA
    e2a9d90 View commit details

  3. parsimonious: excluding unpredictable tests

    @snicket2100
    snicket2100 committed Dec 31, 2020
    Copy the full SHA
    9da0c51 View commit details

Commits on Jan 1, 2021

  1. Merge pull request #107906 from Mic92/wordcloud 

    python3.pkgs.wordcloud: 1.6.0 -> 1.8.1
    @Mic92
    Mic92 authored Jan 1, 2021
    Copy the full SHA
    60c6607 View commit details

  2. Merge pull request #106403 from charles-dyfis-net/desync-0.9.0

    @doronbehar
    doronbehar authored Jan 1, 2021
    Copy the full SHA
    f0faa10 View commit details

  3. Merge pull request #106682 from snicket2100/parsimonius-exclude-perfo… 

    …rmance-tests

parsimonious: excluding unpredictable tests
    @doronbehar
    doronbehar authored Jan 1, 2021
    Copy the full SHA
    04ea3b4 View commit details

  4. Merge pull request #106688 from alyssais/autoconf-license 

    autoconf: license is GPLv3+
    @doronbehar
    doronbehar authored Jan 1, 2021
    Copy the full SHA
    d4a76b1 View commit details

  5. chiaki: add DualShock4 touchpad support 

    Chiaki supports the touchpad on DualShock4 controllers when they are
connected via USB and requires libevdev & udev for this. Add both
libraries if chiaki is to be built for a Linux host.
    @Emantor
    Emantor committed Jan 1, 2021
    Copy the full SHA
    4d46117 View commit details

  6. chiaki: fix build on darwin 

    Darwin requires qtmacextra in the buildInputs, otherwise compilation
fails with:

  CMake Error at /nix/store/05nmn6v1hrk56zqs61s2awvykha51fx9-qtbase-5.12.7-dev/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package):
    By not providing "FindQt5MacExtras.cmake" in CMAKE_MODULE_PATH this project
    has asked CMake to find a package configuration file provided by
    "Qt5MacExtras", but CMake did not find one.

    Could not find a package configuration file provided by "Qt5MacExtras" with
    any of the following names:

      Qt5MacExtrasConfig.cmake
      qt5macextras-config.cmake

    Add the installation prefix of "Qt5MacExtras" to CMAKE_PREFIX_PATH or set
    "Qt5MacExtras_DIR" to a directory containing one of the above files.  If
    "Qt5MacExtras" provides a separate development package or SDK, be sure it
    has been installed.
  Call Stack (most recent call first):
    gui/CMakeLists.txt:7 (find_package)

  -- Configuring incomplete, errors occurred!
  See also "/tmp/nix-build-chiaki-2.0.1.drv-0/chiaki/build/CMakeFiles/CMakeOutput.log".
    @Emantor
    Emantor committed Jan 1, 2021
    Copy the full SHA
    b5a0c74 View commit details

  7. Merge pull request #108029 from danieldk/brave-update-script 

    brave: add update script
    @danieldk
    danieldk authored Jan 1, 2021
    Copy the full SHA
    4df737c View commit details

  8. unifont: 13.0.04 -> 13.0.05

    @rycee
    rycee committed Jan 1, 2021
    Copy the full SHA
    63476e2 View commit details

  9. unifont_upper: 13.0.04 -> 13.0.05

    @rycee
    rycee committed Jan 1, 2021
    Copy the full SHA
    a9e7aa9 View commit details

  10. jwt-cli: 3.2.1 -> 3.3.0

    @rycee
    rycee committed Jan 1, 2021
    Copy the full SHA
    bd970a5 View commit details

  11. Merge pull request #107199 from mcbeth/qrcodegen 

    qrcodegen: init at 1.6.0
    @Lassulus
    Lassulus authored Jan 1, 2021
    Copy the full SHA
    8843930 View commit details

  12. lombok: add bin output with lombok wrapper script 

    The wrapper can be used, e.g., to run the delombok command.
    @rycee
    rycee committed Jan 1, 2021
    Copy the full SHA
    9ce91be View commit details

  13. Merge pull request #107983 from Emantor/topic/chiaki_bump_touchpad 

    chiaki: 1.3.0 -> 2.0.1 & touchpad support
    @prusnak
    prusnak authored Jan 1, 2021
    Copy the full SHA
    37c9f30 View commit details

  14. Merge master into staging-next

    @github-actions
    github-actions[bot] authored Jan 1, 2021
    Copy the full SHA
    0fe33ca View commit details
6 changes: 4 additions & 2 deletions pkgs/applications/networking/browsers/brave/default.nix
View file
Original file line number Diff line number Diff line change
@@ -88,11 +88,11 @@ in

stdenv.mkDerivation rec {
pname = "brave";
version = "1.18.75";
version = "1.18.77";

src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "1njgdw7ml30xs517brc7z7piy6lcylrfjhz6wn1dp7gywsxfgx1h";
sha256 = "AV3bqtWaoy6AVnt8K/Qo+7hguAIsPJPZhgLSeOvJ7JY=";
};

dontConfigure = true;
@@ -147,6 +147,8 @@ stdenv.mkDerivation rec {
ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime
'';

passthru.updateScript = ./update.sh;

meta = with stdenv.lib; {
homepage = "https://brave.com/";
description = "Privacy-oriented browser for Desktop and Laptop computers";
5 changes: 5 additions & 0 deletions pkgs/applications/networking/browsers/brave/update.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused common-updater-scripts

version="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)"
update-source-version brave "$version"
18 changes: 9 additions & 9 deletions pkgs/applications/networking/sync/desync/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
buildGoModule rec {
pname = "desync";
version = "0.4.0";
rev = "v${version}";

goPackagePath = "github.com/folbricht/desync";
version = "0.9.0";

src = fetchFromGitHub {
inherit rev;
rev = "v${version}";
owner = "folbricht";
repo = "desync";
sha256 = "17qh0g1paa7212j761q9z246k10a3xrwd8fgiizw3lr9adn50kdk";
sha256 = "0j9hixgkja268r2zn2dglrmlrb2z57sgz6q3wqb8dfwpan7b5rsy";
};

goDeps = ./deps.nix;
vendorSha256 = "1gajh99jb6mbwk93dypddhl7r7n8h2s11s3s82firbrb5k24s4pz";

# nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad.
doCheck = false;

meta = with stdenv.lib; {
description = "Content-addressed binary distribution system";
312 changes: 0 additions & 312 deletions pkgs/applications/networking/sync/desync/deps.nix
View file

This file was deleted.

6 changes: 3 additions & 3 deletions pkgs/data/fonts/unifont/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@

stdenv.mkDerivation rec {
pname = "unifont";
version = "13.0.04";
version = "13.0.05";

ttf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
sha256 = "sha256-p0wSTyXCXuWIw+hDZ4HZPxgdBJ6oOOqOuX6FzZJmwrE=";
sha256 = "0ff7zbyqi45q0171rl9ckj6lpfhcj8a9850d8j89m7wbwky32isf";
};

pcf = fetchurl {
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
sha256 = "sha256-sKY2qshNV3zXfD2BSbfs0qom1gPt7vD5QmVEkACmx18=";
sha256 = "16n666p6rs6l4r8grh67gy4ls33qfnbb5xk7cksywzjwdh42js0r";
};

nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
Loading