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: a74e7092b076
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: 1e925e1545b2
Choose a head ref
  • 16 commits
  • 9 files changed
  • 5 contributors

Commits on Apr 8, 2020

  1. gitAndTools.gh: 0.5.3 -> 0.5.4 

    (cherry picked from commit 7b61246)
    @r-ryantm @zowoq
    r-ryantm authored and zowoq committed Apr 8, 2020
    Copy the full SHA
    1e8fc3d View commit details

  2. gitAndTools.gh: 0.5.4 -> 0.5.5 

    https://github.com/cli/cli/releases/tag/v0.5.5
(cherry picked from commit 66f5012)
    @zowoq
    zowoq committed Apr 8, 2020
    Copy the full SHA
    ca75c08 View commit details

  3. gitAndTools.gh: 0.5.5 -> 0.5.6 

    https://github.com/cli/cli/releases/tag/v0.5.6
(cherry picked from commit 185aabe)
    @zowoq
    zowoq committed Apr 8, 2020
    Copy the full SHA
    1d6ad14 View commit details

  4. gitAndTools.gh: 0.5.6 -> 0.5.7 

    https://github.com/cli/cli/releases/tag/v0.5.7
(cherry picked from commit 3338225)
    @zowoq
    zowoq committed Apr 8, 2020
    Copy the full SHA
    085b736 View commit details

  5. gitAndTools.gh: 0.5.7 -> 0.6.0 

    https://github.com/cli/cli/releases/tag/v0.6.0
(cherry picked from commit 85a8d13)
    @zowoq
    zowoq committed Apr 8, 2020
    Copy the full SHA
    86a179a View commit details

  6. gitAndTools.gh 0.6.0 -> 0.6.1 

    https://github.com/cli/cli/releases/tag/v0.6.1
(cherry picked from commit 4656fba)
    @zowoq
    zowoq committed Apr 8, 2020
    Copy the full SHA
    ba71d71 View commit details

  7. gitAndTools.gh: 0.6.1 -> 0.6.2 

    https://github.com/cli/cli/releases/tag/v0.6.2
(cherry picked from commit 20f197d)
    @zowoq
    zowoq committed Apr 8, 2020
    Copy the full SHA
    f7b3dfc View commit details

  8. gitAndTools.gh: 0.6.2 -> 0.6.3 

    https://github.com/cli/cli/releases/tag/v0.6.3
(cherry picked from commit 68a50aa)
    @zowoq
    zowoq committed Apr 8, 2020
    Copy the full SHA
    cf7513b View commit details

  9. gitAndTools.gh: 0.6.3 -> 0.6.4 

    https://github.com/cli/cli/releases/tag/v0.6.4
(cherry picked from commit 26a6d89)
    @zowoq
    zowoq committed Apr 8, 2020
    Copy the full SHA
    fbd0974 View commit details

Commits on Apr 9, 2020

  1. make-iso9660-image.sh: enable joliet extension 

    This is per the advice of the osinfo-db maintainers https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/107#note_313094852

(cherry picked from commit f59aa66)
    @worldofpeace
    worldofpeace committed Apr 9, 2020
    Copy the full SHA
    84b906d View commit details

  2. iso-image: normalize volumeID 

    The volumeID will now be in the format of:
nixos-$EDITON-$RELEASE-$ARCH

an example for the minimal image would look like:
nixos-minimal-20.09-x86-64-linux

(cherry picked from commit 70a8e9a)
    @worldofpeace
    worldofpeace committed Apr 9, 2020
    Copy the full SHA
    519ace8 View commit details

  3. iso-image: make sure volumeID is less than 32 chars 

    (cherry picked from commit 591e8d5)
    @worldofpeace
    worldofpeace committed Apr 9, 2020
    Copy the full SHA
    0a63410 View commit details

Commits on Apr 10, 2020

  1. iso-image: make $ARCH shorter 

    we use stdenv.hostPlatform.uname.processor, which I believe is just like
`uname -p`.

Example values:
```
(import <nixpkgs> { system = "x86_64-linux"; }).stdenv.hostPlatform.uname.processor
"x86_64"

(import <nixpkgs> { system = "aarch64-linux"; }).stdenv.hostPlatform.uname.processor
aarch64

(import <nixpkgs> { system = "armv7l-linux"; }).stdenv.hostPlatform.uname.processor
"armv7l"
```

(cherry picked from commit df8c30f)
    @worldofpeace
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    17d67c0 View commit details

  2. Merge pull request #84863 from worldofpeace/backport-83551 

    [20.03] iso-image: normalize volumeID
    @worldofpeace
    worldofpeace authored Apr 10, 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
    9e50a36 View commit details

  3. Merge pull request #84707 from zowoq/gh-backport 

    [20.03] gitAndTools.gh: 0.5.3 -> 0.6.4
    @worldofpeace
    worldofpeace authored Apr 10, 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
    d3d904c View commit details

  4. performous: fix build (#84841) 

    (cherry picked from commit 87f75f8)

Co-authored-by: Orivej Desh <orivej@gmx.fr>
    @ajs124 @orivej
    ajs124 and orivej authored Apr 10, 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
    1e925e1 View commit details
1 change: 1 addition & 0 deletions nixos/lib/make-iso9660-image.sh
View file
Original file line number Diff line number Diff line change
@@ -107,6 +107,7 @@ xorriso="xorriso
-publisher nixos
-graft-points
-full-iso9660-filenames
-joliet
${isoBootFlags}
${usbBootFlags}
${efiBootFlags}
2 changes: 0 additions & 2 deletions nixos/modules/installer/cd-dvd/installation-cd-base.nix
View file
Original file line number Diff line number Diff line change
@@ -18,8 +18,6 @@ with lib;
# ISO naming.
isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso";

isoImage.volumeID = substring 0 11 "NIXOS_ISO";

# EFI booting
isoImage.makeEfiBootable = true;

2 changes: 2 additions & 0 deletions nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ with lib;
{
imports = [ ./installation-cd-graphical-base.nix ];

isoImage.edition = "gnome";

services.xserver.desktopManager.gnome3.enable = true;

# Auto-login as root.
2 changes: 2 additions & 0 deletions nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ with lib;
{
imports = [ ./installation-cd-graphical-base.nix ];

isoImage.edition = "plasma5";

services.xserver = {
desktopManager.plasma5 = {
enable = true;
2 changes: 2 additions & 0 deletions nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
View file
Original file line number Diff line number Diff line change
@@ -8,5 +8,7 @@
[ ./installation-cd-base.nix
];

isoImage.edition = "minimal";

fonts.fontconfig.enable = false;
}
24 changes: 23 additions & 1 deletion nixos/modules/installer/cd-dvd/iso-image.nix
View file
Original file line number Diff line number Diff line change
@@ -417,8 +417,17 @@ in
'';
};

isoImage.edition = mkOption {
default = "";
description = ''
Specifies which edition string to use in the volume ID of the generated
ISO image.
'';
};

isoImage.volumeID = mkOption {
default = "NIXOS_BOOT_CD";
# nixos-$EDITION-$RELEASE-$ARCH
default = "nixos${optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.uname.processor}";
description = ''
Specifies the label or volume ID of the generated ISO image.
Note that the label is used by stage 1 of the boot process to
@@ -515,6 +524,19 @@ in
};

config = {
assertions = [
{
assertion = !(stringLength config.isoImage.volumeID > 32);
# https://wiki.osdev.org/ISO_9660#The_Primary_Volume_Descriptor
# Volume Identifier can only be 32 bytes
message = let
length = stringLength config.isoImage.volumeID;
howmany = toString length;
toomany = toString (length - 32);
in
"isoImage.volumeID ${config.isoImage.volumeID} is ${howmany} characters. That is ${toomany} characters longer than the limit of 32.";
}
];

boot.loader.grub.version = 2;

8 changes: 4 additions & 4 deletions pkgs/applications/version-management/git-and-tools/gh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "gh";
version = "0.5.3";
version = "0.6.4";

src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
sha256 = "033y9bwdaj8735nmj22k8lrgkgimji7hyly9i4jyp11iaa7cgd7a";
sha256 = "0na8zfvcmdy968i47x6qd1jwfaphy5h18ff7ym5sxyia9a27yhf8";
};

modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h";
modSha256 = "102v30wr9wmd6n20qdvgs5mp2s639pwbqqd71r8q52f42p694bi1";

buildFlagsArray = [
"-ldflags=-X github.com/cli/cli/command.Version=${version}"
@@ -29,7 +29,7 @@ buildGoModule rec {

meta = with lib; {
description = "GitHub CLI tool";
homepage = "https://github.com/cli/cli";
homepage = "https://cli.github.com/";
license = licenses.mit;
maintainers = with maintainers; [ zowoq ];
};
2 changes: 2 additions & 0 deletions pkgs/games/performous/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "08j0qhr65l7qnd5vxl4l07523qpvdwi31h4vzl3lfiinx1zcgr4x";
};

patches = [ ./performous-cmake.patch ];

nativeBuildInputs = [ cmake pkgconfig gettext ];

buildInputs = [
86 changes: 86 additions & 0 deletions pkgs/games/performous/performous-cmake.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6)
project(Performous CXX C)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
--- a/cmake/Modules/FindPango.cmake
+++ b/cmake/Modules/FindPango.cmake
@@ -2,31 +2,10 @@
# Once done, this will define
#
# Pango_FOUND - system has Pango
-# Pango_INCLUDE_DIRS - the Pango include directories
# Pango_LIBRARIES - link these to use Pango

include(LibFindMacros)

-# Dependencies
-libfind_package(Pango Freetype)
-libfind_package(Pango Glib)
-libfind_package(Pango GObject)
-
-# Use pkg-config to get hints about paths
-libfind_pkg_check_modules(Pango_PKGCONF pango)
-
-# Include dir
-find_path(Pango_INCLUDE_DIR
- NAMES pango/pango.h
- HINTS ${Pango_PKGCONF_INCLUDE_DIRS}
- PATH_SUFFIXES pango-1.0
-)
-
-# Finally the library itself
-find_library(Pango_LIBRARY
- NAMES pango-1.0
- HINTS ${Pango_PKGCONF_LIBRARY_DIRS}
-)
-
+libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango)
+set(Pango_LIBRARY PkgConfig::Pango_PKGCONF)
libfind_process(Pango)
-
--- a/cmake/Modules/FindPangoCairo.cmake
+++ b/cmake/Modules/FindPangoCairo.cmake
@@ -1,35 +1,11 @@
# - Try to find PangoCairo
# Once done, this will define
#
-# PangoCairo_FOUND - system has Pango
-# PangoCairo_INCLUDE_DIRS - the Pango include directories
-# PangoCairo_LIBRARIES - link these to use Pango
+# PangoCairo_FOUND - system has PangoCairo
+# PangoCairo_LIBRARIES - link these to use PangoCairo

include(LibFindMacros)

-# Dependencies
-libfind_package(PangoCairo Pango)
-libfind_package(PangoCairo Cairo)
-
-# Use pkg-config to get hints about paths
-libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo)
-
-# Include dir
-find_path(PangoCairo_INCLUDE_DIR
- NAMES pango/pangocairo.h
- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS}
- PATH_SUFFIXES pango-1.0
-)
-
-# Finally the library itself
-find_library(PangoCairo_LIBRARY
- NAMES pangocairo-1.0
- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR)
-set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY)
+libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo)
+set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF)
libfind_process(PangoCairo)
-