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: 4e1f8e4e3193
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: 647be9d0ddd0
Choose a head ref
  • 6 commits
  • 6 files changed
  • 6 contributors

Commits on Sep 21, 2020

  1. spotify: support --force-device-scale-factor 

    Add a Spotify wrapper with a `deviceScaleFactor` argument to set the
`--force-device-scale-factor` flag for high-DPI displays. If unset,
nothing is added.

This allows e.g.

   spotify.override { deviceScaleFactor = 1.66; }

Uses a separate wrapper derivation as suggested by @Ma27.
Uses `wrapProgram` instead of `makeWrapper` as suggested by @Ma27.
    @9999years
    9999years committed Sep 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4f03644 View commit details

  2. clightning: 0.9.0-1 -> 0.9.1

    @jonasnick
    jonasnick committed Sep 21, 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
    f4cc8c1 View commit details

  3. Merge pull request #98350 from 9999years/spotify-device-scale-factor 

    spotify: support --force-device-scale-factor for high-DPI displays
    @Ma27
    Ma27 authored Sep 21, 2020
    Copy the full SHA
    2e98177 View commit details

  4. Merge pull request #98417 from jonasnick/clighting-0.9.1 

    clightning: 0.9.0-1 -> 0.9.1
    @mmahut
    mmahut authored Sep 21, 2020
    Copy the full SHA
    509f2c1 View commit details

  5. firecracker: 0.21.1 -> 0.22.0 

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Sep 21, 2020
    Copy the full SHA
    5a71d96 View commit details

  6. age: 1.0.0-beta4 -> 1.0.0-beta5 

    https://github.com/FiloSottile/age/releases/tag/v1.0.0-beta5
    @zowoq
    zowoq committed Sep 21, 2020
    Copy the full SHA
    647be9d View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/audio/spotify/default.nix
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ let
in

stdenv.mkDerivation {
pname = "spotify";
pname = "spotify-unwrapped";
inherit version;

# fetch from snapcraft instead of the debian repository most repos fetch from.
31 changes: 31 additions & 0 deletions pkgs/applications/audio/spotify/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ symlinkJoin
, lib
, spotify-unwrapped
, makeWrapper

# High-DPI support: Spotify's --force-device-scale-factor argument; not added
# if `null`, otherwise, should be a number.
, deviceScaleFactor ? null
}:

symlinkJoin {
name = "spotify-${spotify-unwrapped.version}";

paths = [ spotify-unwrapped.out ];

nativeBuildInputs = [ makeWrapper ];
preferLocalBuild = true;
passthru.unwrapped = spotify-unwrapped;
postBuild = ''
wrapProgram $out/bin/spotify \
${lib.optionalString (deviceScaleFactor != null) ''
--add-flags ${lib.escapeShellArg "--force-device-scale-factor=${
builtins.toString deviceScaleFactor
}"}
''}
'';

meta = spotify-unwrapped.meta // {
priority = (spotify-unwrapped.meta.priority or 0) - 1;
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/blockchains/clightning.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "clightning";
version = "0.9.0-1";
version = "0.9.1";

src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
sha256 = "01cwcrqysqsrf96bbbj0grm8j5m46a3acgwy0kzxdx05jdzld9sc";
sha256 = "4923e2fa001cfc2403d1bed368710499d5def322e6384b8eea2bd39d3351a417";
};

enableParallelBuilding = true;
10 changes: 5 additions & 5 deletions pkgs/applications/virtualization/firecracker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ fetchurl, stdenv }:

let
version = "0.21.1";
version = "0.22.0";

suffix = {
x86_64-linux = "x86_64";
@@ -15,13 +15,13 @@ let
};

firecracker-bin = fetchbin "firecracker" {
x86_64-linux = "0g4fja3bz1fsyz8vj99199yblkn46ygf33ldwd1ssw8f957vbwnb";
aarch64-linux = "1qyppcxnh7f42fs4px5rvkk6lza57h2sq9naskvqn5zy4vsvq89s";
x86_64-linux = "1jl7cmw53fbykcji8a0bkdy82mgpfr8km3ab6iwsrswvahh4srx7";
aarch64-linux = "15vi6441gr4jy0698ifashgv1ic7iz0kbm7c28m2jd8z08p6bnlz";
};

jailer-bin = fetchbin "jailer" {
x86_64-linux = "0x89pfmqci9d3i9fi9b9zm94yr2v7pq7kp3drlb952jkdfj0njyk";
aarch64-linux = "03fx9sk88jm23wqm8fraqd1ccfhbqvc310mkfv1f5p2ykhq2ahrk";
x86_64-linux = "0wir7fi1iqvw02908axfaqzp9q5qyg4yk5jicp8s493iz3vhm9h7";
aarch64-linux = "1l3yc9j27vxfyn89xmxi1ir635v7l8ikwpw9a30dhh50wa3rm4jy";
};

in
11 changes: 2 additions & 9 deletions pkgs/tools/security/age/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,21 +2,14 @@

buildGoModule rec {
pname = "age";
version = "1.0.0-beta4";
version = "1.0.0-beta5";
vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m";

doCheck = false;

subPackages = [
"cmd/age"
"cmd/age-keygen"
];

src = fetchFromGitHub {
owner = "FiloSottile";
repo = "age";
rev = "v${version}";
sha256 = "0pp6zn4rdypyxn1md9ppisiwiapkfkbh08rzfl3qwn0998wx6gnb";
sha256 = "1hdbxd359z8zvnz7h8c4pa16nc7r8db36lx3gpks38lpi0r8hzqk";
};

meta = with lib; {
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -23330,14 +23330,16 @@ in

spek = callPackage ../applications/audio/spek { };

spotify = callPackage ../applications/audio/spotify {
spotify-unwrapped = callPackage ../applications/audio/spotify {
libgcrypt = libgcrypt_1_5;
libpng = libpng12;
curl = curl.override {
sslSupport = false; gnutlsSupport = true;
};
};

spotify = callPackage ../applications/audio/spotify/wrapper.nix { };

libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {});

sourcetrail = callPackage ../development/tools/sourcetrail { };