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: fb34ac13e465
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: aae661cefe53
Choose a head ref
  • 3 commits
  • 4 files changed
  • 3 contributors

Commits on Mar 7, 2020

  1. howard-hinnant-date: allow access to zoneinfo 

    This fixes the situtation where, if `/usr/share/zoneinfo` was
inaccessible/didn't otherwise exist, `howard-hinnant-date` would
download and drop a `~/Downloads/tzdata` directory containing some
timezone information from IANA [1]. To avoid this, we make use of the
`tzdata`'s `zoneinfo`, preventing the dropping of random directories and
files.

[1] https://data.iana.org/time-zones/releases/tzdata2019c.tar.gz

(cherry picked from commit 2505796)

This fixes a bug which breaks the clock module. See
<Alexays/Waybar#566>.
    @cole-h @ryneeverett
    cole-h authored and ryneeverett committed Mar 7, 2020
    Copy the full SHA
    e5c3c21 View commit details

Commits on Mar 8, 2020

  1. Merge pull request #81958 from ryneeverett/backport-howard-hinnant-da… 

    …te-zone-info

howard-hinnant-date: allow access to zoneinfo
    @Ma27
    Ma27 authored Mar 8, 2020
    Copy the full SHA
    ae1b10a View commit details

  2. satallax: Fix build with GCC9 

    (cherry picked from commit bc56175)
    @JohnAZoidberg @Ma27
    JohnAZoidberg authored and Ma27 committed Mar 8, 2020
    Copy the full SHA
    aae661c View commit details
5 changes: 5 additions & 0 deletions pkgs/applications/science/logic/satallax/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
};

patches = [
# GCC9 doesn't allow default value in friend declaration.
./fix-declaration-gcc9.patch
];

preConfigure = ''
mkdir fake-tools
echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname
21 changes: 21 additions & 0 deletions pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git i/minisat/core/SolverTypes.h w/minisat/core/SolverTypes.h
--- i/minisat/core/SolverTypes.h
+++ w/minisat/core/SolverTypes.h
@@ -47,7 +47,7 @@ struct Lit {
int x;

// Use this as a constructor:
- friend Lit mkLit(Var var, bool sign = false);
+ friend Lit mkLit(Var var, bool sign);

bool operator == (Lit p) const { return x == p.x; }
bool operator != (Lit p) const { return x != p.x; }
@@ -55,7 +55,7 @@ struct Lit {
};


-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
+inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; }
inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
inline bool sign (Lit p) { return p.x & 1; }
10 changes: 9 additions & 1 deletion pkgs/development/libraries/howard-hinnant-date/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }:
{ stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }:

stdenv.mkDerivation rec {
pname = "howard-hinnant-date-unstable";
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch";
sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2";
})
# Without this patch, this library will drop a `tzdata` directory into
# `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
# searches for `zoneinfo` be the one from the `tzdata` package.
(substituteAll {
src = ./make-zoneinfo-available.diff;
inherit tzdata;
})
];

nativeBuildInputs = [ cmake ];
@@ -24,6 +31,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_TZ_LIB=true"
"-DBUILD_SHARED_LIBS=true"
"-DUSE_SYSTEM_TZ_DB=true"
];

outputs = [ "out" "dev" ];
13 changes: 13 additions & 0 deletions pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/tz.cpp b/src/tz.cpp
index 68436c3..2bfe19e 100644
--- a/src/tz.cpp
+++ b/src/tz.cpp
@@ -349,7 +349,7 @@ discover_tz_dir()
struct stat sb;
using namespace std;
# ifndef __APPLE__
- CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo";
+ CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo";
CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc";

// Check special path which is valid for buildroot with uclibc builds