From 8baac2af752450b20cb8b37520059ecd86490b8b Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Mon, 25 Jan 2021 17:55:04 -0800
Subject: [PATCH 1/2] lib/systems: fix linuxArch for power + riscv

Looks like these got left behind in the
kernelArch -> linuxArch migration.

Fixes:
* pkgsCross.powernv.linuxHeaders
* pkgsCross.riscv64.linuxHeaders
* pkgsCross.riscv32.linuxHeaders
and dependees
---
 lib/systems/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 1a89120e2bf..1bbe976c4d2 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -92,6 +92,8 @@ rec {
         else if final.isx86_32 then "i386"
         else if final.isx86_64 then "x86_64"
         else if final.isMips then "mips"
+        else if final.isPower then "powerpc"
+        else if final.isRiscV then "riscv"
         else final.parsed.cpu.name;
 
       qemuArch =

From 38e23aeda3f799b9f110f20d795167d54d56a03d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2020 23:06:26 +0000
Subject: [PATCH 2/2] freetds: 1.1.42 -> 1.2

---
 pkgs/development/libraries/freetds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 8e6904a94b2..5166efea21f 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
 
 stdenv.mkDerivation rec {
   pname = "freetds";
-  version = "1.1.42";
+  version = "1.2";
 
   src = fetchurl {
     url    = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
-    sha256 = "02phnk88zv4f8byx954784w8mh33knsslwvj266jfyrmxz6hxxxg";
+    sha256 = "0nilqf3cssi6z8bxxpmc7zxsh7apgwmx8mm7nfc6c5d40z3nyjpk";
   };
 
   buildInputs = [