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: 3f084952127e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f1df516121d3
Choose a head ref
Loading
6 changes: 4 additions & 2 deletions pkgs/applications/networking/browsers/brave/default.nix
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
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
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

This file was deleted.

6 changes: 3 additions & 3 deletions pkgs/data/fonts/unifont/default.nix
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