update nixos
This commit is contained in:
parent
1e6b59eb10
commit
3d5c629da2
22
157175.patch
22
157175.patch
@ -1,22 +0,0 @@
|
||||
From c362bf9fda1878e18dd65797ac2078a6e0fee04e Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Ringer <jonringer117@gmail.com>
|
||||
Date: Fri, 28 Jan 2022 09:42:47 -0800
|
||||
Subject: [PATCH] python3Packages.sentry-sdk: disable web test
|
||||
|
||||
---
|
||||
pkgs/development/python-modules/sentry-sdk/default.nix | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
|
||||
index a59ec10be0378..26ccb1aacc51c 100644
|
||||
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
|
||||
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
|
||||
@@ -109,6 +109,8 @@ buildPythonPackage rec {
|
||||
"test_circular_references"
|
||||
# Failing wsgi test
|
||||
"test_session_mode_defaults_to_request_mode_in_wsgi_handler"
|
||||
+ # Network requests to public web
|
||||
+ "test_crumb_capture"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
@ -17,11 +17,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1643347846,
|
||||
"narHash": "sha256-O0tyXF//ppRpe9yT1Uu5n34yI2MWDyY6ZiJ4Qn5zIkE=",
|
||||
"lastModified": 1643805626,
|
||||
"narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5bb20f9dc70e9ee16e21cc404b6508654931ce41",
|
||||
"rev": "554d2d8aa25b6e583575459c297ec23750adb6cb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
channels.nixpkgs.input = nixpkgs;
|
||||
|
||||
channels.nixpkgs.patches = [ ./157175.patch ];
|
||||
channels.nixpkgs.patches = [ ];
|
||||
|
||||
nix.generateRegistryFromInputs = true;
|
||||
|
||||
|
16
i3.nix
16
i3.nix
@ -79,20 +79,4 @@
|
||||
services.dbus.packages = with pkgs; [ dunst ];
|
||||
systemd.packages = [ pkgs.dunst ];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/157112
|
||||
nixpkgs.config.packageOverrides = prev:
|
||||
let
|
||||
patchedPkgs = import (builtins.fetchTarball {
|
||||
url = "https://github.com/nixos/nixpkgs/archive/ffdadd3ef9167657657d60daf3fe0f1b3176402d.tar.gz";
|
||||
sha256 = "1nrz4vzjsf3n8wlnxskgcgcvpwaymrlff690f5njm4nl0rv22hkh";
|
||||
}) {
|
||||
inherit (prev) system config;
|
||||
# inherit (prev) overlays; # not sure
|
||||
};
|
||||
patchedPam = patchedPkgs.pam;
|
||||
in {
|
||||
i3lock = prev.i3lock.override { pam = patchedPam; };
|
||||
i3lock-color = prev.i3lock-color.override { pam = patchedPam; };
|
||||
};
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user