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: 29200f051766
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: 3a3353953f9b
Choose a head ref

Commits on May 11, 2019

  1. libssh2: 1.8.1 -> 1.8.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/libssh2/versions
    
    (cherry picked from commit 75bbd76)
    Seems suitable: https://www.libssh2.org/changes.html#1.8.2
    r-ryantm authored and vcunat committed May 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    3f05ea6 View commit details

Commits on May 13, 2019

  1. nixos/gdm: use provided PAM login configuration wherever possible

    Fixes #21859
    
    (cherry picked from commit 5b9895b)
    outergod authored and alexeymuranov committed May 13, 2019
    Copy the full SHA
    6ceb134 View commit details
  2. nixos/pam: Add GNOME keyring use_authtok directive to password group

    (cherry picked from commit 56bd011)
    outergod authored and alexeymuranov committed May 13, 2019
    Copy the full SHA
    65eacdd View commit details
  3. libaudit: enable arm (including aarch64) support

    (cherry picked from commit 972c0ca)
    lheckemann committed May 13, 2019
    Copy the full SHA
    a544eb4 View commit details
  4. Merge pull request #61450 from alexeymuranov/backport-gdm_pam_fix-to-…

    …19.03
    
    [19.03] Backport GDM PAM fix (cherry-picked from master)
    worldofpeace authored May 13, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3adb08f View commit details

Commits on May 14, 2019

  1. postgresql_9_4: 9.4.21 -> 9.4.22

    (cherry picked from commit e6cf849)
    marsam authored and FRidh committed May 14, 2019
    Copy the full SHA
    9c51f7c View commit details
  2. postgresql_9_5: 9.5.16 -> 9.5.17

    (cherry picked from commit 63f8f36)
    marsam authored and FRidh committed May 14, 2019
    Copy the full SHA
    81bd3bc View commit details
  3. postgresql_9_6: 9.6.12 -> 9.6.13

    (cherry picked from commit 04cc838)
    marsam authored and FRidh committed May 14, 2019
    Copy the full SHA
    dbcb19f View commit details
  4. postgresql_10: 10.7 -> 10.8

    (cherry picked from commit 34309d7)
    marsam authored and FRidh committed May 14, 2019
    Copy the full SHA
    e9778d9 View commit details
  5. postgresql_11: 11.2 -> 11.3

    (cherry picked from commit fa9015f)
    marsam authored and FRidh committed May 14, 2019
    Copy the full SHA
    822243a View commit details
  6. Copy the full SHA
    1d8f4de View commit details
  7. darwin.binutils: add myself as maintainer

    (cherry picked from commit c563965)
    matthewbauer authored and FRidh committed May 14, 2019
    Copy the full SHA
    6196b73 View commit details
  8. darwin.binutils: set low priority

    (cherry picked from commit a4fbfe4)
    matthewbauer authored and FRidh committed May 14, 2019
    Copy the full SHA
    ab28cfa View commit details
  9. unix-tools: set low priority

    (cherry picked from commit 228f2ea)
    matthewbauer authored and FRidh committed May 14, 2019
    Copy the full SHA
    1eaaf4e View commit details
  10. bintools-wrapper: set low priority

    (cherry picked from commit 9f6f223)
    matthewbauer authored and FRidh committed May 14, 2019
    Copy the full SHA
    238ba9e View commit details
  11. gnutar: set low priority

    (cherry picked from commit 83254ec)
    matthewbauer authored and FRidh committed May 14, 2019
    Copy the full SHA
    a14185e View commit details
  12. coreutils: set low priority

    (cherry picked from commit fce294c)
    matthewbauer authored and FRidh committed May 14, 2019
    Copy the full SHA
    b382eec View commit details
  13. nixos/system-path.nix: add 3 to every priority

    We can’t use lowPrio here because it erases the differences in
    priority of the packages by setting it to a constant value. see this
    comment for info:
    
    NixOS/nixpkgs#55886 (comment)
    (cherry picked from commit 6fc5ce2)
    matthewbauer authored and FRidh committed May 14, 2019
    Copy the full SHA
    fb328e2 View commit details
  14. systemd: lower priority to solve collisions with openresolv

    (cherry picked from commit d16a243)
    rnhmjoj authored and FRidh committed May 14, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    f481d27 View commit details
  15. procps: lower priority to solve collisions with coreutils

    (cherry picked from commit 87bfe6e)
    rnhmjoj authored and FRidh committed May 14, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    6250246 View commit details

Commits on May 20, 2019

  1. rust-cbindgen: 0.8.0 -> 0.8.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/rust-cbindgen/versions
    
    (cherry picked from commit d882895)
    r-ryantm authored and andir committed May 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    475185c View commit details
  2. nspr: make reproducible

    (cherry picked from commit 885d1df)
    grahamc authored and andir committed May 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    8500dd4 View commit details
  3. nspr: 4.20 -> 4.21 (#57335)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/nspr/versions
    
    (cherry picked from commit 97fe2b0)
    r-ryantm authored and andir committed May 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    5cfb484 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    e0d925a View commit details
  5. sqlite: 3.27.1 -> 3.27.2

    (cherry picked from commit f2f90f4)
    dtzWill authored and andir committed May 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    e6d6467 View commit details
  6. sqlite: 3.27.2 -> 3.28.0

    Changelog: https://www.sqlite.org/releaselog/3_28_0.html
    
    Security: includes fixes for CVE-2019-9936 and CVE-2019-9937
    (cherry picked from commit fba13b5)
    c0bw3b authored and andir committed May 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    a71c6bc View commit details
  7. firefox: prepare for firefox 67.0 release

    Firefox now requires `llvm-objdump` during the build phase.
    
    (cherry picked from commit 7f65d06)
    andir committed May 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    11ba7bd View commit details
  8. firefox: 66.0.5 -> 67.0

    (cherry picked from commit f353c0e)
    andir committed May 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    a67b519 View commit details

Commits on May 21, 2019

  1. firefox-bin: 66.0.5 -> 67.0

    (cherry picked from commit 140096b)
    andir committed May 21, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    ce2b6c3 View commit details
  2. firefox-esr-60: 60.6.3esr -> 60.7.0esr

    (cherry picked from commit e57d93a)
    andir committed May 21, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    c7ef4d5 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    7636c3c View commit details
  4. Copy the full SHA
    3fab4f7 View commit details

Commits on May 22, 2019

  1. grafana: 6.1.6 -> 6.2.0

    (cherry picked from commit 3871b76)
    WilliButz authored and fpletz committed May 22, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    Copy the full SHA
    b57f51c View commit details
  2. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    3a33539 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/config/system-path.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ with lib;

let

requiredPackages = map lib.lowPrio
requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
[ config.nix.package
pkgs.acl
pkgs.attr
2 changes: 2 additions & 0 deletions nixos/modules/security/pam.nix
Original file line number Diff line number Diff line change
@@ -398,6 +398,8 @@ let
"password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"}
${optionalString config.services.samba.syncPasswordsByPam
"password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
${optionalString cfg.enableGnomeKeyring
"password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"}
# Session management.
${optionalString cfg.setEnvironment ''
2 changes: 2 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-keyring.nix
Original file line number Diff line number Diff line change
@@ -35,6 +35,8 @@ with lib;

services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ];

security.pam.services.login.enableGnomeKeyring = true;

};

}
73 changes: 11 additions & 62 deletions nixos/modules/services/x11/display-managers/gdm.nix
Original file line number Diff line number Diff line change
@@ -208,76 +208,25 @@ in
session optional pam_permit.so
'';

gdm.text = ''
auth requisite pam_nologin.so
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
${optionalString (! config.security.pam.enableEcryptfs)
"auth required pam_deny.so"}
account sufficient pam_unix.so
password requisite pam_unix.so nullok sha512
${optionalString config.security.pam.enableEcryptfs
"password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_env.so envfile=${config.system.build.pamEnvironment}
session required pam_unix.so
${optionalString config.security.pam.enableEcryptfs
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';

gdm-password.text = ''
auth requisite pam_nologin.so
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
${optionalString (! config.security.pam.enableEcryptfs)
"auth required pam_deny.so"}
account sufficient pam_unix.so
password requisite pam_unix.so nullok sha512
${optionalString config.security.pam.enableEcryptfs
"password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_env.so envfile=${config.system.build.pamEnvironment}
session required pam_unix.so
${optionalString config.security.pam.enableEcryptfs
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
auth substack login
account include login
password substack login
session include login
'';

gdm-autologin.text = ''
auth requisite pam_nologin.so
auth requisite pam_nologin.so
auth required pam_succeed_if.so uid >= 1000 quiet
auth required pam_permit.so
auth required pam_succeed_if.so uid >= 1000 quiet
auth required pam_permit.so
account sufficient pam_unix.so
account sufficient pam_unix.so
password requisite pam_unix.so nullok sha512
password requisite pam_unix.so nullok sha512
session optional pam_keyinit.so revoke
session required pam_env.so envfile=${config.system.build.pamEnvironment}
session required pam_unix.so
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional pam_keyinit.so revoke
session include login
'';

};
794 changes: 397 additions & 397 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkgs/applications/networking/browsers/firefox/common.nix
Original file line number Diff line number Diff line change
@@ -158,6 +158,7 @@ stdenv.mkDerivation rec {
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0
++ extraNativeBuildInputs;

preConfigure = ''
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/firefox/packages.nix
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ rec {

firefox = common rec {
pname = "firefox";
ffversion = "66.0.5";
ffversion = "67.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "18bcpbwzhc2fi6cqhxhh6jiw5akhzr7qqs6s8irjbvh7q8f3z2n046vrlvpblhbkc2kv1n0s14n49yzv432adqwa9qi8d57jnxyfqkf";
sha512 = "0lwljfcbb1avnlafyrw5z08l3wxixfk6nv91blp6sc45mvsk89l77ckfyay7jy4v6c84q4a9h0wbh2mnx0r1xm3fhy9lshlm1n0s051";
};

patches = [
@@ -67,10 +67,10 @@ rec {

firefox-esr-60 = common rec {
pname = "firefox-esr";
ffversion = "60.6.3esr";
ffversion = "60.7.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "3zg75djd7mbr9alhkp7zqrky7g41apyf6ka0acv500dmpnhvn5v5i0wy9ks8v6vh7kcgw7bngf6msb7vbbps6whwdcqv3v4dqbg6yr2";
sha512 = "1armp7nmzn864l42nasw0zqsp8y1zj4vhgbm99c49a435m44c8p66qrjxy6rn2haqsy76i9x5zf8ph2d014ap6g5yhidj7iymbjh5f2";
};

patches = [
1 change: 1 addition & 0 deletions pkgs/build-support/bintools-wrapper/default.nix
Original file line number Diff line number Diff line change
@@ -327,6 +327,7 @@ stdenv.mkDerivation {
{ description =
stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
+ " (wrapper script)";
priority = 10;
} // optionalAttrs useMacosReexportHack {
platforms = stdenv.lib.platforms.darwin;
};
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libssh2/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "libssh2";
version = "1.8.1";
version = "1.8.2";

src = fetchurl {
url = "${meta.homepage}/download/${pname}-${version}.tar.gz";
sha256 = "0ngif3ynk6xqzy5nlfjs7bsmfm81g9f145av0z86kf0vbgrigda0";
sha256 = "0rqd37pc80nm2pz4sa2m9pfc48axys7jwq1l7z0vii5nyvchg0q8";
};

outputs = [ "out" "dev" "devdoc" ];
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 7 Mar 2019 08:11:32 -0500
Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility

---
nspr/lib/ds/Makefile.in | 4 ++--
nspr/lib/libc/src/Makefile.in | 4 ++--
nspr/lib/prstreams/Makefile.in | 4 ++--
nspr/pr/src/Makefile.in | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in
index e737791..d56b0a7 100644
--- a/nspr/lib/ds/Makefile.in
+++ b/nspr/lib/ds/Makefile.in
@@ -101,8 +101,8 @@ ECHO = echo
TINC = $(OBJDIR)/_pl_bld.h
PROD = $(notdir $(SHARED_LIBRARY))
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000

ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
SUF = i64
diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in
index e8a6d9f..0485737 100644
--- a/nspr/lib/libc/src/Makefile.in
+++ b/nspr/lib/libc/src/Makefile.in
@@ -103,8 +103,8 @@ ECHO = echo
TINC = $(OBJDIR)/_pl_bld.h
PROD = $(notdir $(SHARED_LIBRARY))
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000

ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
SUF = i64
diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in
index aeb2944..83ae423 100644
--- a/nspr/lib/prstreams/Makefile.in
+++ b/nspr/lib/prstreams/Makefile.in
@@ -105,8 +105,8 @@ ECHO = echo
TINC = $(OBJDIR)/_pl_bld.h
PROD = $(notdir $(SHARED_LIBRARY))
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000

ifeq ($(OS_ARCH), WINNT)
SUF = i64
diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
index 19c5a69..989cc8c 100644
--- a/nspr/pr/src/Makefile.in
+++ b/nspr/pr/src/Makefile.in
@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE)
endif
#
# In Solaris 2.6 or earlier, -lrt is called -lposix4.
-#
+#
LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE)))
ifeq (5.7, $(LIBRT_TEST))
LIBRT=-lrt
@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY))
endif

NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
-SH_DATE = $(shell date "+%Y-%m-%d %T")
-SH_NOW = $(shell $(NOW))
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
+SH_NOW = $(SOURCE_DATE_EPOCH)000000

ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
SUF = i64
--
2.19.2

8 changes: 6 additions & 2 deletions pkgs/development/libraries/nspr/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,20 @@
, CoreServices ? null
, buildPackages }:

let version = "4.20"; in
let version = "4.21"; in

stdenv.mkDerivation {
name = "nspr-${version}";

src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c";
sha256 = "0nkbgk0x31nfm4xl8la0a3vrnpa8gzkh7g4k65p7n880n73k5shm";
};

patches = [
./0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
];

outputs = [ "out" "dev" ];
outputBin = "dev";

8 changes: 4 additions & 4 deletions pkgs/development/libraries/sqlite/analyzer.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@ in

stdenv.mkDerivation rec {
name = "sqlite-analyzer-${version}";
version = "3.26.0";
version = "3.28.0";

src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
sha256 = "0ysgi2jrl348amdfifsl3cx90d04bijm4pn4xnvivmi3m1dq4hp0";
url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip";
sha256 = "15v57b113bpgcshfsx5jw93szar3da94rr03i053xhl15la7jllh";
};

nativeBuildInputs = [ unzip ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A tool that shows statistics about SQLite databases";
downloadPage = http://sqlite.org/download.html;
homepage = http://www.sqlite.org;
homepage = https://www.sqlite.org;
license = licenses.publicDomain;
maintainers = with maintainers; [ pesterhazy ];
platforms = platforms.unix;
10 changes: 5 additions & 5 deletions pkgs/development/libraries/sqlite/default.nix
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ in

stdenv.mkDerivation rec {
name = "sqlite-${version}";
version = "3.26.0";
version = "3.28.0";

# NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx";
url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "1hxpi45crbqp6lacl7z611lna02k956m9bsy2bjzrbb2y23546yn";
};

outputs = [ "bin" "dev" "out" ];
@@ -75,8 +75,8 @@ stdenv.mkDerivation rec {

meta = {
description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
downloadPage = http://sqlite.org/download.html;
homepage = http://www.sqlite.org/;
downloadPage = https://sqlite.org/download.html;
homepage = https://www.sqlite.org/;
license = licenses.publicDomain;
maintainers = with maintainers; [ eelco np ];
platforms = platforms.unix ++ platforms.windows;
4 changes: 2 additions & 2 deletions pkgs/development/tools/rust/cbindgen/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

rustPlatform.buildRustPackage rec {
name = "rust-cbindgen-${version}";
version = "0.8.0";
version = "0.8.3";

src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
sha256 = "07cizbhr02x3rh07xhs10hzzs3lmmpf61g08sa62b98cgadvs9fq";
sha256 = "08zlnk1k1nddjciccfdcplxqngsnz6ml3zxm57mijabzybry8zz1";
};

cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb";
5 changes: 5 additions & 0 deletions pkgs/os-specific/darwin/binutils/default.nix
Original file line number Diff line number Diff line change
@@ -52,4 +52,9 @@ stdenv.mkDerivation {
passthru = {
inherit targetPrefix;
};

meta = {
maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
priority = 10;
};
}
2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/audit/default.nix
Original file line number Diff line number Diff line change
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
# and pulls in an extra openldap dependency otherwise
"--disable-zos-remote"
(if enablePython then "--with-python" else "--without-python")
"--with-arm"
"--with-aarch64"
];

enableParallelBuilding = true;
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/procps-ng/default.nix
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://gitlab.com/procps-ng/procps;
description = "Utilities that give information about processes using the /proc filesystem";
priority = 10; # less than coreutils, which also provides "kill" and "uptime"
priority = 11; # less than coreutils, which also provides "kill" and "uptime"
license = lib.licenses.gpl2;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.typetetris ];
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/systemd/default.nix
Original file line number Diff line number Diff line change
@@ -220,6 +220,7 @@ in stdenv.mkDerivation rec {
description = "A system and service manager for Linux";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
priority = 10;
maintainers = [ maintainers.eelco ];
};
}
6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/grafana/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

buildGoPackage rec {
version = "6.1.6";
version = "6.2.0";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";

@@ -11,12 +11,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "12fj3j1w37nm8p2h4af38wbxkvm0pzf1zsjx8wpj0zrxanbigpjg";
sha256 = "18zig7r3kq1a3src0yb8fbajnm2hqzpzpmpjarslnp4xv90xqi87";
};

srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "1dg2gjmym06x8wj2xmygsww622k86cq07kbxvp8j8h17br4imj4k";
sha256 = "1cy3d04jjr5h8pzfzqb710rlynh9n125imkisrg05dwz5gl99bd7";
};

postPatch = ''
20 changes: 10 additions & 10 deletions pkgs/servers/sql/postgresql/default.nix
Original file line number Diff line number Diff line change
@@ -157,41 +157,41 @@ let
in self: {

postgresql_9_4 = self.callPackage generic {
version = "9.4.21";
version = "9.4.22";
psqlSchema = "9.4";
sha256 = "01k0s3a7qy8639zsjp1bjbfnnymyl0rgyylrjbkm81m0779b8j80";
sha256 = "0sy66cl2nkqr1al66f3qy7zsyd3vjpjv0icqbda7bqq4j8mlrann";
this = self.postgresql_9_4;
inherit self;
};

postgresql_9_5 = self.callPackage generic {
version = "9.5.16";
version = "9.5.17";
psqlSchema = "9.5";
sha256 = "0cg10ri0475vg1c8k1sb5qi4i64hiv9k7crmg15qvvnwsjanqmx4";
sha256 = "01gp4d3ngl2809dl652md2n1q4nk27cdbl6i892gvwk901xf7yc8";
this = self.postgresql_9_5;
inherit self;
};

postgresql_9_6 = self.callPackage generic {
version = "9.6.12";
version = "9.6.13";
psqlSchema = "9.6";
sha256 = "114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f";
sha256 = "197964wb5pc5fx81a6mh9hlcrr9sgr3nqlpmljv6asi9aq0d5gpc";
this = self.postgresql_9_6;
inherit self;
};

postgresql_10 = self.callPackage generic {
version = "10.7";
version = "10.8";
psqlSchema = "10.0"; # should be 10, but changing it is invasive
sha256 = "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz";
sha256 = "0pfdmy4w95b49w9rkn8dwvzmi2brpqfvbxd04y0k0s0xvymc565i";
this = self.postgresql_10;
inherit self;
};

postgresql_11 = self.callPackage generic {
version = "11.2";
version = "11.3";
psqlSchema = "11.1"; # should be 11, but changing it is invasive
sha256 = "01clq2lw0v83zh5dc89xdr3mmap0jr37kdkh401ph6f2177bjxi6";
sha256 = "0baj61ym7jnl195qcq4hq6225kfz6879j8zx3n148n92zj1f119a";
this = self.postgresql_11;
inherit self;
};
2 changes: 2 additions & 0 deletions pkgs/tools/archivers/gnutar/default.nix
Original file line number Diff line number Diff line change
@@ -62,5 +62,7 @@ stdenv.mkDerivation rec {

maintainers = [ ];
platforms = stdenv.lib.platforms.all;

priority = 10;
};
}
2 changes: 2 additions & 0 deletions pkgs/tools/misc/coreutils/default.nix
Original file line number Diff line number Diff line change
@@ -123,6 +123,8 @@ stdenv.mkDerivation rec {

platforms = platforms.unix ++ platforms.windows;

priority = 10;

maintainers = [ maintainers.eelco ];
};

5 changes: 4 additions & 1 deletion pkgs/top-level/unix-tools.nix
Original file line number Diff line number Diff line change
@@ -20,7 +20,10 @@ let
bin = "${getBin provider}/bin/${cmd}";
manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz";
in runCommand "${cmd}-${version}" {
meta.platforms = map (n: { kernel.name = n; }) (attrNames providers);
meta = {
priority = 10;
platforms = map (n: { kernel.name = n; }) (attrNames providers);
};
passthru = { inherit provider; };
preferLocalBuild = true;
} ''