Author: Chris Warburton <chriswarbo@gmail.com>
Date: Sat 30 Sep 16:02:40 UTC 2023
Parent: 7b78e0cc453359250684debc50d0badd803924d4
Log message:
Python 2 -> 3
1: diff --git a/.gitignore b/.gitignore 2: index b69b3d2..f3a9e75 100644 3: --- a/.gitignore 4: +++ b/.gitignore 5: @@ -3,4 +3,4 @@ build 6: dist 7: *.egg-info 8: .eggs 9: - 10: +/result* 11: diff --git a/default.nix b/default.nix 12: index 59e4810..354f934 100644 13: --- a/default.nix 14: +++ b/default.nix 15: @@ -1,16 +1,18 @@ 16: -{ pkgs ? import <nixpkgs> {} }: 17: - 18: -with pkgs; 19: - 20: -pythonPackages.buildPythonPackage { 21: - name = "feed2maildirsimple"; 22: - version = "0.4.0"; 23: - 24: - src = ./.; 25: - 26: - propagatedBuildInputs = [ 27: - pythonPackages.python 28: - pythonPackages.dateutil 29: - pythonPackages.feedparser 30: - ]; 31: -} 32: +{ nixpkgs ? import (fetchTarball { 33: + name = "nixpkgs2305"; 34: + url = "https://github.com/NixOS/nixpkgs/archive/23.05.tar.gz"; 35: + sha256 = "10wn0l08j9lgqcw8177nh2ljrnxdrpri7bp0g7nvrsn9rkawvlbf"; 36: +}) { 37: + config = { }; 38: + overlays = [ ]; 39: +}, python3Packages ? nixpkgs.python3Packages }: 40: +with { 41: + pkg = { buildPythonPackage, dateutil, feedparser, python }: 42: + buildPythonPackage { 43: + name = "feed2maildirsimple"; 44: + version = "0.4.0"; 45: + src = ./.; 46: + propagatedBuildInputs = [ python dateutil feedparser ]; 47: + }; 48: +}; 49: +python3Packages.callPackage pkg { } 50: diff --git a/scripts/feed2maildir b/scripts/feed2maildir 51: index c42fec9..c990d03 100755 52: --- a/scripts/feed2maildir 53: +++ b/scripts/feed2maildir 54: @@ -1,4 +1,4 @@ 55: -#!/usr/bin/env python 56: +#!/usr/bin/env python3 57: # coding: utf-8 58: 59: import argparse